换表

smart-city-platform/src/main/java/com/bz/smart_city/commom/util/UserUtil.java

@@ -128,5 +128,14 @@ public class UserUtil {
         return null;
     }
 
+    public static String getUsername(){
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        if (loginUser != null) {
+            return loginUser.getUsername();
+        }else {
+            return "system";
+        }
+    }
+
 
 }

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

@@ -301,7 +301,12 @@ public class MobileController {
     		@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 remark
+    		@ApiParam(value = "备注", required = false) @RequestParam(required = false) String remark,
+			@ApiParam(value = "集中器id", required = false) @RequestParam(required = false) Integer concentratorId,
+			@ApiParam(value = "采集器id", required = false) @RequestParam(required = false) Integer collectorId,
+			@ApiParam(value = "通道号id", required = false) @RequestParam(required = false) Integer channelNumberId,
+			@ApiParam(value = "测量点号", required = false) @RequestParam(required = false) String port,
+			@ApiParam(value = "铅封号", required = false) @RequestParam(required = false) String sealNo
     		){
 		LoginAssistantUser loginAssistantUser = AssistantUserUtil.getCurrentUser();
     	
@@ -329,7 +334,12 @@ public class MobileController {
     	dto.setUserPhone(clientUserPhone);
     	dto.setStatus(1);
     	dto.setRemark(remark);
-    	
+		dto.setConcentratorId(concentratorId);
+		dto.setCollectorId(collectorId);
+		dto.setChannelNumberId(channelNumberId);
+		dto.setPort(port);
+		dto.setSealNo(sealNo);
+
     	boolean isSuccess = installManagerService.saveInstallInfoV2(dto);
     	if(log.isDebugEnabled()) {
     		log.debug("保存水表信息{}", isSuccess);

smart-city-platform/src/main/java/com/bz/smart_city/dao/WaterRelatedDeviceMapper.java

@@ -25,6 +25,8 @@ public interface WaterRelatedDeviceMapper {
 
     int delByDeviceId(@Param("deviceId") Long deviceId);
 
+    int realDelByDeviceId(@Param("deviceId") Long deviceId);
+
     int updateIssueStatus(@Param("deviceIds") List<Long> deviceIds, @Param("issueStatus") Integer issueStatus);
 
     Building getConcentratorId(@Param("concentratorId") Integer concentratorId);

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/WaterMeterReplaceLogServiceImpl.java

@@ -158,6 +158,8 @@ public class WaterMeterReplaceLogServiceImpl implements WaterMeterReplaceLogServ
         LoginUser loginUser = UserUtil.getCurrentUser();
         LoginAssistantUser loginAssistantUser = AssistantUserUtil.getCurrentUser();
 
+        Boolean remoteMeterFlag = false;
+
         String username = null;
         String userPhone = null;
         if(loginUser != null){
@@ -235,11 +237,18 @@ public class WaterMeterReplaceLogServiceImpl implements WaterMeterReplaceLogServ
             newDevice.setWaterMeterNo(waterMeterReplaceInputDto.getNewElectronicNo());
         }
         if (waterMeterReplaceInputDto.getNewDeviceTypeId() != null && waterMeterReplaceInputDto.getNewDeviceTypeId()!=0) {
+            Integer channelId = null;
             if(device.getSysId()!=-99){
                 ChannelDeviceTypeUse use = channelDeviceTypeUseMapper.findByDeviceId(waterMeterReplaceInputDto.getNewDeviceTypeId());
                 if (use != null) {
+                    channelId = use.getChannelId();
                     newDevice.setSysId(use.getChannelId());
                 }
+            }else {
+                channelId = device.getSysId();
+            }
+            if(channelId!=null && channelId == 55){
+                remoteMeterFlag = true;
             }
             newDevice.setDeviceType(waterMeterReplaceInputDto.getNewDeviceTypeId());
 
@@ -256,18 +265,30 @@ public class WaterMeterReplaceLogServiceImpl implements WaterMeterReplaceLogServ
         newDevice.setDateUpdate(LocalDateTime.now());
         deviceMapper.updateByPrimaryKeySelective(newDevice);
 
-        if (waterMeterReplaceInputDto.getConcentratorId() != null) {
+
+
+        if (remoteMeterFlag) {
+            //先删除再插入
+            waterRelatedDeviceMapper.realDelByDeviceId(waterMeterReplaceInputDto.getDeviceId());
+
             WaterRelatedDevice waterRelatedDevice = new WaterRelatedDevice();
-            waterRelatedDevice.setDeviceId(device.getId());
+            waterRelatedDevice.setDeviceId(waterMeterReplaceInputDto.getDeviceId());
             waterRelatedDevice.setConcentratorId(waterMeterReplaceInputDto.getConcentratorId());
             waterRelatedDevice.setCollectorId(waterMeterReplaceInputDto.getCollectorId());
             waterRelatedDevice.setChannelNumberId(waterMeterReplaceInputDto.getChannelNumberId());
             waterRelatedDevice.setPort(waterMeterReplaceInputDto.getPort());
+            waterRelatedDevice.setIssueStatus(0);
+            waterRelatedDevice.setStatus(1);
             //waterRelatedDevice.setRemark();
+            waterRelatedDevice.setDateCreate(LocalDateTime.now());
             waterRelatedDevice.setDateUpdate(LocalDateTime.now());
-            waterRelatedDevice.setUpdateBy(UserUtil.getCurrentUser().getUsername());
-            waterRelatedDeviceMapper.updateByPrimaryKeySelective(waterRelatedDevice);
+            waterRelatedDevice.setUpdateBy(username);
+            waterRelatedDevice.setCreateBy(username);
+            waterRelatedDeviceMapper.insertSelective(waterRelatedDevice);
 
+        }else {
+            //删除
+            waterRelatedDeviceMapper.realDelByDeviceId(waterMeterReplaceInputDto.getDeviceId());
         }
 
         // 3、推送换表信息

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/assistant/InstallManagerServiceImpl.java

@@ -904,6 +904,26 @@ public class InstallManagerServiceImpl implements InstallManagerService, Initial
 			d.setRegisterStatus(0);
 			d.setSyncStatus(0);
 			deviceMapper.insert(d);
+
+			// 5,保存远传水表信息
+			if (dto.getConcentratorId() != null) {
+				WaterRelatedDevice waterRelatedDevice = new WaterRelatedDevice();
+				waterRelatedDevice.setDeviceId(d.getId());
+				waterRelatedDevice.setConcentratorId(dto.getConcentratorId());
+				waterRelatedDevice.setCollectorId(dto.getCollectorId());
+				waterRelatedDevice.setChannelNumberId(dto.getChannelNumberId());
+				waterRelatedDevice.setPort(dto.getPort());
+				//waterRelatedDevice.setRemark();
+				waterRelatedDevice.setIssueStatus(0);
+				waterRelatedDevice.setStatus(1);
+				waterRelatedDevice.setDateCreate(LocalDateTime.now());
+				waterRelatedDevice.setDateUpdate(LocalDateTime.now());
+				waterRelatedDevice.setCreateBy("system");
+				waterRelatedDevice.setUpdateBy("system");
+				waterRelatedDeviceMapper.insertSelective(waterRelatedDevice);
+
+			}
+
 			saveDeviceDimInfo(d);
 
 			dto.setIsInPlan(1); //  1 计划内 0 计划外

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

@@ -832,7 +832,7 @@
 			<if test = "param.concentratorCode != null and param.concentratorCode != '' "> and con.serial_number like #{param.concentratorCode}</if>
 			<if test = "param.concentratorId != null"> and m.concentrator_id = #{param.concentratorId}</if>
 			<if test = "param.channelNumberId != null"> and wrd.channel_number_id = #{param.channelNumberId}</if>
-			<if test = "param.collectorCode != null and param.collectorCode != '' "> and col.collector like #{param.collectorCode}</if>
+			<if test = "param.collectorCode != null and param.collectorCode != '' "> and col.collector_no like #{param.collectorCode}</if>
 			<if test = "param.deviceNo != null and param.deviceNo != '' "> 
 				and m.meter_no like #{param.deviceElectricNo}
 			</if>
@@ -875,7 +875,7 @@
         <if test = "param.concentratorCode != null and param.concentratorCode != '' "> and con.serial_number like #{param.concentratorCode}</if>
         <if test = "param.concentratorId != null"> and m.concentrator_id = #{param.concentratorId}</if>
         <if test = "param.channelNumberId != null"> and wrd.channel_number_id = #{param.channelNumberId}</if>
-        <if test = "param.collectorCode != null and param.collectorCode != '' "> and col.collector like #{param.collectorCode}</if>
+        <if test = "param.collectorCode != null and param.collectorCode != '' "> and col.collector_no like #{param.collectorCode}</if>
         <if test = "param.deviceNo != null and param.deviceNo != '' ">
             and  m.meter_no like #{param.deviceElectricNo}
         </if>

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

@@ -189,4 +189,8 @@
   <select id="countByCollectorId" resultType="java.lang.Integer">
     select count(1) from sc_water_related_device where status = 1 and collector_id = #{collectorId}
   </select>
+
+  <delete id="realDelByDeviceId">
+    delete from sc_water_related_device where device_id = #{deviceId}
+  </delete>
 </mapper>