diff --git a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts index b0f89e5..f77ab45 100644 --- a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts +++ b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts @@ -2,27 +2,27 @@ import { defHttp } from '@/utils/http/axios' // 查询业务线/仓库列表 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) { - return defHttp.get({ url: '/xxjj/business-warehouse/get?id=' + id }) + return defHttp.get({ url: '/system/business-warehouse/get?id=' + id }) } // 新增业务线/仓库 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) { - return defHttp.put({ url: '/xxjj/business-warehouse/update', data }) + return defHttp.put({ url: '/system/business-warehouse/update', data }) } // 删除业务线/仓库 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 diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts index 75844d3..1e2ea6d 100644 --- a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts +++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts @@ -2,59 +2,11 @@ import { BasicColumn, FormSchema, useRender } from '@/components/Table' import { DICT_TYPE, getDictOptions } from '@/utils/dict' 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: '业务线名称', dataIndex: 'name', width: 160 }, - { - title: '业务线LOGO', - dataIndex: 'businessLogo', - width: 160 - }, - { - title: '父id', - dataIndex: 'parentId', - width: 160 - }, { title: '类型', dataIndex: 'type', @@ -64,87 +16,44 @@ export const columns: BasicColumn[] = [ } }, { - title: '所属行业', - dataIndex: 'industry', + title: '状态', + dataIndex: 'type', width: 180, customRender: ({ text }) => { - return useRender.renderDict(text, DICT_TYPE.DUTY_TYPE) + return useRender.renderDict(text, DICT_TYPE.CLASS_STATUS) } }, { - title: '所在城市', - dataIndex: 'city', + title: '关联机构', + dataIndex: 'institutionNum', width: 160 }, { - title: '成立时间', - dataIndex: 'establishDate', - width: 180, - customRender: ({ text }) => { - return useRender.renderDate(text) - } - }, - { - title: '归属人员', - dataIndex: 'belongUserId', + title: '成员数量', + dataIndex: 'employeeNum', width: 160 }, { - title: '品牌/业务线/事业群名称', - dataIndex: 'brandName', + title: '主管人员', + dataIndex: 'belongUserId', width: 160 }, { - title: '电话', - dataIndex: 'phone', + title: '介绍', + dataIndex: 'description', width: 160 }, { - title: '业务线仓库区分(0：业务线,1：仓库)', - dataIndex: 'diffFlag', + title: '更新时间', + dataIndex: 'updateTime', width: 180, customRender: ({ text }) => { - return useRender.renderDict(text, DICT_TYPE.DIFF_FLAG) + return useRender.renderDate(text) } }, ] 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: '业务线名称', field: 'name', @@ -152,18 +61,6 @@ export const searchFormSchema: FormSchema[] = [ colProps: { span: 8 } }, // { - // label: '业务线LOGO', - // field: 'businessLogo', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { - // label: '父id', - // field: 'parentId', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { // label: '类型', // field: 'type', // component: 'Select', @@ -182,12 +79,6 @@ export const searchFormSchema: FormSchema[] = [ // colProps: { span: 8 } // }, // { - // label: '所在城市', - // field: 'city', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { // label: '成立时间', // field: 'establishDate', // component: 'RangePicker', @@ -206,12 +97,6 @@ export const searchFormSchema: FormSchema[] = [ // colProps: { span: 8 } // }, // { - // label: '电话', - // field: 'phone', - // component: 'Input', - // colProps: { span: 8 } - // }, - // { // label: '业务线仓库区分(0：业务线,1：仓库)', // field: 'diffFlag', // component: 'Select', @@ -264,7 +149,11 @@ export const createFormSchema: FormSchema[] = [ { label: '业务线LOGO', field: 'businessLogo', - component: 'Input' + component: 'FileUpload', + componentProps: { + fileType: 'file', + maxCount: 1 + } }, { label: '父id', @@ -341,21 +230,6 @@ export const updateFormSchema: FormSchema[] = [ field: 'businessSimple', component: 'Input' }, - { - label: '传真', - field: 'fax', - component: 'Input' - }, - { - label: '网址', - field: 'url', - component: 'Input' - }, - { - label: '介绍', - field: 'description', - component: 'InputTextArea' - }, { label: '业务线名称', field: 'name', @@ -365,7 +239,7 @@ export const updateFormSchema: FormSchema[] = [ { label: '业务线LOGO', field: 'businessLogo', - component: 'Input' + component: 'Upload' }, { label: '父id', @@ -413,6 +287,21 @@ export const updateFormSchema: FormSchema[] = [ field: 'phone', component: 'Input' }, + { + label: '传真', + field: 'fax', + component: 'Input' + }, + { + label: '网址', + field: 'url', + component: 'Input' + }, + { + label: '介绍', + field: 'description', + component: 'InputTextArea' + }, { label: '业务线仓库区分(0：业务线,1：仓库)', field: 'diffFlag', diff --git a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java index 7af04b7..fe43433 100644 --- a/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java +++ b/yunxi-module-system/yunxi-module-system-api/src/main/java/com/yunxi/scm/module/system/enums/ErrorCodeConstants.java @@ -163,4 +163,7 @@ public interface ErrorCodeConstants { // ========== 站内信发送 1002028000 ========== ErrorCode NOTIFY_SEND_TEMPLATE_PARAM_MISS = new ErrorCode(1002028000, "模板参数({})缺失"); + // ========== 业务线表 TODO 补充编号 ========== + ErrorCode BUSINESS_WAREHOUSE_NOT_EXISTS = new ErrorCode(1002025019, "业务线表不存在"); + } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/BusinessWarehouseController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java similarity index 70% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/BusinessWarehouseController.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java index abf091e..6770a6b 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/BusinessWarehouseController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/BusinessWarehouseController.java @@ -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 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 static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*; -import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; -import com.yunxi.scm.module.xxjj.convert.businesswarehouse.BusinessWarehouseConvert; -import com.yunxi.scm.module.xxjj.service.businesswarehouse.BusinessWarehouseService; +import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.convert.businesswarehouse.BusinessWarehouseConvert; +import com.yunxi.scm.module.system.service.businesswarehouse.BusinessWarehouseService; -@Tag(name = "管理后台 - 业务线/仓库") +@Tag(name = "管理后台 - 业务线表") @RestController -@RequestMapping("/xxjj/business-warehouse") +@RequestMapping("/system/business-warehouse") @Validated public class BusinessWarehouseController { @@ -38,65 +38,65 @@ public class BusinessWarehouseController { private BusinessWarehouseService businessWarehouseService; @PostMapping("/create") - @Operation(summary = "创建业务线/仓库") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:create')") + @Operation(summary = "创建业务线表") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:create')") public CommonResult createBusinessWarehouse(@Valid @RequestBody BusinessWarehouseCreateReqVO createReqVO) { return success(businessWarehouseService.createBusinessWarehouse(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新业务线/仓库") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:update')") + @Operation(summary = "更新业务线表") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:update')") public CommonResult updateBusinessWarehouse(@Valid @RequestBody BusinessWarehouseUpdateReqVO updateReqVO) { businessWarehouseService.updateBusinessWarehouse(updateReqVO); return success(true); } @DeleteMapping("/delete") - @Operation(summary = "删除业务线/仓库") + @Operation(summary = "删除业务线表") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:delete')") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:delete')") public CommonResult deleteBusinessWarehouse(@RequestParam("id") Long id) { businessWarehouseService.deleteBusinessWarehouse(id); return success(true); } @GetMapping("/get") - @Operation(summary = "获得业务线/仓库") + @Operation(summary = "获得业务线表") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')") public CommonResult getBusinessWarehouse(@RequestParam("id") Long id) { BusinessWarehouseDO businessWarehouse = businessWarehouseService.getBusinessWarehouse(id); return success(BusinessWarehouseConvert.INSTANCE.convert(businessWarehouse)); } @GetMapping("/list") - @Operation(summary = "获得业务线/仓库列表") + @Operation(summary = "获得业务线表列表") @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> getBusinessWarehouseList(@RequestParam("ids") Collection ids) { List list = businessWarehouseService.getBusinessWarehouseList(ids); return success(BusinessWarehouseConvert.INSTANCE.convertList(list)); } @GetMapping("/page") - @Operation(summary = "获得业务线/仓库分页") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:query')") + @Operation(summary = "获得业务线表分页") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:query')") public CommonResult> getBusinessWarehousePage(@Valid BusinessWarehousePageReqVO pageVO) { PageResult pageResult = businessWarehouseService.getBusinessWarehousePage(pageVO); return success(BusinessWarehouseConvert.INSTANCE.convertPage(pageResult)); } @GetMapping("/export-excel") - @Operation(summary = "导出业务线/仓库 Excel") - @PreAuthorize("@ss.hasPermission('xxjj:business-warehouse:export')") + @Operation(summary = "导出业务线表 Excel") + @PreAuthorize("@ss.hasPermission('system:business-warehouse:export')") @OperateLog(type = EXPORT) public void exportBusinessWarehouseExcel(@Valid BusinessWarehouseExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = businessWarehouseService.getBusinessWarehouseList(exportReqVO); // 导出 Excel List datas = BusinessWarehouseConvert.INSTANCE.convertList02(list); - ExcelUtils.write(response, "业务线/仓库.xls", "数据", BusinessWarehouseExcelVO.class, datas); + ExcelUtils.write(response, "业务线表.xls", "数据", BusinessWarehouseExcelVO.class, datas); } } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java similarity index 69% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java index 27abd55..07be2cc 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java @@ -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 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; /** - * 业务线/仓库 Base VO，提供给添加、修改、详细的子 VO 使用 + * 业务线表 Base VO，提供给添加、修改、详细的子 VO 使用 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data @@ -22,7 +22,7 @@ public class BusinessWarehouseBaseVO { @NotNull(message = "业务线编号不能为空") private String businessCode; - @Schema(description = "业务线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @Schema(description = "业务线名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") @NotNull(message = "业务线名称不能为空") private String name; @@ -32,13 +32,13 @@ public class BusinessWarehouseBaseVO { @Schema(description = "业务线LOGO") private String businessLogo; - @Schema(description = "父id") + @Schema(description = "父id", example = "3408") private Long parentId; - @Schema(description = "类型") + @Schema(description = "类型", example = "1") private String type; - @Schema(description = "状态") + @Schema(description = "状态", example = "1") private String status; @Schema(description = "关联机构") @@ -47,7 +47,7 @@ public class BusinessWarehouseBaseVO { @Schema(description = "成员数量") private Integer employeeNum; - @Schema(description = "所属行业") + @Schema(description = "所属分类") private String industry; @Schema(description = "所在城市") @@ -57,25 +57,26 @@ public class BusinessWarehouseBaseVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime establishDate; - @Schema(description = "归属人员") + @Schema(description = "归属人员", example = "26257") private Long belongUserId; - @Schema(description = "品牌/业务线/事业群名称") + @Schema(description = "品牌/业务线/事业群名称", example = "芋艿") private String brandName; @Schema(description = "电话") private Integer phone; + @Schema(description = "业务线仓库区分(0：业务线,1：仓库)", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "业务线仓库区分(0：业务线,1：仓库)不能为空") + private String diffFlag; + @Schema(description = "传真") private String fax; @Schema(description = "网址", example = "https://www.iocoder.cn") private String url; - @Schema(description = "介绍", example = "你猜") + @Schema(description = "介绍", example = "随便") private String description; - @Schema(description = "区分标志", example = "你猜") - private String diffFlag; - } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java similarity index 65% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java index 18dd2d9..75b2144 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseCreateReqVO.java @@ -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 java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import javax.validation.constraints.*; -@Schema(description = "管理后台 - 业务线/仓库创建 Request VO") +@Schema(description = "管理后台 - 业务线表创建 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java similarity index 70% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java index 0c4e4a5..2669483 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java @@ -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.models.security.SecurityScheme; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -14,7 +13,7 @@ import com.yunxi.scm.framework.excel.core.convert.DictConvert; /** - * 业务线/仓库 Excel VO + * 业务线表 Excel VO * * @author 长江云息 */ @@ -39,10 +38,12 @@ public class BusinessWarehouseExcelVO { @ExcelProperty("父id") private Long parentId; - @ExcelProperty("类型") + @ExcelProperty(value = "类型", converter = DictConvert.class) + @DictFormat("business_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String type; - @ExcelProperty("状态") + @ExcelProperty(value = "状态", converter = DictConvert.class) + @DictFormat("class_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String status; @ExcelProperty("关联机构") @@ -51,7 +52,7 @@ public class BusinessWarehouseExcelVO { @ExcelProperty("成员数量") private Integer employeeNum; - @ExcelProperty(value = "所属行业", converter = DictConvert.class) + @ExcelProperty(value = "所属分类", converter = DictConvert.class) @DictFormat("duty_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String industry; @@ -70,6 +71,10 @@ public class BusinessWarehouseExcelVO { @ExcelProperty("电话") private Integer phone; + @ExcelProperty(value = "业务线仓库区分(0：业务线,1：仓库)", converter = DictConvert.class) + @DictFormat("diff_flag") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + private String diffFlag; + @ExcelProperty("传真") private String fax; @@ -82,7 +87,4 @@ public class BusinessWarehouseExcelVO { @ExcelProperty("创建时间") private LocalDateTime createTime; - @ExcelProperty("区分标志") - private String diffFlag; - } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java similarity index 76% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java index 0146c37..e0f6a9c 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java @@ -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 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; -@Schema(description = "管理后台 - 业务线/仓库 Excel 导出 Request VO，参数和 BusinessWarehousePageReqVO 是一致的") +@Schema(description = "管理后台 - 业务线表 Excel 导出 Request VO，参数和 BusinessWarehousePageReqVO 是一致的") @Data public class BusinessWarehouseExportReqVO { @Schema(description = "业务线编号") private String businessCode; - @Schema(description = "业务线名称", example = "张三") + @Schema(description = "业务线名称", example = "赵六") private String name; @Schema(description = "业务线简称") @@ -25,7 +25,7 @@ public class BusinessWarehouseExportReqVO { @Schema(description = "业务线LOGO") private String businessLogo; - @Schema(description = "父id", example = "6675") + @Schema(description = "父id", example = "3408") private Long parentId; @Schema(description = "类型", example = "1") @@ -40,7 +40,7 @@ public class BusinessWarehouseExportReqVO { @Schema(description = "成员数量") private Integer employeeNum; - @Schema(description = "所属行业") + @Schema(description = "所属分类") private String industry; @Schema(description = "所在城市") @@ -50,29 +50,29 @@ public class BusinessWarehouseExportReqVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] establishDate; - @Schema(description = "归属人员", example = "19777") + @Schema(description = "归属人员", example = "26257") private Long belongUserId; - @Schema(description = "品牌/业务线/事业群名称", example = "王五") + @Schema(description = "品牌/业务线/事业群名称", example = "芋艿") private String brandName; @Schema(description = "电话") private Integer phone; + @Schema(description = "业务线仓库区分(0：业务线,1：仓库)") + private String diffFlag; + @Schema(description = "传真") private String fax; @Schema(description = "网址", example = "https://www.iocoder.cn") private String url; - @Schema(description = "介绍", example = "你猜") + @Schema(description = "介绍", example = "随便") private String description; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "区分标志", example = "你猜") - private String diffFlag; - } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java similarity index 78% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java index a1e7201..782f966 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java @@ -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 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; -@Schema(description = "管理后台 - 业务线/仓库分页 Request VO") +@Schema(description = "管理后台 - 业务线表分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @@ -18,7 +18,7 @@ public class BusinessWarehousePageReqVO extends PageParam { @Schema(description = "业务线编号") private String businessCode; - @Schema(description = "业务线名称", example = "张三") + @Schema(description = "业务线名称", example = "赵六") private String name; @Schema(description = "业务线简称") @@ -27,7 +27,7 @@ public class BusinessWarehousePageReqVO extends PageParam { @Schema(description = "业务线LOGO") private String businessLogo; - @Schema(description = "父id", example = "6675") + @Schema(description = "父id", example = "3408") private Long parentId; @Schema(description = "类型", example = "1") @@ -42,7 +42,7 @@ public class BusinessWarehousePageReqVO extends PageParam { @Schema(description = "成员数量") private Integer employeeNum; - @Schema(description = "所属行业") + @Schema(description = "所属分类") private String industry; @Schema(description = "所在城市") @@ -52,29 +52,29 @@ public class BusinessWarehousePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] establishDate; - @Schema(description = "归属人员", example = "19777") + @Schema(description = "归属人员", example = "26257") private Long belongUserId; - @Schema(description = "品牌/业务线/事业群名称", example = "王五") + @Schema(description = "品牌/业务线/事业群名称", example = "芋艿") private String brandName; @Schema(description = "电话") private Integer phone; + @Schema(description = "业务线仓库区分(0：业务线,1：仓库)") + private String diffFlag; + @Schema(description = "传真") private String fax; @Schema(description = "网址", example = "https://www.iocoder.cn") private String url; - @Schema(description = "介绍", example = "你猜") + @Schema(description = "介绍", example = "随便") private String description; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "区分标志", example = "你猜") - private String diffFlag; - } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java similarity index 71% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java index 279a688..273b3ff 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseRespVO.java @@ -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 lombok.*; import java.time.LocalDateTime; -@Schema(description = "管理后台 - 业务线/仓库 Response VO") +@Schema(description = "管理后台 - 业务线表 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) 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; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java similarity index 69% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java index 1051779..67b3dab 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/businesswarehouse/vo/BusinessWarehouseUpdateReqVO.java @@ -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 lombok.*; import java.util.*; import javax.validation.constraints.*; -@Schema(description = "管理后台 - 业务线/仓库更新 Request VO") +@Schema(description = "管理后台 - 业务线表更新 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) 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不能为空") private Long id; diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businesswarehouse/BusinessWarehouseConvert.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java similarity index 75% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businesswarehouse/BusinessWarehouseConvert.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java index 93423df..b3a23e3 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/convert/businesswarehouse/BusinessWarehouseConvert.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/convert/businesswarehouse/BusinessWarehouseConvert.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.xxjj.convert.businesswarehouse; +package com.yunxi.scm.module.system.convert.businesswarehouse; import java.util.*; @@ -6,11 +6,11 @@ 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.businesswarehouse.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; /** - * 业务线/仓库 Convert + * 业务线表 Convert * * @author 长江云息 */ diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java similarity index 74% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java index cfe43e9..3db54e8 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java @@ -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 java.util.*; import java.time.LocalDateTime; @@ -10,19 +9,19 @@ import com.baomidou.mybatisplus.annotation.*; import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO; /** - * 业务线/仓库 DO + * 业务线表 DO * * @author 长江云息 */ -@TableName("xxjj_business_warehouse") -@KeySequence("xxjj_business_warehouse_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("system_business_warehouse") +@KeySequence("system_business_warehouse_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class BusinessWarehouseDO extends TenantBaseDO { +public class BusinessWarehouseDO extends BaseDO { /** * 业务id @@ -51,10 +50,14 @@ public class BusinessWarehouseDO extends TenantBaseDO { private Long parentId; /** * 类型 + * + * 枚举 {@link TODO business_type 对应的类} */ private String type; /** * 状态 + * + * 枚举 {@link TODO class_status 对应的类} */ private String status; /** @@ -66,7 +69,7 @@ public class BusinessWarehouseDO extends TenantBaseDO { */ private Integer employeeNum; /** - * 所属行业 + * 所属分类 * * 枚举 {@link TODO duty_type 对应的类} */ @@ -91,6 +94,12 @@ public class BusinessWarehouseDO extends TenantBaseDO { * 电话 */ 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 diffFlag; } diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java similarity index 90% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java index 5a91256..7aa3548 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java @@ -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 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.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; 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 长江云息 */ @@ -34,6 +34,7 @@ public interface BusinessWarehouseMapper extends BaseMapperX getBusinessWarehouseList(Collection ids); /** - * 获得业务线/仓库分页 + * 获得业务线表分页 * * @param pageReqVO 分页查询 - * @return 业务线/仓库分页 + * @return 业务线表分页 */ PageResult getBusinessWarehousePage(BusinessWarehousePageReqVO pageReqVO); /** - * 获得业务线/仓库列表, 用于 Excel 导出 + * 获得业务线表列表, 用于 Excel 导出 * * @param exportReqVO 查询条件 - * @return 业务线/仓库列表 + * @return 业务线表列表 */ List getBusinessWarehouseList(BusinessWarehouseExportReqVO exportReqVO); diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java similarity index 82% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImpl.java rename to yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java index c5b56c4..cbf1c49 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/service/businesswarehouse/BusinessWarehouseServiceImpl.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/businesswarehouse/BusinessWarehouseServiceImpl.java @@ -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 javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import java.util.*; -import com.yunxi.scm.module.xxjj.controller.admin.businesswarehouse.vo.*; -import com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse.BusinessWarehouseDO; +import com.yunxi.scm.module.system.controller.admin.businesswarehouse.vo.*; +import com.yunxi.scm.module.system.dal.dataobject.businesswarehouse.BusinessWarehouseDO; import com.yunxi.scm.framework.common.pojo.PageResult; -import com.yunxi.scm.module.xxjj.convert.businesswarehouse.BusinessWarehouseConvert; -import com.yunxi.scm.module.xxjj.dal.mysql.businesswarehouse.BusinessWarehouseMapper; +import com.yunxi.scm.module.system.convert.businesswarehouse.BusinessWarehouseConvert; +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.module.xxjj.enums.ErrorCodeConstants.*; +import static com.yunxi.scm.module.system.enums.ErrorCodeConstants.*; /** - * 业务线/仓库 Service 实现类 + * 业务线表 Service 实现类 * * @author 长江云息 */ diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businesswarehouse/BusinessWarehouseMapper.xml b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml similarity index 84% rename from yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businesswarehouse/BusinessWarehouseMapper.xml rename to yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml index ab94ac8..22cbd0b 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businesswarehouse/BusinessWarehouseMapper.xml +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/resources/Mapper/usergroup/businesswarehouse/BusinessWarehouseMapper.xml @@ -1,6 +1,6 @@ - + - - diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml deleted file mode 100644 index d44875e..0000000 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/resources/mapper/businessuserrelational/BusinessUserRelationalMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java deleted file mode 100644 index b75f307..0000000 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessenterpriserelational/BusinessEnterpriseRelationalServiceImplTest.java +++ /dev/null @@ -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 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 list = businessEnterpriseRelationalService.getBusinessEnterpriseRelationalList(reqVO); - // 断言 - assertEquals(1, list.size()); - assertPojoEquals(dbBusinessEnterpriseRelational, list.get(0)); - } - -} diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java deleted file mode 100644 index 16e4e50..0000000 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/test/java/com/yunxi/scm/module/xxjj/service/businessuserrelational/BusinessUserRelationalServiceImplTest.java +++ /dev/null @@ -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 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 list = businessUserRelationalService.getBusinessUserRelationalList(reqVO); - // 断言 - assertEquals(1, list.size()); - assertPojoEquals(dbBusinessUserRelational, list.get(0)); - } - -}