安装水表

smart-city-platform/src/main/java/com/bz/smart_city/controller/assistant/InstallController.java

@@ -80,7 +80,8 @@ public class InstallController {
     		@ApiParam(value = "客户姓名", required = false) @RequestParam(required = false) String clientUserName,
     		@ApiParam(value = "客户电话", required = false) @RequestParam(required = false) String clientUserPhone,
     		@ApiParam(value = "旧表止度", required = false) @RequestParam(required = false) String oldMeterEnd,
-    		@ApiParam(value = "旧表照片", required = false) @RequestParam(required = false) String oldImageUrl
+    		@ApiParam(value = "旧表照片", required = false) @RequestParam(required = false) String oldImageUrl,
+    		@ApiParam(value = "身份证号", required = false) @RequestParam(required = false) String idCard
     		){
     	LoginUser loginUser = UserUtil.getCurrentUser();
     	
@@ -108,7 +109,8 @@ public class InstallController {
     	dto.setUserName(clientUserName);
     	dto.setUserPhone(clientUserPhone);
     	dto.setStatus(1);
-    	
+    	dto.setIdCard(idCard);
+
     	boolean isSuccess = installManagerService.saveInstallInfo(dto);
     	if(log.isDebugEnabled()) {
     		log.debug("保存水表信息{}", isSuccess);
@@ -135,7 +137,8 @@ public class InstallController {
     		@ApiParam(value = "客户姓名", required = false) @RequestParam(required = false) String clientUserName,
     		@ApiParam(value = "客户电话", required = false) @RequestParam(required = false) String clientUserPhone,
     		@ApiParam(value = "旧表止度", required = false) @RequestParam(required = false) String oldMeterEnd,
-    		@ApiParam(value = "旧表照片", required = false) @RequestParam(required = false) String oldImageUrl){
+    		@ApiParam(value = "旧表照片", required = false) @RequestParam(required = false) String oldImageUrl,
+			@ApiParam(value = "身份证号", required = false) @RequestParam(required = false) String idCard){
     	
     	LoginUser loginUser = UserUtil.getCurrentUser();
     	
@@ -164,7 +167,8 @@ public class InstallController {
     	dto.setUserName(clientUserName);
     	dto.setUserPhone(clientUserPhone);
     	dto.setStatus(1);
-    	
+    	dto.setIdCard(idCard);
+
     	boolean isSuccess = installManagerService.updateInstallInfo(dto);
     	if(log.isDebugEnabled()) {
     		log.debug("更新水表信息{}", isSuccess);

smart-city-platform/src/main/java/com/bz/smart_city/dto/DeviceDto.java

@@ -135,4 +135,13 @@ public class DeviceDto extends Device {
     @ApiModelProperty(value="下发状态 0：未下发 1：已下发",position = 131)
     private Integer issueStatus;
 
+    @ApiModelProperty(value = "用户姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "用户手机号",position = 11)
+    private String userPhone;
+
+    @ApiModelProperty(value = "身份证号")
+    private String idCard;
+
 }

smart-city-platform/src/main/java/com/bz/smart_city/excel/download/column/DeviceColumnTranslator.java

@@ -142,6 +142,15 @@ public class DeviceColumnTranslator {
         if (StringUtils.equals("oldMeterEnd",columnName)) {
             return device.getOldMeterEnd();
         }
+        if (StringUtils.equals("userName",columnName)) {
+            return device.getUserName();
+        }
+        if (StringUtils.equals("userPhone",columnName)) {
+            return device.getUserPhone();
+        }
+        if (StringUtils.equals("idCard",columnName)) {
+            return device.getIdCard();
+        }
         return null;
     }
 }

smart-city-platform/src/main/resources/application-prd.properties

@@ -9,7 +9,7 @@ spring.thymeleaf.prefix=classpath:/templates/
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #使用druid数据源
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.url=jdbc:mysql://47.112.217.10:3306/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://172.18.110.178:3306/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.druid.initial-size=5

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

@@ -22,5 +22,6 @@
   {"dateCreate":"安装时间"},
   {"acceptTime":"验收时间"},
   {"lastReceiveTime":"最后上报时间"},
-  {"oldMeterEnd":"旧表止度"}
+  {"oldMeterEnd":"旧表止度"},
+  {"userName":"用户名称"}
 ]

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

@@ -5,7 +5,7 @@
   "nbiotMeter": ["deviceNo", "waterMeterNo","waterMeterFileNo", "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", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "registerStatus", "buildingName", "locDesc", "installTime"],
+  "installMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "registerStatus", "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"]

smart-city-platform/src/main/resources/mapper/DeviceMapper.xml

@@ -782,7 +782,10 @@
         sb.province,sb.city,sb.region,sb.community,scom.name as community_name,
         scon.serial_number as concentrator_name,scol.collector_no as collector_name,swmed.days,swmed.last_error_type,swmed.meter_reading,scus.customer_name,
         sil.plan_time,sil.install_time,sil.accept_time,sil.new_meter_start,sil.id as install_id,sil.old_meter_end,sd.register_status,sdt.is_valve,sdt.is_register,
-        sd.sync_status
+        sd.sync_status,
+        sil.user_name,
+        sil.user_phone,
+        sil.id_card
         from sc_device sd
         left join sc_device_type sdt on (sdt.id = sd.device_type and sdt.status = 1)
         left join sc_device_manufacturer sdm on (sdm.id = sd.manufacturer_id and sdm.status = 1)

smart-city-platform/src/main/resources/mapper/InstallListMapper.xml

@@ -442,6 +442,7 @@
 			n.old_image_url as old_image_url,
 			n.user_name as user_name,
 			n.user_phone as user_phone,
+			n.id_card as id_card,
 			n.is_in_plan as is_in_plan,
 			n.is_installed as is_installed,
 			n.is_accepted as is_accepted,