忽略system_machine_brand多组织，系统配置接口修改

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/UserSettingTypeEnum.java

@@ -0,0 +1,26 @@
+package com.cf.imes.framework.common.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum UserSettingTypeEnum {
+
+    PREPACKAGED(1,"预打包"),
+    PACKAGED(2, "打包");
+    private Integer type;
+    private String name;
+
+    public boolean equals(Integer status) {
+        return this.type .equals(status) ;
+    }
+
+    public boolean equals(UserSettingTypeEnum enableStatusEnum) {
+        return enableStatusEnum != null && enableStatusEnum.type .equals(this.getType()) ;
+    }
+
+
+
+}

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineTemplateConvert.java

@@ -28,7 +28,7 @@ public class MachineTemplateConvert {
                 .id(reqVO.getId())
                 .name(reqVO.getName())
 //                .brand(reqVO.getBrand())
-                .brandId(reqVO.getNowBrandId())
+                .brandId(reqVO.getBrandId())
                 .setting(reqVO.getSetting().toJSONString())
                 .build();
     }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/MachineBrandDO.java

@@ -13,7 +13,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MachineBrandDO /*extends BaseDO*/ {
+public class MachineBrandDO  {
 
     /**
      * 主键

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java

@@ -179,7 +179,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
 
         if(reqVO.getModel()!=null) {
 
-            MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectMachine(reqVO.getBrandId(), reqVO.getModel());
+            MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectMachine(reqVO.getNowBrandId(), reqVO.getModel());
 
             templateDO.setSetting(machineTemplateDO.getSetting());
 
@@ -219,10 +219,10 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
     @Override
     public CuttingTemplateRespVO getCuttingTemplateById(String id) {
         MachineTemplateDO templateDO = machineTemplateMapper.selectById(id);
-        templateDO.setSetting(JsonUtils.unzipString(templateDO.getSetting()));
         if (Objects.isNull(templateDO)) {
             throw exception(MACHINE_TEMPLATE_NOT_EXISTS);
         }
+        templateDO.setSetting(JsonUtils.unzipString(templateDO.getSetting()));
         CuttingTemplateRespVO respVO  = MachineTemplateConvert.convert1(templateDO);
         return respVO;
     }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingServiceImpl.java

@@ -1,6 +1,7 @@
 package com.cf.imes.module.system.service.setting;
 
 
+import com.cf.imes.framework.common.enums.UserSettingTypeEnum;
 import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.framework.common.util.object.BeanUtils;
 import com.cf.imes.framework.security.core.LoginUser;
@@ -49,10 +50,11 @@ public class SettingServiceImpl implements SettingService{
     @Override
     public Long updateSetting(PackageConfigReqVO reqVO) {
 
+        LoginUser loginUser = getLoginUser();
         // 更新
-        PackageConfigDO packageConfigDO = settingMapper.selectById(reqVO.getId());
+        PackageConfigDO packageConfigDO = settingMapper.selectSetting(reqVO.getType(), loginUser.getId(), loginUser.getOrganId());
         if (packageConfigDO == null) {
-            throw exception(CURRENTLY_NO_CONFIGURATION_AVAILABLE);
+            throw exception(CURRENTLY_NO_CONFIGURATION_AVAILABLE,reqVO.getType() == 1 ? UserSettingTypeEnum.PREPACKAGED.getName(): UserSettingTypeEnum.PACKAGED.getName());
         }
         if(reqVO.getSetting() != null) {
             packageConfigDO.setSetting(JsonUtils.zipString(reqVO.getSetting().toJSONString()));
@@ -69,10 +71,11 @@ public class SettingServiceImpl implements SettingService{
 
         LoginUser loginUser = getLoginUser();
 
+        assert loginUser != null;
         PackageConfigDO packageConfigDO = settingMapper.selectSetting(type, loginUser.getId(), loginUser.getOrganId());
 
         if (packageConfigDO == null) {
-            throw exception(CURRENTLY_NO_CONFIGURATION_AVAILABLE);
+            throw exception(CURRENTLY_NO_CONFIGURATION_AVAILABLE,type == 1 ? UserSettingTypeEnum.PREPACKAGED.getName(): UserSettingTypeEnum.PACKAGED.getName());
         }
 
 

cf-module-system/cf-module-system-biz/src/main/resources/application.yaml

@@ -189,6 +189,7 @@ chenfeng:
       - system_notify_message
       - system_notify_message_readinfo
       - system_data_source_field
+      - system_machine_brand
     use-data-code: imes_prod #动态数据源标识，后期添加的数据源需要修改此值
 
   sms-code: # 短信验证码相关的配置项