电梯物联信息查询优化

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/ElevatorMapper.java

@@ -22,11 +22,7 @@ public interface ElevatorMapper extends BaseMapper<Elevator> {
                                                      Long  sequenceNbr,
                                                       int current, int size);
 
-    List<ElevatorWlInfoDto>  queryElevatorListDetails(String address,
-                                               String registerCode,
-                                               Integer rescueCode,
-                                               String type,
-                                               Integer dealStatus,
+    List<ElevatorWlInfoDto>  queryElevatorListDetails(
                                                Long  sequenceNbr
                                                );
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/ElevatorMapper.xml

@@ -5,13 +5,13 @@
         select
         te.sequence_nbr sequenceNbr,
         concat(te.province,te.city,te.district) area,
-        te.category,
+        te.device_category category,
         te.register_code registerCode,
         te.rescue_code rescueCode,
         te.address ,
-        tea.start_date happenTime,
-        tea.type ,
-        case tea.deal_status
+        te.start_date happenTime,
+        te.type ,
+        case te.deal_status
         when '0' then '处置完成'
         when '1' then '故障发生'
         when '2' then '发出通知'
@@ -21,8 +21,7 @@
         ELSE '' END dealStatus,
         '电梯' categoryName,
         '立信远大科技有限公司' IotServiceProvider
-        from tcb_elevator te inner join tz_elevator_alarm tea on
-        te.register_code = tea.register_code
+        from  tz_elevator_alarm te
         where 1=1
         <if test="address != null and address != ''">
             and te.address like  CONCAT(CONCAT('%',#{address}),'%')
@@ -34,14 +33,15 @@
             and te.rescue_code like  CONCAT(CONCAT('%',#{rescueCode}),'%')
         </if>
         <if test="type != null and type != ''">
-            and tec.type = #{type}
+            and te.type = #{type}
         </if>
-        <if test="dealStatus != null and dealStatus != ''">sequenceNbr
-            and tec.deal_status = #{dealStatus}
+        <if test="dealStatus != null and dealStatus != ''">
+            and te.deal_status = #{dealStatus}
         </if>
         <if test="sequenceNbr != null and sequenceNbr != ''">
             and te.sequence_nbr = #{sequenceNbr}
         </if>
+        group by register_code
         order by start_date DESC limit #{current},#{size}
     </select>
 
@@ -49,13 +49,13 @@
         select
         te.sequence_nbr sequenceNbr,
         concat(te.province,te.city,te.district) area,
-        te.category,
+        te.device_category category,
         te.register_code registerCode,
         te.rescue_code rescueCode,
         te.address ,
-        tea.start_date happenTime,
-        tea.type ,
-        case tea.deal_status
+        te.start_date happenTime,
+        te.type ,
+        case te.deal_status
         when '0' then '处置完成'
         when '1' then '故障发生'
         when '2' then '发出通知'
@@ -65,8 +65,7 @@
         ELSE '' END dealStatus,
         '电梯' categoryName,
         '立信远大科技有限公司' IotServiceProvider
-        from tcb_elevator te inner join tz_elevator_alarm tea on
-        te.register_code = tea.register_code
+        from  tz_elevator_alarm te
         where 1=1
         <if test="sequenceNbr != null and sequenceNbr != ''">
             and te.sequence_nbr = #{sequenceNbr}
@@ -77,9 +76,9 @@
         select count(1) from (
         select
         te.sequence_nbr
-        from tcb_elevator te inner join tz_elevator_alarm tea on
-        te.register_code = tea.register_code
+        from  tz_elevator_alarm te
         where 1=1
+        group by register_code  order by start_date desc
         ) te
     </select>
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -40,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -289,15 +290,16 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         LambdaQueryWrapper<DispatchPaper> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(DispatchPaper::getAlertId,Long.valueOf(alertId));
         DispatchPaper dispatchPaper = dispatchPaperService.getOne(queryWrapper);
-
-        LambdaQueryWrapper<DispatchTask> queryWrapper1 = new LambdaQueryWrapper();
-        queryWrapper1.eq(DispatchTask::getPaperId,Long.valueOf(dispatchPaper.getSequenceNbr()));
-        List<DispatchTask> dispatchTask = dispatchTaskService.list(queryWrapper1);
+        List<DispatchTask> dispatchTask = null;
+        if(!ValidationUtil.isEmpty(dispatchPaper)) {
+            LambdaQueryWrapper<DispatchTask> queryWrapper1 = new LambdaQueryWrapper();
+            queryWrapper1.eq(DispatchTask::getPaperId,Long.valueOf(dispatchPaper.getSequenceNbr()));
+            dispatchTask  = dispatchTaskService.list(queryWrapper1);
+        }
 
         String [] str = new String[]{"使用单位","一级响应","二级响应","三级响应","市级监督"};
 
         if(null != dispatchPaper) {
-
             for(String s:str) {
                 AlertHandlerInfoDto alertHandlerInfoDto = new AlertHandlerInfoDto();
                 if(null != dispatchTask &&dispatchTask.size() > 0 ) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ElevatorServiceImpl.java

@@ -122,10 +122,8 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
     }
 
     public List<ElevatorWlInfoDto> queryElevatorListDetails(ElevatorWlInfoDto esElevatorDto) {
-        return elevatorMapper.queryElevatorListDetails(esElevatorDto.getAddress(),
-                esElevatorDto.getRegisterCode(),esElevatorDto.getRescueCode(),
-                esElevatorDto.getType(), esElevatorDto.getDealStatus() != null ? Integer.parseInt(esElevatorDto.getDealStatus()) :null
-                , esElevatorDto.getSequenceNbr());
+        return elevatorMapper.queryElevatorListDetails(
+                esElevatorDto.getSequenceNbr());
     }
 
     public int queryElevatorListCount() {