lin 4 vuotta sitten
vanhempi
commit
54d3e202a5

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

@@ -99,6 +99,7 @@ public class AsyncInstallPlanDownloadTask {
 
         //获取安装计划建筑列表数据
         List<Building> installBuildingList = buildingMapper.getBuildingByInstallPlanId(installPlan.getId());
+        log.info("installBuildingList size={}",installBuildingList.size());
         List<ZipStreamEntity> zipStreamEntityList = newArrayList();
         installBuildingList.stream().forEach(building -> {
             ZipStreamEntity zipStreamEntity = this.createTemplate(loginUser, installPlan, deviceTypeList,customer,community, building);

+ 4 - 4
smart-city-platform/src/main/java/com/bz/smart_city/service/udip/UdipEtlDataCommandService.java

@@ -54,11 +54,11 @@ public class UdipEtlDataCommandService {
                 //return data.getString("commandId");
                 return data;
             }else {
-                log.debug(jsonObject.getString("msg"));
+                log.info(jsonObject.getString("msg"));
                 throw new ServiceException(-900, jsonObject.getString("msg"));
             }
         } catch (Exception e) {
-            log.debug(e.getMessage());
+            log.info(e.getMessage());
             throw new ServiceException(-900, "下发指令错误");
         }
     }
@@ -89,11 +89,11 @@ public class UdipEtlDataCommandService {
                 //return data.getString("commandId");
                 return data;
             }else {
-                log.debug(jsonObject.getString("msg"));
+                log.info(jsonObject.getString("msg"));
                 throw new ServiceException(-900, jsonObject.getString("msg"));
             }
         } catch (Exception e) {
-            log.debug(e.getMessage());
+            log.info(e.getMessage());
             throw new ServiceException(-900, "下发指令错误");
         }
     }

+ 1 - 1
smart-city-platform/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 #开发环境:dev  测试环境:sit  线上环境:prd  演示环境:uat
-spring.profiles.active=prd
+spring.profiles.active=dev

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

@@ -5,8 +5,8 @@
   "nbiotMeter": ["deviceNo", "waterMeterNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "buildingName", "locDesc", "registerStatus", "valveStatus"],
   "waterQualityMeter": ["deviceNo", "deviceModel", "customerName", "deviceStatus", "buildingName", "locDesc", "lastReceiveTime"],
   "flowmeter": ["deviceNo", "deviceModel", "customerName", "deviceStatus", "buildingName", "locDesc", "lastReceiveTime"],
-  "installMeter": ["deviceNo", "waterMeterNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "registerStatus", "buildingName", "installTime"],
-  "rmcp_loraMeter": ["deviceNo", "waterMeterNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime"],
-  "rmcp_photoelectricMeter": ["waterMeterNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime"],
-  "rmcp_nbiotMeter": ["deviceNo", "waterMeterNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime"]
+  "installMeter": ["deviceNo", "waterMeterNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "registerStatus", "buildingName", "locDesc", "installTime"],
+  "rmcp_loraMeter": ["deviceNo", "waterMeterNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime", "valveStatus"],
+  "rmcp_photoelectricMeter": ["waterMeterNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime", "valveStatus"],
+  "rmcp_nbiotMeter": ["deviceNo", "waterMeterNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime", "valveStatus"]
 }