Skip to content

A
amos-boot-biz
Commit bde52295 authored by tangwei's avatar tangwei
Browse files
Options

Merge branch 'develop_dl_plan6_temp' of…

Merge branch 'develop_dl_plan6_temp' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6_temp
parents 30807b5a 943f2770
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 15 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java
View file @ bde52295
......@@ -7,6 +7,8 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.MessageModel;
import com.yeejoin.amos.maintenance.business.constants.XJConstant;
import com.yeejoin.amos.maintenance.business.dao.mapper.InputItemMapper;
import com.yeejoin.amos.maintenance.business.dao.mapper.PlanMapper;
......@@ -21,6 +23,7 @@ import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.business.util.PlanTaskUtil;
import com.yeejoin.amos.maintenance.business.util.Toke;
import com.yeejoin.amos.maintenance.business.vo.CalDateVo;
import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo;
import com.yeejoin.amos.maintenance.common.enums.PlanTaskDetailIsFinishEnum;
......@@ -44,6 +47,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -294,6 +298,19 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
}
}
private void updateTaskStatus(Plan plan){
Toke toke= remoteSecurityService.getServerToken();
RequestContext.setToken(toke.getToke());
RequestContext.setProduct(toke.getProduct());
RequestContext.setAppKey(toke.getAppKey());
MessageModel model = new MessageModel();
model.setRelationId(String.valueOf(plan.getId()));
model.setMsgType("patrolSystem");
model.setIsRead(true);
log.info("修改待办任务参数-->{}", JSON.toJSON(model));
Systemctl.messageClient.update(model);
}
/**
* 自动任务执行
*/
......@@ -341,6 +358,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
if (!vo.getIsGenData()) {
paramMap.put("status", XJConstant.PLAN_STATUS_STOP);
planMapper.updPlanStatusOrGenDate(paramMap);
updateTaskStatus(plan);
continue;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/quartz/JobService.java
View file @ bde52295
package com.yeejoin.amos.maintenance.quartz;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.MessageModel;
import com.yeejoin.amos.maintenance.business.constants.XJConstant;
import com.yeejoin.amos.maintenance.business.dao.mapper.CheckMapper;
import com.yeejoin.amos.maintenance.business.dao.mapper.MsgMapper;
......@@ -22,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......@@ -237,9 +241,25 @@ public class JobService implements IJobService {
checkInput.setPointClassifyName(arg.getClassifyName());
iCheckInputDao.saveAndFlush(checkInput);
}
Plan plan = new Plan();
plan.setId(planTask.getPlanId());
updateTaskStatus(plan);
}
}
private void updateTaskStatus(Plan plan){
Toke toke= remoteSecurityService.getServerToken();
RequestContext.setToken(toke.getToke());
RequestContext.setProduct(toke.getProduct());
RequestContext.setAppKey(toke.getAppKey());
MessageModel model = new MessageModel();
model.setRelationId(String.valueOf(plan.getId()));
model.setMsgType("patrolSystem");
model.setIsRead(true);
log.info("修改待办任务参数-->{}", JSON.toJSON(model));
Systemctl.messageClient.update(model);
}
private void removeJob(String jobName) {
log.debug("removeJob==jobName==" + jobName);
QuartzManager.removeJob(jobName);
......
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 @ bde52295
......@@ -301,7 +301,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
String remark = param.getRemark();
String photoUrls = "";
List<CheckShot> checkShots = iCheckShotDao.findAllByCheckIdAndCheckInputId(inputCheckDto.getCheckId(),
inputCheckDto.getCheckInputId());
0L);
if (!CollectionUtils.isEmpty(checkShots)) {
List<String> photos = checkShots.stream().map(e -> {
if (e != null) {
......@@ -776,6 +776,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
}
JSONObject task = jsonObject.getJSONObject("data");
LatentDangerBo latentDangerBo = latentDangerMapper.getbyBusinessKey(task.getString("businessKey"));
// LinkedHashMap<String,Object> positionAll = equipFeign.getBuildingAbsolutePosition();
......@@ -883,9 +884,9 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
// }
// List<CheckShot> checkShots = iCheckShotDao.findAllByCheckIdAndCheckInputId(patrolBo.getCheckId(),
// latentDangerBo.getBizId());
//现场图片存的checkInputId 原有保存逻辑里写死为0 避免影响沿用以前逻辑 查询也写死为0
List<CheckShot> checkShots = iCheckShotDao.findAllByCheckIdAndCheckInputId(patrolBo.getCheckId(),
patrolBo.getInputId());
0L);
if (!CollectionUtils.isEmpty(checkShots)) {
List<String> photos = Lists.transform(checkShots, e -> {
if (e != null) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java
View file @ bde52295
package com.yeejoin.amos.patrol.quartz;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.component.feign.config.InnerInvokException;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.MessageModel;
import com.yeejoin.amos.patrol.business.constants.XJConstant;
import com.yeejoin.amos.patrol.business.dao.mapper.*;
import com.yeejoin.amos.patrol.business.dao.mapper.MsgMapper;
......@@ -28,6 +32,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......@@ -199,6 +204,20 @@ public class JobService implements IJobService {
}
}
private void updateTaskStatus(Plan plan){
Toke toke= remoteSecurityService.getServerToken();
RequestContext.setToken(toke.getToke());
RequestContext.setProduct(toke.getProduct());
RequestContext.setAppKey(toke.getAppKey());
MessageModel model = new MessageModel();
model.setRelationId(String.valueOf(plan.getId()));
model.setMsgType("patrolSystem");
model.setIsRead(true);
log.info("修改待办任务参数-->{}", JSON.toJSON(model));
Systemctl.messageClient.update(model);
}
/**
* 创建漏检检查记录
*
......@@ -351,6 +370,16 @@ public class JobService implements IJobService {
checkInput.setPointClassifyName(arg.getClassifyName());
iCheckInputDao.saveAndFlush(checkInput);
}
//漏检修改APP待办通知状态不展示
Plan plan = new Plan();
plan.setId(planTask.getPlanId());
try {
updateTaskStatus(plan);
}catch (InnerInvokException e){
log.error("待办消息不存在");
}
}
String usrIds = planTask.getUserId();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanTaskServiceImpl.java
View file @ bde52295
......@@ -11,11 +11,14 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.component.feign.config.InnerInvokException;
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.DepartmentModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.MessageModel;
import com.yeejoin.amos.supervision.business.constants.XJConstant;
import com.yeejoin.amos.supervision.business.dao.mapper.*;
import com.yeejoin.amos.supervision.business.dao.repository.*;
......@@ -363,6 +366,20 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
return content;
}
private void updateTaskStatus(Plan plan){
Toke toke= remoteSecurityService.getServerToken();
RequestContext.setToken(toke.getToke());
RequestContext.setProduct(toke.getProduct());
RequestContext.setAppKey(toke.getAppKey());
MessageModel model = new MessageModel();
model.setRelationId(String.valueOf(plan.getId()));
model.setMsgType("patrolSystem");
model.setIsRead(true);
log.info("修改待办任务参数-->{}", JSON.toJSON(model));
Systemctl.messageClient.update(model);
}
/**
* 自动任务执行
*/
......@@ -397,6 +414,14 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
param.put("id", plan.getId());
param.put("status", PlanStatusEnum.OUT_TIME.getValue());
planMapper.updPlanStatusOrGenDate(param);
try {
updateTaskStatus(plan);
}catch (InnerInvokException e) {
log.error(e.getMessage(), e);
e.printStackTrace();
}
}
}
......@@ -440,6 +465,25 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
//根据计划id查询关联的任务
List<PlanTask> planTaskByRouteId = planTaskMapper.getPlanTaskByRouteId(plan.getId());
//为2则为外部消防单位
if (plan.getIsFixedDate().equals("2")){
paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
planMapper.updPlanStatusOrGenDate(paramMap);
try {
updateTaskStatus(plan);
}catch (InnerInvokException e) {
log.error(e.getMessage(), e);
e.printStackTrace();
}
// 计划超时，修改计划下任务状态
planTaskMapper.updateTaskStatusByPlanId(plan.getId());
// 计划超时，修改计划下任务详情状态
planTaskMapper.updateTaskDetailStatusByPlanId(plan.getId());
continue;
}
if (!ValidationUtil.isEmpty(planTaskByRouteId)){
HashMap<String, Object> param = new HashMap<String, Object>();
param.put("pointId",plan.getId());
......@@ -456,17 +500,17 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
}else {
paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
planMapper.updPlanStatusOrGenDate(paramMap);
try {
updateTaskStatus(plan);
}catch (InnerInvokException e) {
log.error(e.getMessage(), e);
e.printStackTrace();
}
continue;
}
if (plan.getIsFixedDate().equals("2")){
paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
planMapper.updPlanStatusOrGenDate(paramMap);
// 计划超时，修改计划下任务状态
planTaskMapper.updateTaskStatusByPlanId(plan.getId());
// 计划超时，修改计划下任务详情状态
planTaskMapper.updateTaskDetailStatusByPlanId(plan.getId());
continue;
}
if (!ObjectUtils.isEmpty(paramMap.get("status")) && paramMap.get("status").equals(PlanStatusEnum.OUT_TIME.getValue())){
......@@ -474,6 +518,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
planTaskMapper.updateTaskStatusByPlanId(plan.getId());
// 计划超时，修改计划下任务详情状态
planTaskMapper.updateTaskDetailStatusByPlanId(plan.getId());
try {
updateTaskStatus(plan);
}catch (InnerInvokException e) {
log.error(e.getMessage(), e);
e.printStackTrace();
}
}
continue;
}
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @ bde52295
......@@ -1187,7 +1187,7 @@
IFNULL( fs.`name`, '其他' ) AS fireFightSysName,
'equip' AS fireFacilityType,
ws.source_id AS buildingId,
ws.`name` AS buildingName,
ws.`full_name` AS buildingName,
ed.maintenance_cycle,
ed.area AS location
FROM
......
amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @ bde52295
......@@ -1097,7 +1097,7 @@
where
begin_time &lt;= #{date,jdbcType=TIMESTAMP}
and end_time &gt; #{date,jdbcType=TIMESTAMP}
and finish_status in (0, 1)
and finish_status in (1)
and status = 0
group by plan_id
)
......@@ -1109,7 +1109,7 @@
where
begin_time &lt;= #{date,jdbcType=TIMESTAMP}
and end_time &gt; #{date,jdbcType=TIMESTAMP}
and finish_status in (0, 1)
and finish_status in (1)
and status = 0
</select>
</mapper>
\ No newline at end of file
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