wilson
/
xujie-sys
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-12-18 

优化“自动生成”标记，判断计划到达结束日期自动生成
java8
fengyuan_yang 2 years ago
parent
abdaf428b6
commit
484d14c40a
1 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

36
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
View File

@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.*;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@Service
@ -861,7 +862,7 @@ public class EamServiceImpl implements EamService {
for (EamObjectInData objectData : inData.getObjectList()){
inData.setObjectID(objectData.getObjectID());
List<EamWorkPlanInData> objectPlanList = eamMapper.checkObjectPlan(inData);
if (!objectPlanList.isEmpty()){
if (!objectPlanList.isEmpty()) {
throw new RuntimeException("设备 " + objectData.getObjectID() + " 已存在计划，请勿重复创建！");
}
}
@ -1594,10 +1595,10 @@ public class EamServiceImpl implements EamService {
String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
try {
// 发送短信
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
if (code <= 0) {
throw new RuntimeException("短信发送失败!");
throw new RuntimeException("短信发送失败,code = " + code + " !");
}
// 保存短信记录
MessageRecordData recordData = new MessageRecordData();
@ -1744,10 +1745,10 @@ public class EamServiceImpl implements EamService {
String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
try {
// 发送短信
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
if (code <= 0) {
throw new RuntimeException("短信发送失败!");
throw new RuntimeException("短信发送失败,code = " + code + " !");
}
// 保存短信记录
MessageRecordData recordData = new MessageRecordData();
@ -2524,10 +2525,10 @@ public class EamServiceImpl implements EamService {
String content = inData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + inData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
try {
// 发送短信
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
if (code <= 0){
throw new RuntimeException("短信发送失败!");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
if (code <= 0) {
throw new RuntimeException("短信发送失败,code = " + code + " !");
}
// 保存短信记录
MessageRecordData recordData = new MessageRecordData();
@ -2538,10 +2539,10 @@ public class EamServiceImpl implements EamService {
recordData.setFeedBackDesc(inData.getFeedBackDesc());
recordData.setSender(inData.getCreatedBy());
for (EamObjectAdminData data : phoneList){
if(data.getPhone() != null){
if (data.getPhone() != null) {
recordData.setPhone(data.getPhone());
}
if(data.getAdminName() != null){
if (data.getAdminName() != null) {
recordData.setRecipient(data.getAdminName());
}
eamMapper.saveMessageRecord(recordData);
@ -2571,21 +2572,20 @@ public class EamServiceImpl implements EamService {
for (EamWorkPlanInData data : planList) {
// 修改计划时间
// 1.1 计算开始和结束日期相差天数
int days = DateUtils.differentDays(data.getStartDate(), data.getEndDate());
int days = DateUtils.differentDays(data.getPlanStartDate(), data.getPlanEndDate());
// 1.2 结束日期 +1 作为新计划的开始日期
Date startDate = DateUtils.addDateDays(data.getEndDate(), 1);
Date startDate = DateUtils.addDateDays(data.getPlanEndDate(), 1);
// 1.3 新开始日期 + 相差天数得到新结束日期
Date endDate = DateUtils.addDateDays(startDate, days);
// 1.4 赋值
data.setStartDate(startDate);
data.setEndDate(endDate);
data.setPlanStartDate(startDate);
data.setPlanEndDate(endDate);
// 查出老计划的设备
List<EamObjectInData> objectList = eamMapper.selectObjectByPlanID(data);
data.setObjectList(objectList);
data.setUserId(data.getCreatedBy());
// 新增计划
eamWorkPlanSave(data);
// 下达计划
}
}
}

Write Preview
Loading…
Cancel
Save