修改水源、联动单位、警情地址bug

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/constants/BizConstant.java

+package com.yeejoin.amos.boot.biz.common.constants;
+
+/**
+ * @Description: 业务通用常量类
+ * @Author: DELL
+ * @Date: 2021/5/26
+ */
+public interface BizConstant {
+	/**
+	 * 经度
+	 */
+	public final static String LONGITUDE = "longitude";
+
+	/**
+	 * 纬度
+	 */
+	public final static String LATITUDE = "latitude";
+
+	/**
+	 * 地址
+	 */
+	public final static String ADDRESS = "address";
+    
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import com.alibaba.fastjson.JSONObject;
 
-@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
+@FeignClient(name = "AMOS-API-WORKFLOW-CJHENHAO", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
 public interface WorkflowFeignService {
 	/**
 	 * 发起流程
@@ -74,7 +74,7 @@ public interface WorkflowFeignService {
 	 * @param processInstanceId
 	 * @return
 	 */
-	@RequestMapping(value = "/activitiHistory/tasks/{processInstanceId}", method = RequestMethod.GET)
-	JSONObject queryTasksByProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId);
+	@RequestMapping(value = "/activitiHistory/historyTask/{processInstanceId}", method = RequestMethod.GET)
+	JSONObject queryHistoryTasksByProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId);
 
 }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
@@ -91,19 +92,11 @@ public class WaterResourceController extends BaseController {
         model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
         model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
         
-        
         if(model.getAddress()!=null){
-			String[]  data= model.getAddress().split("@address@");
-			model.setAddress(data[0]);
-			 if(data[1]!=null&&!"".equals(data[1])){
-				 JSONObject jSONObject = JSON.parseObject(data[1]);				 
-				 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
-					 model.setLongitude(Double.valueOf(jSONObject.getString("longitude")));
-				 }
-                 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
-                	 model.setLatitude(Double.valueOf(jSONObject.getString("latitude")));
-				 }
-			 }
+            JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(model.getAddress());
+            model.setAddress(address.getString(BizConstant.ADDRESS));
+            model.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
+            model.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
 		 }
          
         if (!StringUtils.isEmpty(resourceType)) {
@@ -174,21 +167,13 @@ public class WaterResourceController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
     public ResponseModel<WaterResourceDto> updateBySequenceNbrWaterResource(@RequestBody WaterResourceDto model,
                                                                             @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-    	
-    	
-    	 if(model.getAddress()!=null){
- 			String[]  data= model.getAddress().split("@address@");
- 			model.setAddress(data[0]);
- 			 if(data[1]!=null&&!"".equals(data[1])){
- 				 JSONObject jSONObject = JSON.parseObject(data[1]);				 
- 				 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
- 					 model.setLongitude(Double.valueOf(jSONObject.getString("longitude")));
- 				 }
-                  if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
-                 	 model.setLatitude(Double.valueOf(jSONObject.getString("latitude")));
- 				 }
- 			 }
+        if (StringUtils.isNotEmpty(model.getAddress())) {
+            JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(model.getAddress());
+            model.setAddress(address.getString(BizConstant.ADDRESS));
+            model.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
+            model.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
         }
+
         // 更新基本信息
         model.setSequenceNbr(sequenceNbr);
         model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+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;
@@ -124,17 +126,10 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 	public LinkageUnitDto saveModel(LinkageUnitDto linkageUnitDto) {
 
 		if (linkageUnitDto.getAddress() != null) {
-			String[] data = linkageUnitDto.getAddress().split("@address@");
-			linkageUnitDto.setAddress(data[0]);
-			if (data[1] != null && !"".equals(data[1])) {
-				JSONObject jSONObject = JSON.parseObject(data[1]);
-				if (jSONObject.getString("longitude") != null && !"".equals(jSONObject.getString("longitude"))) {
-					linkageUnitDto.setLongitude(Double.valueOf(jSONObject.getString("longitude")));
-				}
-				if (jSONObject.getString("longitude") != null && !"".equals(jSONObject.getString("longitude"))) {
-					linkageUnitDto.setLatitude(Double.valueOf(jSONObject.getString("latitude")));
-				}
-			}
+			JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(linkageUnitDto.getAddress());
+			linkageUnitDto.setAddress(address.getString(BizConstant.ADDRESS));
+			linkageUnitDto.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
+			linkageUnitDto.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
 		}
 		// 1.保存行数据
 		String groupCode = this.getGroupCode();
@@ -178,8 +173,10 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 				.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
 		Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
 		LinkageUnitDto linkageUnitDto = linkageUnitMapper.selectOne(false, fieldCodes, groupCode, sequenceNbr);
+		if (!ValidationUtil.isEmpty(linkageUnitDto)) {
 			List<SourceFile> sourceFiles = sourceFileServiceImpl.findBySourceId(linkageUnitDto.getSequenceNbr());
 			linkageUnitDto.setImage(sourceFiles);
+		}
 		return linkageUnitDto;
 	}
 
@@ -204,17 +201,10 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 	public LinkageUnitDto updateById(LinkageUnitDto linkageUnitDto) {
 
 		if (linkageUnitDto.getAddress() != null) {
-			String[] data = linkageUnitDto.getAddress().split("@address@");
-			linkageUnitDto.setAddress(data[0]);
-			if (data[1] != null && !"".equals(data[1])) {
-				JSONObject jSONObject = JSON.parseObject(data[1]);
-				if (jSONObject.getString("longitude") != null && !"".equals(jSONObject.getString("longitude"))) {
-					linkageUnitDto.setLongitude(Double.valueOf(jSONObject.getString("longitude")));
-				}
-				if (jSONObject.getString("longitude") != null && !"".equals(jSONObject.getString("longitude"))) {
-					linkageUnitDto.setLatitude(Double.valueOf(jSONObject.getString("latitude")));
-				}
-			}
+			JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(linkageUnitDto.getAddress());
+			linkageUnitDto.setAddress(address.getString(BizConstant.ADDRESS));
+			linkageUnitDto.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
+			linkageUnitDto.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
 		}
 		// 修改基本信息
 		updateWithModel(linkageUnitDto);

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

@@ -6,7 +6,10 @@ import java.util.Optional;
 
 import javax.annotation.Resource;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.*;
@@ -235,4 +238,31 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
     public List<WaterResourceTypeDto> getWaterResourceTypeList(Boolean isDelete) {
         return waterResourceMapper.getWaterResourceTypeList(isDelete);
     }
+
+    public static JSONObject getLongLatFromAddress(String address) {
+        JSONObject result = new JSONObject();
+        result.put(BizConstant.ADDRESS, "");
+        result.put(BizConstant.LONGITUDE, "0");
+        result.put(BizConstant.LATITUDE, "0");
+        if (StringUtils.isNotEmpty(address)) {
+            String[] addressData = address.split("@address@");
+            if (addressData.length > 1) {
+                result.put(BizConstant.ADDRESS, addressData[0]);
+                JSONObject langLatObj = JSON.parseObject(addressData[1]);
+                if (StringUtils.isNotEmpty(langLatObj.getString(BizConstant.LONGITUDE))) {
+                    result.put(BizConstant.LONGITUDE, langLatObj.getString(BizConstant.LONGITUDE));
+                } else {
+                    result.put(BizConstant.LONGITUDE, "0");
+                }
+                if (StringUtils.isNotEmpty(langLatObj.getString(BizConstant.LATITUDE))) {
+                    result.put(BizConstant.LATITUDE, langLatObj.getString(BizConstant.LATITUDE));
+                } else {
+                    result.put(BizConstant.LATITUDE, "0");
+                }
+            } else {
+                result.put(BizConstant.ADDRESS, addressData[0]);
+            }
+        }
+        return result;
+    }
 }

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

@@ -8,12 +8,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.FormValue;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.jcs.api.dto.*;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledFormDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
+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.dto.KeyValueLabel;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
@@ -32,63 +40,66 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.StringUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
-import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
-* 警情接警记录 服务实现类
-*
-* @author tb
-* @date 2021-06-17
-*/
+ * 警情接警记录 服务实现类
+ *
+ * @author tb
+ * @date 2021-06-17
+ */
 @Service
-public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCalled,AlertCalledMapper> implements IAlertCalledService {
+public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCalled, AlertCalledMapper> implements IAlertCalledService {
 
     @Autowired
     RedisUtils redisUtils;
     @Autowired
     AlertCalledMapper alertCalledMapper;
-	 
+    @Autowired
+    RuleAlertCalledService ruleAlertCalledService;
+    @Autowired
+    TemplateMapper templateMapper;
+    @Autowired
+    PowerTransferMapper powerTransferMapper;
+    @Autowired
+    AlertSubmittedMapper alertSubmittedMapper;
     @Autowired
     private AlertFormValueServiceImpl iAlertFormValueService;
-	    
     @Autowired
     private ESAlertCalledService eSAlertCalledService;
-	    
-    @Autowired
-    RuleAlertCalledService ruleAlertCalledService;
-
     @Autowired
     private EmqKeeper emqKeeper;
-
     @Value("${mqtt.topic.command.alert.notice}")
     private String topic;
-
     @Value("${redis.cache.failure.time}")
     private long time;
 
-	@Autowired
-	TemplateMapper templateMapper;
-	@Autowired
-	PowerTransferMapper powerTransferMapper;
-	@Autowired
-	AlertSubmittedMapper alertSubmittedMapper;
+    private static int comparingByGroupVal(Map<String, Object> map, Map<String, Object> map2, String key) {
+        int result = 0;
+        if (map.get(key) instanceof Date) {
+            long r1 = ((Date) map.get(key)).getTime();
+            long r2 = ((Date) map2.get(key)).getTime();
+            result = Long.compare(r1, r2);
+        }
+        return result;
+    }
+
     /**
-	 *
      * 指挥系统 未结束的警情列表
-	 *
-	 * **/
+     **/
     @Override
-	public List<AlertCalledZhDto> alertCalledListByAlertStatus( Integer pageNum, Integer pageSize,RequestData par) {
+    public List<AlertCalledZhDto> alertCalledListByAlertStatus(Integer pageNum, Integer pageSize, RequestData par) {
 
-		List<AlertCalledZhDto> list = alertCalledMapper.alertCalledListByAlertStatus( pageNum, pageSize,par);
+        List<AlertCalledZhDto> list = alertCalledMapper.alertCalledListByAlertStatus(pageNum, pageSize, par);
         return list;
 
     }
@@ -99,16 +110,14 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     }
 
     /**
-	 *
      * 根据灾情id 查询灾情详情
-	 *
-	 * **/
+     **/
     @Override
     public Object selectAlertCalledById(Long id) {
-		if(redisUtils.hasKey(RedisKey.ALERTCALLED_ID+id)){
-			Object obj= redisUtils.get(RedisKey.ALERTCALLED_ID+id);
+        if (redisUtils.hasKey(RedisKey.ALERTCALLED_ID + id)) {
+            Object obj = redisUtils.get(RedisKey.ALERTCALLED_ID + id);
             return obj;
-		}else{
+        } else {
             // 警情基本信息
             AlertCalled alertCalled = this.getById(id);
             QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
@@ -116,21 +125,20 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             // 警情动态表单数据
             List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
             List<FormValue> formValue = new ArrayList<FormValue>();
-			if(list!=null&&list.size()>0) {
+            if (list != null && list.size() > 0) {
                 for (AlertFormValue alertFormValue : list) {
-					FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.getBlock());
+                    FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(), alertFormValue.getBlock());
                     formValue.add(value);
                 }
             }
             AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalled, formValue);
 
-			redisUtils.set(RedisKey.ALERTCALLED_ID+id, JSON.toJSON(alertCalledFormVo),time);
+            redisUtils.set(RedisKey.ALERTCALLED_ID + id, JSON.toJSON(alertCalledFormVo), time);
             return alertCalledFormVo;
         }
     }
 
     /**
-	 * 
      * <pre>
      * 保存警情信息
      * </pre>
@@ -142,30 +150,18 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     public AlertCalledObjsDto createAlertCalled(AlertCalledObjsDto alertCalledObjsDto) {
         try {
             // 警情基本信息
-
-
             AlertCalled alertCalled = alertCalledObjsDto.getAlertCalled();
-         if(alertCalled.getAddress()!=null){
-
-			String[]  data= alertCalled.getAddress().split("@address@");
-			 alertCalled.setAddress(data[0]);
-			 if(data[1]!=null&&!"".equals(data[1])){
-				 JSONObject jSONObject = JSON.parseObject(data[1]);				 
-				 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
-					 alertCalled.setCoordinateX(Double.valueOf(jSONObject.getString("longitude")));
-				 }
-                 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
-                	 alertCalled.setCoordinateY(Double.valueOf(jSONObject.getString("latitude")));
-				 }
-				
-				
-			 }
+            if (alertCalled.getAddress() != null) {
+                JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(alertCalled.getAddress());
+                alertCalled.setAddress(address.getString(BizConstant.ADDRESS));
+                alertCalled.setCoordinateX(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
+                alertCalled.setCoordinateY(Double.valueOf(address.getString(BizConstant.LATITUDE)));
             }
             alertCalled.setCallTime(new Date());
- 		   if(AlertStageEnums.RG.getValue().equals(alertCalled.getAlertSourceCode())||
-			AlertStageEnums.RG.getValue().equals(alertCalled.getAlertSourceCode())){
+            if (AlertStageEnums.RG.getValue().equals(alertCalled.getAlertSourceCode()) ||
+                    AlertStageEnums.RG.getValue().equals(alertCalled.getAlertSourceCode())) {
                 alertCalled.setType("0");
-		   }else {
+            } else {
                 alertCalled.setType("1");
             }
 
@@ -227,11 +223,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         }
     }
 
-
     /**
      * 根据id 修改警情
      * type：警情相关 操作类型  0警情续报   1非警情确认   2 警情结案
-	 *
      */
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
@@ -271,16 +265,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         }
     }
 
-	private static int comparingByGroupVal(Map<String, Object> map, Map<String, Object> map2, String key) {
-		int result = 0;
-		if (map.get(key) instanceof Date) {
-			long r1 = ((Date) map.get(key)).getTime();
-			long r2 = ((Date) map2.get(key)).getTime();
-			result = Long.compare(r1, r2);
-		}
-		return result;
-	}
-
     /**
      * 根据时间区间查询警情列表信息
      *
@@ -365,65 +349,67 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         }
         return StringUtils.replaceEach(tempContent, keys, strList.toArray(new String[strList.size()]));
     }
+
     @Override
-	public    Map<String,Object>   selectAlertCalledKeyValueLabelById(Long id) {
+    public Map<String, Object> selectAlertCalledKeyValueLabelById(Long id) {
 
         // 警情基本信息
         AlertCalled alertCalled = this.getById(id);
         QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
-			Map<String,Object> map=new HashMap();
-		    map.put("title","【"+alertCalled.getAlertType()+"】"+alertCalled.getAddress());
+        Map<String, Object> map = new HashMap();
+        map.put("title", "【" + alertCalled.getAlertType() + "】" + alertCalled.getAddress());
         queryWrapper.eq("alert_called_id", id);
         // 警情动态表单数据
-		    List<KeyValueLabel> listdate =new ArrayList<>();
+        List<KeyValueLabel> listdate = new ArrayList<>();
         List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
-			listdate.add(new KeyValueLabel("接警时间","callTime",alertCalled.getCallTime()));
-			listdate.add(new KeyValueLabel("警情地点","address",alertCalled.getAddress()));
-			listdate.add(new KeyValueLabel("警情类型","alertType",alertCalled.getAlertType()));
-			listdate.add(new KeyValueLabel("警情阶段","alertStage",alertCalled.getAlertStage()));
-			listdate.add(new KeyValueLabel("警情等级","responseLevel","无"));
-			listdate.add(new KeyValueLabel("被困人数","trappedNum",alertCalled.getTrappedNum()));
-			listdate.add(new KeyValueLabel("伤亡人数","casualtiesNum",alertCalled.getCasualtiesNum()));
-			listdate.add(new KeyValueLabel("联系人","contactUser",alertCalled.getContactUser()));
-			listdate.add(new KeyValueLabel("联系电话","contactPhone",alertCalled.getContactPhone()));
-			listdate.add(new KeyValueLabel("联系人电话","contactPhone",alertCalled.getContactPhone()));
-		     list.stream().forEach(AlertFormValue->{
-              listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(),AlertFormValue.getFieldCode(), AlertFormValue.getFieldValue()));
+        listdate.add(new KeyValueLabel("接警时间", "callTime", alertCalled.getCallTime()));
+        listdate.add(new KeyValueLabel("警情地点", "address", alertCalled.getAddress()));
+        listdate.add(new KeyValueLabel("警情类型", "alertType", alertCalled.getAlertType()));
+        listdate.add(new KeyValueLabel("警情阶段", "alertStage", alertCalled.getAlertStage()));
+        listdate.add(new KeyValueLabel("警情等级", "responseLevel", "无"));
+        listdate.add(new KeyValueLabel("被困人数", "trappedNum", alertCalled.getTrappedNum()));
+        listdate.add(new KeyValueLabel("伤亡人数", "casualtiesNum", alertCalled.getCasualtiesNum()));
+        listdate.add(new KeyValueLabel("联系人", "contactUser", alertCalled.getContactUser()));
+        listdate.add(new KeyValueLabel("联系电话", "contactPhone", alertCalled.getContactPhone()));
+        listdate.add(new KeyValueLabel("联系人电话", "contactPhone", alertCalled.getContactPhone()));
+        list.stream().forEach(AlertFormValue -> {
+            listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(), AlertFormValue.getFieldCode(), AlertFormValue.getFieldValue()));
         });
-		    map.put("data",listdate);
+        map.put("data", listdate);
         return map;
 
     }
+
     @Override
     public List<KeyValueLabel> selectAlertCalledcount(Long id) {
         // 警情基本信息
         AlertCalled alertCalled = this.getById(id);
 
-		List<KeyValueLabel> listdate =new ArrayList<>();
-		listdate.add(new KeyValueLabel("被困人数","trappedNum",alertCalled.getTrappedNum()));
-		listdate.add(new KeyValueLabel("伤亡人数","casualtiesNum",alertCalled.getCasualtiesNum()));
+        List<KeyValueLabel> listdate = new ArrayList<>();
+        listdate.add(new KeyValueLabel("被困人数", "trappedNum", alertCalled.getTrappedNum()));
+        listdate.add(new KeyValueLabel("伤亡人数", "casualtiesNum", alertCalled.getCasualtiesNum()));
         return listdate;
     }
 
     @Override
     public List<KeyValueLabel> powercount(Long id) {
-		Map<String,Integer>  map=powerTransferMapper.getCarNum(id);
+        Map<String, Integer> map = powerTransferMapper.getCarNum(id);
 //		Map<String,Integer>  mapc=powerTransferMapper.getCompanyNum(id);
 //		Map<String,Integer>  mapu= alertSubmittedMapper.getUseNum(id);
         //统计参与人员
-		List<KeyValueLabel> listdate =new ArrayList<>();
-		listdate.add(new KeyValueLabel("调动人力","useNum","0","人"));
+        List<KeyValueLabel> listdate = new ArrayList<>();
+        listdate.add(new KeyValueLabel("调动人力", "useNum", "0", "人"));
         //统计参与车辆
-		listdate.add(new KeyValueLabel("调动人力","carNum",map.get("carNum"),"辆"));
+        listdate.add(new KeyValueLabel("调动人力", "carNum", map.get("carNum"), "辆"));
         //统计参与队伍
-		listdate.add(new KeyValueLabel("调动单位","companyNum",map.get("companyNum"),"个"));
+        listdate.add(new KeyValueLabel("调动单位", "companyNum", map.get("companyNum"), "个"));
         return listdate;
 
     }
 
     @Override
     public List<PowerData> getPowerDataList(Long id) {
-		List<PowerData> list=powerTransferMapper.getPowerDataList(id);
+        List<PowerData> list = powerTransferMapper.getPowerDataList(id);
         return list;
     }