Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -23,6 +23,7 @@ public class DateUtils {
     public static final String YEAR_PATTERN = "yyyy";
     public static final String MINUTE_ONLY_PATTERN = "mm";
     public static final String HOUR_ONLY_PATTERN = "HH";
+    public static final String DATE_PATTERN_NUM = "yyyyMMdd";
 
     /**
      * 获取  当前年、半年、季度、月、日、小时 开始结束时间
@@ -707,4 +708,16 @@ public class DateUtils {
         timeSdf.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
         return timeSdf.format(newTimes-oldTimes);
     }
+
+    /**
+     * 获取现在日期字符串时间戳格式
+     *
+     * @return返回字符串格式 yyyyMMdd
+     */
+    public static String getDateNowShortNumber() {
+        Date currentTime = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN_NUM);
+        String dateString = formatter.format(currentTime);
+        return dateString;
+    }
 }

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

@@ -88,4 +88,5 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     void updatelistByParentId(String codex, String code);
     
+    List< Map<String,String>>   getPersonSimpleDetail();
 }

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

@@ -633,5 +633,30 @@ GROUP BY
 
     </update>
 
-
+  <select id ='getPersonSimpleDetail' resultType='Map'>
+  SELECT
+	person.biz_org_name as name,
+	cdf.field_value as phone
+FROM
+	(
+		SELECT
+			sequence_nbr,
+			biz_org_name
+		FROM
+			cb_org_usr
+		WHERE
+			biz_org_type = 'PERSON'
+		AND is_delete = 0
+	) person
+LEFT JOIN (
+	SELECT
+		field_value,
+		instance_id
+	FROM
+		cb_dynamic_form_instance
+	WHERE
+		group_code = '246'
+	AND field_code = 'telephone'
+) cdf ON person.sequence_nbr = cdf.instance_id
+  </select>
 </mapper>

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

@@ -42,6 +42,9 @@ public class AlertSubmittedSMSDto {
     @ApiModelProperty(value = "报送内容")
     private String submissionContent;
 
+    @ApiModelProperty(value = "报送内容-自定义")
+    private String submissionContentValue;
+
     @ApiModelProperty(value = "报送模板")
     private String submissionTemplate;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/RescueStationMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.tzs.api.dto.RescueStationDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,4 +22,6 @@ public interface RescueStationMapper extends BaseMapper<RescueStation> {
      * @return
      */
     List<RescueStationDto> getListByLatLonDistance(String lat, String lon, Integer distance);
+
+    List<RescueStationDto> selectExportData(@Param("ids") List<String> ids);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IRescueStationService.java

@@ -23,4 +23,5 @@ public interface IRescueStationService extends IService<RescueStation> {
      */
     List<RescueStationDto> getListByLatLonDistance(String lat, String lon, Integer distance);
 
+    List<RescueStationDto> selectExportData(String exportId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/RescueStationMapper.xml

@@ -44,4 +44,18 @@
 
 
  </select>
+
+
+	<select id="selectExportData" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.RescueStationDto">
+		select t.*
+		from tcb_rescue_station t where t.is_delete = 0
+		<if test="ids != null and ids.size() > 0">
+			and t.sequence_nbr in
+			<foreach item="item" collection="ids" separator="," open="(" close=")" index="">  #{item}
+			</foreach>
+
+		</if>
+
+ </select>
+
 </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/FirefightersServiceImpl.java

@@ -77,10 +77,12 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 			firefighter.setNativePlaceValue(nativePlace.getResult().getRegionName());
 		}
 		save(firefighter);
+		if(firefighters.getFirefightersContacts() != null){
 			FirefightersContacts firefightersContact = firefighters.getFirefightersContacts();
 			firefightersContact.setFirefightersId(firefighter.getSequenceNbr());
 			firefightersContactsService.save(firefightersContact);
 			firefighters.setFirefightersContacts(firefightersContact);
+		}
 		firefighters.setFirefighters(firefighter);
 	}
 

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -43,33 +72,6 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.component.emq.EmqKeeper;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import javax.annotation.Resource;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 机构/部门/人员表 服务实现类
@@ -499,7 +501,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		orgUsr.setRecUserName(user.getRealName());
 		orgUsr.setRecUserId(user.getUserId());
 		OrgUsrDto orgUsrDto = new OrgUsrDto();
-		BeanUtils.copyProperties(orgUsr,orgUsrDto);
+		BeanUtils.copyProperties(orgUsr, orgUsrDto);
 		// 单位新增情况
 		OrgUsrDto model = createWithModel(orgUsrDto);
 		// save(orgUsr);
@@ -1243,11 +1245,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	public List<OrgUsrExcelDto> exportToExcel(Map par) {
-		String parentId = par.containsKey("parentId")?par.get("parentId").toString():null;
-		String bizOrgName = par.containsKey("bizOrgName")?par.get("bizOrgName").toString():null;
-		String internalPositionCode = par.containsKey("internalPositionCode")?par.get("internalPositionCode").toString():null;
-		String positionType= par.containsKey("positionType")?par.get("positionType").toString():null;
-		return orgUsrMapper.exportToExcel(parentId,bizOrgName,internalPositionCode,positionType);
+		String parentId = par.containsKey("parentId") ? par.get("parentId").toString() : null;
+		String bizOrgName = par.containsKey("bizOrgName") ? par.get("bizOrgName").toString() : null;
+		String internalPositionCode = par.containsKey("internalPositionCode")
+				? par.get("internalPositionCode").toString()
+				: null;
+		String positionType = par.containsKey("positionType") ? par.get("positionType").toString() : null;
+		return orgUsrMapper.exportToExcel(parentId, bizOrgName, internalPositionCode, positionType);
 	}
 
 	@Override
@@ -1594,6 +1598,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
 		return this.baseMapper.selectList(wrapper);
 	}
+
 	/**
 	 * 查询组织机构下面的人员信息
 	 *
@@ -1715,7 +1720,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 					break;
 				}
 			}
-			if (!map.containsKey("postType") || map.get("postType") == null || StringUtils.isBlank(map.get("postType").toString())) {
+			if (!map.containsKey("postType") || map.get("postType") == null
+					|| StringUtils.isBlank(map.get("postType").toString())) {
 				continue;
 			}
 			map.put("userName", orgUsr.getBizOrgName());
@@ -1749,13 +1755,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Override
 	public List<OrgUsr> selectCompanyUsers(Long orgUnitId) {
 		OrgUsr orgUsr = this.getById(orgUnitId);
-		if(null == orgUnitId) {
+		if (null == orgUnitId) {
 			return null;
 		}
 		LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper();
-		queryWrapper.like(OrgUsr::getBizOrgCode,orgUsr.getBizOrgCode());
-		queryWrapper.eq(OrgUsr::getBizOrgType,CommonConstant.BIZ_ORG_TYPE_PERSON);
-		queryWrapper.eq(OrgUsr::getIsDelete,false);
+		queryWrapper.like(OrgUsr::getBizOrgCode, orgUsr.getBizOrgCode());
+		queryWrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_PERSON);
+		queryWrapper.eq(OrgUsr::getIsDelete, false);
 		List<OrgUsr> list = this.list(queryWrapper);
 		return list;
 	}
@@ -1764,7 +1770,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	public OrgUsr selectByAmosOrgId(Long id) {
 
 		QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("amos_org_id",id);
+		queryWrapper.eq("amos_org_id", id);
 		OrgUsr orgUsr = orgUsrMapper.selectOne(queryWrapper);
 
 		return orgUsr;
@@ -1772,8 +1778,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	public AgencyUserModel getAmosIdByOrgUserId(String orgUserId) throws Exception {
-        OrgUsr orgUsr = this.baseMapper.selectOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getSequenceNbr,
-                orgUserId));
+		OrgUsr orgUsr = this.baseMapper
+				.selectOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getSequenceNbr, orgUserId));
 		if (ValidationUtil.isEmpty(orgUsr)) {
 			throw new Exception("账号不存在");
 		}
@@ -1790,13 +1796,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			throw new Exception("账号不存在");
 		}
 		List<String> orgUserIdList = Lists.newArrayList(orgUserIds.split(","));
-		List<OrgUsr> orgUsrList = this.baseMapper.selectList(new LambdaQueryWrapper<OrgUsr>().in(OrgUsr::getSequenceNbr,
-				orgUserIdList));
+		List<OrgUsr> orgUsrList = this.baseMapper
+				.selectList(new LambdaQueryWrapper<OrgUsr>().in(OrgUsr::getSequenceNbr, orgUserIdList));
 		if (ValidationUtil.isEmpty(orgUsrList)) {
 			throw new Exception("账号不存在");
 		}
-		List<AgencyUserModel> amosUserList =
-				Privilege.agencyUserClient.queryByIds(Joiner.on(",").join(orgUsrList.stream().map(OrgUsr::getAmosOrgId).collect(Collectors.toList())), false).getResult();
+		List<AgencyUserModel> amosUserList = Privilege.agencyUserClient.queryByIds(
+				Joiner.on(",").join(orgUsrList.stream().map(OrgUsr::getAmosOrgId).collect(Collectors.toList())), false)
+				.getResult();
 		if (ValidationUtil.isEmpty(amosUserList)) {
 			throw new Exception("账号不存在");
 		}
@@ -1807,7 +1814,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Override
 	public List<OrgUsrFormDto> getUnSyncOrgCompanyList(List<Long> companyIdList) {
 		LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.notIn(OrgUsr::getSequenceNbr, companyIdList).eq(OrgUsr::getIsDelete, false).eq(OrgUsr::getBizOrgType, "COMPANY");
+		queryWrapper.notIn(OrgUsr::getSequenceNbr, companyIdList).eq(OrgUsr::getIsDelete, false)
+				.eq(OrgUsr::getBizOrgType, "COMPANY");
 		List<OrgUsr> unSyncCompanyList = this.baseMapper.selectList(queryWrapper);
 		List<OrgUsrFormDto> allUnSyncCompanyList = Lists.newArrayList();
 		if (!ValidationUtil.isEmpty(unSyncCompanyList)) {
@@ -1823,11 +1831,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return allUnSyncCompanyList;
 	}
 
-	
-	public OrgUsr  getDetailById(	Long id){
+	public OrgUsr getDetailById(Long id) {
 		LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<OrgUsr>();
 		queryWrapper.eq(OrgUsr::getIsDelete, false);
 		queryWrapper.eq(OrgUsr::getSequenceNbr, id);
 		return this.baseMapper.selectOne(queryWrapper);
 	}
+
+	public List<Map<String, String>> getPersonSimpleDetail() {
+		return orgUsrMapper.getPersonSimpleDetail();
+	}
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,12 +15,27 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedObjectServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.TemplateServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.ArrayList;
+import java.util.Arrays;
 
 
 /**
@@ -62,6 +64,9 @@ public class AlertSubmittedController extends BaseController {
     @Autowired
     PowerTransferServiceImpl powerTransferService;
 
+    @Autowired
+    AlertSubmittedObjectServiceImpl iAlertSubmittedObjectService;
+
     /**
      * 新增警情报送记录
      *
@@ -213,7 +218,16 @@ public class AlertSubmittedController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "获取融合调度短信内容", notes = "获取融合调度短信内容")
     public ResponseModel<AlertSubmittedSMSDto> getSchedulingContent(@PathVariable Long id) {
         // 获取报送内容
+        // 任务 4174  日常值班---融合调度----短信模版中的内容用户可以全部删除掉，按照自定义内容重新录入发送内容 by litw 2021年10月27日
         AlertSubmittedSMSDto schedulingContent = alertSubmittedService.getSchedulingContent(id);
+        if(!ValidationUtil.isEmpty(schedulingContent.getSubmissionContent())) {
+            try {
+                JSON.parseObject(schedulingContent.getSubmissionContent());
+            } catch (JSONException jsonException) {
+                schedulingContent.setSubmissionContentValue(schedulingContent.getSubmissionContent());
+                schedulingContent.setSubmissionTemplate("<p><span data-name=\"custom\"></span></p>");
+            }
+        }
         return ResponseHelper.buildResponse(schedulingContent);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -106,7 +106,7 @@ public class FirefightersController extends BaseController {
 	public ResponseModel<FirefightersInfoDto> saveFirefighters(@RequestBody FirefightersInfoDto firefighters) {
 		try {
 			/*3184 消防人员，编辑页面岗位选择子分类保存成功后，概要中岗位未修改 chenzhao start 2021-10-19*/
-			if (firefighters.getFirefighters().getJobTitleCode() != null){
+			if (firefighters.getFirefighters().getJobTitleCode() != null && !firefighters.getFirefighters().getJobTitleCode().equals("")){
 				DataDictionary gwmc = dataDictionaryService.getByCode(firefighters.getFirefighters().getJobTitleCode(), "GWMC");
 				firefighters.getFirefighters().setJobTitle(gwmc.getName());
 			}
@@ -114,7 +114,6 @@ public class FirefightersController extends BaseController {
 			iFirefightersService.saveFirefighters(firefighters);
 			return ResponseHelper.buildResponse(firefighters);
 		} catch (Exception e) {
-
 			throw new RuntimeException("系统异常");
 		}
 

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -11,7 +12,6 @@ import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
 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.entity.FirefightersPost;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
@@ -27,7 +27,11 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyZHDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.*;
+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.AlertSubmitted;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertBusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSchedulingTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSubmitTypeEnum;
@@ -37,7 +41,6 @@ import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
 import com.yeejoin.amos.boot.module.jcs.biz.rule.action.AlertCalledAction;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
 import org.apache.commons.lang3.ObjectUtils;
@@ -54,7 +57,16 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -133,12 +145,16 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             // 组装额外信息
             String _extraInfo = "报送给%s、%s";
             alertSubmittedExtDtoList.forEach(alertSubmittedExtDto -> {
+                try {
                     alertSubmittedExtDto.setExtraInfo(String.format(_extraInfo, alertSubmittedExtDto.getCompanyName(),
                             alertSubmittedExtDto.getUserName()));
                     TemplateExtendDto template = templateService.getByType(alertSubmittedExtDto.getBusinessTypeCode());
                     String richContent = template.getRichContent();
                     alertSubmittedExtDto.setSubmissionContentValue(JSONObject.parseObject(alertSubmittedExtDto.getSubmissionContent()));
                     alertSubmittedExtDto.setSubmissionContent(richContent);
+                } catch (JSONException e) {
+                    alertSubmittedExtDto.setSubmissionContentValue(alertSubmittedExtDto.getSubmitContent());
+                }
             });
             schedulingReportingDto.setSchedulingReportingList(alertSubmittedExtDtoList);
 
@@ -275,10 +291,19 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
 
             // 1.保存警情记录主表
             AlertSubmitted alertSubmitted = new AlertSubmitted();
+            String bussTypeCode;
             alertSubmitted.setAlertCalledId(alertSubmittedDto.getAlertCalledId());
+            // 任务 4174  日常值班---融合调度----短信模版中的内容用户可以全部删除掉，按照自定义内容重新录入发送内容 by litw 2021年10月27日
+            if("316".equals(alertSubmittedDto.getBusinessTypeCode())) {
+                alertSubmitted.setBusinessTypeCode(AlertBusinessTypeEnum.警情续报.getCode());
+                bussTypeCode = AlertBusinessTypeEnum.警情续报.getCode();
+            } else {
                 alertSubmitted.setBusinessTypeCode(alertSubmittedDto.getBusinessTypeCode());
+                bussTypeCode = alertSubmittedDto.getBusinessTypeCode();
+            }
+
             Optional<AlertBusinessTypeEnum> businessTypeEnum = EnumsUtils.getEnumObject(AlertBusinessTypeEnum.class,
-                    e -> e.getCode().equals(alertSubmittedDto.getBusinessTypeCode()));
+                    e -> e.getCode().equals(bussTypeCode));
             alertSubmitted.setBusinessType(businessTypeEnum.get().getName());
             alertSubmitted.setCallLogId(alertSubmittedDto.getCallLogId());
             alertSubmitted.setSubmissionMethodCode(alertSubmittedDto.getSubmissionMethodCode());
@@ -290,7 +315,16 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                             e -> e.getCode().equals(alertSubmittedDto.getSchedulingTypeCode()));
             alertSubmitted.setSchedulingTypeCode(alertSubmittedDto.getSchedulingTypeCode());
             alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
+
+            // 任务 4174  日常值班---融合调度----短信模版中的内容用户可以全部删除掉，按照自定义内容重新录入发送内容 by litw 2021年10月27日
+            if("316".equals(alertSubmittedDto.getBusinessTypeCode())) {
+                JSONObject jsonObject = JSON.parseObject(alertSubmittedDto.getSubmitContent().toJSONString());
+                alertSubmitted.setSubmissionContent(jsonObject.get("custom").toString());
+            } else {
+                alertSubmitted.setBusinessTypeCode(alertSubmittedDto.getBusinessTypeCode());
                 alertSubmitted.setSubmissionContent(alertSubmittedDto.getSubmitContent().toJSONString());
+            }
+
             alertSubmitted.setSender(userName);
             alertSubmitted.setRecUserName(userName);
             alertSubmitted.setUpdateTime(new Date());
@@ -372,9 +406,12 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         // 4.1组织短信内容
         HashMap<String, String> smsParams = new HashMap<>();
         JSONObject submitContent = alertSubmittedDto.getSubmitContent();
+        if(!"316".equals(alertSubmittedDto.getBusinessTypeCode())) {
             smsParams.put("alertType", submitContent.get("alertType").toString());
             smsParams.put("trappedNum", submitContent.get("trappedNum").toString());
             smsParams.put("companyName", submitContent.get("companyName").toString());
+        }
+
         // 4.2调用短信发送接口
         alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
         return finalAlertSubmittedId;

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-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TemplateExportController.java

@@ -3,12 +3,15 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ExportDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TemplateExport;
 import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
+import com.yeejoin.amos.boot.module.tzs.api.service.IRescueStationService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
 import org.apache.commons.lang3.StringUtils;
@@ -17,7 +20,11 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TemplateExportServiceImpl;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -56,6 +63,9 @@ public class TemplateExportController extends BaseController {
 	@Autowired
 	ElevatorServiceImpl elevatorServiceImpl;
 
+	@Autowired
+	IRescueStationService iRescueStationService;
+
     /**
      * 新增模板表
      *
@@ -72,7 +82,7 @@ public class TemplateExportController extends BaseController {
 			throw new BadRequest("参数校验失败.");
 		}
 		// 判断 同一类型模板名称不能重复
-		TemplateExport temp = templateExportServiceImpl.getOne(new LambdaQueryWrapper<TemplateExport>().eq(TemplateExport::getTemplateType,model.getTemplateType()).eq(TemplateExport::getTemplateName,model.getTemplateName()));
+		TemplateExport temp = templateExportServiceImpl.getOne(new LambdaQueryWrapper<TemplateExport>().eq(TemplateExport::getIsDelete,0).eq(TemplateExport::getTemplateType,model.getTemplateType()).eq(TemplateExport::getTemplateName,model.getTemplateName()));
 		if(temp != null) {
 			throw new BadRequest("模板名称已存在.");
 		}
@@ -99,7 +109,8 @@ public class TemplateExportController extends BaseController {
 		if(StringUtils.isNotBlank(model.getTemplateName())) {
 			TemplateExport temp = templateExportServiceImpl.getOne(new LambdaQueryWrapper<TemplateExport>().eq(TemplateExport::getTemplateType,model.getTemplateType()).
 					eq(TemplateExport::getTemplateName,model.getTemplateName()).
-					ne(TemplateExport::getSequenceNbr,sequenceNbr));
+					ne(TemplateExport::getSequenceNbr,sequenceNbr).
+					eq(TemplateExport::getIsDelete,0));
 			if(temp != null) {
 				throw new BadRequest("模板名称已存在.");
 			}
@@ -119,7 +130,14 @@ public class TemplateExportController extends BaseController {
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除模板", notes = "根据sequenceNbr删除模板")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
     	// 不可删除标准模板
-        return ResponseHelper.buildResponse(templateExportServiceImpl.removeById(sequenceNbr));
+		TemplateExport temp = templateExportServiceImpl.getOne(new LambdaQueryWrapper<TemplateExport>().
+				eq(TemplateExport::getSequenceNbr,sequenceNbr));
+		if(temp.getIsStandard() == true) {
+			throw new BadRequest("不可删除标准模板.");
+		}
+
+
+        return ResponseHelper.buildResponse(templateExportServiceImpl.update(new LambdaUpdateWrapper<TemplateExport>().set(TemplateExport::getIsDelete,true).eq(TemplateExport::getSequenceNbr,sequenceNbr)));
     }
 
 
@@ -131,16 +149,30 @@ public class TemplateExportController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "模板表列表全部数据查询",   notes = "模板表列表全部数据查询")
 	@GetMapping(value = "/list/{type}")
-	public ResponseModel<List<TemplateExport>> selectForList(@PathVariable String type) {
+	public ResponseModel<Map<String, Object>> selectForList(@PathVariable String type) {
+		Map<String, Object> result = new HashMap<>();
 		List<TemplateExport> list = templateExportServiceImpl.list(new LambdaQueryWrapper<TemplateExport>().eq(TemplateExport::getIsDelete,0).eq(TemplateExport::getTemplateType,type).orderByDesc(TemplateExport::getIsStandard));
-	    return ResponseHelper.buildResponse(list);
+		result.put("list",list);
+		String fileName = null;
+		if("ELEVATOR".equals(type)) { // 查询电梯数据
+			fileName = "电梯信息";
+		} else if("MAINTENANCE_COMPANY".equals(type)) { // 查询维保单位数据
+			fileName = "维保单位";
+		} else if("USE_UNIT".equals(type)) { // 查询使用单位数据
+			fileName = "使用单位";
+		} else if("RESCUE_STATION".equals(type)) { // 查询救援站数据
+			fileName = "救援站";
+		}
+		fileName += DateUtils.getDateNowShortNumber();
+		result.put("fileName",fileName);
+	    return ResponseHelper.buildResponse(result);
 	}
 
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@ApiOperation(httpMethod = "POST", value = "根据模板导出", notes = "根据模板导出")
-	@PostMapping("/exportBytemolate")
-	public void testExport(@RequestBody ExportDto exportDto, HttpServletResponse response) {
+	@ApiOperation(httpMethod = "POST", value = "根据字段类型导出", notes = "根据字段类型导出")
+	@PostMapping("/exportByTypeParams")
+	public void exportByTypeParams(@RequestBody ExportDto exportDto, HttpServletResponse response) {
 		if (ValidationUtil.isEmpty(exportDto.getExportArray())
 				|| ValidationUtil.isEmpty(exportDto.getDataType())
 				|| ValidationUtil.isEmpty(exportDto.getFileName())
@@ -154,8 +186,9 @@ public class TemplateExportController extends BaseController {
 			if(ValidationUtil.isEmpty(exportDto.getExportId())) {
 				throw new BadRequest("未选择需要导出的数据.");
 			}
+		} else {
+			exportDto.setExportId("");
 		}
-		System.out.println(exportDto.getExportArray());
 		JSONArray jsonArray = JSONArray.parseArray(exportDto.getExportArray());
 		List<List<String>> heads = Lists.newArrayList();
 		List<String> headstr = Lists.newArrayList();
@@ -177,6 +210,9 @@ public class TemplateExportController extends BaseController {
 		} else if("USE_UNIT".equals(exportDto.getExportType())) { // 查询使用单位数据
 			sheetName = "使用单位";
 			list = iUseUnitService.selectExportData(exportDto.getExportId());
+		} else if("RESCUE_STATION".equals(exportDto.getExportType())) { // 查询救援站数据
+			sheetName = "救援站";
+			list = iRescueStationService.selectExportData(exportDto.getExportId());
 		}
 		ExcelUtil.createTemplateWithHeaders(response, fileName, sheetName, list, ElevatorDto.class, null, false, heads, headstr, exportDto.getFileType());
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RescueStationServiceImpl.java

@@ -4,10 +4,12 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.RescueStationDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.RescueStationMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IRescueStationService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -26,4 +28,14 @@ public class RescueStationServiceImpl extends BaseService<RescueStationDto, Resc
     public List<RescueStationDto> getListByLatLonDistance(String lat, String lon, Integer distance) {
         return rescueStationMapper.getListByLatLonDistance(lat,lon,distance);
     }
+
+    @Override
+    public List<RescueStationDto> selectExportData(String exportId) {
+        List<String> ids = null;
+        if(StringUtils.isNotEmpty(exportId)) {
+            String[] idStr = exportId.split(",");
+            ids = Arrays.asList(idStr);
+        }
+        return baseMapper.selectExportData(ids);
+    }
 }

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

@@ -19,7 +19,6 @@ 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;
 
@@ -39,7 +38,6 @@ 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" })