1.增加条码规则具体的详情信息

src/main/java/com/neotel/smfcore/common/init/MenuInit.java

@@ -189,7 +189,7 @@ public class MenuInit {
         //条形码:条码管理,条码设置
         Menu pMenuBarcode = Menu.CreatePMenu("条形码", 7, "barcodes", "barcodeMenu",null);
         addDefaultFunctionMenu(51,pMenuBarcode, "条码管理", "barcode", "barcode/barcode/index","chart",DEFAULT_SHOW_MENU);
-        addDefaultFunctionMenu(52, pMenuBarcode, "条码设置","barcodeSetting", "system/barcodeSetting/index", "barcode",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(52, pMenuBarcode, "条码规则","barcodeSetting", "system/barcodeSetting/index", "barcode",DEFAULT_SHOW_MENU);
 
         //日志管理：物料日志
         Menu pMenuLog = Menu.CreatePMenu("日志管理", 8, "log","log",null);

src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRuleDetail.java

+package com.neotel.smfcore.core.barcode.bean;
+
+import lombok.Data;
+
+@Data
+public class BarcodeRuleDetail {
+
+    private String id;
+
+    private String ruleName;
+
+    private String rule;
+
+}

src/main/java/com/neotel/smfcore/core/barcode/rest/BarcodeController.java

 package com.neotel.smfcore.core.barcode.rest;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
@@ -8,9 +9,12 @@ import com.neotel.smfcore.common.csv.CsvReader;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.FileUtil;
 import com.neotel.smfcore.common.utils.QueryHelp;
+import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.bean.BarcodeRule;
+import com.neotel.smfcore.core.barcode.bean.BarcodeRuleDetail;
 import com.neotel.smfcore.core.barcode.bean.CodeBean;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeDto;
+import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeRuleDetailDto;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeRuleDto;
 import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.BarcodeMapper;
 import com.neotel.smfcore.core.barcode.rest.bean.query.BarcodeQueryCriteria;
@@ -40,10 +44,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 @Slf4j
 @RestController
@@ -124,9 +125,34 @@ public class BarcodeController {
     public BarcodeRuleDto getRules() {
         Settings settings = dataCache.getSettings();
         BarcodeRuleDto ruleDto = new BarcodeRuleDto();
-        ruleDto.setCodeRuleList(settings.getCodeRuleList());
+        List<String> codeRuleList = settings.getCodeRuleList();
+        ruleDto.setCodeRuleList(codeRuleList);
         ruleDto.setPageHeight(settings.getPageHeight());
         ruleDto.setPageWidth(settings.getPageWidth());
+
+        //兼容以前的
+        Map<String, BarcodeRuleDetail> barcodeRuleMap = settings.getBarcodeRuleMap();
+        if (barcodeRuleMap.isEmpty()) {
+            if (codeRuleList != null && !codeRuleList.isEmpty()) {
+                for (String codeRule : codeRuleList) {
+                    BarcodeRuleDetail detail = new BarcodeRuleDetail();
+                    detail.setId(RandomUtil.randomString(10));
+                    detail.setRule(codeRule);
+                    barcodeRuleMap.put(detail.getId(),detail);
+                }
+            }
+            settings.setBarcodeRuleMap(barcodeRuleMap);
+            dataCache.updateSettings(settings);
+        }
+        List<BarcodeRuleDetailDto> detailList = new ArrayList<>();
+        for (BarcodeRuleDetail detail : barcodeRuleMap.values()) {
+            BarcodeRuleDetailDto dto = new BarcodeRuleDetailDto();
+            dto.setId(detail.getId());
+            dto.setRule(detail.getRule());
+            dto.setRuleName(detail.getRuleName());
+            detailList.add(dto);
+        }
+        ruleDto.setCodeRuleDetailList(detailList);
         return ruleDto;
     }
 
@@ -153,6 +179,25 @@ public class BarcodeController {
         settings.setCodeRuleList(params.getCodeRuleList());
         settings.setPageHeight(params.getPageHeight());
         settings.setPageWidth(params.getPageWidth());
+
+        Map<String, BarcodeRuleDetail> barcodeRuleMap = settings.getBarcodeRuleMap();
+
+        List<BarcodeRuleDetailDto> codeRuleDetailList = params.getCodeRuleDetailList();
+        if(codeRuleDetailList != null && !codeRuleDetailList.isEmpty()) {
+            for (BarcodeRuleDetailDto detailDto : codeRuleDetailList) {
+                String id = detailDto.getId();
+                if (StringUtils.isEmpty(id)) {
+                    id = RandomUtil.randomString(10);
+                }
+                BarcodeRuleDetail detail = new BarcodeRuleDetail();
+                detail.setRule(detailDto.getRule());
+                detail.setRuleName(detailDto.getRuleName());
+                detail.setId(detailDto.getId());
+                barcodeRuleMap.put(id, detail);
+            }
+        }
+        settings.setBarcodeRuleMap(barcodeRuleMap);
+
         dataCache.updateSettings(settings);
         //修改设置
         return new ResponseEntity<>(HttpStatus.OK);

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeRuleDetailDto.java

+package com.neotel.smfcore.core.barcode.rest.bean.dto;
+
+import com.neotel.smfcore.core.barcode.bean.BarcodeRuleDetail;
+import lombok.Data;
+
+@Data
+public class BarcodeRuleDetailDto extends BarcodeRuleDetail {
+    
+}

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeRuleDto.java

@@ -22,4 +22,7 @@ public class BarcodeRuleDto implements Serializable {
 
     @ApiModelProperty("打印条码的纸张高度")
     private int pageHeight = 160;
+
+    @ApiModelProperty("具体规则详情")
+    private List<BarcodeRuleDetailDto> codeRuleDetailList =  Lists.newArrayList();
 }

src/main/java/com/neotel/smfcore/core/system/service/po/Settings.java

@@ -2,11 +2,14 @@ package com.neotel.smfcore.core.system.service.po;
 
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.base.BasePo;
+import com.neotel.smfcore.core.barcode.bean.BarcodeRuleDetail;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class Settings extends BasePo implements Serializable {
@@ -181,4 +184,9 @@ public class Settings extends BasePo implements Serializable {
     private String notIntoCids = "";
 
     private boolean checkLineShelf = false;
+
+    /**
+     * 具体规则详情
+     */
+    private Map<String, BarcodeRuleDetail> barcodeRuleMap = new HashMap<>();
 }