Skip to content

A
amos-boot-biz
Commit 4cfe91ee authored by litengwei's avatar litengwei
Browse files
Options

bug修改

parent c4f913a7
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 165 deletions
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java
View file @ 4cfe91ee
...@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
...@@ -146,6 +147,7 @@ public class PlanController extends AbstractBaseController { ...@@ -146,6 +147,7 @@ public class PlanController extends AbstractBaseController {
@RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) { public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
try { try {
String userId = RequestContext.getExeUserId();
if (param.getDayRate() == 1) { if (param.getDayRate() == 1) {
long dayBeginTime = param.getDayBegin().getTime(); long dayBeginTime = param.getDayBegin().getTime();
long dayEndTime = param.getDayEnd().getTime(); long dayEndTime = param.getDayEnd().getTime();
...@@ -159,25 +161,25 @@ public class PlanController extends AbstractBaseController { ...@@ -159,25 +161,25 @@ public class PlanController extends AbstractBaseController {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("org_code", loginOrgCode); map.put("org_code", loginOrgCode);
List<String> userGroupIds = Objects.nonNull(param.getUserGroupId()) ? Arrays.asList(param.getUserGroupId().split(",")) : Collections.emptyList(); // List<String> userGroupIds = Objects.nonNull(param.getUserGroupId()) ? Arrays.asList(param.getUserGroupId().split(",")) : Collections.emptyList();
StringBuilder userIdSB = new StringBuilder(), userDeptSB = new StringBuilder(), userNameSB = new StringBuilder(); // StringBuilder userIdSB = new StringBuilder(), userDeptSB = new StringBuilder(), userNameSB = new StringBuilder();
ResponseModel<List<UserDetailsDto>> response; // ResponseModel<List<UserDetailsDto>> response;
for (String userGroupId : userGroupIds) { // for (String userGroupId : userGroupIds) {
response = tzsFeign.getGroupAndPersonInfo(Long.valueOf(userGroupId)); // response = tzsFeign.getGroupAndPersonInfo(Long.valueOf(userGroupId));
if (response.getStatus() == 200) { // if (response.getStatus() == 200) {
List<UserDetailsDto> resultList = response.getResult(); // List<UserDetailsDto> resultList = response.getResult();
for (UserDetailsDto udd : resultList) { // for (UserDetailsDto udd : resultList) {
userIdSB.append(",").append(udd.getUserId()); // userIdSB.append(",").append(udd.getUserId());
userDeptSB.append(",").append(udd.getUserId()).append("@").append(udd.getUnitOrgCode()).append("@").append(udd.getUnitName()); // userDeptSB.append(",").append(udd.getUserId()).append("@").append(udd.getUnitOrgCode()).append("@").append(udd.getUnitName());
userNameSB.append(",").append(udd.getUserName()); // userNameSB.append(",").append(udd.getUserName());
} // }
} // }
} // }
String userId = StringUtils.hasText(userIdSB) ? userIdSB.substring(1) : ""; // String userId = StringUtils.hasText(userIdSB) ? userIdSB.substring(1) : "";
String userDept = StringUtils.hasText(userDeptSB) ? userDeptSB.substring(1) : ""; // String userDept = StringUtils.hasText(userDeptSB) ? userDeptSB.substring(1) : "";
String userName = StringUtils.hasText(userNameSB) ? userNameSB.substring(1) : ""; // String userName = StringUtils.hasText(userNameSB) ? userNameSB.substring(1) : "";
param.setUserId(userId); // param.setUserId(userId);
param.setUserDept(userDept); // param.setUserDept(userDept);
param.setBizOrgCode(loginOrgCode); param.setBizOrgCode(loginOrgCode);
param.setBizOrgName(getCompanyName(reginParams)); param.setBizOrgName(getCompanyName(reginParams));
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanServiceImpl.java
View file @ 4cfe91ee
...@@ -53,9 +53,9 @@ public class PlanServiceImpl implements IPlanService { ...@@ -53,9 +53,9 @@ public class PlanServiceImpl implements IPlanService {
String org_code = map.get("org_code") == null ? "":map.get("org_code").toString(); String org_code = map.get("org_code") == null ? "":map.get("org_code").toString();
String user_id = map.get("user_id")== null ? "":map.get("user_id").toString(); String user_id = map.get("user_id")== null ? "":map.get("user_id").toString();
if(StringUtil.isNotEmpty(map.get("dept_id"))){ // if(StringUtil.isNotEmpty(map.get("dept_id"))){
param.setDeptId(map.get("dept_id").toString()); // param.setDeptId(map.get("dept_id").toString());
} // }
param.setOrgCode(org_code); param.setOrgCode(org_code);
param.setStatus(Byte.parseByte(XJConstant.PLAN_STATUS_START)); param.setStatus(Byte.parseByte(XJConstant.PLAN_STATUS_START));
param.setNextGenDate(DateUtil.getIntervalDate(new Date(),0)); param.setNextGenDate(DateUtil.getIntervalDate(new Date(),0));
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java
View file @ 4cfe91ee
...@@ -717,156 +717,155 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -717,156 +717,155 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
paramMap.put("id", plan.getId()); paramMap.put("id", plan.getId());
paramMap.put("next_gen_date", DateUtil.formatDatrToStr(now, "yyyy-MM-dd")); paramMap.put("next_gen_date", DateUtil.formatDatrToStr(now, "yyyy-MM-dd"));
planMapper.updPlanStatusOrGenDate(paramMap);// 更新下次任务生成日期 planMapper.updPlanStatusOrGenDate(paramMap);// 更新下次任务生成日期
} } else {
// Toke toke = remoteSecurityService.getServerToken(); Map<String, String> deptMap = new HashMap<>();
Map<String, String> deptMap = new HashMap<>(); try {
try { String isFixDate = plan.getIsFixedDate();// 是否固定日期
String isFixDate = plan.getIsFixedDate();// 是否固定日期 List<Long> pointIdList = iRoutePointDao.queryRoutePointIds(plan.getRouteId());
List<Long> pointIdList = iRoutePointDao.queryRoutePointIds(plan.getRouteId()); int pointNum = iRoutePointDao.countRoutePoint(plan.getRouteId());
int pointNum = iRoutePointDao.countRoutePoint(plan.getRouteId()); long batchNo = now.getTime();
long batchNo = now.getTime();
Set<String> departmentIds = new HashSet<>();
Set<String> departmentIds = new HashSet<>(); List<String> depts = Arrays.asList(plan.getUserDept().split(","));
List<String> depts = Arrays.asList(plan.getUserDept().split(",")); depts.stream().forEach(dept -> {
depts.stream().forEach(dept -> { deptMap.put(dept.substring(0, dept.indexOf("@")), dept.substring(dept.indexOf("@") + 1));
deptMap.put(dept.substring(0, dept.indexOf("@")), dept.substring(dept.indexOf("@") + 1)); });
}); for (String entry : deptMap.keySet()) {
for (String entry : deptMap.keySet()) { String entryValue = deptMap.get(entry);
String entryValue = deptMap.get(entry); departmentIds.add(entryValue);
departmentIds.add(entryValue); }
}
StringBuffer departmentIdBuffer = new StringBuffer(); StringBuffer departmentIdBuffer = new StringBuffer();
Iterator<String> it = departmentIds.iterator(); Iterator<String> it = departmentIds.iterator();
while (it.hasNext()) { while (it.hasNext()) {
departmentIdBuffer.append(it.next()).append(","); departmentIdBuffer.append(it.next()).append(",");
} }
List<PlanTask> planTaskList = new ArrayList<>(); List<PlanTask> planTaskList = new ArrayList<>();
List<PlanTaskDetail> planTaskDetailListSync = new ArrayList<>(); List<PlanTaskDetail> planTaskDetailListSync = new ArrayList<>();
PlanTask planTask = new PlanTask(); PlanTask planTask = new PlanTask();
List<PlanTask> taskList = new ArrayList<>(); List<PlanTask> taskList = new ArrayList<>();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String startTime = list.get(i).get("BEGIN_TIME").toString(); String startTime = list.get(i).get("BEGIN_TIME").toString();
String endTime = list.get(i).get("END_TIME").toString(); String endTime = list.get(i).get("END_TIME").toString();
String userId = list.get(i).get("USER_ID") == null ? "-1" : list.get(i).get("USER_ID").toString(); String userId = list.get(i).get("USER_ID") == null ? "-1" : list.get(i).get("USER_ID").toString();
String userDept = list.get(i).get("USER_DEPT") == null ? "-1" : list.get(i).get("USER_DEPT").toString(); String userDept = list.get(i).get("USER_DEPT") == null ? "-1" : list.get(i).get("USER_DEPT").toString();
String userName = list.get(i).get("USER_NAME") == null ? "-1" : String.valueOf(list.get(i).get("USER_NAME")); String userName = list.get(i).get("USER_NAME") == null ? "-1" : String.valueOf(list.get(i).get("USER_NAME"));
String orgCode = list.get(i).get("ORG_CODE") == null ? "-1" : String.valueOf(list.get(i).get("ORG_CODE")); String orgCode = list.get(i).get("ORG_CODE") == null ? "-1" : String.valueOf(list.get(i).get("ORG_CODE"));
String unitCode = list.get(i).get("UNIT_CODE") == null ? "-1" : String.valueOf(list.get(i).get("UNIT_CODE")); String unitCode = list.get(i).get("UNIT_CODE") == null ? "-1" : String.valueOf(list.get(i).get("UNIT_CODE"));
// planTask = iplanTaskDao.findByUserIdAndBeginTimeAndEndTimeAndPlanIdAndRouteId(userId, startTime, endTime, plan.getId(), plan.getRouteId()); // planTask = iplanTaskDao.findByUserIdAndBeginTimeAndEndTimeAndPlanIdAndRouteId(userId, startTime, endTime, plan.getId(), plan.getRouteId());
// if (planTask != null) { // if (planTask != null) {
// continue; // continue;
// } // }
planTask = new PlanTask(); planTask = new PlanTask();
//修改巡检p_plan_task orgcode为执行人的org_code -- add by wujunkai 20201216 //修改巡检p_plan_task orgcode为执行人的org_code -- add by wujunkai 20201216
planTask.setOrgCode(orgCode); planTask.setOrgCode(orgCode);
planTask.setUserName(userName); planTask.setUserName(userName);
planTask.setUseCode(unitCode); planTask.setUseCode(unitCode);
planTask.setPlanType(plan.getPlanType()); planTask.setPlanType(plan.getPlanType());
planTask.setPlanId(plan.getId()); planTask.setPlanId(plan.getId());
planTask.setBatchNo(batchNo); planTask.setBatchNo(batchNo);
planTask.setRouteId(plan.getRouteId()); planTask.setRouteId(plan.getRouteId());
planTask.setInOrder(plan.getInOrder()); planTask.setInOrder(plan.getInOrder());
planTask.setUserId(userId); planTask.setUserId(userId);
planTask.setUserDept(userDept); planTask.setUserDept(userDept);
planTask.setPointNum(pointNum); planTask.setPointNum(pointNum);
if (XJConstant.FIX_DATE_NO.equals(isFixDate)) { if (XJConstant.FIX_DATE_NO.equals(isFixDate)) {
if (sdf.parse(startTime).getTime() <= now.getTime() && sdf.parse(endTime).getTime() >= now.getTime()) { if (sdf.parse(startTime).getTime() <= now.getTime() && sdf.parse(endTime).getTime() >= now.getTime()) {
planTask.setFinishStatus(XJConstant.TASK_STATUS_DEAL); planTask.setFinishStatus(XJConstant.TASK_STATUS_DEAL);
planTask.setFinishNum(0); planTask.setFinishNum(0);
} else {
if (sdf.parse(endTime).getTime() < now.getTime()) {
planTask.setFinishStatus(XJConstant.TASK_STATUS_TIMEOUT);
planTask.setFinishNum(0);
}
}
} else { } else {
if (sdf.parse(startTime).getTime() <= now.getTime() && sdf.parse(endTime).getTime() >= now.getTime()) {
planTask.setFinishStatus(XJConstant.TASK_STATUS_DEAL);
planTask.setFinishNum(0);
}
if (sdf.parse(endTime).getTime() < now.getTime()) { if (sdf.parse(endTime).getTime() < now.getTime()) {
planTask.setFinishStatus(XJConstant.TASK_STATUS_TIMEOUT); planTask.setFinishStatus(XJConstant.TASK_STATUS_TIMEOUT);
planTask.setFinishNum(0); planTask.setFinishNum(0);
} }
} }
} else { if (XJConstant.CHECK_CHANGE_YES.equals(flag)) {
if (sdf.parse(startTime).getTime() <= now.getTime() && sdf.parse(endTime).getTime() >= now.getTime()) { planTask.setFinishStatus(XJConstant.TASK_STATUS_FINISH);
planTask.setFinishStatus(XJConstant.TASK_STATUS_DEAL); planTask.setFinishNum(pointNum);
planTask.setFinishNum(0);
} }
if (sdf.parse(endTime).getTime() < now.getTime()) { if (XJConstant.FIX_DATE_YES.equals(isFixDate) || (XJConstant.FIX_DATE_NO.equals(isFixDate)
planTask.setFinishStatus(XJConstant.TASK_STATUS_TIMEOUT); && XJConstant.PLAN_TYPE_DAY.equals(plan.getPlanType()))) {
planTask.setFinishNum(0); planTask.setCheckDate(list.get(i).get("BEGIN_TIME").toString().substring(0, 10));
} }
} planTask.setBeginTime(startTime);
if (XJConstant.CHECK_CHANGE_YES.equals(flag)) { planTask.setEndTime(endTime);
planTask.setFinishStatus(XJConstant.TASK_STATUS_FINISH); // 1.保存执行数据主表
planTask.setFinishNum(pointNum); // iplanTaskDao.saveAndFlush(planTask);
} taskList.add(planTask);
if (XJConstant.FIX_DATE_YES.equals(isFixDate) || (XJConstant.FIX_DATE_NO.equals(isFixDate) // 发送APP待办消息 (20220617 改为定时任务发送消息)
&& XJConstant.PLAN_TYPE_DAY.equals(plan.getPlanType()))) {
planTask.setCheckDate(list.get(i).get("BEGIN_TIME").toString().substring(0, 10));
}
planTask.setBeginTime(startTime);
planTask.setEndTime(endTime);
// 1.保存执行数据主表
// iplanTaskDao.saveAndFlush(planTask);
taskList.add(planTask);
// 发送APP待办消息 (20220617 改为定时任务发送消息)
// sendMessage(plan, planTask); // sendMessage(plan, planTask);
String executorId = planTask.getUserId(); String executorId = planTask.getUserId();
em.persist(planTask); em.persist(planTask);
for (int i1 = 0; i1 < pointIdList.size(); i1++) { for (int i1 = 0; i1 < pointIdList.size(); i1++) {
Number pointId = pointIdList.get(i1); Number pointId = pointIdList.get(i1);
PlanTaskDetail planTaskDetailInstance = new PlanTaskDetail(); PlanTaskDetail planTaskDetailInstance = new PlanTaskDetail();
planTaskDetailInstance.setPointId(pointId.longValue()); planTaskDetailInstance.setPointId(pointId.longValue());
planTaskDetailInstance.setTaskNo(planTask.getId()); planTaskDetailInstance.setTaskNo(planTask.getId());
planTaskDetailInstance.setStatus("0"); planTaskDetailInstance.setStatus("0");
if (XJConstant.TASK_STATUS_TIMEOUT == planTask.getFinishStatus()) { if (XJConstant.TASK_STATUS_TIMEOUT == planTask.getFinishStatus()) {
planTaskDetailInstance.setIsFinish(Integer.parseInt(XJConstant.PLAN_TASK_DET_FINISH_OUT)); planTaskDetailInstance.setIsFinish(Integer.parseInt(XJConstant.PLAN_TASK_DET_FINISH_OUT));
planTaskDetailInstance.setStatus("3"); planTaskDetailInstance.setStatus("3");
} }
if (XJConstant.CHECK_CHANGE_YES.equals(flag)) { if (XJConstant.CHECK_CHANGE_YES.equals(flag)) {
planTaskDetailInstance.setIsFinish(Integer.parseInt(XJConstant.PLAN_TASK_DET_FINISH_YES)); planTaskDetailInstance.setIsFinish(Integer.parseInt(XJConstant.PLAN_TASK_DET_FINISH_YES));
planTaskDetailInstance.setStatus("1"); planTaskDetailInstance.setStatus("1");
} }
// // 2.保存执行数据明细表 // // 2.保存执行数据明细表
//// planTaskDetail.saveAndFlush(planTaskDetailInstance); //// planTaskDetail.saveAndFlush(planTaskDetailInstance);
planTaskDetailListSync.add(planTaskDetailInstance); planTaskDetailListSync.add(planTaskDetailInstance);
}
} }
} em.flush();
em.flush(); em.clear();
em.clear(); // mybatisService.saveBatch(taskList);
// mybatisService.saveBatch(taskList);
// repositoryTs.batchSave(taskList); // repositoryTs.batchSave(taskList);
repositoryTs.batchSave(planTaskDetailListSync); repositoryTs.batchSave(planTaskDetailListSync);
// 定时任务监控 // 定时任务监控
log.error("计划重做开始添加定时任务监控========"); log.error("计划重做开始添加定时任务监控========");
jobService.planTaskAddJob(planTask); jobService.planTaskAddJob(planTask);
// 3.如果为自动任务调用,则更新id，如果重做或且下次时间大于等于明天，则更新planTaskId到plan表 // 3.如果为自动任务调用,则更新id，如果重做或且下次时间大于等于明天，则更新planTaskId到plan表
Date genDate = DateUtil.str2Date(list.get(list.size() - 1).get("NEXT_GEN_DATE").toString(), "yyyy-MM-dd");//下次生成日期 Date genDate = DateUtil.str2Date(list.get(list.size() - 1).get("NEXT_GEN_DATE").toString(), "yyyy-MM-dd");//下次生成日期
Date tomorrow = DateUtil.getIntervalDate(now, 1);//明天 Date tomorrow = DateUtil.getIntervalDate(now, 1);//明天
String strGenDate = list.get(list.size() - 1).get("NEXT_GEN_DATE").toString().substring(0, 10); String strGenDate = list.get(list.size() - 1).get("NEXT_GEN_DATE").toString().substring(0, 10);
HashMap<String, Object> paramMap = new HashMap<String, Object>(); HashMap<String, Object> paramMap = new HashMap<String, Object>();
paramMap.put("id", plan.getId()); paramMap.put("id", plan.getId());
paramMap.put("next_gen_date", strGenDate); paramMap.put("next_gen_date", strGenDate);
if (XJConstant.SCHED_FLAG.equals(flag)) { if (XJConstant.SCHED_FLAG.equals(flag)) {
paramMap.put("plan_task_id", 0);//修改为初始值 paramMap.put("plan_task_id", 0);//修改为初始值
paramMap.put("first_flag", XJConstant.PLAN_FIRST_STATUS_NO); paramMap.put("first_flag", XJConstant.PLAN_FIRST_STATUS_NO);
} else if (!XJConstant.SCHED_FLAG.equals(flag) && (genDate.getTime() - tomorrow.getTime() >= 0) && XJConstant.FIX_DATE_NO.equals(plan.getIsFixedDate())) {//更新日期及plantaskId到plan表 } else if (!XJConstant.SCHED_FLAG.equals(flag) && (genDate.getTime() - tomorrow.getTime() >= 0) && XJConstant.FIX_DATE_NO.equals(plan.getIsFixedDate())) {//更新日期及plantaskId到plan表
long planTaskId = iplanTaskDao.findMaxIdByBatchNo(batchNo); long planTaskId = iplanTaskDao.findMaxIdByBatchNo(batchNo);
paramMap.put("plan_task_id", planTaskId);// 更新新的任务id到plan paramMap.put("plan_task_id", planTaskId);// 更新新的任务id到plan
paramMap.put("first_flag", XJConstant.PLAN_FIRST_STATUS_NO); paramMap.put("first_flag", XJConstant.PLAN_FIRST_STATUS_NO);
} }
if (DateUtil.str2Date(strGenDate, "yyyy-MM-dd").getTime() - now.getTime() < 0 || org.apache.commons.lang.StringUtils.isBlank(strGenDate)) { if (DateUtil.str2Date(strGenDate, "yyyy-MM-dd").getTime() - now.getTime() < 0 || org.apache.commons.lang.StringUtils.isBlank(strGenDate)) {
paramMap.put("next_gen_date", DateUtil.formatDatrToStr(now, "yyyy-MM-dd")); paramMap.put("next_gen_date", DateUtil.formatDatrToStr(now, "yyyy-MM-dd"));
}
planMapper.updPlanStatusOrGenDate(paramMap);// 更新下次任务生成日期
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage());
throw new RuntimeException(e.getMessage());
} }
planMapper.updPlanStatusOrGenDate(paramMap);// 更新下次任务生成日期
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage());
throw new RuntimeException(e.getMessage());
} }
} }
...@@ -1168,6 +1167,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -1168,6 +1167,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
List<PlanTaskDetail> planTaskDetails = iPlanTaskDetailDao.findAllByTaskNoAndStatus(planTask.getId(), PlanTaskDetailStatusEnum.NOTSTARTED.getValue()); List<PlanTaskDetail> planTaskDetails = iPlanTaskDetailDao.findAllByTaskNoAndStatus(planTask.getId(), PlanTaskDetailStatusEnum.NOTSTARTED.getValue());
if (!planTaskDetails.isEmpty()) { if (!planTaskDetails.isEmpty()) {
planTaskDetails.stream().forEach(action -> { planTaskDetails.stream().forEach(action -> {
action.setStatus(PlanTaskDetailStatusEnum.QUALIFIED.getValue());
iPlanTaskDetailDao.saveAndFlush(action);
planTaskDetailMapper.finishTaskDetail(action.getId(), action.getPointId(), planTaskDetailMapper.finishTaskDetail(action.getId(), action.getPointId(),
action.getPlanTask().getId(), userId); action.getPlanTask().getId(), userId);
}); });
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java
View file @ 4cfe91ee
package com.yeejoin.amos.patrol.quartz; package com.yeejoin.amos.patrol.quartz;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yeejoin.amos.component.feign.config.InnerInvokException; import com.yeejoin.amos.component.feign.config.InnerInvokException;
...@@ -18,6 +19,7 @@ import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper; ...@@ -18,6 +19,7 @@ import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
import com.yeejoin.amos.patrol.business.dao.repository.*; import com.yeejoin.amos.patrol.business.dao.repository.*;
import com.yeejoin.amos.patrol.business.entity.mybatis.PlanTaskPointInputItemBo; import com.yeejoin.amos.patrol.business.entity.mybatis.PlanTaskPointInputItemBo;
import com.yeejoin.amos.patrol.business.feign.JcsFeignClient; import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
import com.yeejoin.amos.patrol.business.param.CheckInputParam;
import com.yeejoin.amos.patrol.business.param.MsgConfigParam; import com.yeejoin.amos.patrol.business.param.MsgConfigParam;
import com.yeejoin.amos.patrol.business.service.intfc.IMessageService; import com.yeejoin.amos.patrol.business.service.intfc.IMessageService;
import com.yeejoin.amos.patrol.business.service.intfc.IPatrolDataSyncService; import com.yeejoin.amos.patrol.business.service.intfc.IPatrolDataSyncService;
...@@ -104,6 +106,9 @@ public class JobService implements IJobService { ...@@ -104,6 +106,9 @@ public class JobService implements IJobService {
@Autowired @Autowired
private WebMqttComponent webMqttComponent; private WebMqttComponent webMqttComponent;
@Autowired
IInputItemDao inputItemDao;
@Autowired @Autowired
JcsFeignClient jcsFeignClient; JcsFeignClient jcsFeignClient;
...@@ -417,7 +422,11 @@ public class JobService implements IJobService { ...@@ -417,7 +422,11 @@ public class JobService implements IJobService {
check = checkMap.get(arg.getPointId()); check = checkMap.get(arg.getPointId());
} }
if (arg.getInputItemId() != null) { if (arg.getInputItemId() != null) {
InputItem inputItem = inputItemDao.findById(arg.getInputItemId()).get();
CheckInput checkInput = new CheckInput(); CheckInput checkInput = new CheckInput();
checkInput = paraseSelect(checkInput, inputItem.getDataJson(), inputItem.getIsScore());
checkInput.setCheckId(check.getId()); checkInput.setCheckId(check.getId());
checkInput.setInputId(arg.getInputItemId()); checkInput.setInputId(arg.getInputItemId());
checkInput.setIsOk(CheckStatusEnum.QUALIFIED.getCode()); checkInput.setIsOk(CheckStatusEnum.QUALIFIED.getCode());
...@@ -436,6 +445,21 @@ public class JobService implements IJobService { ...@@ -436,6 +445,21 @@ public class JobService implements IJobService {
} }
private CheckInput paraseSelect(CheckInput checkInput, String json, String isScore) {
JSONArray jsonArray = JSONArray.parseArray(json);
if (!ObjectUtils.isEmpty(jsonArray)) {
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
String validateName = jsonObject.getString("name");
String validateIsOk = jsonObject.getString("isOk");
if(validateIsOk.equals("是")) {
checkInput.setInputValue(validateName);
}
}
}
return checkInput;
}
private void removeJob(String jobName) { private void removeJob(String jobName) {
log.debug("removeJob==jobName==" + jobName); log.debug("removeJob==jobName==" + jobName);
QuartzManager.removeJob(jobName); QuartzManager.removeJob(jobName);
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @ 4cfe91ee
...@@ -413,26 +413,13 @@ ...@@ -413,26 +413,13 @@
<select id="getPlanTaskPoints" resultType="Map"> <select id="getPlanTaskPoints" resultType="Map">
SELECT SELECT
p.name,
p.id pointId,
p.point_no pointNO,
p.offline,
ptd.status, ptd.status,
ptd.is_finish finish, P.NAME,
p.is_fixed isFixed, P.ID pointId
pt.route_id routeId,
c.id checkId,
prp.order_no orderNo
FROM FROM
p_plan_task_detail ptd ( SELECT * FROM p_plan_task_detail ptd WHERE ptd.task_no = #{planTaskId} ) ptd
LEFT JOIN p_plan_task pt ON pt.id = ptd.task_no LEFT JOIN (SELECT * from p_point where is_delete = 0) P ON P.ID = ptd.point_id
LEFT JOIN p_point p ON p.id = ptd.point_id
LEFT JOIN p_check c ON c.plan_task_detail_id = ptd.id
LEFT JOIN p_route_point prp ON prp.point_id = ptd.point_id AND prp.route_id = pt.route_id
WHERE
p.is_delete = 0
<if test="planTaskId != null and planTaskId > 0 ">and pt.id = #{planTaskId}</if>
ORDER BY orderNo
</select> </select>
<select id="getCurrentPlanTaskCount" resultType="int" parameterType="long"> <select id="getCurrentPlanTaskCount" resultType="int" parameterType="long">
......
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