Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Lee
2023-04-11 16:25:14 +08:00
parent 3f7afc024b 3af30403b7
commit 14d66c6089
13 changed files with 202 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-prepare/prepare-boot/pom.xml
View File

@@ -28,6 +28,12 @@
<groupId>com.njcn</groupId>
<artifactId>common-core</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.njcn</groupId>

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
View File

@@ -85,7 +85,8 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
@Async("asyncExecutor")
public void dataIntegrity(LineParam lineParam,String time) {
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime dateTime = LocalDateTime.parse(time,df);
String data = time + " 00:00:00";
LocalDateTime dateTime = LocalDateTime.parse(data,df);
List<LineDetail> lineDetailList = new ArrayList<>();
if (CollUtil.isEmpty(lineParam.getLineIds())){
List<Overlimit> overLimitList = getAllLinesLimitData();

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/OnlineRateServiceImpl.java
View File

@@ -84,7 +84,8 @@ public class OnlineRateServiceImpl extends MppServiceImpl<RStatOnlineRateDMapper
@Async("asyncExecutor")
public void onlineRateData(LineParam lineParam,String time) {
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime dateTime = LocalDateTime.parse(time,df);
String data = time + " 00:00:00";
LocalDateTime dateTime = LocalDateTime.parse(data,df);
List<String> lineIdList = lineParam.getLineIds();
if (CollUtil.isEmpty(lineParam.getLineIds())){
lineIdList = lineFeignClient.getDeviceList().getData();