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/service/IKeySiteService.java

@@ -71,6 +71,6 @@ public  List<OrgMenuDto> getBuildAndKeyTree(Long sequenceNbr);
 
 public  List<KeySiteDateDto> getKeySiteDate(Long id);
 
-public List<KeySite> getKeySiteDateByNameLike(String name);
+public List<KeySite> getKeySiteDateByNameLike();
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -91,7 +91,7 @@ public interface IOrgUsrService {
      * @param orgUsr
      * @param alertFromValuelist
      */
-    void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
+    OrgUsrDto saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
 
     /**
      * 更新机构/部门/人员基本信息和动态表单数据
@@ -110,9 +110,9 @@ public interface IOrgUsrService {
 
     List<OrgUsr> selectCompanyDepartmentMsg();
 
-    void saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
+    OrgUsrDto saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
 
-    void saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
+    OrgUsrDto saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
 
     void updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
 
@@ -134,7 +134,7 @@ public interface IOrgUsrService {
 
     void savePersonList(List<OrgPersonDto> OrgPersonDto) throws Exception;
 
-    void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
+    OrgUsrDto saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
 
     void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
 

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

@@ -99,14 +99,11 @@
                     <when test="fieldCodes[key] == 'eq' and value !=null and value !=''">
                         and d.${key} = #{value}
                     </when>
-                    <when test="fieldCodes[key] == 'ge' and value !=null and value !=''">
-                        and d.${key} >= #{value}
-                    </when>
-                    <when test="fieldCodes[key] == 'le' and value !=null and value !=''">
-                        and d.${key} <![CDATA[<=]]> #{value}
-                    </when>
                 </choose>
             </foreach>
+        <if test="params.endDate != null and params.beginDate != null">
+            and d.endDate between #{params.beginDate} and #{params.endDate}
+        </if>
         </if>
         <if test="params.date != null and params.lift == 'descend'">
         order by endDate desc

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

@@ -12,6 +12,12 @@
     a.name,
     a.latitude,
     a.person_charge_telephone personChargeTelephone,
+     (SELECT count(i.instance_id)
+        from
+        cb_dynamic_form_instance i
+        where
+        i.field_value = a.sequence_nbr ) As userNum,
+    (SELECT COUNT(*)FROM jc_firestation_jacket WHERE firefighters_id = a.sequence_nbr and is_delete =0) AS eqNum,
     Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
     FROM cb_fire_station a
     where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null

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

@@ -38,4 +38,6 @@ public class PowerTransferCompanyResourcesDto extends BaseDto {
     @ApiModelProperty(value = "调派关联部门id")
     protected Long  powerTransferCompanyId;
 
+    @ApiModelProperty(value = "任务状态")
+    protected String  status;
 }

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

@@ -271,7 +271,7 @@
 	FROM
 		cb_key_site
 	WHERE
-		address_desc LIKE  CONCAT('%',#{locationt},'%') and is_delete=0
+		 is_delete=0
     </select>
     
      <select id="getAlertCalledLocation" resultType="Map">
@@ -282,7 +282,7 @@
 	FROM
 		jc_alert_called
 	WHERE
-		address LIKE  CONCAT('%',#{locationt},'%') and is_delete=0
+		is_delete=0
     </select>
     
      <select id="getOrgUserLocation" resultType="Map">
@@ -296,7 +296,7 @@
 				case when field_code='longitude' then field_value end as longitude,
 				case when field_code='latitude' then field_value end as latitude
 			from cb_dynamic_form_instance 
-			where  group_code='244' ) tt where tt.location like CONCAT('%',#{locationt},'%') and tt.location is not null 
+			where  group_code='244' ) tt where  tt.location is not null 
     </select>
 
      <select id="getAirportLocation" resultType="Map">
@@ -307,7 +307,7 @@
 	FROM
 		jc_airport_stand
 	WHERE
-		stand_code LIKE  CONCAT('%',#{locationt},'%') and is_delete=0
+		 is_delete=0
     </select>
 
 </mapper>

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

@@ -44,8 +44,26 @@
     </select>
 
     <select id="getPowerTransferInfoCount" resultType="java.util.Map">
-        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count, 0 end_count,
-        0
+        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count,
+        (select count(status) from jc_power_transfer_company_resources  where  is_delete = 0 AND status = 'finished'
+            <if test="beginDate != null and beginDate != ''">
+                AND rec_date &gt;= #{beginDate}
+            </if>
+
+            <if test="endDate != null and endDate != ''">
+                AND rec_date &lt;= #{endDate}
+            </if>
+         )
+        end_count,
+        (select count(car_status) from jc_power_transfer_company_resources  where  is_delete = 0 AND status = 'executing'
+            <if test="beginDate != null and beginDate != ''">
+                AND rec_date &gt;= #{beginDate}
+            </if>
+
+            <if test="endDate != null and endDate != ''">
+                AND rec_date &lt;= #{endDate}
+            </if>
+         )
         no_return_car_count
         from jc_power_transfer pt
         left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
@@ -61,6 +79,7 @@
         </where>
         order by pt.rec_date asc
     </select>
+
     <select id="getPowerTransferInfo" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto">
         select sequence_nbr, rescue_grid
         from jc_power_transfer pt
@@ -93,7 +112,7 @@
     </select>
     <select id="getPowerTransferCompanyResourcesInfo"
             resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto">
-        select ptcr.power_transfer_company_id, ptcr.type, ptcr.resources_num, ptcr.resources_id
+        select ptcr.power_transfer_company_id, ptcr.type, ptcr.resources_num, ptcr.resources_id,ptcr.status
         from jc_power_transfer pt
         left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
         left join jc_power_transfer_company_resources ptcr on ptc.sequence_nbr = ptcr.power_transfer_company_id

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -385,6 +385,14 @@ public class CommandController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = " 视频详情88", notes = "视频详情88")
     public ResponseModel<Object> getVideoByid(@PathVariable Long id) {
         ResponseModel<Map<String, Object>> data=  equipFeignClient.getByid(id);
+        Map<String, Object>  records=  data!=null?data.getResult():null;
+        if(records!=null&&records.size()>0){
+            ResponseModel<String> da=videoFeignClient.videoUrlByIndexCode(records.get("code")+"");
+            String url=  da!=null?da.getResult().substring(da.getResult().indexOf("openUrl")):null;
+            records.put("url",url);
+            data.setResult(records);
+        }
+
         return ResponseHelper.buildResponse(data!=null?data.getResult():null);
     }
 

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

@@ -230,8 +230,8 @@ public class KeySiteController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "通过名称模糊查询重点部位的信息",   notes = "通过名称模糊查询重点部位的信息")
 	@GetMapping(value = "/getKeySiteDateByNameLike")
-	public  ResponseModel<List<KeySite>> getKeySiteDateByNameLike(@RequestParam String  name) {
-		return ResponseHelper.buildResponse(keySiteService.getKeySiteDateByNameLike(name));
+	public  ResponseModel<List<KeySite>> getKeySiteDateByNameLike() {
+		return ResponseHelper.buildResponse(keySiteService.getKeySiteDateByNameLike());
 	}
 
 }

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

@@ -52,8 +52,8 @@ public class OrgDepartmentController {
     @ApiOperation(httpMethod = "POST", value = "新增部门信息", notes = "新增部门信息")
     public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentDto OrgDepartmentVo) throws Exception {
     	OrgDepartmentVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
-    	iOrgUsrService.saveOrgDepartment(OrgDepartmentVo);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse(iOrgUsrService.saveOrgDepartment(OrgDepartmentVo));
     }
 
     /**

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

@@ -53,8 +53,8 @@ public class OrgPersonController {
     @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
     public ResponseModel<?> saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo) throws Exception {
         OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
-        iOrgUsrService.saveOrgPerson(OrgPersonVo);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse( iOrgUsrService.saveOrgPerson(OrgPersonVo));
     }
 
     /**

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

@@ -87,10 +87,10 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增单位信息", notes = "新增单位信息")
-    public ResponseModel<?> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo) throws Exception {
+    public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo) throws Exception {
         OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
-        iOrgUsrService.saveOrgUsr(OrgUsrVo);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse(iOrgUsrService.saveOrgUsr(OrgUsrVo));
     }
 
     /**

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

@@ -319,10 +319,9 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	}
 
 	@Override
-	public List<KeySite> getKeySiteDateByNameLike(String name) {
+	public List<KeySite> getKeySiteDateByNameLike() {
 		LambdaQueryWrapper<KeySite> mapper =new LambdaQueryWrapper<KeySite>();
 		mapper.eq(KeySite::getIsDelete, false);
-		mapper.like(KeySite::getName, name);
 		return this.baseMapper.selectList(mapper);
 	}
 }

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

@@ -492,33 +492,37 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist)
+	public OrgUsrDto saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist)
 			throws Exception {
 		orgUsr.setRecDate(new Date());
 		AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
 		orgUsr.setRecUserName(user.getRealName());
 		orgUsr.setRecUserId(user.getUserId());
+		OrgUsrDto orgUsrDto = new OrgUsrDto();
+		BeanUtils.copyProperties(orgUsr,orgUsrDto);
 		// 单位新增情况
-		save(orgUsr);
+		OrgUsrDto model = createWithModel(orgUsrDto);
+		//	save(orgUsr);
 		// 填充主键
 		alertFromValuelist.stream().forEach(alertFromValue -> {
-			if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
+			if (OrgPersonEnum.公司.getKey().equals(orgUsrDto.getBizOrgType())) {
 				alertFromValue.setGroupCode(OrgPersonEnum.公司.getCode());
-			} else if (OrgPersonEnum.部门.getKey().equals(orgUsr.getBizOrgType())) {
+			} else if (OrgPersonEnum.部门.getKey().equals(orgUsrDto.getBizOrgType())) {
 				alertFromValue.setGroupCode(OrgPersonEnum.部门.getCode());
 			}
-			alertFromValue.setInstanceId(orgUsr.getSequenceNbr());
+			alertFromValue.setInstanceId(orgUsrDto.getSequenceNbr());
 		});
 		// 保存动态表单数据
 		alertFormValueServiceImpl.saveBatch(alertFromValuelist);
-		OrgUsrFormDto formDto = this.selectCompanyById(orgUsr.getSequenceNbr());
-		if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
+		OrgUsrFormDto formDto = this.selectCompanyById(orgUsrDto.getSequenceNbr());
+		if (OrgPersonEnum.公司.getKey().equals(orgUsrDto.getBizOrgType())) {
 			try {
 				emqKeeper.getMqttClient().publish(airportAddTopic, JSON.toJSONString(formDto).getBytes(), 2, false);
 			} catch (Exception e) {
 				e.getMessage();
 			}
 		}
+		return model;
 	}
 
 	@Override
@@ -628,7 +632,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void saveOrgUsr(OrgUsrDto OrgUsrVo) throws Exception {
+	public OrgUsrDto saveOrgUsr(OrgUsrDto OrgUsrVo) throws Exception {
 		OrgUsr orgUsr = new OrgUsr();
 		BeanUtils.copyProperties(OrgUsrVo, orgUsr);
 		orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
@@ -640,16 +644,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		} else {
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
-		saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue());
+		OrgUsrDto orgUsrDto = saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue());
 
 		/**
 		 * 同步保存ES
 		 */
 		eSOrgUsrService.saveAlertCalledToES(orgUsr);
+		return orgUsrDto;
 	}
 
 	@Override
-	public void saveOrgPerson(OrgPersonDto OrgPersonVo) throws Exception {
+	public OrgUsrDto saveOrgPerson(OrgPersonDto OrgPersonVo) throws Exception {
 		OrgUsr orgUsr = new OrgUsr();
 		BeanUtils.copyProperties(OrgPersonVo, orgUsr);
 		orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
@@ -662,7 +667,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
 
-		saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
+	return 	saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
 	}
 
 	public void saveOrgPersonExcel(OrgUsrExcelDto OrgPersonVo) throws Exception {
@@ -881,7 +886,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public void saveOrgDepartment(OrgDepartmentDto OrgDepartmentVo) throws Exception {
+	public OrgUsrDto saveOrgDepartment(OrgDepartmentDto OrgDepartmentVo) throws Exception {
 		OrgUsr orgUsr = new OrgUsr();
 		BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
 		orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
@@ -893,7 +898,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		} else {
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
-		saveOrgUsrDynamicFormInstance(orgUsr, OrgDepartmentVo.getDynamicFormValue());
+		return saveOrgUsrDynamicFormInstance(orgUsr, OrgDepartmentVo.getDynamicFormValue());
 	}
 
 	@Override

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

@@ -450,7 +450,7 @@ public class AlertCalledController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getLocation")
 	@ApiOperation(httpMethod = "GET", value = "模糊获取地址的方法", notes = "模糊获取地址的方法")
-	public ResponseModel<Object> getLocationLike(@RequestParam String locationt) {
+	public ResponseModel<Object> getLocationLike(@RequestParam(required = false) String locationt) {
 		return ResponseHelper.buildResponse(iAlertCalledService.getLocationLike(locationt));
 	}
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 
-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;
 
-import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,12 +31,15 @@ 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.QRCodeUtil;
 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.OrgUsrzhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.feign.JcsControlServerClient;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledDto;
@@ -48,6 +51,11 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerEquipDto;
 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.Aircraft;
+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.AlertLocationLog;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.jcs.api.enums.ControllerTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
@@ -825,7 +833,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
                 }
         );
         firefightersName.addAll(contactNames);
-
         return firefightersName;
     }
 

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+
+@Component
+public class GetContactNameSchedulerJob {
+	@Autowired
+	RedisUtils redisUtils;
+
+	@Autowired
+	AlertCalledServiceImpl alertCalledServiceImpl;
+	
+	@Value("${redis.cache.failure.time}")
+    private long time;
+	/**
+	 * 每天凌晨12:01执行方法，更新联系人在缓存中的数据
+	 */
+	@Scheduled(cron = "0 01 00 ? * *")
+	public void excuteJob() {
+			List<Map<String, String>> contactName = alertCalledServiceImpl.getContactName();
+			redisUtils.set(RedisKey.CONTACT_USER, contactName, time);
+	}
+}

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

@@ -411,6 +411,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                         powerTransferCompanyResourcesInfo.forEach(ptcr -> {
                             if (powerTransferCompanyId.equals(ptcr.getPowerTransferCompanyId())) {
                                 transferDetail.append(ptcr.getResourcesNum()).append("、");
+                                transferDetail.append(ptcr.getStatus()).append("、");
                             }
                         });
                         transferDetail.deleteCharAt(transferDetail.length() - 1);
@@ -419,11 +420,24 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                 }
             });
             transferDetail.deleteCharAt(transferDetail.length() - 1);
-            String transferDetails = templateContent.replace("departmentName-type-resourcesNum",
-                    transferDetail.toString()).replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace(
-                    "taskStatus", "");
-
-            transferContent.add(transferDetails);
+            if (transferDetail.toString().contains("、")){
+                String transfer = null ;
+                String taskStatus = null ;
+                String[] split = transferDetail.toString().split("、");
+                if (split.length > 1 ){
+                    transfer = split[0];
+                    taskStatus = split[1];
+                }
+                String transferDetails = templateContent.replace("departmentName-type-resourcesNum",
+                        transfer).replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace(
+                        "taskStatus",taskStatus!=null?FireCarStatusEnum.getEnum(taskStatus).getName():null);
+                transferContent.add(transferDetails);
+            }else {
+                String transferDetails = templateContent.replace("departmentName-type-resourcesNum",
+                        transferDetail.toString()).replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace(
+                        "taskStatus", "");
+                transferContent.add(transferDetails);
+            }
         });
         transferInfo.put("transferContent", transferContent);
 

amos-boot-system-jcs/src/main/java/com/yeejoin/amos/AmosJcsApplication.java

@@ -19,6 +19,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 
@@ -38,6 +39,7 @@ import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils;
 @EnableFeignClients
 @EnableAsync
 @EnableEurekaClient
+@EnableScheduling
 @MapperScan({ "org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*",
 		"org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
 		"com.yeejoin.amos.boot.module.*.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper" })