Skip to content

A
amos-boot-biz
Commit 13284bdc authored by chenhao's avatar chenhao
Browse files
Options

提交力量调派任务发送

parent 592489d7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 403 additions and 71 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java
View file @ 13284bdc
......@@ -106,13 +106,39 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
@Param("endTime") String endTime
);
/**
* 值班表中 【值班排班】中特定部门的特定日期值班员；
* @param dutyDate
* @param departmentName eg：急救科、消救部
* @return
*/
List<Map<String, Object>> getDutyPersonByTeamIdAndCarId(
String carIdName,
String teamIdName,
String userIdName,
String dutyDate,
String groupCode,
String carId,
String teamId);
String departmentName);
/**
* 值班表中 【120急救排班】该急救站的当日值班员
* @param dutyDate
* @param firstAidId
* @return
*/
List<Map<String, Object>> getDutyPersonByTeamIdAndAirId(
String dutyDate,
String firstAidId);
/**
* 机场单位的人员中，部门 ”人员职务“ 不为空的人员，不包括下级部门的人员
* @param departmentName eg: 急救科、 消救部
* @param PositionType : eg 岗位为：支队长、副支队长、党支部副书记、支队长助理、指挥员、；
* @return
*/
List<Map<String, Object>> getFireRescueDepartmentStaff(String departmentName,List<String> positionType);
List<Map<String, Object>> getDutyFirePerson(String dutyDate,String groupCode);
Map<String, Object> getCurentCarIsUserPhone(long carId);
List<Map<String, Object>> getOrgPersonTelphone(List<Map<String, Object>> companyIds);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml
View file @ 13284bdc
......@@ -260,42 +260,315 @@
order by instanceId desc
</select>
<select id="getDutyPersonByTeamIdAndCarId" resultType="java.util.Map">
SELECT
userId
SELECT
cfir.telephone AS mobilePhone,
hh.userId AS userId,
cou.biz_org_name AS userName,
cou.amos_org_id AS amosId
FROM
(
SELECT
MAX(
userId,
instance_id
FROM
(
SELECT
MAX(
CASE
WHEN cbd.field_code = 'deptName' THEN
cbd.field_value
END
) AS deptName,
MAX(
CASE
WHEN cbd.field_code = 'userId' THEN
cbd.field_value
END
) AS userId,
cbd.instance_id
FROM
cb_dynamic_form_instance cbd
LEFT JOIN cb_duty_person_shift cps ON cbd.instance_id = cps.instance_id
WHERE
cps.duty_date = #{dutyDate}
AND cps.is_delete = FALSE
AND cbd.group_code = 'dutyPerson'
GROUP BY
cbd.instance_id
) ss
WHERE
ss.deptName = #{departmentName}
) hh
LEFT JOIN cb_org_usr cou ON hh.userId = cou.sequence_nbr
LEFT JOIN (
SELECT
MAX(
CASE
WHEN cfi.field_code = 'telephone' THEN
cfi.field_value
END
) AS telephone,
cfi.instance_id
FROM
cb_dynamic_form_instance cfi
) cfir ON cfir.instance_id = hh.userId
</select>
<select id="getDutyPersonByTeamIdAndAirId" resultType="java.util.Map">
SELECT
cfir.telephone AS mobilePhone,
hh.userId AS userId,
cou.biz_org_name AS userName,
cou.amos_org_id AS amosId
FROM
(
SELECT
userId
FROM
(
SELECT
MAX(
CASE
WHEN cbd.field_code = 'userId' THEN
cbd.field_value
END
) AS userId,
MAX(
CASE
WHEN cbd.field_code = 'firstAidId' THEN
cbd.field_value
END
) AS firstAidId,
cbd.instance_id
FROM
cb_dynamic_form_instance cbd
LEFT JOIN cb_duty_person_shift cps ON cbd.instance_id = cps.instance_id
WHERE
cps.duty_date = #{dutyDate}
AND cps.is_delete = FALSE
AND cbd.group_code = 'dutyFirstAid'
GROUP BY
cbd.instance_id
) ss
WHERE
ss.firstAidId = #{firstAidId}
) hh
LEFT JOIN cb_org_usr cou ON hh.userId = cou.sequence_nbr
LEFT JOIN (
SELECT
MAX(
CASE
WHEN cfi.field_code = 'telephone' THEN
cfi.field_value
END
) AS telephone,
cfi.instance_id
FROM
cb_dynamic_form_instance cfi
) cfir ON cfir.instance_id = hh.userId
</select>
<select id ="getFireRescueDepartmentStaff" resultType="java.util.Map">
SELECT
dd.telephone AS mobilePhone,
cour.sequence_nbr AS userId,
cour.biz_org_name AS userName,
cour.amos_org_id AS amosId
FROM
(
SELECT
Max(
CASE
WHEN cbd.field_code = #{carIdName} THEN
WHEN cbd.field_code = 'administrativePositionCode' THEN
cbd.field_value
END
) AS #{carIdName},
MAX(
) AS administrativePositionCode,
Max(
CASE
WHEN cbd.field_code = #{teamIdName} THEN
WHEN cbd.field_code = 'telephone' THEN
cbd.field_value
END
) AS #{teamIdName},
MAX(
) AS telephone,
Max(
CASE
WHEN cbd.field_code = #{userIdName} THEN
cbd.field_value
WHEN cbd.field_code = 'stateCode' THEN
cbd.field_value_label
END
) AS #{userIdName},
) AS stateCode,
cbd.instance_id
FROM
cb_dynamic_form_instance cbd
LEFT JOIN cb_duty_person_shift cps ON cbd.instance_id = cps.instance_id
WHERE
cps.duty_date = #{dutyDate}
AND cps.is_delete = FALSE
AND cbd.group_code = #{groupCode}
GROUP BY
cbd.instance_id IN (
SELECT
cou.sequence_nbr
FROM
cb_org_usr cou
WHERE
cou.parent_id = (
SELECT
sequence_nbr
FROM
cb_org_usr
WHERE
biz_org_name = #{departmentName}
)
AND cou.biz_org_type = 'PERSON'
) group by cbd.instance_id
) dd
LEFT JOIN cb_org_usr cour ON dd.instance_id = cour.sequence_nbr
WHERE
<if test="positionType == null ">
dd.administrativePositionCode IS NOT NULL
</if>
<if test="positionType != null">
dd.administrativePositionCode in
<foreach collection="positionType" item="item" separator="," open="(" close=")" index="">
#{item, jdbcType=NUMERIC}
</foreach>
</if>
</select>
<select id ="getDutyFirePerson" resultType="java.util.Map">
SELECT
dd.telephone AS mobilePhone
FROM
(
SELECT
Max(
CASE
WHEN cbd.field_code = 'telephone' THEN
cbd.field_value
END
) AS telephone,
cbd.instance_id
FROM
cb_dynamic_form_instance cbd
WHERE
cbd.instance_id IN (
SELECT
userId
FROM
(
SELECT
MAX(
CASE
WHEN cbd.field_code = 'deptId' THEN
cbd.field_value
END
) AS deptId,
MAX(
CASE
WHEN cbd.field_code = 'userId' THEN
cbd.field_value
END
) AS userId,
cbd.instance_id
FROM
cb_dynamic_form_instance cbd
LEFT JOIN cb_duty_person_shift cps ON cbd.instance_id = cps.instance_id
WHERE
cps.duty_date = #{dutyDate}
AND cps.is_delete = FALSE
AND cbd.group_code = #{groupCode}
GROUP BY
cbd.instance_id
) ss
WHERE
ss.deptId IN (
SELECT
sequence_nbr
FROM
cb_org_usr
WHERE
biz_org_name = '消防救援保障部'
AND biz_org_type = 'COMPANY'
)
)
) dd
</select>
<select id='getCurentCarIsUserPhone' resultType="java.util.Map">
SELECT
ss.telephone AS mobilePhone,
cou.sequence_nbr AS userId,
cou.biz_org_name AS userName,
cou.amos_org_id AS amosId
FROM
(
SELECT
field_value as telephone
,instance_id
FROM
cb_dynamic_form_instance
WHERE
group_code = '246'
AND instance_id = (
SELECT
sequence_nbr
FROM
cb_org_usr
WHERE
amos_org_id = (
SELECT
amos_user_id
FROM
jc_user_car
WHERE
car_id = #{carId}
)
) and field_code='telephone'
) ss
LEFT JOIN cb_org_usr cou ON ss.instance_id = cou.sequence_nbr
</select>
<select id='getOrgPersonTelphone' resultType="java.util.Map">
SELECT
dd.telephone AS mobilePhone
FROM
(
SELECT
Max(
CASE
WHEN cbd.field_code = 'administrativePositionCode' THEN
cbd.field_value_label
END
) AS administrativePositionCode,
Max(
CASE
WHEN cbd.field_code = 'telephone' THEN
cbd.field_value
END
) AS telephone,
Max(
CASE
WHEN cbd.field_code = 'stateCode' THEN
cbd.field_value_label
END
) AS stateCode,
cbd.instance_id
FROM
cb_dynamic_form_instance cbd
WHERE
cbd.instance_id IN (
SELECT
cou.sequence_nbr
FROM
cb_org_usr cou
WHERE
cou.parent_id in
<foreach item="item" collection="companyIds" separator="," open="(" close=")" index="">
#{item.departmentId, jdbcType=NUMERIC}
</foreach>
AND cou.biz_org_type = 'PERSON'
)group by cbd.instance_id
) dd
WHERE
ss.carId = #{carId}
AND ss.teamId = #{teamId}
dd.administrativePositionCode 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/dto/AlertCallePowerTransferRo.java
View file @ 13284bdc
package com.yeejoin.amos.boot.module.jcs.api.dto;
import java.io.Serializable;
import com.yeejoin.amos.component.rule.Label;
import com.yeejoin.amos.component.rule.RuleFact;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
*
* <pre>
......@@ -20,16 +20,12 @@ import java.util.List;
@Data
@RuleFact(value = "调派信息",project = "西咸机场119调派规则")
public class AlertCallePowerTransferRo implements Serializable{
/**
* <pre>
*
* </pre>
*/
private static final long serialVersionUID = 4735920511849348360L;
private static final long serialVersionUID = 9053208791780047768L;
/**
* 通用属性
......@@ -86,7 +82,7 @@ public class AlertCallePowerTransferRo implements Serializable{
private String contactPhone;
@ApiModelProperty(value = "调派单位资源列表")
private List< PowerTransferCompanyDto> company;
private String company;
@ApiModelProperty(value = "调派类型队伍")
private String powerTransType;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/AlertBusinessTypeEnum.java
View file @ 13284bdc
......@@ -23,6 +23,7 @@ public enum AlertBusinessTypeEnum {
警情初报("reportAlert", "297", "297","", "警情初报"),
警情续报("followReportAlert", "313", "313","SMS_JCS_0006", "警情续报"),
非警情确认("notAlert", "314", "314","SMS_JCS_0008", "非警情确认"),
力量调派("powerTransfer", "316", "316","SMS_JCS_DP", "力量调派"),
警情结案("endAlert", "315", "315","SMS_JCS_0009", "警情结案");
private String key;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/AlertStageEnums.java
View file @ 13284bdc
......@@ -28,7 +28,7 @@ public enum AlertStageEnums {
RG("226", "人工上报"),
DJ("228", "对讲呼入"),
JK("388", "监控中心报警"),
JK("388", "监控中心报警"),//也是监控大队
DH("389", "电话报警"),
......@@ -41,7 +41,18 @@ public enum AlertStageEnums {
ZZZD("116", "企（事）业单位专职消防救援支队"),
YWDD("117", "企（事）业单位义务消防救援大队"),
YLJY("830", "企（事）业单位医疗救援队（站）"),
JKDD("118", "企（事）业单位监控大队");
DD("DD", "所属大队"),
JJZ("JJZ", "急救站"),
ZD("ZD", "消防支队"),
XJ("XJ", "消救部"),
ZH("ZH", "应急指挥科"),
BD("BD", "调派车辆指定人"),
监控大队("JK","监控大队"),
onDuty("onDuty", "值班单位"),
fireBrigade("fireBrigade", "岗位名称，规则配置"),
airportUnit("airportUnit", "人员职务规则配置"),
flag("flag", "值班单位"),
JKDD("6", "企（事）业单位监控大队");
......
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
View file @ 13284bdc
......@@ -12,7 +12,6 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
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.Menu;
......@@ -146,7 +145,9 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
*/
public List<Map<String, Object>> getDetailByTeamIdAndJobTitle(Long teamId,List<String> jobTitleArray) {
LambdaQueryWrapper<Firefighters> wrapper = new LambdaQueryWrapper<Firefighters>();
wrapper.in(Firefighters::getJobTitle, jobTitleArray);
if(jobTitleArray!=null && jobTitleArray.size()>0) {
wrapper.in(Firefighters::getJobTitleCode, jobTitleArray);
}
wrapper.eq(Firefighters::getIsDelete, false);
wrapper.eq(Firefighters::getFireTeamId, teamId);
wrapper.select(Firefighters::getMobilePhone);
......
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
View file @ 13284bdc
......@@ -66,6 +66,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
import com.yeejoin.amos.boot.module.common.api.enums.UserRolesEnum;
import com.yeejoin.amos.boot.module.common.api.enums.UserUnitTypeEnum;
import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
......@@ -74,6 +75,8 @@ import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import ch.qos.logback.core.joran.conditional.IfAction;
/**
* 机构/部门/人员表 服务实现类
*
......@@ -112,6 +115,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
FireStationServiceImpl fireStationServiceImpl;
@Value("${jcs.company.topic.add}")
private String airportAddTopic;
@Autowired
DynamicFormInstanceMapper dynamicFormInstanceMapper;
public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
......@@ -1864,5 +1870,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
return orgUsrMapper.queryCompanyId(bizOrgName);
}
public List<Map<String,Object>> getuserDetail(Long departmentId,List<Map<String, Object>> resulLists){
OrgUsr resulList =this.baseMapper.selectById(departmentId);
if(resulList.getParentId()!=null) {
Map<String, Object> resultMap =new HashMap<String, Object>();
resultMap.put("departmentId", resulList.getSequenceNbr());
resulLists.add(resultMap);
return getuserDetail(Long.parseLong(resulList.getParentId()),resulLists);
}else {
return resulLists;
}
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/rule/action/PowerTransferAction.java
View file @ 13284bdc
......@@ -8,6 +8,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCallePowerTransferRo;
import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
import com.yeejoin.amos.component.rule.RuleActionBean;
import com.yeejoin.amos.component.rule.RuleMethod;
......@@ -44,14 +46,19 @@ public class PowerTransferAction {
* @param object 模板内容对象
* @throws Exception 异常
*/
@RuleMethod(methodLabel = "短信报送", project = "西咸机场119接处警规则")
@SuppressWarnings("rawtypes")
@RuleMethod(methodLabel = "短信报送", project = "西咸机场119接处警规则")
public void sendcmd(String smsCode, String sendType, List sendIds, Object object) throws Exception {
// alertSubmittedService.ruleCallbackAction(smsCode, sendIds, object);
System.out.println("8796w39879873298798");
if (object instanceof AlertCallePowerTransferRo) {
AlertCallePowerTransferRo calledRo = (AlertCallePowerTransferRo) object;
calledRo.getPowerTransType();
if (FireBrigadeTypeEnum.专职消防队.getKey().equals(calledRo.getPowerTransType())) {
alertSubmittedService.ruleCallbackActionForPowerTransferForCar(smsCode, sendIds, object);//消防车辆
} else if (FireBrigadeTypeEnum.医疗救援队.getKey().equals(calledRo.getPowerTransType())) {
alertSubmittedService.ruleCallbackActionForPowerTransferForAid(smsCode, sendIds, object);//120急救站
} else if (FireBrigadeTypeEnum.监控大队.getKey().equals(calledRo.getPowerTransType())) {
alertSubmittedService.ruleCallbackActionForPowerTransferForSurvBrigade(smsCode, sendIds, object);//监控大队
}
}
}
}
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
View file @ 13284bdc
......@@ -438,4 +438,5 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
// queryWrapper.eq(FireTeam::getCompany, companyId);
return this.baseMapper.selectList(queryWrapper);
}
}
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
View file @ 13284bdc
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
......@@ -143,22 +142,22 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
powerTransfer.setDispatchNum(dispatch_num);
powerTransfer.setSequenceNbr(null);
save(powerTransfer);
Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
// 获取任务派发模板
Template template = templateService.getOne(new QueryWrapper<Template>().eq("type",
alertCalled.getAlertType()).eq("format", false));
String content = template.getContent();
Map<String, String> definitions = new HashMap<>();
initDefinitions(definitions, alertCalled, powerTransferDto);
// save(powerTransfer);
// Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
//
// // 获取任务派发模板
// Template template = templateService.getOne(new QueryWrapper<Template>().eq("type",
// alertCalled.getAlertType()).eq("format", false));
// String content = template.getContent();
// Map<String, String> definitions = new HashMap<>();
// initDefinitions(definitions, alertCalled, powerTransferDto);
// 创建力量调派单位
createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content);
// createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content);
//封装调派任务的集合，以便于实现任务规则校验
try {
//packagePowerTransferDetail(powerTransferDto);
packagePowerTransferDetail(powerTransferDto);
} catch (Exception e) {
log.error("调用规则失败：PowerTransferServiceImpl。createPowerTransfer（）");
}
......@@ -191,8 +190,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
}
}
//ruleAlertCalledService.powerTransferCalledRule(fullTimeList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.专职消防队.getKey());
//ruleAlertCalledService.powerTransferCalledRule(medicalTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.医疗救援队.getKey());
ruleAlertCalledService.powerTransferCalledRule(monitorTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.监控大队.getKey());
ruleAlertCalledService.powerTransferCalledRule(medicalTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.医疗救援队.getKey());
//ruleAlertCalledService.powerTransferCalledRule(monitorTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.监控大队.getKey());
}
@Override
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/RuleAlertCalledService.java
View file @ 13284bdc
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import com.yeejoin.amos.boot.module.jcs.api.enums.AlertBusinessTypeEnum;
import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import com.alibaba.fastjson.JSONArray;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCallePowerTransferRo;
......@@ -20,6 +18,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
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.enums.AlertStageEnums;
import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
import com.yeejoin.amos.component.rule.RuleTrigger;
......@@ -236,13 +235,15 @@ public class RuleAlertCalledService {
AlertCalledFormDto alertCalledFormDto = (AlertCalledFormDto) alertCalledServiceImpl
.selectAlertCalledByIdNoRedis(alertCalledId);
alertCallePowerTransferRo.setAlertSubmittedId(Long.toString(alertCalledId));
if (alertCalledFormDto == null) {
return false;
}
AlertCalled alertCalled = alertCalledFormDto.getAlertCalled();
alertCallePowerTransferRo
.setCallTimeStr(DateUtils.convertDateToString(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
alertCallePowerTransferRo.setSequenceNbr(String.valueOf(alertCalled.getSequenceNbr()));
alertCallePowerTransferRo.setAddress(alertCalled.getAddress());
alertCallePowerTransferRo.setAlertType(alertCalled.getAlertType());
alertCallePowerTransferRo.setAlertTypeCode(alertCalled.getAlertTypeCode());
......@@ -258,9 +259,6 @@ public class RuleAlertCalledService {
List<FormValue> alertFormValues = alertCalledFormDto.getDynamicFormAlert();
if (!ValidationUtil.isEmpty(alertFormValues)) {
for (FormValue alertFormValue : alertFormValues) {
if (alertFormValue.getKey().equals("alertSubmittedId")) {
alertCallePowerTransferRo.setAlertSubmittedId(alertFormValue.getValue());
}
// 一般火灾
if (alertFormValue.getKey().equals("fireLocation")) {
alertCallePowerTransferRo.setFireLocation(alertFormValue.getValue());
......@@ -292,7 +290,7 @@ public class RuleAlertCalledService {
}
}
if (FireBrigadeTypeEnum.专职消防队.getKey().equals(type)) {
alertCallePowerTransferRo.setCompany(new ArrayList<>(i));
alertCallePowerTransferRo.setCompany(JSONArray.toJSONString(i));
alertCallePowerTransferRo.setPowerTransType(type);
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append(" 失火位置："+alertCallePowerTransferRo.getFireLocation());
......@@ -302,7 +300,7 @@ public class RuleAlertCalledService {
alertCallePowerTransferRo.setContent(stringBuffer.toString());
} else if (FireBrigadeTypeEnum.监控大队.getKey().equals(type)) {
alertCallePowerTransferRo.setCompany(new ArrayList<>(i));
alertCallePowerTransferRo.setCompany(JSONArray.toJSONString(i));
alertCallePowerTransferRo.setPowerTransType(type);
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append(" 失火位置："+alertCallePowerTransferRo.getFireLocation());
......@@ -312,7 +310,7 @@ public class RuleAlertCalledService {
alertCallePowerTransferRo.setContent(stringBuffer.toString());
} else if (FireBrigadeTypeEnum.医疗救援队.getKey().equals(type)) {
alertCallePowerTransferRo.setCompany(new ArrayList<>(i));
alertCallePowerTransferRo.setCompany(JSONArray.toJSONString(i));
alertCallePowerTransferRo.setPowerTransType(type);
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append(" 患者现状："+ageGroup==null?"无":ageGroup);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment