Merge branch 'chenhao' 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());
             }
         }