增加烘固参数 和设备名称

jjt-biz/src/main/java/com/jjt/biz/service/impl/ApiYrServiceImpl.java

@@ -344,9 +344,10 @@ public class ApiYrServiceImpl implements IApiYrService {
         vo.setLine(req.getLine());
         vo.setStart(req.getStart());
         vo.setEnd(req.getEnd());
-        vo.setYh(10);
         CompareVO.Qz qz = vo.getQz();
         CompareVO.Hz hz = vo.getHz();
+        CompareVO.Yr yr = vo.getYr();
+        yr.setYh(10);
         LocalDateTime ldt = req.getEnd().minusHours(1);
         Date date = Date.from(ldt.toLocalDate().atStartOfDay(ZoneOffset.of("+8")).toInstant());
         TwinCalcHourRz search = new TwinCalcHourRz();
@@ -358,19 +359,22 @@ public class ApiYrServiceImpl implements IApiYrService {
             Map<String, Object> map = JSON.parseObject(item.getData(), Map.class);
             map.put("device", item.getDeviceName());
             map.put("online", item.getOnline());
-
+            CompareVO.Para para = new CompareVO.Para();
+            para.setName(item.getDeviceName());
+            para.setPara(map);
             if ("Forward".equals(item.getWsName())) {
-                qzProcessor(qz, item, flag, map);
+                qzProcessor(qz, item, flag, para);
             } else if ("Back".equals(item.getWsName())) {
-                hzProcessor(hz, item, flag, map);
+                hzProcessor(hz, item, flag, para);
             } else {
                 //留给烘固机
+                yrProcessor(yr, item, flag, para);
             }
         });
         return vo;
     }
 
-    private void qzProcessor(CompareVO.Qz qz, TwinCalcHourRz item, boolean flag, Map<String, Object> map) {
+    private void qzProcessor(CompareVO.Qz qz, TwinCalcHourRz item, boolean flag, CompareVO.Para para) {
         //前整
         switch (item.getTypeId()) {
             case 2:
@@ -379,7 +383,7 @@ public class ApiYrServiceImpl implements IApiYrService {
                     qz.setDx(qz.getDx() + 1);
                 }
                 if (flag) {
-                    qz.addDxPara(map);
+                    qz.addDxPara(para);
                 }
                 break;
             case 3:
@@ -388,7 +392,7 @@ public class ApiYrServiceImpl implements IApiYrService {
                     qz.setTg(qz.getTg() + 1);
                 }
                 if (flag) {
-                    qz.addTgPara(map);
+                    qz.addTgPara(para);
                 }
                 break;
             case 4:
@@ -397,7 +401,7 @@ public class ApiYrServiceImpl implements IApiYrService {
                     qz.setGs(qz.getGs() + 1);
                 }
                 if (flag) {
-                    qz.addGsPara(map);
+                    qz.addGsPara(para);
                 }
                 break;
             case 5:
@@ -406,7 +410,7 @@ public class ApiYrServiceImpl implements IApiYrService {
                     qz.setSm(qz.getSm() + 1);
                 }
                 if (flag) {
-                    qz.addSmPara(map);
+                    qz.addSmPara(para);
                 }
                 break;
             default:
@@ -414,7 +418,15 @@ public class ApiYrServiceImpl implements IApiYrService {
         }
     }
 
-    private void hzProcessor(CompareVO.Hz hz, TwinCalcHourRz item, boolean flag, Map<String, Object> map) {
+    private void yrProcessor(CompareVO.Yr yr, TwinCalcHourRz item, boolean flag, CompareVO.Para para) {
+        if (8 == item.getTypeId()) {
+            if (flag) {
+                yr.addHgPara(para);
+            }
+        }
+    }
+
+    private void hzProcessor(CompareVO.Hz hz, TwinCalcHourRz item, boolean flag, CompareVO.Para para) {
         //后整
         switch (item.getTypeId()) {
             case 6:
@@ -423,7 +435,7 @@ public class ApiYrServiceImpl implements IApiYrService {
                     hz.setDx(hz.getDx() + 1);
                 }
                 if (flag) {
-                    hz.addDxPara(map);
+                    hz.addDxPara(para);
                 }
                 break;
             case 3:
@@ -432,7 +444,7 @@ public class ApiYrServiceImpl implements IApiYrService {
                     hz.setTg(hz.getTg() + 1);
                 }
                 if (flag) {
-                    hz.addTgPara(map);
+                    hz.addTgPara(para);
                 }
                 break;
             case 4:
@@ -441,7 +453,7 @@ public class ApiYrServiceImpl implements IApiYrService {
                     hz.setGs(hz.getGs() + 1);
                 }
                 if (flag) {
-                    hz.addGsPara(map);
+                    hz.addGsPara(para);
                 }
                 break;
             case 5:
@@ -450,7 +462,7 @@ public class ApiYrServiceImpl implements IApiYrService {
                     hz.setSm(hz.getSm() + 1);
                 }
                 if (flag) {
-                    hz.addSmPara(map);
+                    hz.addSmPara(para);
                 }
                 break;
             case 7:
@@ -459,7 +471,7 @@ public class ApiYrServiceImpl implements IApiYrService {
                     hz.setQm(hz.getQm() + 1);
                 }
                 if (flag) {
-                    hz.addQmPara(map);
+                    hz.addQmPara(para);
                 }
                 break;
             case 9:
@@ -468,7 +480,7 @@ public class ApiYrServiceImpl implements IApiYrService {
                     hz.setTj(hz.getTj() + 1);
                 }
                 if (flag) {
-                    hz.addTjPara(map);
+                    hz.addTjPara(para);
                 }
                 break;
             default:

jjt-biz/src/main/java/com/jjt/rz/vo/CompareVO.java

@@ -33,8 +33,8 @@ public class CompareVO {
     private Qz qz;
     @ApiModelProperty("后整车间")
     private Hz hz;
-    @ApiModelProperty("印花")
-    private Integer yh;
+    @ApiModelProperty("印染车间")
+    private Yr yr;
     @ApiModelProperty("电")
     private BigDecimal elect;
     @ApiModelProperty("热油")
@@ -47,19 +47,19 @@ public class CompareVO {
         @ApiModelProperty("定型次数")
         private Integer dx;
         @ApiModelProperty("定型参数")
-        private List<Map<String, Object>> dxPara;
+        private List<Para> dxPara;
         @ApiModelProperty("高梳次数")
         private Integer gs;
         @ApiModelProperty("高梳参数")
-        private List<Map<String, Object>> gsPara;
+        private List<Para> gsPara;
         @ApiModelProperty("双棍烫光次数")
         private Integer tg;
         @ApiModelProperty("双棍烫光参数")
-        private List<Map<String, Object>> tgPara;
+        private List<Para> tgPara;
         @ApiModelProperty("双棍刷毛次数")
         private Integer sm;
         @ApiModelProperty("双棍刷毛参数")
-        private List<Map<String, Object>> smPara;
+        private List<Para> smPara;
         @ApiModelProperty("电")
         private BigDecimal elect;
         @ApiModelProperty("热油")
@@ -78,49 +78,66 @@ public class CompareVO {
             this.smPara = new ArrayList<>();
         }
 
-        public void addDxPara(Map<String, Object> treeMap) {
-            this.dxPara.add(treeMap);
+        public void addDxPara(Para para) {
+            this.dxPara.add(para);
         }
 
-        public void addGsPara(Map<String, Object> treeMap) {
-            this.gsPara.add(treeMap);
+        public void addGsPara(Para para) {
+            this.gsPara.add(para);
         }
 
-        public void addTgPara(Map<String, Object> treeMap) {
-            this.tgPara.add(treeMap);
+        public void addTgPara(Para para) {
+            this.tgPara.add(para);
         }
 
-        public void addSmPara(Map<String, Object> treeMap) {
-            this.smPara.add(treeMap);
+        public void addSmPara(Para para) {
+            this.smPara.add(para);
         }
     }
 
     @Data
+    public static class Yr {
+        @ApiModelProperty("印花次数")
+        private Integer yh;
+        @ApiModelProperty("烘固参数")
+        private List<Para> hgPara;
+
+        public Yr() {
+            this.hgPara = new ArrayList<>();
+        }
+
+        public void addHgPara(Para para) {
+            this.hgPara.add(para);
+        }
+
+    }
+
+    @Data
     public static class Hz {
         @ApiModelProperty("定型次数")
         private Integer dx;
         @ApiModelProperty("定型参数")
-        private List<Map<String, Object>> dxPara;
+        private List<Para> dxPara;
         @ApiModelProperty("高梳次数")
         private Integer gs;
         @ApiModelProperty("高梳参数")
-        private List<Map<String, Object>> gsPara;
+        private List<Para> gsPara;
         @ApiModelProperty("双棍烫光次数")
         private Integer tg;
         @ApiModelProperty("双棍烫光参数")
-        private List<Map<String, Object>> tgPara;
+        private List<Para> tgPara;
         @ApiModelProperty("双棍刷毛次数")
         private Integer sm;
         @ApiModelProperty("双棍刷毛参数")
-        private List<Map<String, Object>> smPara;
+        private List<Para> smPara;
         @ApiModelProperty("起毛次数")
         private Integer qm;
         @ApiModelProperty("起毛参数")
-        private List<Map<String, Object>> qmPara;
+        private List<Para> qmPara;
         @ApiModelProperty("烫剪次数")
         private Integer tj;
         @ApiModelProperty("烫剪参数")
-        private List<Map<String, Object>> tjPara;
+        private List<Para> tjPara;
         @ApiModelProperty("电")
         private BigDecimal elect;
         @ApiModelProperty("热油")
@@ -143,35 +160,42 @@ public class CompareVO {
             this.tjPara = new ArrayList<>();
         }
 
-        public void addDxPara(Map<String, Object> treeMap) {
-            this.dxPara.add(treeMap);
+        public void addDxPara(Para para) {
+            this.dxPara.add(para);
         }
 
-        public void addGsPara(Map<String, Object> treeMap) {
-            this.gsPara.add(treeMap);
+        public void addGsPara(Para para) {
+            this.gsPara.add(para);
         }
 
-        public void addTgPara(Map<String, Object> treeMap) {
-            this.tgPara.add(treeMap);
+        public void addTgPara(Para para) {
+            this.tgPara.add(para);
         }
 
-        public void addSmPara(Map<String, Object> treeMap) {
-            this.smPara.add(treeMap);
+        public void addSmPara(Para para) {
+            this.smPara.add(para);
         }
 
-        public void addQmPara(Map<String, Object> treeMap) {
-            this.qmPara.add(treeMap);
+        public void addQmPara(Para para) {
+            this.qmPara.add(para);
         }
 
-        public void addTjPara(Map<String, Object> treeMap) {
-            this.tjPara.add(treeMap);
+        public void addTjPara(Para para) {
+            this.tjPara.add(para);
         }
     }
 
+    @Data
+    public static class Para {
+        @ApiModelProperty("名称")
+        private String name;
+        @ApiModelProperty("参数")
+        private Map<String, Object> para;
+    }
+
     public CompareVO() {
         this.qz = new Qz();
         this.hz = new Hz();
-
-
+        this.yr = new Yr();
     }
 }