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

代码调整

Browse Source
This commit is contained in:
xuyang
2023-04-11 15:56:41 +08:00
parent e7d4fc8979
commit 826778a2b8
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java
View File

@@ -19,7 +19,7 @@ import lombok.Setter;
@Getter @Getter
@Setter @Setter
@TableName("r_stat_onlinerate_d") @TableName("r_stat_onlinerate_d")
public class RStatOnlinerateD extends BaseEntity { public class RStatOnlinerateD {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@MppMultiId @MppMultiId

1
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/utils/PublicUtil.java
View File

@@ -120,7 +120,6 @@ public class PublicUtil {
if(month>=10 && i>=10){ if(month>=10 && i>=10){
date = year +"-"+month+"-"+i; date = year +"-"+month+"-"+i;
} }
date = date + " 00:00:00";
list.add(date); list.add(date);
} }
return list; return list;

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") @Async("asyncExecutor")
public void dataIntegrity(LineParam lineParam,String time) { public void dataIntegrity(LineParam lineParam,String time) {
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); 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<>(); List<LineDetail> lineDetailList = new ArrayList<>();
if (CollUtil.isEmpty(lineParam.getLineIds())){ if (CollUtil.isEmpty(lineParam.getLineIds())){
List<Overlimit> overLimitList = getAllLinesLimitData(); 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") @Async("asyncExecutor")
public void onlineRateData(LineParam lineParam,String time) { public void onlineRateData(LineParam lineParam,String time) {
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); 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(); List<String> lineIdList = lineParam.getLineIds();
if (CollUtil.isEmpty(lineParam.getLineIds())){ if (CollUtil.isEmpty(lineParam.getLineIds())){
lineIdList = lineFeignClient.getDeviceList().getData(); lineIdList = lineFeignClient.getDeviceList().getData();