xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +55245 -1122
374 changed files with 55245 additions and 1122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4f3cd8c82b - Show all commits

43
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java
View File

@ -1,8 +1,5 @@
package com.xzzn.ems.service.impl;
import java.util.List;
import java.util.Map;
import com.alibaba.fastjson2.JSON;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
@ -12,19 +9,27 @@ import com.xzzn.common.utils.DateUtils;
import com.xzzn.common.utils.StringUtils;
import com.xzzn.common.utils.bean.BeanUtils;
import com.xzzn.ems.domain.EmsStrategy;
import com.xzzn.ems.domain.EmsStrategyRunning;
import com.xzzn.ems.domain.EmsStrategyTemp;
import com.xzzn.ems.domain.EmsStrategyTempTimeConfig;
import com.xzzn.ems.domain.vo.StrategyRunningVo;
import com.xzzn.ems.domain.vo.StrategyTempConfigRequest;
import com.xzzn.ems.domain.vo.SyncStrategyTempVo;
import com.xzzn.ems.mapper.EmsStrategyCurveMapper;
import com.xzzn.ems.mapper.EmsStrategyMapper;
import com.xzzn.ems.mapper.EmsStrategyTempMapper;
import com.xzzn.ems.mapper.EmsStrategyTimeConfigMapper;
import com.xzzn.ems.service.IEmsStrategyTempService;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xzzn.ems.mapper.EmsStrategyTempMapper;
import com.xzzn.ems.domain.EmsStrategyTemp;
import com.xzzn.ems.service.IEmsStrategyTempService;
import org.springframework.transaction.annotation.Transactional;
/**
@ -147,6 +152,8 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
switch (operateType) {
case "INSERT":
SyncStrategyTempVo syncVo = JSON.parseObject(content, SyncStrategyTempVo.class);
//转换开始和结束时间
convertStringToDate(content, syncVo);
BeanUtils.copyProperties(syncVo, temp);
// 先校验策略是否存在，不存在则插入
dealStrategyData(temp, syncVo);
@ -165,6 +172,26 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
}
}
private void convertStringToDate(String content, SyncStrategyTempVo syncVo) throws JsonProcessingException {
ObjectMapper mapper = new ObjectMapper();
JsonNode rootNode = mapper.readTree(content);
String startTime = rootNode.path("startTime").asText();
String endTime = rootNode.path("endTime").asText();
if (startTime != null && !"null".equals(startTime)) {
syncVo.setStartTime(parseTimeStringToDate(startTime));
}
if (endTime != null && !"null".equals(endTime)) {
syncVo.setEndTime(parseTimeStringToDate(endTime));
}
}
private Date parseTimeStringToDate(String timeStr) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
LocalTime time = LocalTime.parse(timeStr, formatter);
LocalDateTime dateTime = LocalDateTime.of(LocalDate.now(), time);
return Date.from(dateTime.atZone(ZoneId.of("Asia/Shanghai")).toInstant());
}
private void dealStrategyData(EmsStrategyTemp temp, SyncStrategyTempVo syncVo) {
// 主策略
String mainStrategyName = syncVo.getStrategyName();