fix:新增报表模板管理模块

yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java

@@ -200,9 +200,9 @@ public interface ErrorCodeConstants {
     ErrorCode SCHEDULE_DEVICE_COLLECTION_MAPPING_MISSING = new ErrorCode(100_301_0019, "{}-{}，设备未关联采集设备，deviceId={}，deviceName={}");
 
 
-    // ========== 打印模板 相关 100_401_0000 ==========
+    // ========== 模板 相关 100_401_0000 ==========
-    ErrorCode PRINT_TEMPLATE_NOT_EXISTS = new ErrorCode(100_401_0000, "打印模板不存在");
+    ErrorCode PRINT_TEMPLATE_NOT_EXISTS = new ErrorCode(100_401_0000, "模板不存在");
-    ErrorCode PRINT_TEMPLATE_CODE_EXISTS = new ErrorCode(100_401_0001, "打印模板编码已存在，请重新提交");
+    ErrorCode PRINT_TEMPLATE_CODE_EXISTS = new ErrorCode(100_401_0001, "模板编码已存在，请重新提交");
-    ErrorCode PRINT_TEMPLATE_TYPE_EXISTS = new ErrorCode(100_401_0002, "该模板类型已存在打印模板，请勿重复新增");
+    ErrorCode PRINT_TEMPLATE_TYPE_EXISTS = new ErrorCode(100_401_0002, "该模板类型已存在模板，请勿重复新增");
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printtemplate/vo/PrintTemplatePageReqVO.java

@@ -24,6 +24,9 @@ public class PrintTemplatePageReqVO extends PageParam {
     @Schema(description = "模板类型", example = "1")
     private Integer templateType;
 
+    @Schema(description = "模板分类 1-打印模板 2-报表模板", example = "1")
+    private Integer templateBizType;
+
     @Schema(description = "模板JSON内容（布局、字段、样式等）")
     private String templateJson;
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printtemplate/vo/PrintTemplateRespVO.java

@@ -28,6 +28,10 @@ public class PrintTemplateRespVO {
     @ExcelProperty("模板类型")
     private Integer templateType;
 
+    @Schema(description = "模板分类 1-打印模板 2-报表模板", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("模板分类")
+    private Integer templateBizType;
+
     @Schema(description = "模板JSON内容（布局、字段、样式等）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("模板JSON内容（布局、字段、样式等）")
     private String templateJson;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printtemplate/vo/PrintTemplateSaveReqVO.java

@@ -25,6 +25,10 @@ public class PrintTemplateSaveReqVO {
     @NotNull(message = "模板类型不能为空")
     private Integer templateType;
 
+    @Schema(description = "模板分类 1-打印模板 2-报表模板", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "模板分类不能为空")
+    private Integer templateBizType;
+
     @Schema(description = "模板JSON内容（布局、字段、样式等）", requiredMode = Schema.RequiredMode.REQUIRED)
 //    @NotEmpty(message = "模板JSON内容（布局、字段、样式等）不能为空")
     private String templateJson;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printtemplate/PrintTemplateDO.java

@@ -39,6 +39,10 @@ public class PrintTemplateDO extends BaseDO {
      * 模板类型
      */
     private Integer templateType;
+    /**
+     * 模板分类 1-打印模板 2-报表模板
+     */
+    private Integer templateBizType;
     /**
      * 模板JSON内容（布局、字段、样式等）
      */

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/printtemplate/PrintTemplateMapper.java

@@ -17,12 +17,12 @@ import cn.iocoder.yudao.module.mes.controller.admin.printtemplate.vo.*;
 @Mapper
 public interface PrintTemplateMapper extends BaseMapperX<PrintTemplateDO> {
 
-    default PrintTemplateDO selectByNo(String no) {
+    default PrintTemplateDO selectByNo(String no,Integer type) {
-        return selectOne(PrintTemplateDO::getTemplateCode, no);
+        return selectOne(PrintTemplateDO::getTemplateCode, no,PrintTemplateDO::getTemplateBizType,type);
     }
 
-    default PrintTemplateDO selectByTemplateType(Integer templateType) {
+    default PrintTemplateDO selectByTemplateType(Integer templateType,Integer templateBizType) {
-        return selectOne(PrintTemplateDO::getTemplateType, templateType);
+        return selectOne(PrintTemplateDO::getTemplateType, templateType,PrintTemplateDO::getTemplateBizType,templateBizType);
     }
 
     default PageResult<PrintTemplateDO> selectPage(PrintTemplatePageReqVO reqVO) {
@@ -30,6 +30,7 @@ public interface PrintTemplateMapper extends BaseMapperX<PrintTemplateDO> {
                 .eqIfPresent(PrintTemplateDO::getTemplateCode, reqVO.getTemplateCode())
                 .likeIfPresent(PrintTemplateDO::getTemplateName, reqVO.getTemplateName())
                 .eqIfPresent(PrintTemplateDO::getTemplateType, reqVO.getTemplateType())
+                .eqIfPresent(PrintTemplateDO::getTemplateBizType, reqVO.getTemplateBizType())
                 .eqIfPresent(PrintTemplateDO::getTemplateJson, reqVO.getTemplateJson())
                 .eqIfPresent(PrintTemplateDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(PrintTemplateDO::getIsEnable, reqVO.getIsEnable())

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printtemplate/PrintTemplateServiceImpl.java

@@ -38,13 +38,13 @@ public class PrintTemplateServiceImpl implements PrintTemplateService {
     public Long createPrintTemplate(PrintTemplateSaveReqVO createReqVO) {
         // 插入
         PrintTemplateDO printTemplate = BeanUtils.toBean(createReqVO, PrintTemplateDO.class);
-        if (printTemplateMapper.selectByTemplateType(printTemplate.getTemplateType()) != null) {
+        if (printTemplateMapper.selectByTemplateType(printTemplate.getTemplateType(),createReqVO.getTemplateBizType()) != null) {
             throw exception(PRINT_TEMPLATE_TYPE_EXISTS);
         }
         if (StringUtils.isEmpty(printTemplate.getTemplateCode())) {
-            printTemplate.setTemplateCode(autoCodeUtil.genSerialCode("PRINT_TEMPLATE_CODE", null));
+            printTemplate.setTemplateCode(autoCodeUtil.genSerialCode(getTemplateRuleCode(printTemplate.getTemplateBizType()), null));
         } else {
-            if (printTemplateMapper.selectByNo(printTemplate.getTemplateCode()) != null) {
+            if (printTemplateMapper.selectByNo(printTemplate.getTemplateCode(),createReqVO.getTemplateType()) != null) {
                 throw exception(PRINT_TEMPLATE_CODE_EXISTS);
             }
         }
@@ -59,12 +59,12 @@ public class PrintTemplateServiceImpl implements PrintTemplateService {
         validatePrintTemplateExists(updateReqVO.getId());
         // 更新
         PrintTemplateDO updateObj = BeanUtils.toBean(updateReqVO, PrintTemplateDO.class);
-        PrintTemplateDO typeExists = printTemplateMapper.selectByTemplateType(updateObj.getTemplateType());
+        PrintTemplateDO typeExists = printTemplateMapper.selectByTemplateType(updateObj.getTemplateType(),updateReqVO.getTemplateBizType());
         if (typeExists != null && !typeExists.getId().equals(updateObj.getId())) {
             throw exception(PRINT_TEMPLATE_TYPE_EXISTS);
         }
         if (StringUtils.isNotEmpty(updateObj.getTemplateCode())) {
-            PrintTemplateDO codeExists = printTemplateMapper.selectByNo(updateObj.getTemplateCode());
+            PrintTemplateDO codeExists = printTemplateMapper.selectByNo(updateObj.getTemplateCode(),updateReqVO.getTemplateType());
             if (codeExists != null && !codeExists.getId().equals(updateObj.getId())) {
                 throw exception(PRINT_TEMPLATE_CODE_EXISTS);
             }
@@ -96,4 +96,8 @@ public class PrintTemplateServiceImpl implements PrintTemplateService {
         return printTemplateMapper.selectPage(pageReqVO);
     }
 
+    private String getTemplateRuleCode(Integer templateBizType) {
+        return Objects.equals(templateBizType, 1) ? "PRINT_TEMPLATE_CODE" : "REPORT_TEMPLATE_CODE";
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java

@@ -111,7 +111,7 @@ public class AuthController {
         // 1.3 获得菜单列表
         Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId));
         List<MenuDO> menuList = menuService.getMenuList(menuIds);
-        menuList.removeIf(menu -> !Objects.equals(menu.getClientType(), clientType));
+        menuList.removeIf(menu -> !Objects.equals(menu.getClientType(), clientType==null ? 1 : clientType));
         menuList = menuService.filterDisableMenus(menuList);
 
         // 2. 拼接结果返回