修改生成装表计划BUG

smart-city-platform/src/main/java/com/bz/smart_city/async/AsyncInstallPlanDownloadTask.java

@@ -274,7 +274,7 @@ public class AsyncInstallPlanDownloadTask {
             }
 
             //获取集中器数据和采集器数据
-            List<ConcentratorDto> concentratorList = concentratorMapper.getLazyList(loginUser.getSiteId(),UserUtil.getCustomerIds());
+            List<ConcentratorDto> concentratorList = concentratorMapper.getLazyList(installPlan.getSiteId(),UserUtil.getCustomerIds());
 
 
 

smart-city-platform/src/main/java/com/bz/smart_city/excel/resolver/InstallPlanResolverExcelTemplate.java

@@ -367,8 +367,12 @@ public class InstallPlanResolverExcelTemplate extends AbstractResolverExcelTempl
             if (installPlanDeviceTypeList.size() > 0) {
                 installPlanDeviceTypeMapper.batchInsert(installPlanDeviceTypeList);
             }
-            installListMapper.batchInsert(installLists);
-            installPlanDataMapper.batchInsert(installPlanDataList);
+            if (installLists.size() > 0) {
+                installListMapper.batchInsert(installLists);
+            }
+            if (installPlanDataList.size() > 0) {
+                installPlanDataMapper.batchInsert(installPlanDataList);
+            }
 
             //更新数量
             InstallPlan updateInstallPlan = new InstallPlan();

smart-city-platform/src/main/resources/json/deviceCustomColumn.json

@@ -5,9 +5,9 @@
   "nbiotMeter": ["deviceNo", "waterMeterNo","waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading","communityName", "buildingName", "locDesc", "registerStatus", "valveStatus","lastReceiveTime","userName"],
   "waterQualityMeter": ["deviceNo", "deviceModel", "customerName", "deviceStatus", "buildingName", "locDesc", "lastReceiveTime"],
   "flowmeter": ["deviceNo", "deviceModel", "customerName", "deviceStatus", "buildingName", "locDesc", "lastReceiveTime"],
-  "installLoraMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "communityName", "buildingName", "installTime", "lastReceiveTime", "userName"],
-  "installNbiotMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "registerStatus", "communityName", "buildingName", "installTime", "lastReceiveTime", "userName"],
-  "installRemoteMeter": ["waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus","concentratorName","channelNumberName","collectorName","issueStatus", "meterReading", "oldMeterEnd", "communityName", "buildingName", "installTime","lastReceiveTime", "userName"],
+  "installLoraMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "communityName", "buildingName", "locDesc", "installTime", "lastReceiveTime", "userName"],
+  "installNbiotMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "registerStatus", "communityName", "buildingName", "locDesc", "installTime", "lastReceiveTime", "userName"],
+  "installRemoteMeter": ["waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus","concentratorName","channelNumberName","collectorName","issueStatus", "meterReading", "oldMeterEnd", "communityName", "buildingName","locDesc", "installTime","lastReceiveTime", "userName"],
   "rmcp_loraMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime", "valveStatus"],
   "rmcp_photoelectricMeter": ["waterMeterNo", "waterMeterFileNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime", "valveStatus"],
   "rmcp_nbiotMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime", "valveStatus"]