sprint21 bug

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

@@ -7,7 +7,6 @@ import com.bz.smart_city.commom.util.AssistantUserUtil;
 import com.bz.smart_city.dto.*;
 import com.bz.smart_city.dto.assistant.*;
 import com.bz.smart_city.entity.ChannelNumber;
-import com.bz.smart_city.entity.DeviceAlarmLevel;
 import com.bz.smart_city.entity.OperationLog;
 import com.bz.smart_city.service.*;
 import com.bz.smart_city.service.assistant.InstallPlanDeviceTypeService;
@@ -17,8 +16,6 @@ import org.springframework.web.bind.annotation.*;
 
 import com.bz.smart_city.commom.model.AjaxMessage;
 import com.bz.smart_city.commom.model.ResultStatus;
-import com.bz.smart_city.commom.util.MemberUtil;
-import com.bz.smart_city.commom.util.UserUtil;
 import com.bz.smart_city.service.assistant.InstallManagerService;
 
 import io.swagger.annotations.Api;
@@ -392,11 +389,12 @@ public class MobileController {
 	@GetMapping("/collector/getList")
 	@ApiOperation(value = "查询采集器列表")
 	public AjaxMessage<List<CollectorDto>> getList(
+			@ApiParam(value = "采集器id", required = false) @RequestParam(required = false) Integer concentratorId,
 			@ApiParam(value = "采集器编码", required = false) @RequestParam(required = false) String collectorNo,
 			@ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String serialNumber
 	){
 		List<CollectorDto> list = collectorService.getList(
-				collectorNo,serialNumber);
+                concentratorId, collectorNo,serialNumber);
 		return new AjaxMessage<>(ResultStatus.OK, list);
 	}
 

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

@@ -55,11 +55,12 @@ public class CollectorController {
     @GetMapping("getList")
     @ApiOperation(value = "查询采集器列表")
     public AjaxMessage<List<CollectorDto>> getList(
+            @ApiParam(value = "采集器id", required = false) @RequestParam(required = false) Integer concentratorId,
             @ApiParam(value = "采集器编码", required = false) @RequestParam(required = false) String collectorNo,
             @ApiParam(value = "集中器编码", required = false) @RequestParam(required = false) String serialNumber
     ){
         List<CollectorDto> list = collectorService.getList(
-                collectorNo,serialNumber);
+                concentratorId,collectorNo,serialNumber);
         return new AjaxMessage<>(ResultStatus.OK, list);
     }
 

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

@@ -19,6 +19,7 @@ public interface CollectorMapper {
 
     List<CollectorDto> getList(
             @Param("siteId") Integer siteId,
+            @Param("concentratorId") Integer concentratorId,
             @Param("collectorNo") String collectorNo,
             @Param("serialNumber") String serialNumber,
             @Param("address") String address,

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

@@ -20,7 +20,7 @@ public interface CollectorService{
 
     Pagination<CollectorDto> getPage(String collectorNo, String serialNumber, String address, Integer provinceId, Integer cityId, Integer regionId, Integer communityId, Integer buildingId, int pageNum, int pageSize);
 
-    List<CollectorDto> getList(String collectorNo, String serialNumber);
+    List<CollectorDto> getList(Integer concentratorId, String collectorNo, String serialNumber);
 
     List<BuildingSelectDto> getAreaList(String collectorNo, String serialNumber, String address);
 

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

@@ -64,14 +64,14 @@ public class CollectorServiceImpl implements CollectorService{
         LoginUser loginUser = UserUtil.getCurrentUser();
         PageHelper.startPage(pageNum,pageSize);
         List<CollectorDto> list = collectorMapper.getList(
-                loginUser.getSiteId(),collectorNo,serialNumber,address,
+                loginUser.getSiteId(), null, collectorNo,serialNumber,address,
                 provinceId,cityId,regionId,communityId,buildingId,UserUtil.getCustomerIds()
         );
         return new Pagination<>(list);
     }
 
     @Override
-    public List<CollectorDto> getList(String collectorNo, String serialNumber) {
+    public List<CollectorDto> getList(Integer concentratorId, String collectorNo, String serialNumber) {
         Integer siteId = null;
         LoginUser loginUser = UserUtil.getCurrentUser();
         if (loginUser != null) {
@@ -84,7 +84,7 @@ public class CollectorServiceImpl implements CollectorService{
                 siteId = customer.getSiteId();
             }
         }
-        return collectorMapper.getList(siteId,collectorNo,serialNumber,null,null,null,null,null,null, UserUtil.getCustomerIds());
+        return collectorMapper.getList(siteId,concentratorId,collectorNo,serialNumber,null,null,null,null,null,null, UserUtil.getCustomerIds());
     }
 
     @Override
@@ -159,7 +159,7 @@ public class CollectorServiceImpl implements CollectorService{
 
     @Override
     public void test() {
-        List<CollectorDto> list = collectorMapper.getList(1,null,null,null,null,null,null,null,null, UserUtil.getCustomerIds());
+        List<CollectorDto> list = collectorMapper.getList(1, null, null,null,null,null,null,null,null,null, UserUtil.getCustomerIds());
         for (CollectorDto collectorDto : list) {
             Concentrator concentrator = concentratorMapper.findById(collectorDto.getConcentratorId());
             if (concentrator != null) {

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

@@ -172,10 +172,11 @@ rule_id
 
     <select id="findByAlarmId" resultType="com.bz.smart_city.dto.AlarmMeasuringDataDto">
         select
-        samd.id, samd.measuring_id, samd.measuring_code, samd.measuring_name, samd.measuring_data, samd.measuring_unit, samd.show_data,
+        samd.id, samd.measuring_id, samd.measuring_code, stmd.measuring_name, samd.measuring_data, samd.measuring_unit, samd.show_data,
         sdar.specification
         from sc_alarm_measuring_data samd
         left join sc_device_alarm_rule sdar on (sdar.id = samd.rule_id)
+        left join sc_tpl_measuring_desc stmd on (stmd.device_type = sdar.device_type and stmd.measuring_code = samd.measuring_code and stmd.`status` = 1)
         where samd.status = 1 and samd.alarm_id = #{alarmId}
     </select>
 </mapper>

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

@@ -185,6 +185,7 @@
     left join sc_customer scu on(scu.id = soll.customer_id)
     where soll.status = 1
     <if test="siteId != null"> and soll.site_id = #{siteId}</if>
+    <if test="concentratorId != null"> and soll.concentrator_id = #{concentratorId}</if>
     <if test="collectorNo != null and collectorNo != ''"> and soll.collector_no LIKE concat('%',#{collectorNo},'%')</if>
     <if test="serialNumber != null and serialNumber != ''"> and scon.serial_number LIKE concat('%',#{serialNumber},'%')</if>
     <if test="address != null and address != ''"> and soll.address LIKE concat('%',#{address},'%')</if>