linkage
/
YX-SCM
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

Browse Source
qhw-dev-0927
tengxi 1 year ago
parent 13f7735e79 7c77ddcfa6
commit cb79e228f8
48 changed files with 212 additions and 1688 deletions
Show Stats Download Patch File Download Diff File

10
yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts
Unescape View File

@ -2,27 +2,27 @@ import { defHttp } from '@/utils/http/axios'
// 查询业务线/仓库列表 // 查询业务线/仓库列表
export function getBusinessWarehousePage(params) { export function getBusinessWarehousePage(params) {
return defHttp.get({ url: '/xxjj/business-warehouse/page', params }) return defHttp.get({ url: '/system/business-warehouse/page', params })
} }
// 查询业务线/仓库详情 // 查询业务线/仓库详情
export function getBusinessWarehouse(id: number) { export function getBusinessWarehouse(id: number) {
return defHttp.get({ url: '/xxjj/business-warehouse/get?id=' + id }) return defHttp.get({ url: '/system/business-warehouse/get?id=' + id })
} }
// 新增业务线/仓库 // 新增业务线/仓库
export function createBusinessWarehouse(data) { export function createBusinessWarehouse(data) {
return defHttp.post({ url: '/xxjj/business-warehouse/create', data }) return defHttp.post({ url: '/system/business-warehouse/create', data })
} }
// 修改业务线/仓库 // 修改业务线/仓库
export function updateBusinessWarehouse(data) { export function updateBusinessWarehouse(data) {
return defHttp.put({ url: '/xxjj/business-warehouse/update', data }) return defHttp.put({ url: '/system/business-warehouse/update', data })
} }
// 删除业务线/仓库 // 删除业务线/仓库
export function deleteBusinessWarehouse(id: number) { export function deleteBusinessWarehouse(id: number) {
return defHttp.delete({ url: '/xxjj/business-warehouse/delete?id=' + id }) return defHttp.delete({ url: '/system/business-warehouse/delete?id=' + id })
} }
// 导出业务线/仓库 Excel // 导出业务线/仓库 Excel

181
yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts
Unescape View File

@ -2,59 +2,11 @@ import { BasicColumn, FormSchema, useRender } from '@/components/Table'
import { DICT_TYPE, getDictOptions } from '@/utils/dict' import { DICT_TYPE, getDictOptions } from '@/utils/dict'
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{
title: '业务id',
dataIndex: 'id',
width: 160
},
{
title: '业务线编号',
dataIndex: 'businessCode',
width: 160
},
{
title: '业务线简称',
dataIndex: 'businessSimple',
width: 160
},
{
title: '传真',
dataIndex: 'fax',
width: 160
},
{
title: '网址',
dataIndex: 'url',
width: 160
},
{
title: '介绍',
dataIndex: 'description',
width: 160
},
{
title: '创建时间',
dataIndex: 'createTime',
width: 180,
customRender: ({ text }) => {
return useRender.renderDate(text)
}
},
{ {
title: '业务线名称', title: '业务线名称',
dataIndex: 'name', dataIndex: 'name',
width: 160 width: 160
}, },
{
title: '业务线LOGO',
dataIndex: 'businessLogo',
width: 160
},
{
title: '父id',
dataIndex: 'parentId',
width: 160
},
{ {
title: '类型', title: '类型',
dataIndex: 'type', dataIndex: 'type',
@ -64,87 +16,44 @@ export const columns: BasicColumn[] = [
} }
}, },
{ {
title: '所属行业', title: '状态',
dataIndex: 'industry', dataIndex: 'type',
width: 180, width: 180,
customRender: ({ text }) => { customRender: ({ text }) => {
return useRender.renderDict(text, DICT_TYPE.DUTY_TYPE) return useRender.renderDict(text, DICT_TYPE.CLASS_STATUS)
} }
}, },
{ {
title: '所在城市', title: '关联机构',
dataIndex: 'city', dataIndex: 'institutionNum',
width: 160 width: 160
}, },
{ {
title: '成立时间', title: '成员数量',
dataIndex: 'establishDate', dataIndex: 'employeeNum',
width: 180,
customRender: ({ text }) => {
return useRender.renderDate(text)
}
},
{
title: '归属人员',
dataIndex: 'belongUserId',
width: 160 width: 160
}, },
{ {
title: '品牌/业务线/事业群名称', title: '主管人员',
dataIndex: 'brandName', dataIndex: 'belongUserId',
width: 160 width: 160
}, },
{ {
title: '电话', title: '介绍',
dataIndex: 'phone', dataIndex: 'description',
width: 160 width: 160
}, },
{ {
title: '业务线仓库区分(0：业务线,1：仓库)', title: '更新时间',
dataIndex: 'diffFlag', dataIndex: 'updateTime',
width: 180, width: 180,
customRender: ({ text }) => { customRender: ({ text }) => {
return useRender.renderDict(text, DICT_TYPE.DIFF_FLAG) return useRender.renderDate(text)
} }
}, },
] ]
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
// {
// label: '业务线编号',
// field: 'businessCode',
// component: 'Input',
// colProps: { span: 8 }
// },
// {
// label: '业务线简称',
// field: 'businessSimple',
// component: 'Input',
// colProps: { span: 8 }
// },
// {
// label: '传真',
// field: 'fax',
// component: 'Input',
// colProps: { span: 8 }
// },
// {
// label: '网址',
// field: 'url',
// component: 'Input',
// colProps: { span: 8 }
// },
// {
// label: '介绍',
// field: 'description',
// colProps: { span: 8 }
// },
// {
// label: '创建时间',
// field: 'createTime',
// component: 'RangePicker',
// colProps: { span: 8 }
// },
{ {
label: '业务线名称', label: '业务线名称',
field: 'name', field: 'name',
@ -152,18 +61,6 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 8 } colProps: { span: 8 }
}, },
// { // {
// label: '业务线LOGO',
// field: 'businessLogo',
// component: 'Input',
// colProps: { span: 8 }
// },
// {
// label: '父id',
// field: 'parentId',
// component: 'Input',
// colProps: { span: 8 }
// },
// {
// label: '类型', // label: '类型',
// field: 'type', // field: 'type',
// component: 'Select', // component: 'Select',
@ -182,12 +79,6 @@ export const searchFormSchema: FormSchema[] = [
// colProps: { span: 8 } // colProps: { span: 8 }
// }, // },
// { // {
// label: '所在城市',
// field: 'city',
// component: 'Input',
// colProps: { span: 8 }
// },
// {
// label: '成立时间', // label: '成立时间',
// field: 'establishDate', // field: 'establishDate',
// component: 'RangePicker', // component: 'RangePicker',
@ -206,12 +97,6 @@ export const searchFormSchema: FormSchema[] = [
// colProps: { span: 8 } // colProps: { span: 8 }
// }, // },
// { // {
// label: '电话',
// field: 'phone',
// component: 'Input',
// colProps: { span: 8 }
// },
// {
// label: '业务线仓库区分(0：业务线,1：仓库)', // label: '业务线仓库区分(0：业务线,1：仓库)',
// field: 'diffFlag', // field: 'diffFlag',
// component: 'Select', // component: 'Select',
@ -264,7 +149,11 @@ export const createFormSchema: FormSchema[] = [
{ {
label: '业务线LOGO', label: '业务线LOGO',
field: 'businessLogo', field: 'businessLogo',
component: 'Input' component: 'FileUpload',
componentProps: {
fileType: 'file',
maxCount: 1
}
}, },
{ {
label: '父id', label: '父id',
@ -341,21 +230,6 @@ export const updateFormSchema: FormSchema[] = [
field: 'businessSimple', field: 'businessSimple',
component: 'Input' component: 'Input'
}, },
{
label: '传真',
field: 'fax',
component: 'Input'
},
{
label: '网址',
field: 'url',
component: 'Input'
},
{
label: '介绍',
field: 'description',
component: 'InputTextArea'
},
{ {
label: '业务线名称', label: '业务线名称',
field: 'name', field: 'name',
@ -365,7 +239,7 @@ export const updateFormSchema: FormSchema[] = [
{ {
label: '业务线LOGO', label: '业务线LOGO',
field: 'businessLogo', field: 'businessLogo',
component: 'Input' component: 'Upload'
}, },
{ {
label: '父id', label: '父id',
@ -413,6 +287,21 @@ export const updateFormSchema: FormSchema[] = [
field: 'phone', field: 'phone',
component: 'Input' component: 'Input'
}, },
{
label: '传真',
field: 'fax',
component: 'Input'
},
{
label: '网址',
field: 'url',
component: 'Input'
},
{
label: '介绍',
field: 'description',
component: 'InputTextArea'
},
{ {
label: '业务线仓库区分(0：业务线,1：仓库)', label: '业务线仓库区分(0：业务线,1：仓库)',
field: 'diffFlag', field: 'diffFlag',

6
yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java
Unescape View File

@ -163,6 +163,12 @@ public interface ErrorCodeConstants {
// ========== 站内信发送 1002028000 ========== // ========== 站内信发送 1002028000 ==========
ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002028000, "模板参数({})缺失"); ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002028000, "模板参数({})缺失");
// ========== 企业信息 TODO 补充编号 ========== // ========== 企业信息 TODO 补充编号 ==========
ErrorCode ENTERPRISE_NOT_EXISTS = new ErrorCode(1002004015, "企业信息不存在"); ErrorCode ENTERPRISE_NOT_EXISTS = new ErrorCode(1002004015, "企业信息不存在");
// ========== 业务线表 TODO 补充编号 ==========
ErrorCode BUSINESS_WAREHOUSE_NOT_EXISTS = new ErrorCode(1002025019, "业务线表不存在");
} }

44
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/BusinessWarehouseController.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java
Unescape View File

@ -1,4 +1,4 @@
package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse; package com.yunxi.scm.module.system.controller.admin.businesswarehouse;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -23,14 +23,14 @@ import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*; import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
import com.yunxi.scm.module.xxjj.convert.businesswarehouse.BusinessWarehouseConvert; import com.yunxi.scm.module.system.convert.businesswarehouse.BusinessWarehouseConvert;
import com.yunxi.scm.module.xxjj.service.businesswarehouse.BusinessWarehouseService; import com.yunxi.scm.module.system.service.businesswarehouse.BusinessWarehouseService;
@Tag(name = "管理后台 - 业务线/仓库") @Tag(name = "管理后台 - 业务线表")
@RestController @RestController
@RequestMapping("/xxjj/business-warehouse") @RequestMapping("/system/business-warehouse")
@Validated @Validated
public class BusinessWarehouseController { public class BusinessWarehouseController {
@ -38,65 +38,65 @@ public class BusinessWarehouseController {
private BusinessWarehouseService businessWarehouseService; private BusinessWarehouseService businessWarehouseService;
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建业务线/仓库") @Operation(summary = "创建业务线表")
@PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:create')") @PreAuthorize("@ss.hasPermission('system:business-warehouse:create')")
public CommonResult<Long> createBusinessWarehouse(@Valid @RequestBody BusinessWarehouseCreateReqVO createReqVO) { public CommonResult<Long> createBusinessWarehouse(@Valid @RequestBody BusinessWarehouseCreateReqVO createReqVO) {
return success(businessWarehouseService.createBusinessWarehouse(createReqVO)); return success(businessWarehouseService.createBusinessWarehouse(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新业务线/仓库") @Operation(summary = "更新业务线表")
@PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:update')") @PreAuthorize("@ss.hasPermission('system:business-warehouse:update')")
public CommonResult<Boolean> updateBusinessWarehouse(@Valid @RequestBody BusinessWarehouseUpdateReqVO updateReqVO) { public CommonResult<Boolean> updateBusinessWarehouse(@Valid @RequestBody BusinessWarehouseUpdateReqVO updateReqVO) {
businessWarehouseService.updateBusinessWarehouse(updateReqVO); businessWarehouseService.updateBusinessWarehouse(updateReqVO);
return success(true); return success(true);
} }
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "删除业务线/仓库") @Operation(summary = "删除业务线表")
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:delete')") @PreAuthorize("@ss.hasPermission('system:business-warehouse:delete')")
public CommonResult<Boolean> deleteBusinessWarehouse(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteBusinessWarehouse(@RequestParam("id") Long id) {
businessWarehouseService.deleteBusinessWarehouse(id); businessWarehouseService.deleteBusinessWarehouse(id);
return success(true); return success(true);
} }
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得业务线/仓库") @Operation(summary = "获得业务线表")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')") @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')")
public CommonResult<BusinessWarehouseRespVO> getBusinessWarehouse(@RequestParam("id") Long id) { public CommonResult<BusinessWarehouseRespVO> getBusinessWarehouse(@RequestParam("id") Long id) {
BusinessWarehouseDO businessWarehouse = businessWarehouseService.getBusinessWarehouse(id); BusinessWarehouseDO businessWarehouse = businessWarehouseService.getBusinessWarehouse(id);
return success(BusinessWarehouseConvert.INSTANCE.convert(businessWarehouse)); return success(BusinessWarehouseConvert.INSTANCE.convert(businessWarehouse));
} }
@GetMapping("/list") @GetMapping("/list")
@Operation(summary = "获得业务线/仓库列表") @Operation(summary = "获得业务线表列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')") @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')")
public CommonResult<List<BusinessWarehouseRespVO>> getBusinessWarehouseList(@RequestParam("ids") Collection<Long> ids) { public CommonResult<List<BusinessWarehouseRespVO>> getBusinessWarehouseList(@RequestParam("ids") Collection<Long> ids) {
List<BusinessWarehouseDO> list = businessWarehouseService.getBusinessWarehouseList(ids); List<BusinessWarehouseDO> list = businessWarehouseService.getBusinessWarehouseList(ids);
return success(BusinessWarehouseConvert.INSTANCE.convertList(list)); return success(BusinessWarehouseConvert.INSTANCE.convertList(list));
} }
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得业务线/仓库分页") @Operation(summary = "获得业务线表分页")
@PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')") @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')")
public CommonResult<PageResult<BusinessWarehouseRespVO>> getBusinessWarehousePage(@Valid BusinessWarehousePageReqVO pageVO) { public CommonResult<PageResult<BusinessWarehouseRespVO>> getBusinessWarehousePage(@Valid BusinessWarehousePageReqVO pageVO) {
PageResult<BusinessWarehouseDO> pageResult = businessWarehouseService.getBusinessWarehousePage(pageVO); PageResult<BusinessWarehouseDO> pageResult = businessWarehouseService.getBusinessWarehousePage(pageVO);
return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult)); return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult));
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出业务线/仓库 Excel") @Operation(summary = "导出业务线表 Excel")
@PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:export')") @PreAuthorize("@ss.hasPermission('system:business-warehouse:export')")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
public void exportBusinessWarehouseExcel(@Valid BusinessWarehouseExportReqVO exportReqVO, public void exportBusinessWarehouseExcel(@Valid BusinessWarehouseExportReqVO exportReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
List<BusinessWarehouseDO> list = businessWarehouseService.getBusinessWarehouseList(exportReqVO); List<BusinessWarehouseDO> list = businessWarehouseService.getBusinessWarehouseList(exportReqVO);
// 导出 Excel // 导出 Excel
List<BusinessWarehouseExcelVO> datas = BusinessWarehouseConvert.INSTANCE.convertList02(list); List<BusinessWarehouseExcelVO> datas = BusinessWarehouseConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "业务线/仓库.xls", "数据", BusinessWarehouseExcelVO.class, datas); ExcelUtils.write(response, "业务线表.xls", "数据", BusinessWarehouseExcelVO.class, datas);
} }
} }

27
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java
Unescape View File

@ -1,4 +1,4 @@
package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
@ -12,7 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/** /**
* 业务线/仓库 Base VO，提供给添加、修改、详细的子 VO 使用 * 业务线表 Base VO，提供给添加、修改、详细的子 VO 使用
* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
*/ */
@Data @Data
@ -22,7 +22,7 @@ public class BusinessWarehouseBaseVO {
@NotNull(message = "业务线编号不能为空") @NotNull(message = "业务线编号不能为空")
private String businessCode; private String businessCode;
@Schema(description = "业务线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @Schema(description = "业务线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@NotNull(message = "业务线名称不能为空") @NotNull(message = "业务线名称不能为空")
private String name; private String name;
@ -32,13 +32,13 @@ public class BusinessWarehouseBaseVO {
@Schema(description = "业务线LOGO") @Schema(description = "业务线LOGO")
private String businessLogo; private String businessLogo;
@Schema(description = "父id") @Schema(description = "父id", example = "3408")
private Long parentId; private Long parentId;
@Schema(description = "类型") @Schema(description = "类型", example = "1")
private String type; private String type;
@Schema(description = "状态") @Schema(description = "状态", example = "1")
private String status; private String status;
@Schema(description = "关联机构") @Schema(description = "关联机构")
@ -47,7 +47,7 @@ public class BusinessWarehouseBaseVO {
@Schema(description = "成员数量") @Schema(description = "成员数量")
private Integer employeeNum; private Integer employeeNum;
@Schema(description = "所属行业") @Schema(description = "所属分类")
private String industry; private String industry;
@Schema(description = "所在城市") @Schema(description = "所在城市")
@ -57,25 +57,26 @@ public class BusinessWarehouseBaseVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime establishDate; private LocalDateTime establishDate;
@Schema(description = "归属人员") @Schema(description = "归属人员", example = "26257")
private Long belongUserId; private Long belongUserId;
@Schema(description = "品牌/业务线/事业群名称") @Schema(description = "品牌/业务线/事业群名称", example = "芋艿")
private String brandName; private String brandName;
@Schema(description = "电话") @Schema(description = "电话")
private Integer phone; private Integer phone;
@Schema(description = "业务线仓库区分(0：业务线,1：仓库)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "业务线仓库区分(0：业务线,1：仓库)不能为空")
private String diffFlag;
@Schema(description = "传真") @Schema(description = "传真")
private String fax; private String fax;
@Schema(description = "网址", example = "https://www.iocoder.cn") @Schema(description = "网址", example = "https://www.iocoder.cn")
private String url; private String url;
@Schema(description = "介绍", example = "你猜") @Schema(description = "介绍", example = "随便")
private String description; private String description;
@Schema(description = "区分标志", example = "你猜")
private String diffFlag;
} }

4
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java
Unescape View File

@ -1,11 +1,11 @@
package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*; import javax.validation.constraints.*;
@Schema(description = "管理后台 - 业务线/仓库创建 Request VO") @Schema(description = "管理后台 - 业务线表创建 Request VO")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)

20
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java
Unescape View File

@ -1,7 +1,6 @@
package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.models.security.SecurityScheme;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -14,7 +13,7 @@ import com.yunxi.scm.framework.excel.core.convert.DictConvert;
/** /**
* 业务线/仓库 Excel VO * 业务线表 Excel VO
* *
* @author 长江云息 * @author 长江云息
*/ */
@ -39,10 +38,12 @@ public class BusinessWarehouseExcelVO {
@ExcelProperty("父id") @ExcelProperty("父id")
private Long parentId; private Long parentId;
@ExcelProperty("类型") @ExcelProperty(value = "类型", converter = DictConvert.class)
@DictFormat("business_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String type; private String type;
@ExcelProperty("状态") @ExcelProperty(value = "状态", converter = DictConvert.class)
@DictFormat("class_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String status; private String status;
@ExcelProperty("关联机构") @ExcelProperty("关联机构")
@ -51,7 +52,7 @@ public class BusinessWarehouseExcelVO {
@ExcelProperty("成员数量") @ExcelProperty("成员数量")
private Integer employeeNum; private Integer employeeNum;
@ExcelProperty(value = "所属行业", converter = DictConvert.class) @ExcelProperty(value = "所属分类", converter = DictConvert.class)
@DictFormat("duty_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 @DictFormat("duty_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String industry; private String industry;
@ -70,6 +71,10 @@ public class BusinessWarehouseExcelVO {
@ExcelProperty("电话") @ExcelProperty("电话")
private Integer phone; private Integer phone;
@ExcelProperty(value = "业务线仓库区分(0：业务线,1：仓库)", converter = DictConvert.class)
@DictFormat("diff_flag") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String diffFlag;
@ExcelProperty("传真") @ExcelProperty("传真")
private String fax; private String fax;
@ -82,7 +87,4 @@ public class BusinessWarehouseExcelVO {
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@ExcelProperty("区分标志")
private String diffFlag;
} }

22
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java
Unescape View File

@ -1,4 +1,4 @@
package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
@ -9,14 +9,14 @@ import org.springframework.format.annotation.DateTimeFormat;
import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 业务线/仓库 Excel 导出 Request VO，参数和 BusinessWarehousePageReqVO 是一致的") @Schema(description = "管理后台 - 业务线表 Excel 导出 Request VO，参数和 BusinessWarehousePageReqVO 是一致的")
@Data @Data
public class BusinessWarehouseExportReqVO { public class BusinessWarehouseExportReqVO {
@Schema(description = "业务线编号") @Schema(description = "业务线编号")
private String businessCode; private String businessCode;
@Schema(description = "业务线名称", example = "张三") @Schema(description = "业务线名称", example = "赵六")
private String name; private String name;
@Schema(description = "业务线简称") @Schema(description = "业务线简称")
@ -25,7 +25,7 @@ public class BusinessWarehouseExportReqVO {
@Schema(description = "业务线LOGO") @Schema(description = "业务线LOGO")
private String businessLogo; private String businessLogo;
@Schema(description = "父id", example = "6675") @Schema(description = "父id", example = "3408")
private Long parentId; private Long parentId;
@Schema(description = "类型", example = "1") @Schema(description = "类型", example = "1")
@ -40,7 +40,7 @@ public class BusinessWarehouseExportReqVO {
@Schema(description = "成员数量") @Schema(description = "成员数量")
private Integer employeeNum; private Integer employeeNum;
@Schema(description = "所属行业") @Schema(description = "所属分类")
private String industry; private String industry;
@Schema(description = "所在城市") @Schema(description = "所在城市")
@ -50,29 +50,29 @@ public class BusinessWarehouseExportReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] establishDate; private LocalDateTime[] establishDate;
@Schema(description = "归属人员", example = "19777") @Schema(description = "归属人员", example = "26257")
private Long belongUserId; private Long belongUserId;
@Schema(description = "品牌/业务线/事业群名称", example = "王五") @Schema(description = "品牌/业务线/事业群名称", example = "芋艿")
private String brandName; private String brandName;
@Schema(description = "电话") @Schema(description = "电话")
private Integer phone; private Integer phone;
@Schema(description = "业务线仓库区分(0：业务线,1：仓库)")
private String diffFlag;
@Schema(description = "传真") @Schema(description = "传真")
private String fax; private String fax;
@Schema(description = "网址", example = "https://www.iocoder.cn") @Schema(description = "网址", example = "https://www.iocoder.cn")
private String url; private String url;
@Schema(description = "介绍", example = "你猜") @Schema(description = "介绍", example = "随便")
private String description; private String description;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
@Schema(description = "区分标志", example = "你猜")
private String diffFlag;
} }

22
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java
Unescape View File

@ -1,4 +1,4 @@
package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
@ -9,7 +9,7 @@ import java.time.LocalDateTime;
import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 业务线/仓库分页 Request VO") @Schema(description = "管理后台 - 业务线表分页 Request VO")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
@ -18,7 +18,7 @@ public class BusinessWarehousePageReqVO extends PageParam {
@Schema(description = "业务线编号") @Schema(description = "业务线编号")
private String businessCode; private String businessCode;
@Schema(description = "业务线名称", example = "张三") @Schema(description = "业务线名称", example = "赵六")
private String name; private String name;
@Schema(description = "业务线简称") @Schema(description = "业务线简称")
@ -27,7 +27,7 @@ public class BusinessWarehousePageReqVO extends PageParam {
@Schema(description = "业务线LOGO") @Schema(description = "业务线LOGO")
private String businessLogo; private String businessLogo;
@Schema(description = "父id", example = "6675") @Schema(description = "父id", example = "3408")
private Long parentId; private Long parentId;
@Schema(description = "类型", example = "1") @Schema(description = "类型", example = "1")
@ -42,7 +42,7 @@ public class BusinessWarehousePageReqVO extends PageParam {
@Schema(description = "成员数量") @Schema(description = "成员数量")
private Integer employeeNum; private Integer employeeNum;
@Schema(description = "所属行业") @Schema(description = "所属分类")
private String industry; private String industry;
@Schema(description = "所在城市") @Schema(description = "所在城市")
@ -52,29 +52,29 @@ public class BusinessWarehousePageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] establishDate; private LocalDateTime[] establishDate;
@Schema(description = "归属人员", example = "19777") @Schema(description = "归属人员", example = "26257")
private Long belongUserId; private Long belongUserId;
@Schema(description = "品牌/业务线/事业群名称", example = "王五") @Schema(description = "品牌/业务线/事业群名称", example = "芋艿")
private String brandName; private String brandName;
@Schema(description = "电话") @Schema(description = "电话")
private Integer phone; private Integer phone;
@Schema(description = "业务线仓库区分(0：业务线,1：仓库)")
private String diffFlag;
@Schema(description = "传真") @Schema(description = "传真")
private String fax; private String fax;
@Schema(description = "网址", example = "https://www.iocoder.cn") @Schema(description = "网址", example = "https://www.iocoder.cn")
private String url; private String url;
@Schema(description = "介绍", example = "你猜") @Schema(description = "介绍", example = "随便")
private String description; private String description;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
@Schema(description = "区分标志", example = "你猜")
private String diffFlag;
} }

6
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java
Unescape View File

@ -1,16 +1,16 @@
package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Schema(description = "管理后台 - 业务线/仓库 Response VO") @Schema(description = "管理后台 - 业务线表 Response VO")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class BusinessWarehouseRespVO extends BusinessWarehouseBaseVO { public class BusinessWarehouseRespVO extends BusinessWarehouseBaseVO {
@Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27714") @Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20782")
private Long id; private Long id;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)

6
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java
Unescape View File

@ -1,17 +1,17 @@
package com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo; package com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import javax.validation.constraints.*; import javax.validation.constraints.*;
@Schema(description = "管理后台 - 业务线/仓库更新 Request VO") @Schema(description = "管理后台 - 业务线表更新 Request VO")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class BusinessWarehouseUpdateReqVO extends BusinessWarehouseBaseVO { public class BusinessWarehouseUpdateReqVO extends BusinessWarehouseBaseVO {
@Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27714") @Schema(description = "业务id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20782")
@NotNull(message = "业务id不能为空") @NotNull(message = "业务id不能为空")
private Long id; private Long id;

8
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businesswarehouse/BusinessWarehouseConvert.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java
Unescape View File

@ -1,4 +1,4 @@
package com.yunxi.scm.module.xxjj.convert.businesswarehouse; package com.yunxi.scm.module.system.convert.businesswarehouse;
import java.util.*; import java.util.*;
@ -6,11 +6,11 @@ import com.yunxi.scm.framework.common.pojo.PageResult;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
/** /**
* 业务线/仓库 Convert * 业务线表 Convert
* *
* @author 长江云息 * @author 长江云息
*/ */

27
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java
Unescape View File

@ -1,6 +1,5 @@
package com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse; package com.yunxi.scm.module.system.dal.dataobject.businesswarehouse;
import com.yunxi.scm.framework.tenant.core.db.TenantBaseDO;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -10,19 +9,19 @@ import com.baomidou.mybatisplus.annotation.*;
import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO; import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
/** /**
* 业务线/仓库 DO * 业务线表 DO
* *
* @author 长江云息 * @author 长江云息
*/ */
@TableName("xxjj_business_warehouse") @TableName("system_business_warehouse")
@KeySequence("xxjj_business_warehouse_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @KeySequence("system_business_warehouse_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class BusinessWarehouseDO extends TenantBaseDO { public class BusinessWarehouseDO extends BaseDO {
/** /**
* 业务id * 业务id
@ -51,10 +50,14 @@ public class BusinessWarehouseDO extends TenantBaseDO {
private Long parentId; private Long parentId;
/** /**
* 类型 * 类型
*
* 枚举 {@link TODO business_type 对应的类}
*/ */
private String type; private String type;
/** /**
* 状态 * 状态
*
* 枚举 {@link TODO class_status 对应的类}
*/ */
private String status; private String status;
/** /**
@ -66,7 +69,7 @@ public class BusinessWarehouseDO extends TenantBaseDO {
*/ */
private Integer employeeNum; private Integer employeeNum;
/** /**
* 所属行业 * 所属分类
* *
* 枚举 {@link TODO duty_type 对应的类} * 枚举 {@link TODO duty_type 对应的类}
*/ */
@ -91,6 +94,12 @@ public class BusinessWarehouseDO extends TenantBaseDO {
* 电话 * 电话
*/ */
private Integer phone; private Integer phone;
/**
* 业务线仓库区分(0：业务线,1：仓库)
*
* 枚举 {@link TODO diff_flag 对应的类}
*/
private String diffFlag;
/** /**
* 传真 * 传真
*/ */
@ -103,9 +112,5 @@ public class BusinessWarehouseDO extends TenantBaseDO {
* 介绍 * 介绍
*/ */
private String description; private String description;
/**
* 区分标志
*/
private String diffFlag;
} }

10
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
Unescape View File

@ -1,16 +1,16 @@
package com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse; package com.yunxi.scm.module.system.dal.mysql.businesswarehouse;
import java.util.*; import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX; import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
/** /**
* 业务线/仓库 Mapper * 业务线表 Mapper
* *
* @author 长江云息 * @author 长江云息
*/ */
@ -34,6 +34,7 @@ public interface BusinessWarehouseMapper extends BaseMapperX<BusinessWarehouseDO
.eqIfPresent(BusinessWarehouseDO::getBelongUserId, reqVO.getBelongUserId()) .eqIfPresent(BusinessWarehouseDO::getBelongUserId, reqVO.getBelongUserId())
.likeIfPresent(BusinessWarehouseDO::getBrandName, reqVO.getBrandName()) .likeIfPresent(BusinessWarehouseDO::getBrandName, reqVO.getBrandName())
.eqIfPresent(BusinessWarehouseDO::getPhone, reqVO.getPhone()) .eqIfPresent(BusinessWarehouseDO::getPhone, reqVO.getPhone())
.eqIfPresent(BusinessWarehouseDO::getDiffFlag, reqVO.getDiffFlag())
.eqIfPresent(BusinessWarehouseDO::getFax, reqVO.getFax()) .eqIfPresent(BusinessWarehouseDO::getFax, reqVO.getFax())
.eqIfPresent(BusinessWarehouseDO::getUrl, reqVO.getUrl()) .eqIfPresent(BusinessWarehouseDO::getUrl, reqVO.getUrl())
.eqIfPresent(BusinessWarehouseDO::getDescription, reqVO.getDescription()) .eqIfPresent(BusinessWarehouseDO::getDescription, reqVO.getDescription())
@ -58,6 +59,7 @@ public interface BusinessWarehouseMapper extends BaseMapperX<BusinessWarehouseDO
.eqIfPresent(BusinessWarehouseDO::getBelongUserId, reqVO.getBelongUserId()) .eqIfPresent(BusinessWarehouseDO::getBelongUserId, reqVO.getBelongUserId())
.likeIfPresent(BusinessWarehouseDO::getBrandName, reqVO.getBrandName()) .likeIfPresent(BusinessWarehouseDO::getBrandName, reqVO.getBrandName())
.eqIfPresent(BusinessWarehouseDO::getPhone, reqVO.getPhone()) .eqIfPresent(BusinessWarehouseDO::getPhone, reqVO.getPhone())
.eqIfPresent(BusinessWarehouseDO::getDiffFlag, reqVO.getDiffFlag())
.eqIfPresent(BusinessWarehouseDO::getFax, reqVO.getFax()) .eqIfPresent(BusinessWarehouseDO::getFax, reqVO.getFax())
.eqIfPresent(BusinessWarehouseDO::getUrl, reqVO.getUrl()) .eqIfPresent(BusinessWarehouseDO::getUrl, reqVO.getUrl())
.eqIfPresent(BusinessWarehouseDO::getDescription, reqVO.getDescription()) .eqIfPresent(BusinessWarehouseDO::getDescription, reqVO.getDescription())

30
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseService.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseService.java
Unescape View File

@ -1,20 +1,20 @@
package com.yunxi.scm.module.xxjj.service.businesswarehouse; package com.yunxi.scm.module.system.service.businesswarehouse;
import java.util.*; import java.util.*;
import javax.validation.*; import javax.validation.*;
import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.common.pojo.PageResult;
/** /**
* 业务线/仓库 Service 接口 * 业务线表 Service 接口
* *
* @author 长江云息 * @author 长江云息
*/ */
public interface BusinessWarehouseService { public interface BusinessWarehouseService {
/** /**
* 创建业务线/仓库 * 创建业务线表
* *
* @param createReqVO 创建信息 * @param createReqVO 创建信息
* @return 编号 * @return 编号
@ -22,48 +22,48 @@ public interface BusinessWarehouseService {
Long createBusinessWarehouse(@Valid BusinessWarehouseCreateReqVO createReqVO); Long createBusinessWarehouse(@Valid BusinessWarehouseCreateReqVO createReqVO);
/** /**
* 更新业务线/仓库 * 更新业务线表
* *
* @param updateReqVO 更新信息 * @param updateReqVO 更新信息
*/ */
void updateBusinessWarehouse(@Valid BusinessWarehouseUpdateReqVO updateReqVO); void updateBusinessWarehouse(@Valid BusinessWarehouseUpdateReqVO updateReqVO);
/** /**
* 删除业务线/仓库 * 删除业务线表
* *
* @param id 编号 * @param id 编号
*/ */
void deleteBusinessWarehouse(Long id); void deleteBusinessWarehouse(Long id);
/** /**
* 获得业务线/仓库 * 获得业务线表
* *
* @param id 编号 * @param id 编号
* @return 业务线/仓库 * @return 业务线表
*/ */
BusinessWarehouseDO getBusinessWarehouse(Long id); BusinessWarehouseDO getBusinessWarehouse(Long id);
/** /**
* 获得业务线/仓库列表 * 获得业务线表列表
* *
* @param ids 编号 * @param ids 编号
* @return 业务线/仓库列表 * @return 业务线表列表
*/ */
List<BusinessWarehouseDO> getBusinessWarehouseList(Collection<Long> ids); List<BusinessWarehouseDO> getBusinessWarehouseList(Collection<Long> ids);
/** /**
* 获得业务线/仓库分页 * 获得业务线表分页
* *
* @param pageReqVO 分页查询 * @param pageReqVO 分页查询
* @return 业务线/仓库分页 * @return 业务线表分页
*/ */
PageResult<BusinessWarehouseDO> getBusinessWarehousePage(BusinessWarehousePageReqVO pageReqVO); PageResult<BusinessWarehouseDO> getBusinessWarehousePage(BusinessWarehousePageReqVO pageReqVO);
/** /**
* 获得业务线/仓库列表, 用于 Excel 导出 * 获得业务线表列表, 用于 Excel 导出
* *
* @param exportReqVO 查询条件 * @param exportReqVO 查询条件
* @return 业务线/仓库列表 * @return 业务线表列表
*/ */
List<BusinessWarehouseDO> getBusinessWarehouseList(BusinessWarehouseExportReqVO exportReqVO); List<BusinessWarehouseDO> getBusinessWarehouseList(BusinessWarehouseExportReqVO exportReqVO);

14
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImpl.java → yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java
Unescape View File

@ -1,22 +1,22 @@
package com.yunxi.scm.module.xxjj.service.businesswarehouse; package com.yunxi.scm.module.system.service.businesswarehouse;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import java.util.*; import java.util.*;
import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.module.xxjj.convert.businesswarehouse.BusinessWarehouseConvert; import com.yunxi.scm.module.system.convert.businesswarehouse.BusinessWarehouseConvert;
import com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse.BusinessWarehouseMapper; import com.yunxi.scm.module.system.dal.mysql.businesswarehouse.BusinessWarehouseMapper;
import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*;
/** /**
* 业务线/仓库 Service 实现类 * 业务线表 Service 实现类
* *
* @author 长江云息 * @author 长江云息
*/ */

2
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businesswarehouse/BusinessWarehouseMapper.xml → yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse.BusinessWarehouseMapper"> <mapper namespace="com.yunxi.scm.module.system.dal.mysql.businesswarehouse.BusinessWarehouseMapper">
<!-- <!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

55
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImplTest.java → yunxi-module-system/yunxi-module-system-biz/src/test/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImplTest.java
Unescape View File

@ -1,4 +1,4 @@
package com.yunxi.scm.module.xxjj.service.businesswarehouse; package com.yunxi.scm.module.system.service.businesswarehouse;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -8,9 +8,9 @@ import javax.annotation.Resource;
import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest; import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest;
import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO;
import com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse.BusinessWarehouseMapper; import com.yunxi.scm.module.system.dal.mysql.businesswarehouse.BusinessWarehouseMapper;
import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.common.pojo.PageResult;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -19,7 +19,7 @@ import java.util.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import static cn.hutool.core.util.RandomUtil.*; import static cn.hutool.core.util.RandomUtil.*;
import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*; import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*;
import static com.yunxi.scm.framework.test.core.util.AssertUtils.*; import static com.yunxi.scm.framework.test.core.util.AssertUtils.*;
import static com.yunxi.scm.framework.test.core.util.RandomUtils.*; import static com.yunxi.scm.framework.test.core.util.RandomUtils.*;
import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*; import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*;
@ -116,22 +116,25 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
o.setBusinessLogo(null); o.setBusinessLogo(null);
o.setParentId(null); o.setParentId(null);
o.setType(null); o.setType(null);
o.setStatus(null);
o.setInstitutionNum(null);
o.setEmployeeNum(null);
o.setIndustry(null); o.setIndustry(null);
o.setCity(null); o.setCity(null);
o.setEstablishDate(null); o.setEstablishDate(null);
o.setBelongUserId(null); o.setBelongUserId(null);
o.setBrandName(null); o.setBrandName(null);
o.setPhone(null); o.setPhone(null);
o.setDiffFlag(null);
o.setFax(null); o.setFax(null);
o.setUrl(null); o.setUrl(null);
o.setDescription(null); o.setDescription(null);
o.setCreateTime(null); o.setCreateTime(null);
o.setDiffFlag(null);
}); });
businessWarehouseMapper.insert(dbBusinessWarehouse); businessWarehouseMapper.insert(dbBusinessWarehouse);
// 测试 businessCode 不匹配 // 测试 businessCode 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessCode(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessCode(null)));
// 测试 businessName 不匹配 // 测试 name 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setName(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setName(null)));
// 测试 businessSimple 不匹配 // 测试 businessSimple 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessSimple(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessSimple(null)));
@ -141,6 +144,12 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setParentId(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setParentId(null)));
// 测试 type 不匹配 // 测试 type 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setType(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setType(null)));
// 测试 status 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setStatus(null)));
// 测试 institutionNum 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setInstitutionNum(null)));
// 测试 employeeNum 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setEmployeeNum(null)));
// 测试 industry 不匹配 // 测试 industry 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setIndustry(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setIndustry(null)));
// 测试 city 不匹配 // 测试 city 不匹配
@ -153,6 +162,8 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBrandName(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBrandName(null)));
// 测试 phone 不匹配 // 测试 phone 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setPhone(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setPhone(null)));
// 测试 diffFlag 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDiffFlag(null)));
// 测试 fax 不匹配 // 测试 fax 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setFax(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setFax(null)));
// 测试 url 不匹配 // 测试 url 不匹配
@ -161,8 +172,6 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDescription(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDescription(null)));
// 测试 createTime 不匹配 // 测试 createTime 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setCreateTime(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setCreateTime(null)));
// 测试 diffFlag 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDiffFlag(null)));
// 准备参数 // 准备参数
BusinessWarehousePageReqVO reqVO = new BusinessWarehousePageReqVO(); BusinessWarehousePageReqVO reqVO = new BusinessWarehousePageReqVO();
reqVO.setBusinessCode(null); reqVO.setBusinessCode(null);
@ -171,17 +180,21 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
reqVO.setBusinessLogo(null); reqVO.setBusinessLogo(null);
reqVO.setParentId(null); reqVO.setParentId(null);
reqVO.setType(null); reqVO.setType(null);
reqVO.setStatus(null);
reqVO.setInstitutionNum(null);
reqVO.setEmployeeNum(null);
reqVO.setIndustry(null); reqVO.setIndustry(null);
reqVO.setCity(null); reqVO.setCity(null);
reqVO.setEstablishDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); reqVO.setEstablishDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setBelongUserId(null); reqVO.setBelongUserId(null);
reqVO.setBrandName(null); reqVO.setBrandName(null);
reqVO.setPhone(null); reqVO.setPhone(null);
reqVO.setDiffFlag(null);
reqVO.setFax(null); reqVO.setFax(null);
reqVO.setUrl(null); reqVO.setUrl(null);
reqVO.setDescription(null); reqVO.setDescription(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setDiffFlag(null);
// 调用 // 调用
PageResult<BusinessWarehouseDO> pageResult = businessWarehouseService.getBusinessWarehousePage(reqVO); PageResult<BusinessWarehouseDO> pageResult = businessWarehouseService.getBusinessWarehousePage(reqVO);
// 断言 // 断言
@ -201,22 +214,25 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
o.setBusinessLogo(null); o.setBusinessLogo(null);
o.setParentId(null); o.setParentId(null);
o.setType(null); o.setType(null);
o.setStatus(null);
o.setInstitutionNum(null);
o.setEmployeeNum(null);
o.setIndustry(null); o.setIndustry(null);
o.setCity(null); o.setCity(null);
o.setEstablishDate(null); o.setEstablishDate(null);
o.setBelongUserId(null); o.setBelongUserId(null);
o.setBrandName(null); o.setBrandName(null);
o.setPhone(null); o.setPhone(null);
o.setDiffFlag(null);
o.setFax(null); o.setFax(null);
o.setUrl(null); o.setUrl(null);
o.setDescription(null); o.setDescription(null);
o.setCreateTime(null); o.setCreateTime(null);
o.setDiffFlag(null);
}); });
businessWarehouseMapper.insert(dbBusinessWarehouse); businessWarehouseMapper.insert(dbBusinessWarehouse);
// 测试 businessCode 不匹配 // 测试 businessCode 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessCode(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessCode(null)));
// 测试 businessName 不匹配 // 测试 name 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setName(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setName(null)));
// 测试 businessSimple 不匹配 // 测试 businessSimple 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessSimple(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBusinessSimple(null)));
@ -226,6 +242,12 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setParentId(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setParentId(null)));
// 测试 type 不匹配 // 测试 type 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setType(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setType(null)));
// 测试 status 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setStatus(null)));
// 测试 institutionNum 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setInstitutionNum(null)));
// 测试 employeeNum 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setEmployeeNum(null)));
// 测试 industry 不匹配 // 测试 industry 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setIndustry(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setIndustry(null)));
// 测试 city 不匹配 // 测试 city 不匹配
@ -238,6 +260,8 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBrandName(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setBrandName(null)));
// 测试 phone 不匹配 // 测试 phone 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setPhone(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setPhone(null)));
// 测试 diffFlag 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDiffFlag(null)));
// 测试 fax 不匹配 // 测试 fax 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setFax(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setFax(null)));
// 测试 url 不匹配 // 测试 url 不匹配
@ -246,8 +270,6 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDescription(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDescription(null)));
// 测试 createTime 不匹配 // 测试 createTime 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setCreateTime(null))); businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setCreateTime(null)));
// 测试 diffFlag 不匹配
businessWarehouseMapper.insert(cloneIgnoreId(dbBusinessWarehouse, o -> o.setDiffFlag(null)));
// 准备参数 // 准备参数
BusinessWarehouseExportReqVO reqVO = new BusinessWarehouseExportReqVO(); BusinessWarehouseExportReqVO reqVO = new BusinessWarehouseExportReqVO();
reqVO.setBusinessCode(null); reqVO.setBusinessCode(null);
@ -256,17 +278,20 @@ public class BusinessWarehouseServiceImplTest extends BaseDbUnitTest {
reqVO.setBusinessLogo(null); reqVO.setBusinessLogo(null);
reqVO.setParentId(null); reqVO.setParentId(null);
reqVO.setType(null); reqVO.setType(null);
reqVO.setStatus(null);
reqVO.setInstitutionNum(null);
reqVO.setEmployeeNum(null);
reqVO.setIndustry(null); reqVO.setIndustry(null);
reqVO.setCity(null); reqVO.setCity(null);
reqVO.setEstablishDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); reqVO.setEstablishDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setBelongUserId(null); reqVO.setBelongUserId(null);
reqVO.setBrandName(null); reqVO.setBrandName(null);
reqVO.setPhone(null); reqVO.setPhone(null);
reqVO.setDiffFlag(null);
reqVO.setFax(null); reqVO.setFax(null);
reqVO.setUrl(null); reqVO.setUrl(null);
reqVO.setDescription(null); reqVO.setDescription(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
reqVO.setDiffFlag(null);
// 调用 // 调用
List<BusinessWarehouseDO> list = businessWarehouseService.getBusinessWarehouseList(reqVO); List<BusinessWarehouseDO> list = businessWarehouseService.getBusinessWarehouseList(reqVO);

102
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/BusinessEnterpriseRelationalController.java
Unescape View File

@ -1,102 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.framework.common.pojo.CommonResult;
import static com.yunxi.scm.framework.common.pojo.CommonResult.success;
import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO;
import com.yunxi.scm.module.xxjj.convert.businessenterpriserelational.BusinessEnterpriseRelationalConvert;
import com.yunxi.scm.module.xxjj.service.businessenterpriserelational.BusinessEnterpriseRelationalService;
@Tag(name = "管理后台 - 业务线和机构关联")
@RestController
@RequestMapping("/xxjj/business-enterprise-relational")
@Validated
public class BusinessEnterpriseRelationalController {
@Resource
private BusinessEnterpriseRelationalService businessEnterpriseRelationalService;
@PostMapping("/create")
@Operation(summary = "创建业务线和机构关联")
@PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:create')")
public CommonResult<Long> createBusinessEnterpriseRelational(@Valid @RequestBody BusinessEnterpriseRelationalCreateReqVO createReqVO) {
return success(businessEnterpriseRelationalService.createBusinessEnterpriseRelational(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新业务线和机构关联")
@PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:update')")
public CommonResult<Boolean> updateBusinessEnterpriseRelational(@Valid @RequestBody BusinessEnterpriseRelationalUpdateReqVO updateReqVO) {
businessEnterpriseRelationalService.updateBusinessEnterpriseRelational(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除业务线和机构关联")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:delete')")
public CommonResult<Boolean> deleteBusinessEnterpriseRelational(@RequestParam("id") Long id) {
businessEnterpriseRelationalService.deleteBusinessEnterpriseRelational(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得业务线和机构关联")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:query')")
public CommonResult<BusinessEnterpriseRelationalRespVO> getBusinessEnterpriseRelational(@RequestParam("id") Long id) {
BusinessEnterpriseRelationalDO businessEnterpriseRelational = businessEnterpriseRelationalService.getBusinessEnterpriseRelational(id);
return success(BusinessEnterpriseRelationalConvert.INSTANCE.convert(businessEnterpriseRelational));
}
@GetMapping("/list")
@Operation(summary = "获得业务线和机构关联列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:query')")
public CommonResult<List<BusinessEnterpriseRelationalRespVO>> getBusinessEnterpriseRelationalList(@RequestParam("ids") Collection<Long> ids) {
List<BusinessEnterpriseRelationalDO> list = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalList(ids);
return success(BusinessEnterpriseRelationalConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得业务线和机构关联分页")
@PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:query')")
public CommonResult<PageResult<BusinessEnterpriseRelationalRespVO>> getBusinessEnterpriseRelationalPage(@Valid BusinessEnterpriseRelationalPageReqVO pageVO) {
PageResult<BusinessEnterpriseRelationalDO> pageResult = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalPage(pageVO);
return success(BusinessEnterpriseRelationalConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/export-excel")
@Operation(summary = "导出业务线和机构关联 Excel")
@PreAuthorize("@ss.hasPermission('xxjj:business-enterprise-relational:export')")
@OperateLog(type = EXPORT)
public void exportBusinessEnterpriseRelationalExcel(@Valid BusinessEnterpriseRelationalExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<BusinessEnterpriseRelationalDO> list = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalList(exportReqVO);
// 导出 Excel
List<BusinessEnterpriseRelationalExcelVO> datas = BusinessEnterpriseRelationalConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "业务线和机构关联.xls", "数据", BusinessEnterpriseRelationalExcelVO.class, datas);
}
}

25
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalBaseVO.java
Unescape View File

@ -1,25 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
/**
* 业务线和机构关联 Base VO，提供给添加、修改、详细的子 VO 使用
* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
*/
@Data
public class BusinessEnterpriseRelationalBaseVO {
@Schema(description = "业务线id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7685")
@NotNull(message = "业务线id不能为空")
private Long businessId;
@Schema(description = "企业id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7361")
@NotNull(message = "企业id不能为空")
private Long enterpriseId;
}

14
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalCreateReqVO.java
Unescape View File

@ -1,14 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 业务线和机构关联创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BusinessEnterpriseRelationalCreateReqVO extends BusinessEnterpriseRelationalBaseVO {
}

31
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExcelVO.java
Unescape View File

@ -1,31 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
/**
* 业务线和机构关联 Excel VO
*
* @author 长江云息
*/
@Data
public class BusinessEnterpriseRelationalExcelVO {
@ExcelProperty("主键id")
private Long id;
@ExcelProperty("业务线id")
private Long businessId;
@ExcelProperty("企业id")
private Long enterpriseId;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

26
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalExportReqVO.java
Unescape View File

@ -1,26 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.yunxi.scm.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 业务线和机构关联 Excel 导出 Request VO，参数和 BusinessEnterpriseRelationalPageReqVO 是一致的")
@Data
public class BusinessEnterpriseRelationalExportReqVO {
@Schema(description = "业务线id", example = "7685")
private Long businessId;
@Schema(description = "企业id", example = "7361")
private Long enterpriseId;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

28
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalPageReqVO.java
Unescape View File

@ -1,28 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.yunxi.scm.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 业务线和机构关联分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BusinessEnterpriseRelationalPageReqVO extends PageParam {
@Schema(description = "业务线id", example = "7685")
private Long businessId;
@Schema(description = "企业id", example = "7361")
private Long enterpriseId;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

19
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalRespVO.java
Unescape View File

@ -1,19 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 业务线和机构关联 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BusinessEnterpriseRelationalRespVO extends BusinessEnterpriseRelationalBaseVO {
@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29174")
private Long id;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
}

18
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessenterpriserelational/vo/BusinessEnterpriseRelationalUpdateReqVO.java
Unescape View File

@ -1,18 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 业务线和机构关联更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BusinessEnterpriseRelationalUpdateReqVO extends BusinessEnterpriseRelationalBaseVO {
@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29174")
@NotNull(message = "主键id不能为空")
private Long id;
}

102
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/BusinessUserRelationalController.java
Unescape View File

@ -1,102 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.framework.common.pojo.CommonResult;
import static com.yunxi.scm.framework.common.pojo.CommonResult.success;
import com.yunxi.scm.framework.excel.core.util.ExcelUtils;
import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog;
import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO;
import com.yunxi.scm.module.xxjj.convert.businessuserrelational.BusinessUserRelationalConvert;
import com.yunxi.scm.module.xxjj.service.businessuserrelational.BusinessUserRelationalService;
@Tag(name = "管理后台 - 业务线和用户关联")
@RestController
@RequestMapping("/xxjj/business-user-relational")
@Validated
public class BusinessUserRelationalController {
@Resource
private BusinessUserRelationalService businessUserRelationalService;
@PostMapping("/create")
@Operation(summary = "创建业务线和用户关联")
@PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:create')")
public CommonResult<Long> createBusinessUserRelational(@Valid @RequestBody BusinessUserRelationalCreateReqVO createReqVO) {
return success(businessUserRelationalService.createBusinessUserRelational(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新业务线和用户关联")
@PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:update')")
public CommonResult<Boolean> updateBusinessUserRelational(@Valid @RequestBody BusinessUserRelationalUpdateReqVO updateReqVO) {
businessUserRelationalService.updateBusinessUserRelational(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除业务线和用户关联")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:delete')")
public CommonResult<Boolean> deleteBusinessUserRelational(@RequestParam("id") Long id) {
businessUserRelationalService.deleteBusinessUserRelational(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得业务线和用户关联")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:query')")
public CommonResult<BusinessUserRelationalRespVO> getBusinessUserRelational(@RequestParam("id") Long id) {
BusinessUserRelationalDO businessUserRelational = businessUserRelationalService.getBusinessUserRelational(id);
return success(BusinessUserRelationalConvert.INSTANCE.convert(businessUserRelational));
}
@GetMapping("/list")
@Operation(summary = "获得业务线和用户关联列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:query')")
public CommonResult<List<BusinessUserRelationalRespVO>> getBusinessUserRelationalList(@RequestParam("ids") Collection<Long> ids) {
List<BusinessUserRelationalDO> list = businessUserRelationalService.getBusinessUserRelationalList(ids);
return success(BusinessUserRelationalConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得业务线和用户关联分页")
@PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:query')")
public CommonResult<PageResult<BusinessUserRelationalRespVO>> getBusinessUserRelationalPage(@Valid BusinessUserRelationalPageReqVO pageVO) {
PageResult<BusinessUserRelationalDO> pageResult = businessUserRelationalService.getBusinessUserRelationalPage(pageVO);
return success(BusinessUserRelationalConvert.INSTANCE.convertPage(pageResult));
}
@GetMapping("/export-excel")
@Operation(summary = "导出业务线和用户关联 Excel")
@PreAuthorize("@ss.hasPermission('xxjj:business-user-relational:export')")
@OperateLog(type = EXPORT)
public void exportBusinessUserRelationalExcel(@Valid BusinessUserRelationalExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<BusinessUserRelationalDO> list = businessUserRelationalService.getBusinessUserRelationalList(exportReqVO);
// 导出 Excel
List<BusinessUserRelationalExcelVO> datas = BusinessUserRelationalConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "业务线和用户关联.xls", "数据", BusinessUserRelationalExcelVO.class, datas);
}
}

25
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalBaseVO.java
Unescape View File

@ -1,25 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
/**
* 业务线和用户关联 Base VO，提供给添加、修改、详细的子 VO 使用
* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
*/
@Data
public class BusinessUserRelationalBaseVO {
@Schema(description = "业务线id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6353")
@NotNull(message = "业务线id不能为空")
private Long businessId;
@Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5981")
@NotNull(message = "用户id不能为空")
private Long userId;
}

14
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalCreateReqVO.java
Unescape View File

@ -1,14 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 业务线和用户关联创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BusinessUserRelationalCreateReqVO extends BusinessUserRelationalBaseVO {
}

31
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExcelVO.java
Unescape View File

@ -1,31 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
/**
* 业务线和用户关联 Excel VO
*
* @author 长江云息
*/
@Data
public class BusinessUserRelationalExcelVO {
@ExcelProperty("主键id")
private Long id;
@ExcelProperty("业务线id")
private Long businessId;
@ExcelProperty("用户id")
private Long userId;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

26
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalExportReqVO.java
Unescape View File

@ -1,26 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.yunxi.scm.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 业务线和用户关联 Excel 导出 Request VO，参数和 BusinessUserRelationalPageReqVO 是一致的")
@Data
public class BusinessUserRelationalExportReqVO {
@Schema(description = "业务线id", example = "6353")
private Long businessId;
@Schema(description = "用户id", example = "5981")
private Long userId;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

28
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalPageReqVO.java
Unescape View File

@ -1,28 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.yunxi.scm.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 业务线和用户关联分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BusinessUserRelationalPageReqVO extends PageParam {
@Schema(description = "业务线id", example = "6353")
private Long businessId;
@Schema(description = "用户id", example = "5981")
private Long userId;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

19
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalRespVO.java
Unescape View File

@ -1,19 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 业务线和用户关联 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BusinessUserRelationalRespVO extends BusinessUserRelationalBaseVO {
@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31510")
private Long id;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
}

18
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businessuserrelational/vo/BusinessUserRelationalUpdateReqVO.java
Unescape View File

@ -1,18 +0,0 @@
package com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - 业务线和用户关联更新 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BusinessUserRelationalUpdateReqVO extends BusinessUserRelationalBaseVO {
@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31510")
@NotNull(message = "主键id不能为空")
private Long id;
}

34
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessenterpriserelational/BusinessEnterpriseRelationalConvert.java
Unescape View File

@ -1,34 +0,0 @@
package com.yunxi.scm.module.xxjj.convert.businessenterpriserelational;
import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO;
/**
* 业务线和机构关联 Convert
*
* @author 长江云息
*/
@Mapper
public interface BusinessEnterpriseRelationalConvert {
BusinessEnterpriseRelationalConvert INSTANCE = Mappers.getMapper(BusinessEnterpriseRelationalConvert.class);
BusinessEnterpriseRelationalDO convert(BusinessEnterpriseRelationalCreateReqVO bean);
BusinessEnterpriseRelationalDO convert(BusinessEnterpriseRelationalUpdateReqVO bean);
BusinessEnterpriseRelationalRespVO convert(BusinessEnterpriseRelationalDO bean);
List<BusinessEnterpriseRelationalRespVO> convertList(List<BusinessEnterpriseRelationalDO> list);
PageResult<BusinessEnterpriseRelationalRespVO> convertPage(PageResult<BusinessEnterpriseRelationalDO> page);
List<BusinessEnterpriseRelationalExcelVO> convertList02(List<BusinessEnterpriseRelationalDO> list);
}

34
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businessuserrelational/BusinessUserRelationalConvert.java
Unescape View File

@ -1,34 +0,0 @@
package com.yunxi.scm.module.xxjj.convert.businessuserrelational;
import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO;
/**
* 业务线和用户关联 Convert
*
* @author 长江云息
*/
@Mapper
public interface BusinessUserRelationalConvert {
BusinessUserRelationalConvert INSTANCE = Mappers.getMapper(BusinessUserRelationalConvert.class);
BusinessUserRelationalDO convert(BusinessUserRelationalCreateReqVO bean);
BusinessUserRelationalDO convert(BusinessUserRelationalUpdateReqVO bean);
BusinessUserRelationalRespVO convert(BusinessUserRelationalDO bean);
List<BusinessUserRelationalRespVO> convertList(List<BusinessUserRelationalDO> list);
PageResult<BusinessUserRelationalRespVO> convertPage(PageResult<BusinessUserRelationalDO> page);
List<BusinessUserRelationalExcelVO> convertList02(List<BusinessUserRelationalDO> list);
}

39
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessenterpriserelational/BusinessEnterpriseRelationalDO.java
Unescape View File

@ -1,39 +0,0 @@
package com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
/**
* 业务线和机构关联 DO
*
* @author 长江云息
*/
@TableName("xxjj_business_enterprise_relational")
@KeySequence("xxjj_business_enterprise_relational_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BusinessEnterpriseRelationalDO extends BaseDO {
/**
* 主键id
*/
@TableId
private Long id;
/**
* 业务线id
*/
private Long businessId;
/**
* 企业id
*/
private Long enterpriseId;
}

39
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businessuserrelational/BusinessUserRelationalDO.java
Unescape View File

@ -1,39 +0,0 @@
package com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
/**
* 业务线和用户关联 DO
*
* @author 长江云息
*/
@TableName("xxjj_business_user_relational")
@KeySequence("xxjj_business_user_relational_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BusinessUserRelationalDO extends BaseDO {
/**
* 主键id
*/
@TableId
private Long id;
/**
* 业务线id
*/
private Long businessId;
/**
* 用户id
*/
private Long userId;
}

36
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessenterpriserelational/BusinessEnterpriseRelationalMapper.java
Unescape View File

@ -1,36 +0,0 @@
package com.yunxi.scm.module.xxjj.dal.mysql.businessenterpriserelational;
import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO;
import org.apache.ibatis.annotations.Mapper;
import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*;
/**
* 业务线和机构关联 Mapper
*
* @author 长江云息
*/
@Mapper
public interface BusinessEnterpriseRelationalMapper extends BaseMapperX<BusinessEnterpriseRelationalDO> {
default PageResult<BusinessEnterpriseRelationalDO> selectPage(BusinessEnterpriseRelationalPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<BusinessEnterpriseRelationalDO>()
.eqIfPresent(BusinessEnterpriseRelationalDO::getBusinessId, reqVO.getBusinessId())
.eqIfPresent(BusinessEnterpriseRelationalDO::getEnterpriseId, reqVO.getEnterpriseId())
.betweenIfPresent(BusinessEnterpriseRelationalDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(BusinessEnterpriseRelationalDO::getId));
}
default List<BusinessEnterpriseRelationalDO> selectList(BusinessEnterpriseRelationalExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<BusinessEnterpriseRelationalDO>()
.eqIfPresent(BusinessEnterpriseRelationalDO::getBusinessId, reqVO.getBusinessId())
.eqIfPresent(BusinessEnterpriseRelationalDO::getEnterpriseId, reqVO.getEnterpriseId())
.betweenIfPresent(BusinessEnterpriseRelationalDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(BusinessEnterpriseRelationalDO::getId));
}
}

36
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businessuserrelational/BusinessUserRelationalMapper.java
Unescape View File

@ -1,36 +0,0 @@
package com.yunxi.scm.module.xxjj.dal.mysql.businessuserrelational;
import java.util.*;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO;
import org.apache.ibatis.annotations.Mapper;
import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*;
/**
* 业务线和用户关联 Mapper
*
* @author 长江云息
*/
@Mapper
public interface BusinessUserRelationalMapper extends BaseMapperX<BusinessUserRelationalDO> {
default PageResult<BusinessUserRelationalDO> selectPage(BusinessUserRelationalPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<BusinessUserRelationalDO>()
.eqIfPresent(BusinessUserRelationalDO::getBusinessId, reqVO.getBusinessId())
.eqIfPresent(BusinessUserRelationalDO::getUserId, reqVO.getUserId())
.betweenIfPresent(BusinessUserRelationalDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(BusinessUserRelationalDO::getId));
}
default List<BusinessUserRelationalDO> selectList(BusinessUserRelationalExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<BusinessUserRelationalDO>()
.eqIfPresent(BusinessUserRelationalDO::getBusinessId, reqVO.getBusinessId())
.eqIfPresent(BusinessUserRelationalDO::getUserId, reqVO.getUserId())
.betweenIfPresent(BusinessUserRelationalDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(BusinessUserRelationalDO::getId));
}
}

70
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalService.java
Unescape View File

@ -1,70 +0,0 @@
package com.yunxi.scm.module.xxjj.service.businessenterpriserelational;
import java.util.*;
import javax.validation.*;
import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO;
import com.yunxi.scm.framework.common.pojo.PageResult;
/**
* 业务线和机构关联 Service 接口
*
* @author 长江云息
*/
public interface BusinessEnterpriseRelationalService {
/**
* 创建业务线和机构关联
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createBusinessEnterpriseRelational(@Valid BusinessEnterpriseRelationalCreateReqVO createReqVO);
/**
* 更新业务线和机构关联
*
* @param updateReqVO 更新信息
*/
void updateBusinessEnterpriseRelational(@Valid BusinessEnterpriseRelationalUpdateReqVO updateReqVO);
/**
* 删除业务线和机构关联
*
* @param id 编号
*/
void deleteBusinessEnterpriseRelational(Long id);
/**
* 获得业务线和机构关联
*
* @param id 编号
* @return 业务线和机构关联
*/
BusinessEnterpriseRelationalDO getBusinessEnterpriseRelational(Long id);
/**
* 获得业务线和机构关联列表
*
* @param ids 编号
* @return 业务线和机构关联列表
*/
List<BusinessEnterpriseRelationalDO> getBusinessEnterpriseRelationalList(Collection<Long> ids);
/**
* 获得业务线和机构关联分页
*
* @param pageReqVO 分页查询
* @return 业务线和机构关联分页
*/
PageResult<BusinessEnterpriseRelationalDO> getBusinessEnterpriseRelationalPage(BusinessEnterpriseRelationalPageReqVO pageReqVO);
/**
* 获得业务线和机构关联列表, 用于 Excel 导出
*
* @param exportReqVO 查询条件
* @return 业务线和机构关联列表
*/
List<BusinessEnterpriseRelationalDO> getBusinessEnterpriseRelationalList(BusinessEnterpriseRelationalExportReqVO exportReqVO);
}

82
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImpl.java
Unescape View File

@ -1,82 +0,0 @@
package com.yunxi.scm.module.xxjj.service.businessenterpriserelational;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.module.xxjj.convert.businessenterpriserelational.BusinessEnterpriseRelationalConvert;
import com.yunxi.scm.module.xxjj.dal.mysql.businessenterpriserelational.BusinessEnterpriseRelationalMapper;
import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
/**
* 业务线和机构关联 Service 实现类
*
* @author 长江云息
*/
@Service
@Validated
public class BusinessEnterpriseRelationalServiceImpl implements BusinessEnterpriseRelationalService {
@Resource
private BusinessEnterpriseRelationalMapper businessEnterpriseRelationalMapper;
@Override
public Long createBusinessEnterpriseRelational(BusinessEnterpriseRelationalCreateReqVO createReqVO) {
// 插入
BusinessEnterpriseRelationalDO businessEnterpriseRelational = BusinessEnterpriseRelationalConvert.INSTANCE.convert(createReqVO);
businessEnterpriseRelationalMapper.insert(businessEnterpriseRelational);
// 返回
return businessEnterpriseRelational.getId();
}
@Override
public void updateBusinessEnterpriseRelational(BusinessEnterpriseRelationalUpdateReqVO updateReqVO) {
// 校验存在
validateBusinessEnterpriseRelationalExists(updateReqVO.getId());
// 更新
BusinessEnterpriseRelationalDO updateObj = BusinessEnterpriseRelationalConvert.INSTANCE.convert(updateReqVO);
businessEnterpriseRelationalMapper.updateById(updateObj);
}
@Override
public void deleteBusinessEnterpriseRelational(Long id) {
// 校验存在
validateBusinessEnterpriseRelationalExists(id);
// 删除
businessEnterpriseRelationalMapper.deleteById(id);
}
private void validateBusinessEnterpriseRelationalExists(Long id) {
if (businessEnterpriseRelationalMapper.selectById(id) == null) {
throw exception(BUSINESS_ENTERPRISE_RELATIONAL_NOT_EXISTS);
}
}
@Override
public BusinessEnterpriseRelationalDO getBusinessEnterpriseRelational(Long id) {
return businessEnterpriseRelationalMapper.selectById(id);
}
@Override
public List<BusinessEnterpriseRelationalDO> getBusinessEnterpriseRelationalList(Collection<Long> ids) {
return businessEnterpriseRelationalMapper.selectBatchIds(ids);
}
@Override
public PageResult<BusinessEnterpriseRelationalDO> getBusinessEnterpriseRelationalPage(BusinessEnterpriseRelationalPageReqVO pageReqVO) {
return businessEnterpriseRelationalMapper.selectPage(pageReqVO);
}
@Override
public List<BusinessEnterpriseRelationalDO> getBusinessEnterpriseRelationalList(BusinessEnterpriseRelationalExportReqVO exportReqVO) {
return businessEnterpriseRelationalMapper.selectList(exportReqVO);
}
}

70
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalService.java
Unescape View File

@ -1,70 +0,0 @@
package com.yunxi.scm.module.xxjj.service.businessuserrelational;
import java.util.*;
import javax.validation.*;
import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO;
import com.yunxi.scm.framework.common.pojo.PageResult;
/**
* 业务线和用户关联 Service 接口
*
* @author 长江云息
*/
public interface BusinessUserRelationalService {
/**
* 创建业务线和用户关联
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createBusinessUserRelational(@Valid BusinessUserRelationalCreateReqVO createReqVO);
/**
* 更新业务线和用户关联
*
* @param updateReqVO 更新信息
*/
void updateBusinessUserRelational(@Valid BusinessUserRelationalUpdateReqVO updateReqVO);
/**
* 删除业务线和用户关联
*
* @param id 编号
*/
void deleteBusinessUserRelational(Long id);
/**
* 获得业务线和用户关联
*
* @param id 编号
* @return 业务线和用户关联
*/
BusinessUserRelationalDO getBusinessUserRelational(Long id);
/**
* 获得业务线和用户关联列表
*
* @param ids 编号
* @return 业务线和用户关联列表
*/
List<BusinessUserRelationalDO> getBusinessUserRelationalList(Collection<Long> ids);
/**
* 获得业务线和用户关联分页
*
* @param pageReqVO 分页查询
* @return 业务线和用户关联分页
*/
PageResult<BusinessUserRelationalDO> getBusinessUserRelationalPage(BusinessUserRelationalPageReqVO pageReqVO);
/**
* 获得业务线和用户关联列表, 用于 Excel 导出
*
* @param exportReqVO 查询条件
* @return 业务线和用户关联列表
*/
List<BusinessUserRelationalDO> getBusinessUserRelationalList(BusinessUserRelationalExportReqVO exportReqVO);
}

82
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImpl.java
Unescape View File

@ -1,82 +0,0 @@
package com.yunxi.scm.module.xxjj.service.businessuserrelational;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO;
import com.yunxi.scm.framework.common.pojo.PageResult;
import com.yunxi.scm.module.xxjj.convert.businessuserrelational.BusinessUserRelationalConvert;
import com.yunxi.scm.module.xxjj.dal.mysql.businessuserrelational.BusinessUserRelationalMapper;
import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
/**
* 业务线和用户关联 Service 实现类
*
* @author 长江云息
*/
@Service
@Validated
public class BusinessUserRelationalServiceImpl implements BusinessUserRelationalService {
@Resource
private BusinessUserRelationalMapper businessUserRelationalMapper;
@Override
public Long createBusinessUserRelational(BusinessUserRelationalCreateReqVO createReqVO) {
// 插入
BusinessUserRelationalDO businessUserRelational = BusinessUserRelationalConvert.INSTANCE.convert(createReqVO);
businessUserRelationalMapper.insert(businessUserRelational);
// 返回
return businessUserRelational.getId();
}
@Override
public void updateBusinessUserRelational(BusinessUserRelationalUpdateReqVO updateReqVO) {
// 校验存在
validateBusinessUserRelationalExists(updateReqVO.getId());
// 更新
BusinessUserRelationalDO updateObj = BusinessUserRelationalConvert.INSTANCE.convert(updateReqVO);
businessUserRelationalMapper.updateById(updateObj);
}
@Override
public void deleteBusinessUserRelational(Long id) {
// 校验存在
validateBusinessUserRelationalExists(id);
// 删除
businessUserRelationalMapper.deleteById(id);
}
private void validateBusinessUserRelationalExists(Long id) {
if (businessUserRelationalMapper.selectById(id) == null) {
throw exception(BUSINESS_USER_RELATIONAL_NOT_EXISTS);
}
}
@Override
public BusinessUserRelationalDO getBusinessUserRelational(Long id) {
return businessUserRelationalMapper.selectById(id);
}
@Override
public List<BusinessUserRelationalDO> getBusinessUserRelationalList(Collection<Long> ids) {
return businessUserRelationalMapper.selectBatchIds(ids);
}
@Override
public PageResult<BusinessUserRelationalDO> getBusinessUserRelationalPage(BusinessUserRelationalPageReqVO pageReqVO) {
return businessUserRelationalMapper.selectPage(pageReqVO);
}
@Override
public List<BusinessUserRelationalDO> getBusinessUserRelationalList(BusinessUserRelationalExportReqVO exportReqVO) {
return businessUserRelationalMapper.selectList(exportReqVO);
}
}

12
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessenterpriserelational/BusinessEnterpriseRelationalMapper.xml
Unescape View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yunxi.scm.module.xxjj.dal.mysql.businessenterpriserelational.BusinessEnterpriseRelationalMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>

12
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml
Unescape View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yunxi.scm.module.xxjj.dal.mysql.businessuserrelational.BusinessUserRelationalMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>

167
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java
Unescape View File

@ -1,167 +0,0 @@
package com.yunxi.scm.module.xxjj.service.businessenterpriserelational;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
import javax.annotation.Resource;
import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest;
import com.yunxi.scm.module.xxjj.controller.admin.businessenterpriserelational.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessenterpriserelational.BusinessEnterpriseRelationalDO;
import com.yunxi.scm.module.xxjj.dal.mysql.businessenterpriserelational.BusinessEnterpriseRelationalMapper;
import com.yunxi.scm.framework.common.pojo.PageResult;
import javax.annotation.Resource;
import org.springframework.context.annotation.Import;
import java.util.*;
import java.time.LocalDateTime;
import static cn.hutool.core.util.RandomUtil.*;
import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
import static com.yunxi.scm.framework.test.core.util.AssertUtils.*;
import static com.yunxi.scm.framework.test.core.util.RandomUtils.*;
import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*;
import static com.yunxi.scm.framework.common.util.object.ObjectUtils.*;
import static com.yunxi.scm.framework.common.util.date.DateUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
/**
* {@link BusinessEnterpriseRelationalServiceImpl} 的单元测试类
*
* @author 长江云息
*/
@Import(BusinessEnterpriseRelationalServiceImpl.class)
public class BusinessEnterpriseRelationalServiceImplTest extends BaseDbUnitTest {
@Resource
private BusinessEnterpriseRelationalServiceImpl businessEnterpriseRelationalService;
@Resource
private BusinessEnterpriseRelationalMapper businessEnterpriseRelationalMapper;
@Test
public void testCreateBusinessEnterpriseRelational_success() {
// 准备参数
BusinessEnterpriseRelationalCreateReqVO reqVO = randomPojo(BusinessEnterpriseRelationalCreateReqVO.class);
// 调用
Long businessEnterpriseRelationalId = businessEnterpriseRelationalService.createBusinessEnterpriseRelational(reqVO);
// 断言
assertNotNull(businessEnterpriseRelationalId);
// 校验记录的属性是否正确
BusinessEnterpriseRelationalDO businessEnterpriseRelational = businessEnterpriseRelationalMapper.selectById(businessEnterpriseRelationalId);
assertPojoEquals(reqVO, businessEnterpriseRelational);
}
@Test
public void testUpdateBusinessEnterpriseRelational_success() {
// mock 数据
BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class);
businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational);// @Sql: 先插入出一条存在的数据
// 准备参数
BusinessEnterpriseRelationalUpdateReqVO reqVO = randomPojo(BusinessEnterpriseRelationalUpdateReqVO.class, o -> {
o.setId(dbBusinessEnterpriseRelational.getId()); // 设置更新的 ID
});
// 调用
businessEnterpriseRelationalService.updateBusinessEnterpriseRelational(reqVO);
// 校验是否更新正确
BusinessEnterpriseRelationalDO businessEnterpriseRelational = businessEnterpriseRelationalMapper.selectById(reqVO.getId()); // 获取最新的
assertPojoEquals(reqVO, businessEnterpriseRelational);
}
@Test
public void testUpdateBusinessEnterpriseRelational_notExists() {
// 准备参数
BusinessEnterpriseRelationalUpdateReqVO reqVO = randomPojo(BusinessEnterpriseRelationalUpdateReqVO.class);
// 调用, 并断言异常
assertServiceException(() -> businessEnterpriseRelationalService.updateBusinessEnterpriseRelational(reqVO), BUSINESS_ENTERPRISE_RELATIONAL_NOT_EXISTS);
}
@Test
public void testDeleteBusinessEnterpriseRelational_success() {
// mock 数据
BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class);
businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational);// @Sql: 先插入出一条存在的数据
// 准备参数
Long id = dbBusinessEnterpriseRelational.getId();
// 调用
businessEnterpriseRelationalService.deleteBusinessEnterpriseRelational(id);
// 校验数据不存在了
assertNull(businessEnterpriseRelationalMapper.selectById(id));
}
@Test
public void testDeleteBusinessEnterpriseRelational_notExists() {
// 准备参数
Long id = randomLongId();
// 调用, 并断言异常
assertServiceException(() -> businessEnterpriseRelationalService.deleteBusinessEnterpriseRelational(id), BUSINESS_ENTERPRISE_RELATIONAL_NOT_EXISTS);
}
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetBusinessEnterpriseRelationalPage() {
// mock 数据
BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class, o -> { // 等会查询到
o.setBusinessId(null);
o.setEnterpriseId(null);
o.setCreateTime(null);
});
businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational);
// 测试 businessId 不匹配
businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setBusinessId(null)));
// 测试 enterpriseId 不匹配
businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setEnterpriseId(null)));
// 测试 createTime 不匹配
businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setCreateTime(null)));
// 准备参数
BusinessEnterpriseRelationalPageReqVO reqVO = new BusinessEnterpriseRelationalPageReqVO();
reqVO.setBusinessId(null);
reqVO.setEnterpriseId(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用
PageResult<BusinessEnterpriseRelationalDO> pageResult = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalPage(reqVO);
// 断言
assertEquals(1, pageResult.getTotal());
assertEquals(1, pageResult.getList().size());
assertPojoEquals(dbBusinessEnterpriseRelational, pageResult.getList().get(0));
}
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetBusinessEnterpriseRelationalList() {
// mock 数据
BusinessEnterpriseRelationalDO dbBusinessEnterpriseRelational = randomPojo(BusinessEnterpriseRelationalDO.class, o -> { // 等会查询到
o.setBusinessId(null);
o.setEnterpriseId(null);
o.setCreateTime(null);
});
businessEnterpriseRelationalMapper.insert(dbBusinessEnterpriseRelational);
// 测试 businessId 不匹配
businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setBusinessId(null)));
// 测试 enterpriseId 不匹配
businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setEnterpriseId(null)));
// 测试 createTime 不匹配
businessEnterpriseRelationalMapper.insert(cloneIgnoreId(dbBusinessEnterpriseRelational, o -> o.setCreateTime(null)));
// 准备参数
BusinessEnterpriseRelationalExportReqVO reqVO = new BusinessEnterpriseRelationalExportReqVO();
reqVO.setBusinessId(null);
reqVO.setEnterpriseId(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用
List<BusinessEnterpriseRelationalDO> list = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalList(reqVO);
// 断言
assertEquals(1, list.size());
assertPojoEquals(dbBusinessEnterpriseRelational, list.get(0));
}
}

167
yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java
Unescape View File

@ -1,167 +0,0 @@
package com.yunxi.scm.module.xxjj.service.businessuserrelational;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
import javax.annotation.Resource;
import com.yunxi.scm.framework.test.core.ut.BaseDbUnitTest;
import com.yunxi.scm.module.xxjj.controller.admin.businessuserrelational.vo.*;
import com.yunxi.scm.module.xxjj.dal.dataobject.businessuserrelational.BusinessUserRelationalDO;
import com.yunxi.scm.module.xxjj.dal.mysql.businessuserrelational.BusinessUserRelationalMapper;
import com.yunxi.scm.framework.common.pojo.PageResult;
import javax.annotation.Resource;
import org.springframework.context.annotation.Import;
import java.util.*;
import java.time.LocalDateTime;
import static cn.hutool.core.util.RandomUtil.*;
import static com.yunxi.scm.module.xxjj.enums.ErrorCodeConstants.*;
import static com.yunxi.scm.framework.test.core.util.AssertUtils.*;
import static com.yunxi.scm.framework.test.core.util.RandomUtils.*;
import static com.yunxi.scm.framework.common.util.date.LocalDateTimeUtils.*;
import static com.yunxi.scm.framework.common.util.object.ObjectUtils.*;
import static com.yunxi.scm.framework.common.util.date.DateUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
/**
* {@link BusinessUserRelationalServiceImpl} 的单元测试类
*
* @author 长江云息
*/
@Import(BusinessUserRelationalServiceImpl.class)
public class BusinessUserRelationalServiceImplTest extends BaseDbUnitTest {
@Resource
private BusinessUserRelationalServiceImpl businessUserRelationalService;
@Resource
private BusinessUserRelationalMapper businessUserRelationalMapper;
@Test
public void testCreateBusinessUserRelational_success() {
// 准备参数
BusinessUserRelationalCreateReqVO reqVO = randomPojo(BusinessUserRelationalCreateReqVO.class);
// 调用
Long businessUserRelationalId = businessUserRelationalService.createBusinessUserRelational(reqVO);
// 断言
assertNotNull(businessUserRelationalId);
// 校验记录的属性是否正确
BusinessUserRelationalDO businessUserRelational = businessUserRelationalMapper.selectById(businessUserRelationalId);
assertPojoEquals(reqVO, businessUserRelational);
}
@Test
public void testUpdateBusinessUserRelational_success() {
// mock 数据
BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class);
businessUserRelationalMapper.insert(dbBusinessUserRelational);// @Sql: 先插入出一条存在的数据
// 准备参数
BusinessUserRelationalUpdateReqVO reqVO = randomPojo(BusinessUserRelationalUpdateReqVO.class, o -> {
o.setId(dbBusinessUserRelational.getId()); // 设置更新的 ID
});
// 调用
businessUserRelationalService.updateBusinessUserRelational(reqVO);
// 校验是否更新正确
BusinessUserRelationalDO businessUserRelational = businessUserRelationalMapper.selectById(reqVO.getId()); // 获取最新的
assertPojoEquals(reqVO, businessUserRelational);
}
@Test
public void testUpdateBusinessUserRelational_notExists() {
// 准备参数
BusinessUserRelationalUpdateReqVO reqVO = randomPojo(BusinessUserRelationalUpdateReqVO.class);
// 调用, 并断言异常
assertServiceException(() -> businessUserRelationalService.updateBusinessUserRelational(reqVO), BUSINESS_USER_RELATIONAL_NOT_EXISTS);
}
@Test
public void testDeleteBusinessUserRelational_success() {
// mock 数据
BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class);
businessUserRelationalMapper.insert(dbBusinessUserRelational);// @Sql: 先插入出一条存在的数据
// 准备参数
Long id = dbBusinessUserRelational.getId();
// 调用
businessUserRelationalService.deleteBusinessUserRelational(id);
// 校验数据不存在了
assertNull(businessUserRelationalMapper.selectById(id));
}
@Test
public void testDeleteBusinessUserRelational_notExists() {
// 准备参数
Long id = randomLongId();
// 调用, 并断言异常
assertServiceException(() -> businessUserRelationalService.deleteBusinessUserRelational(id), BUSINESS_USER_RELATIONAL_NOT_EXISTS);
}
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetBusinessUserRelationalPage() {
// mock 数据
BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class, o -> { // 等会查询到
o.setBusinessId(null);
o.setUserId(null);
o.setCreateTime(null);
});
businessUserRelationalMapper.insert(dbBusinessUserRelational);
// 测试 businessId 不匹配
businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setBusinessId(null)));
// 测试 userId 不匹配
businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setUserId(null)));
// 测试 createTime 不匹配
businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setCreateTime(null)));
// 准备参数
BusinessUserRelationalPageReqVO reqVO = new BusinessUserRelationalPageReqVO();
reqVO.setBusinessId(null);
reqVO.setUserId(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用
PageResult<BusinessUserRelationalDO> pageResult = businessUserRelationalService.getBusinessUserRelationalPage(reqVO);
// 断言
assertEquals(1, pageResult.getTotal());
assertEquals(1, pageResult.getList().size());
assertPojoEquals(dbBusinessUserRelational, pageResult.getList().get(0));
}
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetBusinessUserRelationalList() {
// mock 数据
BusinessUserRelationalDO dbBusinessUserRelational = randomPojo(BusinessUserRelationalDO.class, o -> { // 等会查询到
o.setBusinessId(null);
o.setUserId(null);
o.setCreateTime(null);
});
businessUserRelationalMapper.insert(dbBusinessUserRelational);
// 测试 businessId 不匹配
businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setBusinessId(null)));
// 测试 userId 不匹配
businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setUserId(null)));
// 测试 createTime 不匹配
businessUserRelationalMapper.insert(cloneIgnoreId(dbBusinessUserRelational, o -> o.setCreateTime(null)));
// 准备参数
BusinessUserRelationalExportReqVO reqVO = new BusinessUserRelationalExportReqVO();
reqVO.setBusinessId(null);
reqVO.setUserId(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用
List<BusinessUserRelationalDO> list = businessUserRelationalService.getBusinessUserRelationalList(reqVO);
// 断言
assertEquals(1, list.size());
assertPojoEquals(dbBusinessUserRelational, list.get(0));
}
}
Write Preview
Loading…
Cancel
Save