通道号查询设备和批量开关阀

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

@@ -56,6 +56,7 @@ public class DeviceController {
             @ApiParam(value = "小区", required = false) @RequestParam(required = false) Integer community,
             @ApiParam(value = "集中器编号", required = false) @RequestParam(required = false) String concentratorNo,
             @ApiParam(value = "采集器编号", required = false) @RequestParam(required = false) String collectorNo,
+            @ApiParam(value = "通道号id", required = false) @RequestParam(required = false) Integer channelNumberId,
             @ApiParam(value = "故障类型", required = false) @RequestParam(required = false) String errorType,
             @ApiParam(value = "客户id", required = false) @RequestParam(required = false) Integer customerId,
             @ApiParam(value = "连续故障天数", required = false) @RequestParam(required = false) Integer days,
@@ -74,7 +75,7 @@ public class DeviceController {
             @ApiParam(value = "条数，非必传，默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize
     ) {
         Pagination<DeviceDto> pageInfo = deviceService.getList(sysId, buildingId, StringUtils.trim(deviceNo), status, manufacturerId, StringUtils.trim(equipmentType), StringUtils.trim(model), isTag,
-                floor, StringUtils.trim(locDesc), province, city, region, community, concentratorNo, collectorNo, errorType, customerId, days, startDays,endDays,
+                floor, StringUtils.trim(locDesc), province, city, region, community, concentratorNo, collectorNo, channelNumberId, errorType, customerId, days, startDays,endDays,
                 deviceTypeId,valveStatus,registerStatus,issueStatus,syncStatus, startReading, endReading, sortColumn, sortOrder, pageNum, pageSize);
         return new AjaxMessage<>(ResultStatus.OK, pageInfo);
     }
@@ -358,6 +359,18 @@ public class DeviceController {
         return new AjaxMessage(ResultStatus.OK);
     }
 
+    @ResponseBody
+    @PostMapping("batchSetValve/{valveStatus}")
+    @ApiOperation(value = "批量开关阀门")
+    public AjaxMessage batchSetValve(
+            @ApiParam(value = "开关阀门 0：关阀 1：开阀", required = true) @PathVariable Integer valveStatus,
+            @ApiParam(value = "设备", required = true) @RequestBody(required = true) InputDeviceDto inputDeviceDto
+    ) {
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        deviceService.batchSetValve(loginUser,valveStatus, inputDeviceDto);
+        return new AjaxMessage(ResultStatus.OK);
+    }
+
 
     @ResponseBody
     @PostMapping("synArchies")

smart-city-platform/src/main/java/com/bz/smart_city/controller/system/BuildingController.java

@@ -261,7 +261,7 @@ public class BuildingController {
             @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
             @ApiParam(value = "条数，非必传，默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize
     ) {
-        Pagination<BuildingInfoListDto> pageInfo = buildingService.getBuildingPage(sysId, StringUtils.trim(buildingName), province, city, region, community, pageNum, pageSize);
+        Pagination<BuildingInfoListDto> pageInfo = buildingService.getBuildingPageV2(sysId, StringUtils.trim(buildingName), province, city, region, community, pageNum, pageSize);
         return new AjaxMessage<>(ResultStatus.OK, pageInfo);
     }
 

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

@@ -31,7 +31,7 @@ public interface DeviceMapper {
                             @Param("deviceNo") String deviceNo, @Param("status") Integer status, @Param("manufacturerId") Integer manufacturerId, @Param("equipmentType") String equipmentType,
                             @Param("model") String model, @Param("isTag") Integer isTag, @Param("floor") Integer floor, @Param("locDesc") String locDesc, @Param("province") Integer province,
                             @Param("city") Integer city, @Param("region") Integer region, @Param("community") Integer community, @Param("concentratorNo") String concentratorNo,
-                            @Param("collectorNo") String collectorNo, @Param("errorType") String errorType, @Param("customerId") Integer customerId, @Param("days") Integer days,
+                            @Param("collectorNo") String collectorNo, @Param("channelNumberId") Integer channelNumberId, @Param("errorType") String errorType, @Param("customerId") Integer customerId, @Param("days") Integer days,
                             @Param("startDays") Integer startDays, @Param("endDays") Integer endDays, @Param("deviceTypeId") Integer deviceTypeId, @Param("valveStatus") Integer valveStatus,
                             @Param("registerStatus") Integer registerStatus, @Param("issueStatus") Integer issueStatus, @Param("syncStatus") Integer syncStatus, @Param("startReading") Double startReading, @Param("endReading") Double endReading, @Param("sortColumn") String sortColumn, @Param("sortOrder") String sortOrder);
 
@@ -132,18 +132,20 @@ public interface DeviceMapper {
             @Param("customers") String customers,
             @Param("communitys") String communitys,
             @Param("buildings") String buildings,
-            @Param("channels") String channels ,
+            @Param("channels") String channels,
             @Param("deviceTypes") String deviceTypes,
-            @Param("status") Integer status ,
+            @Param("status") Integer status,
             @Param("beginDate") Date beginDate,
             @Param("endDate") Date endDate);
+
     List<DeviceDto> getDeviceListByRange(
             @Param("customers") String customers,
             @Param("communitys") String communitys,
             @Param("buildings") String buildings,
-            @Param("channels") String channels ,
+            @Param("channels") String channels,
             @Param("deviceTypes") String deviceTypes
     );
+
     List<PlanCommunityDTO> findFaultByCommunity(
             @Param("customerId") Integer customerId,
             @Param("communityName") String communityName);

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

@@ -38,7 +38,7 @@ public interface DeviceService{
     DeviceDto getDeviceLastReceiveTime(Long deviceId);
 
     Pagination<DeviceDto> getList(Integer sysId, Integer buildingId, String deviceNo, Integer status, Integer manufacturerId, String equipmentType, String model, Integer isTag, Integer floor,
-                                  String locDesc, Integer province, Integer city, Integer region, Integer community, String concentratorNo, String collectorNo, String errorType,
+                                  String locDesc, Integer province, Integer city, Integer region, Integer community, String concentratorNo, String collectorNo, Integer channelNumberId, String errorType,
                                   Integer customerId, Integer days, Integer startDays, Integer endDays, Integer deviceTypeId, Integer valveStatus, Integer registerStatus, Integer issueStatus, Integer syncStatus, Double startReading, Double endReading, String sortColumn, String sortOrder, int pageNum, int pageSize);
 
     List<DeviceDto> getWaterMeterListByDeviceNo(String deviceNo,String waterMeterNo);
@@ -130,7 +130,7 @@ public interface DeviceService{
 
     List<Device> findByAccountId(BigInteger accountId);
 
-    void setValve(Long deviceId, String valve);
+    void setValve(Long deviceId, Integer valve);
 
     String batchRegister(List<Long> deviceIds);
 
@@ -139,4 +139,8 @@ public interface DeviceService{
     Integer syncDevice(Long deviceId);
 
     void valveUpdate(CommandRspNotifyResult result);
+
+    void batchSetValve(LoginUser loginUser, Integer valveStatus, InputDeviceDto inputDeviceDto);
+
+    void setValveV2(Long aLong, String valve);
 }

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

@@ -973,7 +973,7 @@ public class BuildingServiceImpl implements BuildingService {
         LoginUser loginUser = UserUtil.getCurrentUser();
 
         PageHelper.startPage(pageNum, pageSize);
-        List<BuildingInfoListDto> list = buildingMapper.getBuildingList(loginUser.getSiteId(), UserUtil.getCurrentSiteProgramItems(loginUser), sysId, buildingName, province, city, region, community, UserUtil.getCustomerIds());
+        List<BuildingInfoListDto> list = buildingMapper.getBuildingListV2(loginUser.getSiteId(), UserUtil.getCurrentSiteProgramItems(loginUser), sysId, buildingName, province, city, region, community, UserUtil.getCustomerIds());
         return new Pagination<>(list);
     }
 
@@ -1026,7 +1026,7 @@ public class BuildingServiceImpl implements BuildingService {
     public void add(Building building) {
         log.info("begin addBuilding,building = " + JSON.toJSONString(building));
         LoginUser loginUser = UserUtil.getCurrentUser();
-        int nameResult = buildingMapper.findByNameUnique(null,building.getSiteId(),building.getCommunity(), building.getName());
+        int nameResult = buildingMapper.findByNameUnique(null,loginUser.getSiteId(),building.getCommunity(), building.getName());
         if (nameResult > 0) {
             throw new ServiceException(-900, "建筑名称已经存在");
         }
@@ -1091,7 +1091,7 @@ public class BuildingServiceImpl implements BuildingService {
         log.info("begin editBuilding,building = " + JSON.toJSONString(building));
         LoginUser loginUser = UserUtil.getCurrentUser();
 
-        int nameResult = buildingMapper.findByNameUnique(building.getId(),building.getSiteId(),building.getCommunity(), building.getName());
+        int nameResult = buildingMapper.findByNameUnique(building.getId(),loginUser.getSiteId(),building.getCommunity(), building.getName());
         if (nameResult > 0) {
             throw new ServiceException(-900, "建筑名称已经存在");
         }

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

@@ -30,6 +30,7 @@ import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -121,6 +122,8 @@ public  class DeviceServiceImpl implements DeviceService {
     private ScConfigurationService scConfigurationService;
     @Autowired
     private GeneralDownload generalDownload;
+    @Autowired
+    private MessageService messageService;
 
     @Override
     public int insert(Device device) {
@@ -173,12 +176,12 @@ public  class DeviceServiceImpl implements DeviceService {
     }
 
     @Override
-    public Pagination<DeviceDto> getList(Integer sysId, Integer buildingId, String deviceNo, Integer status, Integer manufacturerId, String equipmentType, String model, Integer isTag, Integer floor, String locDesc, Integer province, Integer city, Integer region, Integer community, String concentratorNo, String collectorNo, String errorType, Integer customerId, Integer days, Integer startDays, Integer endDays, Integer deviceTypeId, Integer valveStatus, Integer registerStatus, Integer issueStatus, Integer syncStatus, Double startReading, Double endReading, String sortColumn, String sortOrder, int pageNum, int pageSize) {
+    public Pagination<DeviceDto> getList(Integer sysId, Integer buildingId, String deviceNo, Integer status, Integer manufacturerId, String equipmentType, String model, Integer isTag, Integer floor, String locDesc, Integer province, Integer city, Integer region, Integer community, String concentratorNo, String collectorNo, Integer channelNumberId, String errorType, Integer customerId, Integer days, Integer startDays, Integer endDays, Integer deviceTypeId, Integer valveStatus, Integer registerStatus, Integer issueStatus, Integer syncStatus, Double startReading, Double endReading, String sortColumn, String sortOrder, int pageNum, int pageSize) {
         LoginUser loginUser = UserUtil.getCurrentUser();
 
         PageHelper.startPage(pageNum, pageSize);
         List<DeviceDto> list = deviceMapper.getList(sysId, buildingId, loginUser.getSiteId(), UserUtil.getCurrentSiteProgramItems(loginUser), deviceNo, status, manufacturerId,
-                equipmentType, model, isTag, floor, locDesc, province, city, region, community, concentratorNo, collectorNo, errorType, customerId,
+                equipmentType, model, isTag, floor, locDesc, province, city, region, community, concentratorNo, collectorNo, channelNumberId, errorType, customerId,
                 days, startDays, endDays,deviceTypeId, valveStatus, registerStatus, issueStatus, syncStatus,startReading,endReading, sortColumn, sortOrder);
         return new Pagination<>(list);
     }
@@ -194,7 +197,7 @@ public  class DeviceServiceImpl implements DeviceService {
         LoginUser loginUser = UserUtil.getCurrentUser();
 
         List<DeviceDto> list = deviceMapper.getList(sysId, buildingId, loginUser.getSiteId(), UserUtil.getCurrentSiteProgramItems(loginUser), deviceNo, status, manufacturerId,
-                equipmentType, model, isTag, floor, locDesc, province, city, region, community, concentratorNo, collectorNo, errorType, customerId,
+                equipmentType, model, isTag, floor, locDesc, province, city, region, community, concentratorNo, collectorNo, null, errorType, customerId,
                 days, startDays, endDays, deviceTypeId, valveStatus, registerStatus, issueStatus, syncStatus, startReading, endReading, sortColumn, sortOrder);
         String title = "设备列表";
 
@@ -306,7 +309,7 @@ public  class DeviceServiceImpl implements DeviceService {
         LoginUser loginUser = UserUtil.getCurrentUser();
 
         List<DeviceDto> list = deviceMapper.getList(sysId, buildingId, loginUser.getSiteId(), UserUtil.getCurrentSiteProgramItems(loginUser), deviceNo, status, manufacturerId,
-                equipmentType, model, isTag, floor, locDesc, province, city, region, community, concentratorNo, collectorNo, errorType, customerId,
+                equipmentType, model, isTag, floor, locDesc, province, city, region, community, concentratorNo, collectorNo, null, errorType, customerId,
                 days, startDays, endDays, deviceTypeId, valveStatus, registerStatus, issueStatus, syncStatus, startReading, endReading, sortColumn, sortOrder);
         String title = "设备列表";
         //判断是否是水表场景
@@ -1351,14 +1354,16 @@ public  class DeviceServiceImpl implements DeviceService {
 
     @Override
     @Transactional
-    public void setValve(Long deviceId, String valve) {
+    public void setValve(Long deviceId, Integer valve) {
         Device device = deviceMapper.findByDeviceId(deviceId);
         DeviceTypeDto deviceTypeDto = deviceTypeMapper.getById(device.getDeviceType());
         WaterMeterErrorDays waterMeterErrorDays = waterMeterErrorDaysMapper.findByDeviceId(deviceId);
         String sendValveStatus = "0";
 
         if (valve != null) {
-            sendValveStatus = valve;
+            if(valve == 1){
+                sendValveStatus = "1";
+            }
         }else {
             if(waterMeterErrorDays != null){
                 if (waterMeterErrorDays.getValveButtonStatus() != null) {
@@ -1367,41 +1372,66 @@ public  class DeviceServiceImpl implements DeviceService {
                     }
                 }
             }
+        }
 
-            //更新按钮阀门状态
-            WaterMeterErrorDays waterMeterErrorDayUpdate = new WaterMeterErrorDays();
-            waterMeterErrorDayUpdate.setDeviceId(deviceId);
-            if (waterMeterErrorDays != null) {
-
-                if (waterMeterErrorDays.getValveButtonStatus() != null) {
 
-                    if(waterMeterErrorDays.getValveButtonStatus()== 1){
-                        waterMeterErrorDayUpdate.setValveButtonStatus(0);
+        //更新按钮阀门状态
+        WaterMeterErrorDays waterMeterErrorDayUpdate = new WaterMeterErrorDays();
+        waterMeterErrorDayUpdate.setDeviceId(deviceId);
+        if (waterMeterErrorDays != null) {
+            if (waterMeterErrorDays.getValveButtonStatus() != null) {
+                if (valve != null) {
+                    if(waterMeterErrorDays.getValveButtonStatus()==valve){
+                        waterMeterErrorDayUpdate.setValveButtonStatus(waterMeterErrorDays.getValveButtonStatus());
                     }else {
-                        waterMeterErrorDayUpdate.setValveButtonStatus(1);
+                        waterMeterErrorDayUpdate.setValveButtonStatus(valve==1?1:0);
                     }
                 }else {
-                    waterMeterErrorDayUpdate.setValveButtonStatus(0);
+                    waterMeterErrorDayUpdate.setValveButtonStatus(waterMeterErrorDays.getValveButtonStatus()== 1?0:1);
                 }
-                waterMeterErrorDaysMapper.updateByPrimaryKeySelective(waterMeterErrorDayUpdate);
             }else {
                 waterMeterErrorDayUpdate.setValveButtonStatus(0);
-                waterMeterErrorDayUpdate.setStatus(1);
-                waterMeterErrorDaysMapper.insert(waterMeterErrorDayUpdate);
             }
+            waterMeterErrorDaysMapper.updateByPrimaryKeySelective(waterMeterErrorDayUpdate);
+        }else {
+            if (valve != null) {
+                //waterMeterErrorDayUpdate.setValveButtonStatus(valve==0?1:0);
+                waterMeterErrorDayUpdate.setValveButtonStatus(valve==1?1:0);
+            }else {
+                waterMeterErrorDayUpdate.setValveButtonStatus(0);
+            }
+
+            waterMeterErrorDayUpdate.setStatus(1);
+            waterMeterErrorDaysMapper.insert(waterMeterErrorDayUpdate);
         }
 
 
         ValveCommandRequestDTO valveCommandRequest = new ValveCommandRequestDTO();
         valveCommandRequest.setValveStatus(sendValveStatus);
 
-        //1、下发开关阀门
+        //1、执行开关阀门
+        executeValveCommand(device,deviceTypeDto,valveCommandRequest);
+
+    }
+
+    public void setValveV2(Long deviceId, String valve) {
+        Device device = deviceMapper.findByDeviceId(deviceId);
+        DeviceTypeDto deviceTypeDto = deviceTypeMapper.getById(device.getDeviceType());
+
+        ValveCommandRequestDTO valveCommandRequest = new ValveCommandRequestDTO();
+        valveCommandRequest.setValveStatus(valve);
+
+        //1、执行开关阀门
+        executeValveCommand(device,deviceTypeDto,valveCommandRequest);
+    }
+
+    private void executeValveCommand(Device device,DeviceTypeDto deviceTypeDto,ValveCommandRequestDTO valveCommandRequest){
         if(StringUtils.equals("lora188",deviceTypeDto.getEnModel())){
             valveCommandRequest.setMeterCode(device.getWaterMeterNo());
             easylinkinUtils.sendDownlink(device.getDeviceNo(),valveCommandRequest);
         }else if(StringUtils.equals("hxgd",deviceTypeDto.getEnModel()))
         {
-            valveCommandRequest.setMeterCode(String.valueOf(deviceId));
+            valveCommandRequest.setMeterCode(String.valueOf(device.getId()));
             gdAgentUtils.setMeterValve(valveCommandRequest);
         }
         else if(StringUtils.equals("hengxin-nb",deviceTypeDto.getEnModel()))
@@ -1416,8 +1446,8 @@ public  class DeviceServiceImpl implements DeviceService {
 
             //2、插入开关阀门记录
             DeviceValveRecord deviceValveRecord = new DeviceValveRecord();
-            deviceValveRecord.setDeviceId(deviceId);
-            deviceValveRecord.setSendValveStatus(Integer.valueOf(sendValveStatus));
+            deviceValveRecord.setDeviceId(device.getId());
+            deviceValveRecord.setSendValveStatus(Integer.valueOf(valveCommandRequest.getValveStatus()));
             deviceValveRecord.setSendStatus(1);
             deviceValveRecord.setCommandId(commandResult.getString("commandId"));
             deviceValveRecord.setRemark("");
@@ -1430,8 +1460,8 @@ public  class DeviceServiceImpl implements DeviceService {
 
                 //2、插入开关阀门记录
                 DeviceValveRecord deviceValveRecord = new DeviceValveRecord();
-                deviceValveRecord.setDeviceId(deviceId);
-                deviceValveRecord.setSendValveStatus(Integer.valueOf(sendValveStatus));
+                deviceValveRecord.setDeviceId(device.getId());
+                deviceValveRecord.setSendValveStatus(Integer.valueOf(valveCommandRequest.getValveStatus()));
                 deviceValveRecord.setSendStatus(1);
                 deviceValveRecord.setCommandId(commandResult.getString("commandId"));
                 deviceValveRecord.setCommandStatus(commandResult.getString("status"));
@@ -1442,7 +1472,6 @@ public  class DeviceServiceImpl implements DeviceService {
             valveCommandRequest.setMeterCode(device.getWaterMeterNo());
             udipEtlDataCommandService.defaultCommandSend(device.getUdipId(),valveCommandRequest);
         }
-
     }
 
     @Override
@@ -1545,4 +1574,42 @@ public  class DeviceServiceImpl implements DeviceService {
 
         log.info("end valveUpdate");
     }
+
+    @Async
+    @Override
+    public void batchSetValve(LoginUser loginUser, Integer valveStatus, InputDeviceDto inputDeviceDto) {
+        log.info("begin batchSetValve size = {},inputDeviceDto = {}",inputDeviceDto.getDeviceIds().size(),JSON.toJSON(inputDeviceDto));
+
+        String valveStatusName = "关阀";
+        if(valveStatus == 1){
+            valveStatusName = "开阀";
+        }
+
+        AtomicInteger success = new AtomicInteger(0);
+        AtomicInteger fail = new AtomicInteger(0);
+        if (inputDeviceDto.getDeviceIds() != null && inputDeviceDto.getDeviceIds().size() > 0) {
+            for (Long deviceId : inputDeviceDto.getDeviceIds()) {
+                try {
+                    setValve(deviceId,valveStatus);
+                    success.incrementAndGet();
+                }catch (Exception e){
+                    fail.incrementAndGet();
+                    log.error("batchReleaseFiles error {}",e.getMessage());
+                }
+
+            }
+        }
+
+        //waterRelatedDeviceMapper.updateIssueStatus(inputDeviceDto.getDeviceIds(),1);
+
+        Message message = new Message();
+        message.setSiteId(loginUser.getSiteId());
+        message.setUserId(loginUser.getId());
+        message.setMessageType(5);
+        message.setMessageTitle("远传水表-设备列表-批量"+valveStatusName);
+        message.setMessageContent("远传水表批量"+valveStatusName+"完成，成功"+success.get()+"条，失败"+fail.get()+"条。");
+        message.setRead(0);
+        messageService.insertSelective(message);
+        log.info("end batchSetValve");
+    }
 }

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

@@ -75,7 +75,7 @@ public class ValveServiceImpl implements ValveService {
         if (list.size() > 1) {
             throw new ServiceException(-900,"该水表表号出现重复");
         }
-        deviceService.setValve(list.get(0),result.getValve());
+        deviceService.setValveV2(list.get(0),result.getValve());
         log.info("end  valveControl");
     }
 }

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

@@ -806,8 +806,7 @@
         sc.name as community_name,
         sb.latitude,
         sb.longitude,
-        (SELECT
-        count(1) as device_count
+        IFNULL((SELECT 1 as device_count
         from sc_device sd
         <if test="programItems != null and programItems.size() != 0">left join sc_device_dimension sdd on (sdd.device_id = sd.id and sdd.status = 1)</if>
         WHERE sd.status = 1 and sd.sys_id != -99 and sd.building_id = sb.id
@@ -816,7 +815,7 @@
                 sdd.${item.dimensionCode} = #{item.dimensionValue}
             </foreach>
         </if>
-        ) as device_count
+         limit 1),0) as device_count
         from sc_building sb
         left join sc_access_unit sau on sau.id = sb.access_unit_id and sau.status = 1
         left join sc_area sa1 on sa1.id = sb.province

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

@@ -408,6 +408,7 @@
         <if test="syncStatus != null"> and sd.sync_status = #{syncStatus}</if>
         <if test="startReading != null"> and swmed.meter_reading >= #{startReading} </if>
         <if test="endReading != null"> and swmed.meter_reading <![CDATA[ <= ]]> #{endReading} </if>
+        <if test="channelNumberId != null"> and swrd.channel_number_id = #{channelNumberId} </if>
         <if test="days != null">
             <choose>
                 <when test="days == 0">
@@ -438,7 +439,7 @@
         from sc_device sd
         <if test="(equipmentType != null and equipmentType != '') or (model != null and model != '') or (valveStatus != null)">left join sc_device_type sdt on (sdt.id = sd.device_type and sdt.status = 1)</if>
         <if test="province != null or city != null or region != null or community != null">left join sc_building sb on (sb.id = sd.building_id and sb.status = 1)</if>
-        <if test="(concentratorNo != null and concentratorNo != '') or (collectorNo != null and collectorNo != '') or issueStatus != null">left join sc_water_related_device swrd on ( swrd.device_id = sd.id and swrd.status = 1)</if>
+        <if test="(concentratorNo != null and concentratorNo != '') or (collectorNo != null and collectorNo != '') or issueStatus != null or channelNumberId != null">left join sc_water_related_device swrd on ( swrd.device_id = sd.id and swrd.status = 1)</if>
         <if test="concentratorNo != null and concentratorNo != ''">left join sc_concentrator scon on ( scon.id = swrd.concentrator_id and scon.status = 1)</if>
         <if test="collectorNo != null and collectorNo != ''">left join sc_collector scol on ( scol.id = swrd.collector_id)</if>
         <if test="(errorType != null and errorType != '') or days != null or startDays != null or endDays != null or (valveStatus != null) or startReading != null or endReading != null">left join sc_water_meter_error_days swmed on ( swmed.device_id = sd.id)</if>
@@ -472,6 +473,7 @@
         <if test="syncStatus != null"> and sd.sync_status = #{syncStatus}</if>
         <if test="startReading != null"> and swmed.meter_reading >= #{startReading} </if>
         <if test="endReading != null"> and swmed.meter_reading <![CDATA[ <= ]]> #{endReading} </if>
+        <if test="channelNumberId != null"> and swrd.channel_number_id = #{channelNumberId} </if>
         <if test="days != null">
             <choose>
                 <when test="days == 0">

smart-city-platform/src/test/java/com/bz/smart_city/ForCreateDataTest.java

@@ -99,7 +99,7 @@ public class ForCreateDataTest {
         Integer systemId = 18;
         Integer siteId = 37;
         String prefix = "30393731";
-        List<DeviceDto> devices = deviceMapper.getList(systemId, null, siteId, null, prefix, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,null, null, null, null, null, null, null, null, null, null, null,null);
+        List<DeviceDto> devices = deviceMapper.getList(systemId, null, siteId, null, prefix, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,null, null, null, null, null, null, null, null, null, null, null,null);
         int i = 0;
         for (DeviceDto d : devices) {
             if (i % 100 == 0) {
@@ -195,7 +195,7 @@ public class ForCreateDataTest {
         Integer systemId = 4;
         Integer siteId = 37;
         String prefix = "004a70124";
-        List<DeviceDto> devices = deviceMapper.getList(systemId, null, siteId, null, prefix, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,null);
+        List<DeviceDto> devices = deviceMapper.getList(systemId, null, siteId, null, prefix, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,null);
         int i = 0;
         for (DeviceDto d : devices) {
             if (i % 100 == 0) {
@@ -218,7 +218,7 @@ public class ForCreateDataTest {
         Integer systemId = 4;
         Integer siteId = 37;
         String prefix = "004a70124";
-        List<DeviceDto> devices = deviceMapper.getList(systemId, null, siteId, null, prefix, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,null);
+        List<DeviceDto> devices = deviceMapper.getList(systemId, null, siteId, null, prefix, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,null);
 
         for (int i = 0; i < 105; i++) {
             DeviceDto d = devices.get(getRandom(devices.size()));