Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireTeamMapper.java

@@ -98,5 +98,12 @@ public interface FireTeamMapper extends BaseMapper<FireTeam> {
 	 */
 	Integer getFighterNumByTeamId(Long teamId);
 
+	/**
+	 * 根据companyCode 返回机构下所有的队伍
+	 * @param teamId
+	 * @return
+	 */
+	List<FireTeam> byTeamId(Long teamId);
+
 
 }

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

@@ -150,6 +150,16 @@
 				AND is_delete = 0
     </select>
 
+    <select id="byTeamId" resultType="com.yeejoin.amos.boot.module.common.api.entity.FireTeam">
+        SELECT
+            *
+        FROM
+            cb_fire_team
+        WHERE
+            company_code = #{teamId}
+          AND is_delete = 0
+    </select>
+
 
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ESAlertCalledDto.java

@@ -34,8 +34,14 @@ public class ESAlertCalledDto extends BaseDto {
     /**
      * 响应级别字典code 为了过滤用（只有航空器故障有）
      */
-    @ApiModelProperty(value = "响应级别")
+    @ApiModelProperty(value = "响应级别code")
     private String responseLevelCode;
+
+    /**
+     * 响应级别字典名称 为了过滤用（只有航空器故障有）
+     */
+    @ApiModelProperty(value = "响应级别")
+    private String responseLevel;
     /**
      * 警情阶段
      */

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

@@ -106,12 +106,12 @@ public class OrgUsrController extends BaseController {
         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));
-            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-09 start*/
-            List<FireTeam> fireTeams = fireTeamMapper.listFireTeamById(id);
+            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 start*/
+            List<FireTeam> fireTeams = fireTeamMapper.byTeamId(id);
             if(tempList.size() > 0 || fireTeams.size() > 0 ) {
                 return ResponseHelper.buildResponse("-1");
             }
-            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-09 end*/
+            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 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-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -7,6 +7,8 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStatusEnum;
@@ -42,6 +44,8 @@ import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ESAlertCalledService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import javax.swing.plaf.basic.BasicViewportUI;
+
 /**
  * 警情接警记录
  *
@@ -61,7 +65,8 @@ public class AlertCalledController extends BaseController {
     private ESAlertCalledService eSAlertCalledService;
     @Autowired
     RedisUtils redisUtils;
-
+    @Autowired
+    DataDictionaryServiceImpl dataDictionaryService;
     @Autowired
     OrgUsrServiceImpl iOrgUsrService;
     @Value("${redis.cache.failure.time}")
@@ -163,7 +168,7 @@ public class AlertCalledController extends BaseController {
         /* bug2408 筛选参数解析异常  修改筛选条件方法 修改入参分离筛选条件
         alertStatus 警情状态  alertTypeCode 报警类型code  alertSourceCode 警情来源code
         陈召 2021-08-21 开始*/
-        IPage<AlertCalled> alertCalledIPage = iAlertCalledService.queryForCalledList(page, alertStatus, alertTypeCode, alertSourceCode, callTimeStart, callTimeEnd,sort);
+        IPage<AlertCalled> alertCalledIPage = iAlertCalledService.queryForCalledList(page, alertStatus,alertTypeCode, alertSourceCode, callTimeStart, callTimeEnd,sort);
         /*  bug  2406   接警记录，列表缺少警情状态字段  by litw start*/
         alertCalledIPage.getRecords().stream().forEach(e->{
             if(e.getAlertStatus()) {
@@ -197,7 +202,18 @@ public class AlertCalledController extends BaseController {
     		@RequestBody ESAlertCalledRequestDto alertCalledVo,
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int size) throws Exception {
-        return ResponseHelper.buildResponse(eSAlertCalledService.queryByKeys(alertCalledVo, current, size));
+        /*bug 3090 警情填报，相似警情中响应级别错误显示为code 2021-10-13 chenzhao */
+        Page<ESAlertCalledDto> esAlertCalledDtoPage = eSAlertCalledService.queryByKeys(alertCalledVo, current, size);
+        List<ESAlertCalledDto> records = esAlertCalledDtoPage.getRecords();
+
+        for (ESAlertCalledDto record : records) {
+            if (record.getResponseLevelCode() != null){
+                DataDictionary byCode = dataDictionaryService.getByCode(record.getResponseLevelCode(),"XYJBR");
+                record.setResponseLevel(byCode.getName());
+            }
+        }
+        /*bug 3090 警情填报，相似警情中响应级别错误显示为code 2021-10-13 chenzhao */
+        return ResponseHelper.buildResponse(esAlertCalledDtoPage);
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/schedule/LatentDanerScheduled.java

@@ -19,7 +19,7 @@ public class LatentDanerScheduled {
      * 每1分钟执行一次：查询逾期的隐患，修改状态
      */
 
-    @Scheduled(cron = "0 0/1 * * * ?")
+//    @Scheduled(cron = "0 0/1 * * * ?")
     public void updateDangerStateOfOvertime() {
         iLatentDangerService.updateDangerStateOfOvertime();
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/task/PlanTaskJob.java

+package com.yeejoin.amos.supervision.task;
+
+import com.yeejoin.amos.supervision.business.service.intfc.IPlanTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author DELL
+ */
+@Component
+@EnableScheduling
+public class PlanTaskJob {
+
+
+    @Autowired
+    private IPlanTaskService planTaskService;
+
+    /**
+     * 定时查询任务状态
+     */
+    @Scheduled(cron = "${jobs.cron}")
+    public void scheduleJob() {
+        planTaskService.taskExecution(null);
+    }
+}