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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -265,14 +265,16 @@ public class DataDictionaryController extends BaseController {
 		queryWrapper.eq("type", type);
 		queryWrapper.orderByAsc("sort_num");
 		Collection<DataDictionary> list = null;
+		List<Menu> menus  =null;
 		if ("YJLDDW".equals(type)) {
 			list =	dataDictionaryMapper.getNoInLinkUnit();
+			menus  = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
+					null);
 		} else {
 			list = iDataDictionaryService.list(queryWrapper);
-			
-		}
-		List<Menu> menus  = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
+			menus  = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
 					null);
+		}
 		// 创建根节点
 		Menu menu = new Menu(-1L, rootName, -1L, menus, 0);
 		List<Menu> menuList = new ArrayList<>();

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

@@ -29,7 +29,9 @@ GROUP BY
 
 <select id ="getNoInLinkUnit" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
 SELECT
-	cbb.*
+CONCAT(cbb.`name`,' (',elink.count,')') as `name`,
+	cbb.*,
+	elink.count as count
 FROM
 	cb_data_dictionary cbb
 LEFT JOIN (
@@ -42,7 +44,7 @@ LEFT JOIN (
 		emergency_linkage_unit_code
 ) elink ON elink.emergency_linkage_unit_code = cbb.`code`
 WHERE
-	cbb.type = 'YJLDDW'
+	cbb.type = 'YJLDDW' and cbb.is_delete = 0
 AND elink.count IS NOT NULL
 </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledTodyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
@@ -34,4 +35,11 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
     Integer AlertCalledcountTime(@Param("type")int type);
 
     List<AlertCalledTodyDto> getTodayAlertCalled();
+
+    List<AlertCalled> selectAllPage(Long current, Long size,
+                                    Integer alertStatus,
+                                    String alertTypeCode ,
+                                    String alertSourceCode,
+                                    String startTime,
+                                    String endTime);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -84,6 +84,52 @@
     </select>
 
 
+    <select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled">
+        SELECT
+        a.sequence_nbr,
+        a.alert_status,
+        a.type,
+        a.alert_stage,
+        a.alarm_type,
+        a.alarm_type_code,
+        a.call_record_id,
+        a.father_alert,
+        a.response_level_code,
+        a.contact_user,
+        a.contact_phone,
+        a.call_time,
+        a.call_time_num,
+        a.alert_source,
+        a.alert_source_code,
+        a.alert_type,
+        a.alert_type_code,
+        a.unit_involved,
+        a.trapped_num,
+        a.casualties_num,
+        a.address,
+        a.rescue_grid,
+        a.coordinate_x,
+        a.coordinate_y,
+        a.response_level
+        FROM
+        jc_alert_called a
+        <where>
+            <if test="alertStatus!= null ">
+                and alert_status = #{alertStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and call_time between #{startTime} and #{endTime}
+            </if>
+            <if test="alertTypeCode!= null ">
+                and alarm_type_code = #{alertTypeCode}
+            </if>
+            <if test="alertSourceCode!= null ">
+                and alert_source_code = #{alertSourceCode}
+            </if>
+        </where>
+        order by call_time DESC limit #{current},#{size}
+    </select>
+
 
     <select id="AlertCalledcountTime" resultType="Integer">
 
@@ -107,11 +153,11 @@
 
     <select id="getTodayAlertCalled" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledTodyDto">
 
-        select
-            jc_alert_called.alert_type alarmType,
+        select jc_alert_called.alert_type alarmType,
                jc_alert_called.address,
                jc_alert_called.call_time  callTime
-            from jc_alert_called where is_delete=0
+        from jc_alert_called
+        where is_delete = 0
           and to_days(call_time) = to_days(now())
         ORDER BY call_time DESC
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java

@@ -77,19 +77,6 @@ public class FailureDetailsController extends BaseController {
     }
 
 
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<FailureDetailsDto> updateBySequenceNbrFailureDetails(@RequestBody FailureDetailsDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(failureDetailsServiceImpl.updateWithModel(model));
-    }
 
 
     /**
@@ -251,7 +238,7 @@ public class FailureDetailsController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/weblist")
+    @GetMapping(value = "/list/weblist")
     @ApiOperation(httpMethod = "GET", value = "Web端列表分页查询", notes = "Web端列表分页查询")
     public ResponseModel<IPage<FailureDetailsDto>> queryForPageList(@RequestParam(value = "current") Long current, @RequestParam
             (value = "size") Long size, @RequestParam (required = false) Long currentStatus,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -353,20 +353,22 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     @Override
     public List<FormValue> getFormValue(Long id) throws Exception {
         // 动态表单数据
+        /*BUG2580 返回值为code值 修改为类型名称 2021-08-31 陈召 开始 */
         List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
         List<FormValue> formValue = new ArrayList<>();
         for (DynamicFormInstanceDto alertFormValue : list) {
-            if (alertFormValue.getFieldValue() != null) {
+            if (alertFormValue.getFieldValueLabel() != null) {
                 FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                        alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock());
+                        alertFormValue.getFieldType(), alertFormValue.getFieldValueLabel(), alertFormValue.getBlock());
                 formValue.add(value);
             } else {
                 FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
-                        alertFormValue.getFieldType(), alertFormValue.getFieldValueLabel(), alertFormValue.getBlock());
+                        alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock());
                 formValue.add(value);
             }
         }
         return formValue;
+        /*BUG2580 返回值为code值 修改为类型名称 2021-08-31 陈召 结束 */
     }
 
     public List<FormValue> getFormValueDetail(Long id) throws Exception {

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

@@ -140,20 +140,30 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/list")
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public ResponseModel<IPage<AlertCalled>> listPage(String pageNum, String pageSize,String sort, AlertCalled alertCalled) {
+    public ResponseModel<IPage<AlertCalled>> listPage(String pageNum, String pageSize, String sort, AlertCalled alertCalled, Integer alertStatus,
+                                                      String alertTypeCode ,
+                                                      String alertSourceCode,
+                                                      String startTime,
+                                                      String endTime){
         Page<AlertCalled> pageBean;
-        IPage<AlertCalled> page;
+ /*       IPage<AlertCalled> page;
+
+        String sort, AlertCalled alertCalled,
         QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
 
         setQueryWrapper(alertCalledQueryWrapper, alertCalled,sort);
-
+*/
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
             pageBean = new Page<>(0, Long.MAX_VALUE);
         } else {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
-        page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
-        return ResponseHelper.buildResponse(page);
+        /* bug2408 筛选参数解析异常  修改筛选条件方法 修改入参分离筛选条件
+        alertStatus 警情状态  alertTypeCode 报警类型code  alertSourceCode 警情来源code
+        陈召 2021-08-21 开始*/
+        IPage<AlertCalled> alertCalledIPage = iAlertCalledService.queryForCalledList(pageBean, alertStatus, alertTypeCode, alertSourceCode, startTime, endTime);
+        /* bug2408 筛选参数解析异常  修改筛选条件方法 陈召 2021-08-21 结束*/
+        return ResponseHelper.buildResponse(alertCalledIPage);
     }
 
     /**

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

@@ -6,14 +6,18 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
 import com.yeejoin.amos.boot.module.common.api.feign.JcsControlServerClient;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledDto;
@@ -124,6 +128,26 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         return alertCalledMapper.alertCalledListByAlertStatusCount(par);
     }
 
+
+    /**
+     * 接警记录  列表分页查询
+     **/   /* bug2408 筛选参数解析异常 修改筛选条件方法 陈召 2021-08-21 开始*/
+    public IPage<AlertCalled> queryForCalledList(Page pageBean,Integer alertStatus,
+                                           String alertTypeCode ,
+                                           String alertSourceCode,
+                                           String startTime,
+                                           String endTime) {
+        List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus, alertTypeCode, alertSourceCode, startTime, endTime);
+        IPage<AlertCalled> iPage = new Page<>();
+        iPage.setRecords(list);
+        iPage.setTotal(list.size());
+        return iPage;
+        /* bug2408 筛选参数解析异常 修改筛选条件方法 陈召 2021-08-21 结束*/
+    }
+
+
+
+
     /**
      * 根据灾情id 查询灾情详情
      **/

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java

@@ -25,6 +25,7 @@ import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import io.swagger.models.auth.In;
+import org.aspectj.weaver.ast.Var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
@@ -33,11 +34,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -133,7 +130,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
     public List<Menu> getTeamTree(Map<String, Object> columnMap) throws Exception {
         Collection<FireTeam> list = this.listByMap(columnMap);
         return TreeParser.getTree(null, list, FireTeam.class.getName(), "getSequenceNbr", 2, "getName",
-                "getParent",null);
+                "getParent", null);
     }
 
     /**
@@ -192,7 +189,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         }
 
         DataDictionary dataDictionary = iDataDictionaryService.getById(fireTeam.getTypeCode());
-        if(null !=dataDictionary ) {
+        if (null != dataDictionary) {
             fireTeam.setType(dataDictionary.getName());
         }
         if (ValidationUtil.isEmpty(fireTeam.getSequenceNbr())) {
@@ -225,16 +222,29 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         if (null == pageNum || null == pageSize) {
             pageNum = 1;
             pageSize = Integer.MAX_VALUE;
-        }else{
-            pageNum=(pageNum - 1) * pageSize;
+        } else {
+            pageNum = (pageNum - 1) * pageSize;
         }
 
-        List<FireTeamZhDto> list= fireTeamMapper.getFireTeamList( pageNum,  pageSize,  par);
+        List<FireTeamZhDto> list = fireTeamMapper.getFireTeamList(pageNum, pageSize, par);
 
         // 获取消防车辆列表
-        ResponseModel<List<Map<String,Object>>> result = equipFeignClient.getFireCarListAllcount();
+        ResponseModel<List<Map<String, Object>>> result = equipFeignClient.getFireCarListAllcount();
+
+        List<Map<String, Object>> result1 = result.getResult();
+
+        list.forEach(fireTeamZhDto -> {
+            Long sequenceNbr = fireTeamZhDto.getSequenceNbr();
+            result1.forEach(map -> {
+                String mapId = String.valueOf(map.get("teamId"));
+                if(String.valueOf(sequenceNbr).equals(mapId)){
+                    Integer carNum = Integer.valueOf(map.get("carNum").toString());
+                    fireTeamZhDto.setCarNum(carNum);
+                }
+            });
+        });
+/*
 
-        List<Map<String,Object>> result1 = result.getResult();
         if(result1!=null&&result1.size()>0){
             Map<String, Object>   combineResultMap =  new HashMap<String, Object>();
             result1.stream().forEach(obj ->{
@@ -245,9 +255,9 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
                     obj.setCarNum(Integer.valueOf(combineResultMap.get(obj.getSequenceNbr()).toString()));
                 }
             });
-       }
+       }*/
        return list;
-    }
+}
 
     @Override
     public Integer getFireTeamListCount(RequestData par) {
@@ -262,20 +272,20 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
 
     @Override
     public List<FireTeamZhDto> getFireTeamCountList() {
-    	 List<FireTeamZhDto> list=  fireTeamMapper.getFireTeamCountList();
+        List<FireTeamZhDto> list = fireTeamMapper.getFireTeamCountList();
 
 
         // 获取消防车辆列表
-        ResponseModel<List<Map<String,Object>>> result = equipFeignClient.getFireCarListAllcount();
+        ResponseModel<List<Map<String, Object>>> result = equipFeignClient.getFireCarListAllcount();
 
-        List<Map<String,Object>> result1 = result.getResult();
-        if(result1!=null&&result1.size()>0){
+        List<Map<String, Object>> result1 = result.getResult();
+        if (result1 != null && result1.size() > 0) {
             Map<String, Object> combineResultMap = new HashMap<String, Object>();
-            result1.stream().forEach(obj ->{
-                combineResultMap.put(obj.get("teamId").toString(),obj.get("carNum"));
+            result1.stream().forEach(obj -> {
+                combineResultMap.put(obj.get("teamId").toString(), obj.get("carNum"));
             });
-            list.stream().forEach(obj ->{
-                if(combineResultMap.containsKey(obj.getSequenceNbr().toString())){
+            list.stream().forEach(obj -> {
+                if (combineResultMap.containsKey(obj.getSequenceNbr().toString())) {
                     obj.setCarNum(Integer.valueOf(combineResultMap.get(obj.getSequenceNbr().toString()).toString()));
                 }
             });
@@ -292,12 +302,12 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         count += fireTeamMapper.getFighterNumByTeamId(teamId);
         // 获取下部分数据
         LambdaQueryWrapper<FireTeam> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(FireTeam::getParent,teamId).eq(FireTeam::getIsDelete,false);
+        queryWrapper.eq(FireTeam::getParent, teamId).eq(FireTeam::getIsDelete, false);
         List<FireTeam> fireTeamList = this.list(queryWrapper);
-        if(fireTeamList.size() == 0) {
+        if (fireTeamList.size() == 0) {
             return count;
         } else {
-            for(FireTeam t :  fireTeamList) {
+            for (FireTeam t : fireTeamList) {
                 count += getFightNumByTeamId(t.getSequenceNbr());
             }
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java

@@ -69,7 +69,7 @@ public interface PlanTaskMapper extends BaseMapper {
 	 * @param params
 	 * @return
 	 */
-	List<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params);
+	List<Map<String, Object>> getPlanTasks(HashMap<String, Object> params);
 	/**
 	 *	 通过计划任务Id获得计划任务信息
 	 * @param planTaskId
@@ -121,6 +121,12 @@ public interface PlanTaskMapper extends BaseMapper {
 	 * @return
 	 */
 	List<CheckChkExListBo> getChkExList(CheckPtListPageParam param);
+
+	/**
+	 * 任务分页查询数量
+	 * @param params 参数
+	 * @return long
+	 */
 	long getPlanTasksCount(HashMap<String, Object> params);
 
 	Map<String, Object> getPlanTaskStatisticsForApp(HashMap<String, Object> params);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPlanTaskService.java

@@ -79,7 +79,7 @@ public interface IPlanTaskService {
 	 * @param params
 	 * @return
 	 */
-	Page<HashMap<String, Object>> getPlanTasks(String toke,String product,String appKey,HashMap<String, Object> params);
+	Page<Map<String, Object>> getPlanTasks(String toke,String product,String appKey,HashMap<String, Object> params);
 
 	/**
 	 *  根据计划任务Id获取计划任务信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/PlanTaskPageParamUtil.java

 package com.yeejoin.amos.patrol.business.util;
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.util.ObjectUtils;
-
 import com.yeejoin.amos.patrol.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
 import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
+import org.springframework.util.ObjectUtils;
+
+import java.util.HashMap;
+import java.util.List;
 
 public class PlanTaskPageParamUtil {
 
     public static PlanTaskPageParam fillChkInfoParam(List<CommonRequest> queryRequests, CommonPageable commonPageable,
                                                      PlanTaskPageParam param, HashMap<String, Object> paramMap) {
-		for(int i=0;i<queryRequests.size();i++){
+        for (int i = 0; i < queryRequests.size(); i++) {
             String name = queryRequests.get(i).getName();
-			if("pointNo".equals(name)){
+            if ("pointNo".equals(name)) {
                 param.setPointNo(toString(queryRequests.get(i).getValue()));
-			}else if("pointName".equals(name)){
+            } else if ("pointName".equals(name)) {
                 param.setPointName(toString(queryRequests.get(i).getValue()));
-			}else if("beginDate".equals(name)){
+            } else if ("beginDate".equals(name)) {
                 param.setBeginDate(toString(queryRequests.get(i).getValue()));
-			}else if("endDate".equals(name)){
+            } else if ("endDate".equals(name)) {
                 param.setEndDate(toString(queryRequests.get(i).getValue()));
-			}else if("status".equals(name)){
+            } else if ("status".equals(name)) {
                 param.setStatus(toString(queryRequests.get(i).getValue()));
-			}else if("planId".equals(name)){
+            } else if ("planId".equals(name)) {
                 param.setPlanId(toString(queryRequests.get(i).getValue()));
-			}else if("routeId".equals(name)){
+            } else if ("routeId".equals(name)) {
                 param.setRouteId(toString(queryRequests.get(i).getValue()));
             }
         }
-		param.setOrgCode(paramMap.get("orgCode") == null ? null:paramMap.get("orgCode").toString());
-		param.setUserId(paramMap.get("userId") == null ? null:paramMap.get("userId").toString());
+        param.setOrgCode(paramMap.get("orgCode") == null ? null : paramMap.get("orgCode").toString());
+        param.setUserId(paramMap.get("userId") == null ? null : paramMap.get("userId").toString());
         if (!ObjectUtils.isEmpty(commonPageable)) {
             param.setPageNumber(commonPageable.getPageNumber());
             param.setPageSize(commonPageable.getPageSize());
@@ -43,43 +42,40 @@ public class PlanTaskPageParamUtil {
     }
 
     private static String toString(Object value) {
-		if(null ==value || value ==""){
+        if (null == value || value == "") {
             return null;
-		}else{
+        } else {
             return value.toString();
         }
     }
 
-	public static HashMap<String, Object> fillPlanTask(List<CommonRequest> queryRequests,
+    public static void fillPlanTask(List<CommonRequest> queryRequests,
                                     HashMap<String, Object> params) {
         if (ObjectUtils.isEmpty(queryRequests)) {
-			return params;
+            return;
         }
-		String order = "";
-		for(int i=0;i<queryRequests.size();i++){
-			String name = queryRequests.get(i).getName();
-			String type = queryRequests.get(i).getType();
-			if(type!=null && type!=""){
+        StringBuilder order = new StringBuilder();
+        for (CommonRequest queryRequest : queryRequests) {
+            String name = queryRequest.getName();
+            String type = queryRequest.getType();
+            if (type != null && !"".equals(type)) {
                 if (!QueryOperatorEnum.ORDER_BY.getName().equals(type)) {
-					params.put(name, queryRequests.get(i).getValue());
-				} else if  (QueryOperatorEnum.ORDER_BY.getName().equals(type))  {
-					order +=name + " " + queryRequests.get(i).getValue();
+                    params.put(name, queryRequest.getValue());
+                } else {
+                    order.append(name).append(" ").append(queryRequest.getValue());
                 }
-			}else{
-				if(name.equals("orderBy") && queryRequests.get(i).getValue()!=null){
-					order +=  queryRequests.get(i).getValue();
+            } else {
+                if ("orderBy".equals(name) && queryRequest.getValue() != null) {
+                    order.append(queryRequest.getValue());
                 }
-				params.put(name, queryRequests.get(i).getValue());
+                params.put(name, queryRequest.getValue());
             }
-	
-			
         }
-		if (!ObjectUtils.isEmpty(order)) {
-			params.put("orderBy", order);
-		}else{
+        if (!ObjectUtils.isEmpty(order.toString())) {
+            params.put("orderBy", order.toString());
+        } else {
             params.put("orderBy", "beginTime ASC");
         }
-		return params;
     }
 
 }

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -161,4 +161,51 @@
 			ALTER TABLE `cb_firefighters_thought` modify talking_time datetime COMMENT '谈话时间';
 		</sql>
 	</changeSet>
+	<changeSet author="litengwei" id="2021-09-01-litengwei-1">
+		<comment>add data cb_data_dictionary</comment>
+		<sql>
+			INSERT INTO `cb_data_dictionary` VALUES(1152, '1152', '大面积航班延误保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1153, '1153', '二类运行保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1154, '1154', '施工加油保障', 'QTZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1155, '1155', '航空器失事', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1156, '1156', '空中遇险', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1157, '1157', '跑道事件', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1158, '1158', '地面遇险', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1159, '1159', '劫机', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1160, '1160', '发现爆炸物', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1161, '1161', '爆炸物威胁', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1162, '1162', '其他非法干扰', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1163, '1163', '残损航空器搬移', 'HKQJYZL', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1164, '1164', '紧急出动', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1165, '1165', '紧急集结', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1);
+			INSERT INTO `cb_data_dictionary` VALUES(1166, '1166', '原地待命', 'XYJB', NULL, NULL, NULL, NULL, NULL, 0, 1);
+		</sql>
+	</changeSet>
+	<changeSet author="litengwei" id="2021-09-01-litengwei-2">
+		<comment>add data jc_alert_form</comment>
+		<sql>
+			INSERT INTO `jc_alert_form` VALUES(127, '230', 'HKQJYZL', '航空器救援子类', 'aircraftRescueSub', 'radio', NULL, NULL, NULL, 0, 1, 1, NULL);
+			INSERT INTO `jc_alert_form` VALUES(128, '242', 'QTZL', '子类', 'sub', 'radio', NULL, NULL, NULL, 0, 1, 1, NULL);
+			INSERT INTO `jc_alert_form` VALUES(129, '230', NULL, '机位', 'mechinePosition', 'select', NULL, NULL, NULL, 0, 0, 5, NULL);
+			INSERT INTO `jc_alert_form` VALUES(130, '230', NULL, '响应级别', 'responseLevel', 'select', NULL, NULL, NULL, 0, 0, 8, NULL);
+		</sql>
+	</changeSet>
+	<changeSet author="litengwei" id="2021-09-01-litengwei-3">
+		<comment>update data jc_alert_form</comment>
+		<sql>
+			UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航班号', field_code='flightNumber', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=2, url='aircraft/getAircraftNum' WHERE sequence_nbr=103;
+			UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航空器型号', field_code='aircraftModel', field_type='input', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=3, url='aircraft/getAircraft' WHERE sequence_nbr=104;
+			UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='落地时间', field_code='landingTime', field_type='datetime', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=4, url=NULL WHERE sequence_nbr=105;
+			UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='航空器故障部位', field_code='damageLocation', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=7, url='data-dictionary/gwmcDataDictionary/FJSSWZ' WHERE sequence_nbr=106;
+			UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='燃油量(吨)', field_code='fuelQuantity', field_type='inputNumber', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=10, url=NULL WHERE sequence_nbr=107;
+			UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='载客量', field_code='passengerCapacity', field_type='inputNumber', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=9, url=NULL WHERE sequence_nbr=108;
+			UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code='PJPD', field_name='迫降跑道', field_code='forcedLandingTrack ', field_type='select', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=6, url='' WHERE sequence_nbr=109;
+			UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='灾害事故情况', field_code='accidentSituation', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=11, url=NULL WHERE sequence_nbr=110;
+			UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='发展态势', field_code='developmentTrend', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=12, url=NULL WHERE sequence_nbr=111;
+			UPDATE `jc_alert_form` SET alert_type_code='230', field_value_code=NULL, field_name='备注', field_code='remarks', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=13, url=NULL WHERE sequence_nbr=112;
+			UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='保障类别', field_code='securityCategory', field_type='selectDelay', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=0, sort_num=2, url='data-dictionary/gwmcDataDictionary/YGCJ' WHERE sequence_nbr=124;
+			UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='事件概述', field_code='eventOverview', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=3, url=NULL WHERE sequence_nbr=125;
+			UPDATE `jc_alert_form` SET alert_type_code='242', field_value_code=NULL, field_name='备注', field_code='remarks', field_type='textarea', rec_user_name=NULL, rec_user_id=NULL, rec_date=NULL, is_delete=0, block=1, sort_num=4, url=NULL WHERE sequence_nbr=126;
+		</sql>
+	</changeSet>
 </databaseChangeLog>

amos-boot-system-maintenance/src/main/resources/application.properties

@@ -26,6 +26,8 @@ mybatis.mapper-locations = classpath:db/mapper/*.xml
 mybatis-plus.mapper-locations=classpath:db/mapper/*.xml
 mybatis.type-aliases-package = com.yeejoin.amos.maintenance.business.entity.mybatis
 mybatis.configuration.mapUnderscoreToCamelCase=true
+#null值也返回
+mybatis-plus.configuration.call-setters-on-nulls=true
 spring.liquibase.changeLog=classpath:db/changelog/changelog-master.xml
 spring.liquibase.enabled=true
 

amos-boot-system-patrol/src/main/java/com/yeejoin/amos/PatrolApplication.java

 package com.yeejoin.amos;
 
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,15 +14,21 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.client.RestTemplate;
+import org.typroject.tyboot.core.restful.config.JsonSerializerManage;
 import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+
 /**
- *
  * <pre>
  * 服务启动类
  * </pre>
@@ -44,15 +45,14 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 @EnableFeignClients
 @EnableAsync
 @EnableEurekaClient
-@ComponentScan({"org.typroject","com.yeejoin.amos"})
-@MapperScan(basePackages = { "com.yeejoin.amos.patrol.business.dao.mapper","org.typroject.tyboot.core.auth.face.orm.dao","com.yeejoin.amos.boot.biz.common.dao.mapper" })
-public class PatrolApplication
-{
+@ComponentScan(value = {"org.typroject", "com.yeejoin.amos"}, excludeFilters = {
+		@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {JsonSerializerManage.class})})
+@MapperScan(basePackages = {"com.yeejoin.amos.patrol.business.dao.mapper", "org.typroject.tyboot.core.auth.face.orm.dao", "com.yeejoin.amos.boot.biz.common.dao.mapper"})
+public class PatrolApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(PatrolApplication.class);
 
 
-
     @Bean
     @LoadBalanced
     RestTemplate initRestTemplate() {
@@ -66,8 +66,7 @@ public class PatrolApplication
      * @throws IOException
      * @throws URISyntaxException
      */
-	public static void main(String[] args) throws UnknownHostException
-	{
+    public static void main(String[] args) throws UnknownHostException {
         logger.info("start Service..........");
         ConfigurableApplicationContext context = SpringApplication.run(PatrolApplication.class, args);
         GlobalExceptionHandler.setAlwaysOk(true);

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -168,7 +168,6 @@
 		and SYSDATE() <![CDATA[>=]]> pt.begin_time
 		and SYSDATE() <![CDATA[<]]> pt.end_time
 	</select>
-
 	<select id="getPlanTasks" resultType="Map">
 			SELECT
 			a.planTaskId,
@@ -185,7 +184,6 @@
 			a.userId  executiveName,
 			a.userName,
 			a.userDept
-			<!-- (SELECT GROUP_CONCAT(`name`) FROM s_user where find_in_set(id,a.userId)>0 ORDER BY `id`) AS executiveName -->
 		FROM
 			(
 				SELECT
@@ -202,7 +200,6 @@
 						pt.end_time,
 						'%Y-%m-%d %H:%i:%s'
 					) endTime,
-
 					date_format(
 						pt.check_date,
 						'%Y-%m-%d %H:%i:%s'
@@ -219,79 +216,10 @@
 				p_plan_task pt
 				INNER JOIN  p_plan p ON pt.plan_id = p.id
 			) a
-		<where>
-		<if test="userId != null and userId > 0 "> and find_in_set(#{userId},a.userId)>0</if>
-		<if test="routeId != null and userId > 0 "> and a.route_id = #{routeId} </if>
-		<if test="checkDate != null and checkDate != '' "> and a.beginTime <![CDATA[<=]]> #{checkDate} and a.endTime <![CDATA[>=]]> #{checkDate} </if>
-		<if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
-		<if test="orgCode != null and orgCode !=''" >
-			and (a.OrgCode LIKE CONCAT( #{orgCode}, '-%' ) or a.OrgCode= #{orgCode} )
-		</if>
-		<choose>
-             <when test="departmentId != null and departmentId != 0 ">and a.userDept like  concat('%', #{departmentId}, '%')</when>
-<!--             <when test="departmentId == -1 and ids != null">and a.userId in-->
-<!--             <foreach item="item" collection="ids" separator="," open="(" close=")" index="index">-->
-<!--				#{item}-->
-<!--			</foreach>-->
-<!--             </when>-->
-          </choose>
-
-		<if test="startTime != null and startTime != '' and endTime != null and endTime != ''  ">
-			AND (
-					(
-						a.beginTime <![CDATA[>=]]>  #{startTime}
-						AND a.endTime <![CDATA[<=]]> #{endTime}
-					)
-					OR (
-						a.beginTime <![CDATA[<=]]> #{endTime}
-						AND a.endTime <![CDATA[>=]]> #{endTime}
-					)
-					OR (
-						a.beginTime <![CDATA[<=]]> #{startTime}
-						AND a.endTime <![CDATA[>]]> #{startTime}
-					)
-					OR (
-						a.beginTime <![CDATA[<=]]> #{startTime}
-						AND a.endTime <![CDATA[>=]]> #{endTime}
-					)
-				)
-
-		</if>
-		<if test="query != null and query != '' ">
-			<if test="queryType != null and queryType != 'executiveName' and queryType != 'plan' ">
-			AND EXISTS (
-						SELECT
-							1
-						FROM
-						p_point pp
-						LEFT JOIN p_route_point rp ON rp.point_id = pp.id
-						LEFT JOIN p_route r ON r.id = rp.route_id
-						where a.route_id = r.id
-						<if test="queryType == null or queryType == '' or queryType == 'all' ">
-							AND CONCAT(pp.name, ',',r.name, ',', pp.point_no,a.taskName, ',', a.batchNo) LIKE concat('%', #{query}, '%')
-						</if>
-						<if test="queryType != null and queryType == 'route' ">
-							AND r.name LIKE concat('%', #{query}, '%')
-						</if>
-						<if test="queryType != null and queryType == 'point' ">
-							AND CONCAT(pp.name, ',', pp.point_no) LIKE concat('%', #{query}, '%')
-						</if>
-				)
-			</if>
-
-			<if test="queryType != null and queryType == 'executiveName' ">
-					AND a.userName  LIKE concat('%',  #{query}, '%')
-			</if>
-			<if test="queryType != null and queryType == 'plan' ">
-					AND CONCAT(a.taskName, ',', a.batchNo) LIKE concat('%', #{query}, '%')
-			</if>
-		</if>
-		</where>
-		<if test="orderBy != null and orderBy != ''  "> order by ${orderBy} </if>
+		<include refid="plan-task-app-where"/>
+		<if test="orderBy != null and orderBy != ''"> order by ${orderBy} </if>
 		limit #{offset},#{pageSize}
 	</select>
-
-
 	<select id="getPlanTasksCount" resultType="long">
 		SELECT
 			count(1) tasksCount
@@ -324,24 +252,18 @@
 				p_plan_task pt
 				INNER JOIN  p_plan p ON pt.plan_id = p.id
 			) a
-
+		<include refid="plan-task-app-where"/>
+	</select>
+    <sql id="plan-task-app-where">
 		<where>
-		<if test="userId != null and userId > 0 "> and find_in_set(#{userId},a.userId)>0 </if>
-		<if test="routeId != null and userId > 0 "> and a.route_id = #{routeId} </if>
+			<if test="userId != null and userId > 0 "> and find_in_set(#{userId},a.userId)>0</if>
+			<if test="routeId != null and routeId > 0 "> and a.route_id = #{routeId} </if>
 			<if test="checkDate != null and checkDate != '' "> and a.beginTime <![CDATA[<=]]> #{checkDate} and a.endTime <![CDATA[>=]]> #{checkDate} </if>
 			<if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
 			<if test="orgCode != null and orgCode !=''" >
 				and (a.OrgCode LIKE CONCAT( #{orgCode}, '-%' ) or a.OrgCode= #{orgCode} )
 			</if>
-		<choose>
-             <when test="departmentId != null and departmentId!= 0 ">and a.userDept like  concat('%', #{departmentId}, '%') </when>
-<!--             <when test="departmentId == -1 and ids != null">and a.userId in-->
-<!--             <foreach item="item" collection="ids" separator="," open="(" close=")" index="index">-->
-<!--				#{item}-->
-<!--			</foreach>-->
-<!--             </when>-->
-          </choose>
-
+			<if test="departmentId != null and departmentId != 0 ">and a.userDept like  concat('%', #{departmentId}, '%')</if>
 			<if test="startTime != null and startTime != '' and endTime != null and endTime != ''  ">
 				AND (
 				(
@@ -361,7 +283,6 @@
 				AND a.endTime <![CDATA[>=]]> #{endTime}
 				)
 				)
-
 			</if>
 			<if test="query != null and query != '' ">
 				<if test="queryType != null and queryType != 'executiveName' and queryType != 'plan' ">
@@ -382,10 +303,8 @@
 					<if test="queryType != null and queryType == 'point' ">
 						AND CONCAT(pp.name, ',', pp.point_no) LIKE concat('%', #{query}, '%')
 					</if>
-
 					)
 				</if>
-
 				<if test="queryType != null and queryType == 'executiveName' ">
 					AND a.userName  LIKE concat('%',  #{query}, '%')
 				</if>
@@ -394,8 +313,7 @@
 				</if>
 			</if>
 		</where>
-	</select>
-
+	</sql>
 
 
 	<select id="queryPlanTaskById" resultType="Map">