小调整

jjt-biz/src/main/java/com/jjt/dye/controller/DyeTypeProcessController.java

@@ -145,13 +145,13 @@ public class DyeTypeProcessController extends BaseController {
                                 createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "走布速度(m/min)",
                                         calenderMachineParams.getBeltSpeedSet(), calenderMachineParams.getBeltSpeedActual());
 
-                                // 设备电量(kw.h)
-                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电量(kw.h)",
-                                        calenderMachineParams.getPowerKwhSet(), calenderMachineParams.getPowerKwhActual());
-
-                                // 设备电流(A)
-                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电流(A)",
-                                        calenderMachineParams.getCurrentASet(), calenderMachineParams.getCurrentAActual());
+//                                // 设备电量(kw.h)
+//                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电量(kw.h)",
+//                                        calenderMachineParams.getPowerKwhSet(), calenderMachineParams.getPowerKwhActual());
+//
+//                                // 设备电流(A)
+//                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电流(A)",
+//                                        calenderMachineParams.getCurrentASet(), calenderMachineParams.getCurrentAActual());
 
                                 // 合并设备名称单元格（第一列）
                                 if (startRow < rowNum.get() - 1) {
@@ -168,7 +168,7 @@ public class DyeTypeProcessController extends BaseController {
                             if (highCombingMachineParams != null) {
                                 // 记录起始行号用于合并单元格
                                 int startRow = rowNum.get();
-                                String deviceName = "#高梳机";
+                                String deviceName = d.getSortNum() + "#高梳机";
 
                                 // 大锡林转速(r/min)
                                 createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "大锡林转速(r/min)",
@@ -202,13 +202,13 @@ public class DyeTypeProcessController extends BaseController {
                                 createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "走布速度(m/min)",
                                         highCombingMachineParams.getBeltSpeedSet(), highCombingMachineParams.getBeltSpeedActual());
 
-                                // 设备电量(kw.h)
-                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电量(kw.h)",
-                                        highCombingMachineParams.getPowerKwhSet(), highCombingMachineParams.getPowerKwhActual());
-
-                                // 设备电流(A)
-                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电流(A)",
-                                        highCombingMachineParams.getCurrentASet(), highCombingMachineParams.getCurrentAActual());
+//                                // 设备电量(kw.h)
+//                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电量(kw.h)",
+//                                        highCombingMachineParams.getPowerKwhSet(), highCombingMachineParams.getPowerKwhActual());
+//
+//                                // 设备电流(A)
+//                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电流(A)",
+//                                        highCombingMachineParams.getCurrentASet(), highCombingMachineParams.getCurrentAActual());
 
                                 // 合并设备名称单元格（第一列）
                                 if (startRow < rowNum.get() - 1) {
@@ -245,23 +245,23 @@ public class DyeTypeProcessController extends BaseController {
 
                                 // 烫棍1电流(A)
                                 createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "烫棍1电流(A)",
-                                        calenderingMachineParams.getRoller1CurrSet(), calenderingMachineParams.getRoller1CurrActual());
+                                        calenderingMachineParams.getRoller1CurrSet() * 0.1, calenderingMachineParams.getRoller1CurrActual());
 
                                 // 烫棍2电流(A)
                                 createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "烫棍2电流(A)",
-                                        calenderingMachineParams.getRoller2CurrSet(), calenderingMachineParams.getRoller2CurrActual());
+                                        calenderingMachineParams.getRoller2CurrSet() * 0.1, calenderingMachineParams.getRoller2CurrActual());
 
                                 // 走布速度(m/min)
                                 createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "走布速度(m/min)",
                                         calenderingMachineParams.getBeltSpeedSet(), calenderingMachineParams.getBeltSpeedActual());
 
-                                // 设备电量(kw.h)
-                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电量(kw.h)",
-                                        calenderingMachineParams.getPowerKwhSet(), calenderingMachineParams.getPowerKwhActual());
-
-                                // 设备电流(A)
-                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电流(A)",
-                                        calenderingMachineParams.getCurrentASet(), calenderingMachineParams.getCurrentAActual());
+//                                // 设备电量(kw.h)
+//                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电量(kw.h)",
+//                                        calenderingMachineParams.getPowerKwhSet(), calenderingMachineParams.getPowerKwhActual());
+//
+//                                // 设备电流(A)
+//                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电流(A)",
+//                                        calenderingMachineParams.getCurrentASet(), calenderingMachineParams.getCurrentAActual());
 
                                 // 合并设备名称单元格（第一列）
                                 if (startRow < rowNum.get() - 1) {
@@ -278,7 +278,7 @@ public class DyeTypeProcessController extends BaseController {
                             if (dualBrushMachineParams != null) {
                                 // 记录起始行号用于合并单元格
                                 int startRow = rowNum.get();
-                                String deviceName = "#双棍刷毛机";
+                                String deviceName = d.getSortNum() + "#两棍刷毛机";
 
                                 // 刷辊1隔离(mm)
                                 createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "刷辊1隔离(mm)",
@@ -316,13 +316,13 @@ public class DyeTypeProcessController extends BaseController {
                                 createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "走布速度(m/min)",
                                         dualBrushMachineParams.getBeltSpeedSet(), dualBrushMachineParams.getBeltSpeedActual());
 
-                                // 设备电量(kw.h)
-                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电量(kw.h)",
-                                        dualBrushMachineParams.getPowerKwhSet(), dualBrushMachineParams.getPowerKwhActual());
-
-                                // 设备电流(A)
-                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电流(A)",
-                                        dualBrushMachineParams.getCurrentASet(), dualBrushMachineParams.getCurrentAActual());
+//                                // 设备电量(kw.h)
+//                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电量(kw.h)",
+//                                        dualBrushMachineParams.getPowerKwhSet(), dualBrushMachineParams.getPowerKwhActual());
+//
+//                                // 设备电流(A)
+//                                createDataRow(sheet, rowNum.getAndIncrement(), deviceName, "设备电流(A)",
+//                                        dualBrushMachineParams.getCurrentASet(), dualBrushMachineParams.getCurrentAActual());
 
                                 // 合并设备名称单元格（第一列）
                                 if (startRow < rowNum.get() - 1) {

jjt-biz/src/main/java/com/jjt/dye/service/impl/DyeTypeProcessServiceImpl.java

@@ -140,30 +140,29 @@ public class DyeTypeProcessServiceImpl implements IDyeTypeProcessService {
                 BeanUtils.copyProperties(device, vo);
                 deviceMap.put(device.getDeviceId(), vo);
                 List<DyeTypeProcess> typeProcesses = device.getProcParas();
-                List<DyeDevicePara> deviceParas = device.getEngParas();
+//                List<DyeDevicePara> deviceParas = device.getEngParas();
                 for (DyeTypeProcess typeProcess : typeProcesses) {
-                    String coeff = typeProcess.getCoeff() != null ? typeProcess.getCoeff().toString() : "";
                     if (StringUtils.isNotEmpty(typeProcess.getParaSet())) {
                         field = device.getDeviceCode() + "." + typeProcess.getParaSet();
                         fields.add(field);
-                        value = "s-" + typeProcess.getParaCode() + "-" + device.getDeviceId() + "-" + coeff;
+                        value = "s-" + typeProcess.getParaCode() + "-" + device.getDeviceId() ;
                         fieldMap.put(keyPrefix + field, value);
                     }
                     if (StringUtils.isNotEmpty(typeProcess.getParaAct())) {
                         field = device.getDeviceCode() + "." + typeProcess.getParaAct();
                         fields.add(field);
-                        value = "a-" + typeProcess.getParaCode() + "-" + device.getDeviceId() + "-" + coeff;
-                        fieldMap.put(keyPrefix + field, value);
-                    }
-                }
-                for (DyeDevicePara devicePara : deviceParas) {
-                    if ("ENG_amp_a".equals(devicePara.getParaCode())) {
-                        field = devicePara.getRemark();
-                        fields.add(field);
-                        value = "a-current_a-" + device.getDeviceId() + "-0.1";
+                        value = "a-" + typeProcess.getParaCode() + "-" + device.getDeviceId() ;
                         fieldMap.put(keyPrefix + field, value);
                     }
                 }
+//                for (DyeDevicePara devicePara : deviceParas) {
+//                    if ("ENG_amp_a".equals(devicePara.getParaCode())) {
+//                        field = devicePara.getRemark();
+//                        fields.add(field);
+//                        value = "a-current_a-" + device.getDeviceId() + "-0.1";
+//                        fieldMap.put(keyPrefix + field, value);
+//                    }
+//                }
             }
 
             String sql = "select last %s from root.tl.suxi where time <=%s";
@@ -188,12 +187,12 @@ public class DyeTypeProcessServiceImpl implements IDyeTypeProcessService {
                         String paraType = split[0];
                         String paraCode = split[1];
                         String deviceId = split[2];
-                        if (split.length > 3) {
-                            String coeff = split[3];
-                            if (StringUtils.isNotEmpty(coeff)) {
-                                v = BigDecimal.valueOf(v).multiply(BigDecimal.valueOf(Double.parseDouble(coeff))).doubleValue();
-                            }
-                        }
+//                        if (split.length > 3) {
+//                            String coeff = split[3];
+//                            if (StringUtils.isNotEmpty(coeff)) {
+//                                v = BigDecimal.valueOf(v).multiply(BigDecimal.valueOf(Double.parseDouble(coeff))).doubleValue();
+//                            }
+//                        }
                         if ("s".equals(paraType)) {
                             paraCode = paraCode + "_set";
                         }