合并分支 'bug' 到 'master'

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckAreaStatVo.java

@@ -113,10 +113,10 @@ public class CheckAreaStatVo implements Cloneable {
             if (this.areaDetailId == 0) {
                 this.areaDetailId = other.areaDetailId;
             } else {
-                throw new IllegalArgumentException(String.format(
-                        "要合并的两个地区统计数据的areaName与areaDetailId必须保持一致，" +
-                                "你提供的分别是areaName = %s 与 %s , areaDetailId = %d 与 %d %n",
-                        this.areaName, other.areaName, this.areaDetailId, other.areaDetailId));
+//                throw new IllegalArgumentException(String.format(
+//                        "要合并的两个地区统计数据的areaName与areaDetailId必须保持一致，" +
+//                                "你提供的分别是areaName = %s 与 %s , areaDetailId = %d 与 %d %n",
+//                        this.areaName, other.areaName, this.areaDetailId, other.areaDetailId));
             }
         }
 
@@ -125,10 +125,10 @@ public class CheckAreaStatVo implements Cloneable {
             if (this.areaStatId == 0) {
                 this.areaStatId = other.areaStatId;
             } else {
-                throw new IllegalArgumentException(String.format(
-                        "要合并的两个地区统计数据的areaName与areaStatId必须保持一致，" +
-                                "你提供的分别是areaName = %s 与 %s , areaStatId = %d 与 %d %n",
-                        this.areaName, other.areaName, this.areaStatId, other.areaStatId));
+//                throw new IllegalArgumentException(String.format(
+//                        "要合并的两个地区统计数据的areaName与areaStatId必须保持一致，" +
+//                                "你提供的分别是areaName = %s 与 %s , areaStatId = %d 与 %d %n",
+//                        this.areaName, other.areaName, this.areaStatId, other.areaStatId));
             }
         }
 
@@ -161,10 +161,10 @@ public class CheckAreaStatVo implements Cloneable {
             if (this.areaDetailId == 0) {
                 this.areaDetailId = other.areaDetailId;
             } else {
-                throw new IllegalArgumentException(String.format(
-                        "要合并的两个地区统计数据的areaName与areaDetailId必须保持一致，" +
-                                "你提供的分别是areaName = %s 与 %s , areaDetailId = %d 与 %d %n",
-                        this.areaName, other.areaName, this.areaDetailId, other.areaDetailId));
+//                throw new IllegalArgumentException(String.format(
+//                        "要合并的两个地区统计数据的areaName与areaDetailId必须保持一致，" +
+//                                "你提供的分别是areaName = %s 与 %s , areaDetailId = %d 与 %d %n",
+//                        this.areaName, other.areaName, this.areaDetailId, other.areaDetailId));
             }
         }
 
@@ -173,10 +173,10 @@ public class CheckAreaStatVo implements Cloneable {
             if (this.areaStatId == 0) {
                 this.areaStatId = other.areaStatId;
             } else {
-                throw new IllegalArgumentException(String.format(
-                        "要合并的两个地区统计数据的areaName与areaStatId必须保持一致，" +
-                                "你提供的分别是areaName = %s 与 %s , areaStatId = %d 与 %d %n",
-                        this.areaName, other.areaName, this.areaStatId, other.areaStatId));
+//                throw new IllegalArgumentException(String.format(
+//                        "要合并的两个地区统计数据的areaName与areaStatId必须保持一致，" +
+//                                "你提供的分别是areaName = %s 与 %s , areaStatId = %d 与 %d %n",
+//                        this.areaName, other.areaName, this.areaStatId, other.areaStatId));
             }
         }
 

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -551,7 +551,7 @@ public class RepairController {
                     repairDetail1.setLocationUnit(repairBill.getReceiveUnit());
                     deviceRepairDetailService.update(repairDetail1);
                     if (repairDetail1.getPid() != null) {
-                        RepairDetail repairDetail2 = deviceRepairDetailService.getOne(repairDetail.getPid());
+                        RepairDetail repairDetail2 = deviceRepairDetailService.getOne(repairDetail1.getPid());
                         repairDetail2.setLocationUnit(repairBill.getReceiveUnit());
                         deviceRepairDetailService.update(repairDetail2);
                     }

dev-statistical/src/main/java/com/tykj/dev/statistical/cache/BigScreenCacheConfig.java

+package com.tykj.dev.statistical.cache;
+
+import com.tykj.dev.statistical.service.BigScreenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * BigScreenCacheConfig.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2021/9/9 at 1:57 下午
+ */
+@Configuration
+public class BigScreenCacheConfig {
+
+    @Autowired
+    private BigScreenService bigScreenService;
+
+    @Bean
+    public BigScreenCache initBigScreenCache(){
+        return new BigScreenCache(bigScreenService.getAllDeviceNum(),bigScreenService.getBusinessNum(2),bigScreenService.getCenterNum(),bigScreenService.getRepairNum(),bigScreenService.getRepairDevices(),bigScreenService.getSelfCheckNum(),bigScreenService.selectUserDataScreen());
+    }
+
+}

dev-statistical/src/main/java/com/tykj/dev/statistical/cache/CacheConfig.java

@@ -18,16 +18,10 @@ public class CacheConfig {
     @Autowired
     private StatisticalService statisticalService;
 
-    @Autowired
-    private BigScreenService bigScreenService;
 
     @Bean
     public StatisticalCache initStatisticalCache() throws ParseException {
         return new StatisticalCache(statisticalService.getDeviceNum(),statisticalService.getLifeStatus(1),statisticalService.getLifeStatus(2),statisticalService.getSelfCheck(),statisticalService.getYearSelfCheck(),statisticalService.getRfidWarning(),statisticalService.getRfidWarningDetail(1),statisticalService.getRfidWarningDetail(2),statisticalService.getCheckNum(),statisticalService.getConfirmCheck(1),statisticalService.getConfirmCheck(2),statisticalService.getUserGeneralSituation(),statisticalService.getSelfCheckStat());
     }
 
-    @Bean
-    public BigScreenCache initBigScreenCache(){
-        return new BigScreenCache(bigScreenService.getAllDeviceNum(),bigScreenService.getBusinessNum(2),bigScreenService.getCenterNum(),bigScreenService.getRepairNum(),bigScreenService.getRepairDevices(),bigScreenService.getSelfCheckNum(),bigScreenService.selectUserDataScreen());
-    }
 }