Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -263,7 +263,7 @@ public class WaterResourceDto extends BaseDto {
     @ExplicitConstraint(indexNum = 32, source = {"有", "无"}) //固定下拉内容
     @ExcelProperty(value = "有无枯水期", index = 32)
     @ApiModelProperty(value = "有无枯水期")
-    private Boolean hasDrySeasonType;
+    private String hasDrySeasonType;
 
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -47,7 +47,7 @@
                rn.quality_situation_info,
                rn.season_change_info,
                rn.has_dry_season,
-               (case r.has_dry_season when 0 then '有' when 1 then '无' end) hasDrySeasonType,
+               (case rn.has_dry_season when 0 then '有' when 1 then '无' end) hasDrySeasonType,
                rn.dry_period_span,
                rp.intake_height,
                rp.elevation_difference,

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/AlertCalledMapper.xml

@@ -323,7 +323,7 @@
 	</select>
 	<select id="getImportantEventDetail" resultType="java.util.Map">
 		select tzs.contact_phone,tzs.rec_user_name,
-		tzs.type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
+		tzs.alert_stage   as type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
 		tzs.device_id,tzs.contact_user,tzs.alarm_type_code,tzs.sequence_nbr,date_format(tzs.call_time,"%Y-%m-%d %H:%i:%S") call_time,
 		tzs.rec_user_id,tzs.registration_code,tzs.emergency_call,tzs.type_code,tzs.equipment_id
 		,te.latitude ,te.region_code ,te.longitude,tzs.injured from (
@@ -357,7 +357,7 @@
 
 	<select id="getTodayEmergencyDetail" resultType="java.util.Map">
 		select tzs.contact_phone,tzs.rec_user_name,
-		tzs.type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
+		tzs.alert_stage   as type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
 		tzs.device_id,tzs.contact_user,tzs.alarm_type_code,tzs.sequence_nbr,date_format(tzs.call_time,"%Y-%m-%d %H:%i:%S") call_time,
 		tzs.rec_user_id,tzs.registration_code,tzs.emergency_call,tzs.type_code,tzs.equipment_id
 		,te.latitude ,te.region_code ,te.longitude,tzs.injured from (
@@ -396,7 +396,7 @@
 		union all
 
 		select tzs.contact_phone,tzs.rec_user_name,
-		tzs.type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
+		tzs.alert_stage   as type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
 		tzs.device_id,tzs.contact_user,tzs.alarm_type_code,tzs.sequence_nbr,date_format(tzs.call_time,"%Y-%m-%d %H:%i:%S")  call_time,
 		tzs.rec_user_id,tzs.registration_code,tzs.emergency_call,tzs.type_code,tzs.equipment_id
 		,te.latitude ,te.region_code ,te.longitude,tzs.injured from (

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-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -12,8 +12,10 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -51,6 +53,10 @@ public class OrgUsrController extends BaseController {
     OrgUsrServiceImpl iOrgUsrService;
     @Autowired
     ESOrgUsrService eSOrgUsrService;
+
+    @Autowired
+    FireTeamMapper fireTeamMapper;
+
     @Autowired
     EmqKeeper emqKeeper;
     @Value("${jcs.company.topic.delete}")
@@ -85,19 +91,16 @@ public class OrgUsrController extends BaseController {
     public ResponseModel<String> deleteById(HttpServletRequest request, @PathVariable Long id) {
         // 删除时，只作逻辑删除
         // BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm
-        OrgUsr tempOrg = iOrgUsrService.getById(id.toString());
-        if(tempOrg.getBizOrgType().equals("COMPANY")) {
-            List<OrgUsr> tempList = iOrgUsrService.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId,id).eq(OrgUsr::getIsDelete,false));
-            if(tempList.size() > 0) {
-                return ResponseHelper.buildResponse("-1");
-            }
-        }
         //bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 start
-        if(tempOrg.getBizOrgType().equals("DEPARTMENT")) {
+        OrgUsr tempOrg = iOrgUsrService.getById(id.toString());
+        if(tempOrg.getBizOrgType().equals("COMPANY") || tempOrg.getBizOrgType().equals("DEPARTMENT")) {
             List<OrgUsr> tempList = iOrgUsrService.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId,id).eq(OrgUsr::getIsDelete,false));
-            if(tempList.size() > 0) {
+            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-09 start*/
+            List<FireTeam> fireTeams = fireTeamMapper.listFireTeamById(id);
+            if(tempList.size() > 0 || fireTeams.size() > 0 ) {
                 return ResponseHelper.buildResponse("-1");
             }
+            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-09 end*/
         }
         //bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 end
 //        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));

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/ESElevatorServiceImpl.java

@@ -173,6 +173,7 @@ public class ESElevatorServiceImpl {
                             esElevatorDto.setHappenTime(al.getCallTime());
                             esElevatorDto.setAlertId(String.valueOf(al.getSequenceNbr()));
                             esElevatorDto.setAlarmTypeCode(al.getAlarmTypeCode());
+                            esElevatorDto.setType(al.getAlertStage());
                             list.add(esElevatorDto);
                             break;
                         }

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() {