后台 优化返回组件全部信息(allList)接口

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/CodeMsg.java

@@ -35,30 +35,6 @@ public enum CodeMsg implements ErrorEnum{
     CODE_MSG_202(202,"验证码错误"),
     CODE_MSG_221(221, "TOKEN已过期"),
 
-    //业务级别 3xx
-    CODE_MSG_301(301, "员工不存在"),
-    CODE_MSG_302(302, "您办理的号码不是黑龙江号码!"),
-    CODE_MSG_303(303, "您的号码与向您推荐业务的朋友非同一城市，办理失败。!"),
-    CODE_MSG_304(304, "没有找到对应的产品!"),
-
-    //业务级别 4xx
-    StatusMsg_403(403, "xxxx"),
-    StatusMsg_404(404, "数据不存在"),
-    StatusMsg_405(405, "服务器错误%s"),
-    StatusMsg_406(406, "%s 是非法的文件格式"),
-
-    //宽带业务BOSS异常
-    StatusMsg_KD_BOSS(501, "%s"),
-    StatusMsg_KD_502(502, "未获取到您的当前主资费"),
-    StatusMsg_KD_503(503, "您目前的手机账户余额为：%s元。您至少需交%s元话费方可参与本活动。"),
-    StatusMsg_KD_504(504, "您暂无可办理的家庭网组。"),
-    StatusMsg_KD_505(505, "未获取到您要添加的号码的详细信息！"),
-    StatusMsg_KD_506(506, "账户状态为：%s。无法添加"),
-    StatusMsg_KD_507(507, "家庭业务校验失败！"),
-    StatusMsg_KD_508(508, "营销案办理失败:%s"),
-    StatusMsg_KD_509(509, "选择要办理的业务错误，请刷新重试！"),
-
-
     ;
 
     private int code;

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ComponentsAndBasicVo.java

@@ -1,6 +1,5 @@
 package com.ruoyi.system.domain.vo;
 
-import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 
 /**
@@ -16,64 +15,78 @@ public class ComponentsAndBasicVo {
     private Long id;
 
     /** 组件名称 */
-    @Excel(name = "组件名称")
     private String name;
 
     /** 基础库id */
-    @Excel(name = "基础库id")
     private Long baseId;
 
     /** 组件样式 */
-    @Excel(name = "组件样式")
     private String bntStyle;
 
     /** 组件类型   1开关型  2加减形 */
-    @Excel(name = "组件类型   1开关型  2加减形")
     private String typeNum;
 
     /** 加减型  最大值 */
-    @Excel(name = "加减型  最大值")
     private Long addSubMax;
 
     /** 加减型  最小值 */
-    @Excel(name = "加减型  最小值")
     private Long addSubMin;
 
     /** 命令参数 */
-    @Excel(name = "命令参数")
     private String dictateParameter;
 
     /** 默认值 */
-    @Excel(name = "默认值")
     private String defValue;
 
     /** 重复码 */
-    @Excel(name = "重复码")
     private Long repeatCode;
 
     /** 基本库名 */
-    @Excel(name = "基本库名")
     private String baseName;
 
     /** 波段值  默认38000 */
-    @Excel(name = "波段值  默认38000")
     private Long bandValue;
 
     /** 引导码  500,100  校验size=2 */
-    @Excel(name = "引导码  500,100  校验size=2")
     private String bootCode;
 
     /** 引导码发送次数 默认1  校验大于0 */
-    @Excel(name = "引导码发送次数 默认1  校验大于0")
     private Long bootCodeSend;
 
+    /** 引导码启用状态 0启用  1禁用 */
+    private String bootCodeStatus;
+
+    /** 同步码  500,100  校验size=2 */
+    private String synchronizeCode;
+
+    /** 同步码发送次数 默认1  校验大于0 */
+    private Long synchronizeCodeSend;
+
+    /** 同步码启用状态 0启用  1禁用 */
+    private String synchronizeCodeStatus;
+
+    /** 重复码 */
+    private String baseRepeatCode;
+
+    /** 地址码 */
+    private String addressCode;
+
+    /** 地址码启用状态 0启用  1禁用 */
+    private String addressCodeStatus;
+
     /** 数据码 */
-    @Excel(name = "数据码")
     private String dateCode;
 
     /** 结束码 */
-    @Excel(name = "结束码")
     private String overCode;
 
+    /** 数据反码启用状态  0启用 1禁用 */
+    private String dataInverseCodeStatus;
+
+    /** 二进制0   560,565  高电平低电平*/
+    private String dateBinary0;
+
+    /** 二进制1 */
+    private String dateBinary1;
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ComponentsLibraryServiceImpl.java

@@ -8,7 +8,6 @@ import com.ruoyi.system.domain.vo.ComponentsAndBasicVo;
 import com.ruoyi.system.mapper.ComponentsLibraryMapper;
 import com.ruoyi.system.service.BasicLibraryService;
 import com.ruoyi.system.service.ComponentsLibraryService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,14 +42,23 @@ public class ComponentsLibraryServiceImpl extends ServiceImpl<ComponentsLibraryM
             componentsAndBasicVo.setDictateParameter(componentsLibrary.getDictateParameter());
             componentsAndBasicVo.setDefValue(componentsLibrary.getDefValue());
             componentsAndBasicVo.setRepeatCode(componentsLibrary.getRepeatCode());
-            BeanUtils.copyProperties(basicLibraryList,componentsAndBasicVo);
             BasicLibrary one = basicLibraryService.getOne(new LambdaQueryWrapper<BasicLibrary>().eq(BasicLibrary::getId, componentsLibrary.getBaseId()), false);
             componentsAndBasicVo.setBaseName(one.getName());
             componentsAndBasicVo.setBandValue(one.getBandValue());
             componentsAndBasicVo.setBootCode(one.getBootCode());
             componentsAndBasicVo.setBootCodeSend(one.getBootCodeSend());
+            componentsAndBasicVo.setBootCodeStatus(one.getBootCodeStatus());
+            componentsAndBasicVo.setSynchronizeCode(one.getSynchronizeCode());
+            componentsAndBasicVo.setSynchronizeCodeSend(one.getSynchronizeCodeSend());
+            componentsAndBasicVo.setSynchronizeCodeStatus(one.getAddressCodeStatus());
+            componentsAndBasicVo.setBaseRepeatCode(one.getRepeatCode());
+            componentsAndBasicVo.setAddressCode(one.getAddressCode());
+            componentsAndBasicVo.setAddressCodeStatus(one.getAddressCodeStatus());
             componentsAndBasicVo.setDateCode(one.getDateCode());
             componentsAndBasicVo.setOverCode(one.getOverCode());
+            componentsAndBasicVo.setDataInverseCodeStatus(one.getDataInverseCodeStatus());
+            componentsAndBasicVo.setDateBinary0(one.getDateBinary0());
+            componentsAndBasicVo.setDateBinary1(one.getDateBinary1());
             voList.add(componentsAndBasicVo);
         }
         return voList;