Skip to content

A
amos-boot-biz
Commit c1c6c875 authored by chenzhao's avatar chenzhao
Browse files
Options

Merge branch 'develop_dl_plan6_temp_merge_colony' of…

Merge branch 'develop_dl_plan6_temp_merge_colony' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6_temp_merge_colony # Conflicts: # 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
parents ca572120 5dac69b8
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 51 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 @ c1c6c875
......@@ -128,7 +128,8 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
List<Map<String, Object>> getDutyPersonByTeamIdAndCarIdone(
String dutyDate,
String departmentName);
String departmentName,
String type);
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java
View file @ c1c6c875
......@@ -36,7 +36,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
String state, String areasExpertise, String jobTitle, String bizOrgCode);
List<FirefightersDto> queryById(@Param("gw") String[] gw, @Param("name") String name);
List<FirefightersDto> queryByIdone(@Param("gw") String[] gw, @Param("name") String name);
List<FirefightersDto> queryByIdone(@Param("gw") String[] gw, @Param("name") String name, @Param("type") String type);
List<Map<String, String>> selectNormalFirePerson(String jobId);
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml
View file @ c1c6c875
......@@ -421,7 +421,16 @@ FROM
cbd.instance_id
) ss
WHERE
ss.userId in ( select cb_firefighters.org_usr_id FROM cb_firefighters where cb_firefighters.fire_team_id=#{departmentName}
ss.userId in ( select cb_firefighters.org_usr_id FROM cb_firefighters
LEFT JOIN cb_fire_team f on cb_firefighters.fire_team_id =f.sequence_nbr
where cb_firefighters.fire_team_id=#{departmentName}
<if test="type != null">
and f.name !='消防支队'
</if>
and cb_firefighters.org_usr_id is not null )
) hh
LEFT JOIN cb_org_usr cou ON hh.userId = cou.sequence_nbr
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml
View file @ c1c6c875
......@@ -241,8 +241,14 @@
amos_user_id amosUserId
FROM
(select * from cb_firefighters fr where is_delete = 0) firefighters
LEFT JOIN cb_fire_team f on fire_team_id =f.sequence_nbr
WHERE
fire_team_id =#{name}
fire_team_id =#{name}
<if test="type != null">
and f.name !='消防支队'
</if>
<if test="gw != null">
And job_title_code In
<foreach item="item" collection="gw" index="index" open="(" separator="," close=")">
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledRo.java
View file @ c1c6c875
package com.yeejoin.amos.boot.module.jcs.api.dto;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
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.Date;
/**
*
* <pre>
......@@ -165,6 +170,16 @@ public class AlertCalledRo implements Serializable{
@Label(value = "类型")
private Integer category;
//新加新字段
@Label(value = "创建人")
protected String recUserName;
@Label(value = "更新时间")
private Date updateTime;
@Label(value = "接警时间")
private Date callTime;
//
// /**
// * 其他
......
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 @ c1c6c875
......@@ -192,10 +192,10 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
}
public List<FirefightersDto> queryByIdone(String[] gw,String name){
public List<FirefightersDto> queryByIdone(String[] gw,String name, String type){
return firefightersMapper.queryByIdone(gw,name);
return firefightersMapper.queryByIdone(gw,name,type);
}
/**
* 获取指定岗位名称下的队伍人员电话号码信息
......
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
View file @ c1c6c875
......@@ -383,7 +383,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
*/
public void ruleCallbackAction(String smsCode, List<Map<String,Object>> sendIds, Object object) throws Exception {
Thread.sleep(1000);
// Thread.sleep(1000);
log.info("规则回调参数"+object.toString());
......@@ -398,7 +398,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
List<Map<String, Object>> orgUsersqc = new LinkedList<>();
String sCode = "";
String alertWay = "";
AlertCalled alertCalled = null;
// AlertCalled alertCalled = null;
List<String> usIds = new ArrayList<>();
if (object instanceof AlertCalledRo) {
AlertCalledRo calledRo = (AlertCalledRo) object;
......@@ -430,9 +431,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
log.info("calledRo.getSequenceNbr()"+calledRo.getSequenceNbr());
log.info("alertCalledObjsDtoid"+Long.valueOf(calledRo.getSequenceNbr()));
AlertCalledObjsDto alertCalledObjsDto = alertCalledService.selectAlertCalledByIdNoRedisNew(Long.valueOf(calledRo.getSequenceNbr()));
log.info("alertCalledObjsDto"+alertCalledObjsDto);
alertCalled = alertCalledObjsDto.getAlertCalled();
// AlertCalledObjsDto alertCalledObjsDto = alertCalledService.selectAlertCalledByIdNoRedisNew(Long.valueOf(calledRo.getSequenceNbr()));
// log.info("alertCalledObjsDto"+alertCalledObjsDto);
// alertCalled = alertCalledObjsDto.getAlertCalled();
// AlertCalledRo tempCalledRo = new AlertCalledRo();
// RuleAlertCalledService.init(tempCalledRo,alertCalledObjsDto);
......@@ -554,7 +555,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
alertSubmitted.setSchedulingTypeCode(alertSchedulingTypeEnum.get().getCode());
alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
alertSubmitted.setSubmissionContent(JSONObject.toJSONString(objectToMap(calledRo)));
alertSubmitted.setSender(alertCalled.getRecUserName());
// alertSubmitted.setSender(alertCalled.getRecUserName());
alertSubmitted.setSender(calledRo.getRecUserName());
alertSubmitted.setUpdateTime(new Date());
alertSubmitted.setSubmissionTime(new Date());
......@@ -621,54 +624,71 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
smsParams.put("callTimeStr", calledRo.getCallTimeStr());
smsParams.put("address", calledRo.getAddress());
smsParams.put("fireLocation", calledRo.getFireLocation());
log.info("alertCalled888888"+alertCalled);
smsParams.put("endTimeStr", alertCalled.getUpdateTime()!=null ? DateUtils.convertDateToString(alertCalled.getUpdateTime(),DateUtils.DATE_TIME_PATTERN) : "");
// smsParams.put("endTimeStr", alertCalled.getUpdateTime()!=null ? DateUtils.convertDateToString(alertCalled.getUpdateTime(),DateUtils.DATE_TIME_PATTERN) : "");
smsParams.put("endTimeStr", calledRo.getUpdateTime()!=null ? DateUtils.convertDateToString(calledRo.getUpdateTime(),DateUtils.DATE_TIME_PATTERN) : "");
smsParams.put("burningMaterial", calledRo.getBurningMaterial());
smsParams.put("fireSituation", calledRo.getFireSituation());
smsParams.put("trappedNum", calledRo.getTrappedNum());
smsParams.put("casualtiesNum", calledRo.getCasualtiesNum());
smsParams.put("dangerousExplosives", calledRo.getDangerousExplosives());
smsParams.put("companyName", calledRo.getCompanyName());
smsParams.put("contactUser", alertCalled.getContactUser());
smsParams.put("contactPhone", alertCalled.getContactPhone());
// smsParams.put("contactUser", alertCalled.getContactUser());
// smsParams.put("contactPhone", alertCalled.getContactPhone());
smsParams.put("contactUser", calledRo.getContactUser());
smsParams.put("contactPhone", calledRo.getContactPhone());
smsParams.put("replaceContent", calledRo.getReplaceContent());
smsParams.put("alertType", calledRo.getAlertType());
smsParams.put("feedback", calledRo.getFeedback());
}
// 短信报送对象
alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
// 发送任务消息
// 组织短信内容
// 调用短信发送接口
Map<String,String> besidesMap = new HashMap<>();
besidesMap.put("alterId",String.valueOf(alertCalled.getSequenceNbr()));
if(alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode())) {
alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
besidesMap.put("sendTime", DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情初报.getCode(),besidesMap,smsParams,usIds, null);
} else {
if(alertWay.equals(AlertBusinessTypeEnum.警情续报.getCode())) {
besidesMap.put("sendTime", DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情续报.getCode(),besidesMap,smsParams,usIds, null);
}
if(alertWay.equals(AlertBusinessTypeEnum.警情结案.getCode())) {
besidesMap.put("startTime", DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
besidesMap.put("endTime", DateUtils.dateFormat(alertCalled.getUpdateTime(), DateUtils.DATE_TIME_PATTERN));
pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情结案.getCode(),besidesMap,smsParams,usIds, null);
}
if(alertWay.equals(AlertBusinessTypeEnum.非警情确认.getCode())) {
pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.非警情确认.getCode(),besidesMap,smsParams,usIds, null);
// 短信报送对象
alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
// 发送任务消息
// 组织短信内容
// 调用短信发送接口
Map<String,String> besidesMap = new HashMap<>();
//besidesMap.put("alterId",String.valueOf(alertCalled.getSequenceNbr()));
besidesMap.put("alterId",String.valueOf(calledRo.getSequenceNbr()));
if(alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode())) {
alertCalledAction.sendAlertCalleCmd(smsCode, mobiles, smsParams);
// besidesMap.put("sendTime", DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
besidesMap.put("sendTime", DateUtils.dateFormat(calledRo.getCallTime(), DateUtils.DATE_TIME_PATTERN));
pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情初报.getCode(),besidesMap,smsParams,usIds, null);
} else {
if(alertWay.equals(AlertBusinessTypeEnum.警情续报.getCode())) {
// besidesMap.put("sendTime", DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
besidesMap.put("sendTime", DateUtils.dateFormat(calledRo.getCallTime(), DateUtils.DATE_TIME_PATTERN));
pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情续报.getCode(),besidesMap,smsParams,usIds, null);
}
if(alertWay.equals(AlertBusinessTypeEnum.警情结案.getCode())) {
// besidesMap.put("startTime", DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
// besidesMap.put("endTime", DateUtils.dateFormat(alertCalled.getRecDate(), DateUtils.DATE_TIME_PATTERN));
besidesMap.put("startTime", DateUtils.dateFormat(calledRo.getCallTime(), DateUtils.DATE_TIME_PATTERN));
besidesMap.put("endTime", DateUtils.dateFormat(calledRo.getUpdateTime(), DateUtils.DATE_TIME_PATTERN));
pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情结案.getCode(),besidesMap,smsParams,usIds, null);
}
if(alertWay.equals(AlertBusinessTypeEnum.非警情确认.getCode())) {
pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.非警情确认.getCode(),besidesMap,smsParams,usIds, null);
}
alertCalledAction.sendAlertCalleCmd(sCode, mobiles, smsParams);
}
alertCalledAction.sendAlertCalleCmd(sCode, mobiles, smsParams);
}
emqKeeper.getMqttClient().publish(topic, alertCalledId.getBytes(), RuleConfig.DEFAULT_QOS, false);
}
emqKeeper.getMqttClient().publish(topic, alertCalledId.getBytes(), RuleConfig.DEFAULT_QOS, false);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException();
......@@ -1677,7 +1697,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
if (jsonObject1.containsKey("fireBrigade")) {
//List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getFireRescueDepartmentStaff(one.getBizOrgName(),positionType);
List<FirefightersDto> fireBrigade = firefightersService.queryByIdone(groupCode, fireTeam.getSequenceNbr().toString());
List<FirefightersDto> fireBrigade = firefightersService.queryByIdone(groupCode, fireTeam.getSequenceNbr().toString(),"1");
fireBrigade.stream().forEach(f-> {
HashMap<String, Object> map = new HashMap<>();
map.put("mobilePhone", f.getMobilePhone());
......@@ -1690,7 +1710,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
}
//所在大队值班当日值班员；
if(jsonObject1.containsKey("onDuty")) {
List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarIdone(DateUtils.getDateNowShortStr(), fireTeam.getSequenceNbr().toString());
List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarIdone(DateUtils.getDateNowShortStr(), fireTeam.getSequenceNbr().toString(),"1");
sendUserIds.addAll(mapList);
}
//支队
......@@ -1707,7 +1727,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
List<FirefightersDto> fireBrigade = firefightersService.queryByIdone(groupCode, fireTeaml.getSequenceNbr().toString());
List<FirefightersDto> fireBrigade = firefightersService.queryByIdone(groupCode, fireTeaml.getSequenceNbr().toString(),null);
fireBrigade.stream().forEach(f-> {
HashMap<String, Object> map = new HashMap<>();
map.put("mobilePhone", f.getMobilePhone());
......@@ -1722,7 +1742,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
}
// 支队值班员： 值班表中 【值班排班】中本支队的当日值班员；
if(jsonObject1.containsKey("onDuty")) {
List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarIdone(DateUtils.getDateNowShortStr(),fireTeaml.getSequenceNbr().toString());
List<Map<String, Object>> mapList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarIdone(DateUtils.getDateNowShortStr(),fireTeaml.getSequenceNbr().toString(),null);
sendUserIds.addAll(mapList);
}
......
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 @ c1c6c875
......@@ -8,10 +8,12 @@ import java.util.Set;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.enums.RuleTypeEnum;
import com.yeejoin.amos.component.rule.Label;
import com.yeejoin.amos.component.rule.config.ClazzUtils;
import com.yeejoin.amos.feign.rule.Rule;
import com.yeejoin.amos.feign.rule.client.RuleClient;
import com.yeejoin.amos.feign.rule.model.FactBaseModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -116,6 +118,13 @@ public class RuleAlertCalledService {
alertCalledRo.setTrappedNum(alertCalled.getTrappedNum() != null ? String.valueOf(alertCalled.getTrappedNum()) : "无");
alertCalledRo.setCompanyName(alertCalled.getCompanyName());
alertCalledRo.setRecUserName(alertCalled.getRecUserName());
alertCalledRo.setUpdateTime(alertCalled.getUpdateTime());
alertCalledRo.setCallTime(alertCalled.getCallTime());
List<AlertFormValue> alertFormValues = alertCalledVo.getAlertFormValue();
if (!ValidationUtil.isEmpty(alertFormValues))
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/LatentDangerNormalParam.java
View file @ c1c6c875
......@@ -64,5 +64,5 @@ public class LatentDangerNormalParam {
private String bizType;
//所属单位
private String bizOrgcode;
private String bizOrgCode;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java
View file @ c1c6c875
......@@ -247,7 +247,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
//详情
JSONObject js= new JSONObject();
js.put("bizOrgCode",latentDangerParam.getBizOrgcode());
js.put("bizOrgCode",latentDangerParam.getBizOrgCode());
latentDangerBo.setBizInfo(js.toJSONString());
latentDangerMapper.update(latentDangerBo);
......
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