1.条码测试,返回规则名称

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

@@ -253,15 +253,23 @@ public class BarcodeController {
     public ResultBean getBarCodeInfo(@RequestBody Map<String, String> paramMap) {
     public ResultBean getBarCodeInfo(@RequestBody Map<String, String> paramMap) {
         //获取条码内容
         //获取条码内容
         String codeStr = paramMap.get("code");
         String codeStr = paramMap.get("code");
-        if(ObjectUtil.isEmpty(codeStr)){
-            codeStr="";
+        if (ObjectUtil.isEmpty(codeStr)) {
+            codeStr = "";
         }
         }
-        List<BarcodeRule> barcodeRuleList = codeResolve.getBarcodeRuleList();
-        if (barcodeRuleList != null && !barcodeRuleList.isEmpty()) {
-            for (BarcodeRule barcodeRule : barcodeRuleList) {
+        Settings settings = dataCache.getSettings();
+        Map<String, BarcodeRuleDetail> barcodeRuleMap = settings.getBarcodeRuleMap();
+        if (barcodeRuleMap != null && !barcodeRuleMap.isEmpty()) {
+            for (BarcodeRuleDetail detail : barcodeRuleMap.values()) {
+                String rule = detail.getRule();
+                if (StringUtils.isNotEmpty(rule)) {
+                    BarcodeRule barcodeRule = BarcodeRule.newRule(rule);
                     CodeBean codeBean = barcodeRule.toCodeBean(codeStr);
                     CodeBean codeBean = barcodeRule.toCodeBean(codeStr);
                     if (codeBean.getBarcode() != null) {
                     if (codeBean.getBarcode() != null) {
-                    return ResultBean.newOkResult(codeBean.getBarcode());
+                        Barcode barcode = codeBean.getBarcode();
+                        BarcodeDto barcodeDto = barcodeMapper.toDto(barcode);
+                        barcodeDto.setOtherField1(detail.getRuleName());
+                        return ResultBean.newOkResult(barcodeDto);
+                    }
                 }
                 }
             }
             }
         } else {
         } else {