admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-01-08 11:18:39 +08:00
parent 6fb89a1ade
commit 9582b73155
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDataServiceImpl.java
View File

@ -93,6 +93,7 @@ public class StableWaterMixStationDataServiceImpl extends ServiceImpl<StableWate
List<StableWaterMixStationSetData> setDataList = data.getSetDataList();
if (CollUtil.isNotEmpty(setDataList)) {
for (StableWaterMixStationSetData setData : setDataList) {
setData.setId(null);
setData.setStableWaterMixStationDataId(data.getId());
setData.setDevSn(devSn);
setData.setProjectSn(projectSn);
@ -100,6 +101,7 @@ public class StableWaterMixStationDataServiceImpl extends ServiceImpl<StableWate
List<StableWaterMixStationRawMaterialData> rawMaterialDataList = setData.getRawMaterialDataList();
if (CollUtil.isNotEmpty(rawMaterialDataList)) {
for (StableWaterMixStationRawMaterialData rawMaterialData : rawMaterialDataList) {
rawMaterialData.setId(null);
rawMaterialData.setStableWaterMixStationSetDataId(setData.getId());
rawMaterialData.setDevSn(devSn);
rawMaterialData.setProjectSn(projectSn);

4
src/main/java/com/zhgd/xmgl/task/StableWaterMixStationTask.java
View File

@ -55,8 +55,8 @@ public class StableWaterMixStationTask {
*/
@Scheduled(cron = "0 0/5 * * * ?")
@SchedulerLock(name = "executeStableWaterMixStationTask", lockAtMostFor = 1000 * 60 * 2, lockAtLeastFor = 1000 * 60 * 1)
@GetMapping("s/1205")
public void executeTask() {
@GetMapping("xmgl/task/executeStableWaterMixStationTask")
public void executeStableWaterMixStationTask() {
log.info("定时拉取广联达的搅拌站数据任务开始");
List<Project> projects = projectMapper.selectList(new LambdaQueryWrapper<Project>()
.isNotNull(Project::getGldLicPath)

14
src/main/java/com/zhgd/xmgl/util/TimeUtil.java
View File

@ -1,5 +1,7 @@
package com.zhgd.xmgl.util;
import java.util.Scanner;
public class TimeUtil {
/**
* 获取时分秒中文显示
@ -25,8 +27,14 @@ public class TimeUtil {
}
public static void main(String[] args) {
System.out.println(toHourMinSecond(1));
System.out.println(toHourMinSecond(70));
System.out.println(toHourMinSecond(1000));
//abcdefg hijkl mnopq rst uvwxyz
for (int i = 0; i < 100; i++) {
Scanner scanner = new Scanner(System.in);
char c1 = (char) ('a' + Math.random() * ('z' - 'a' + 1));
char c2 = (char) ('a' + Math.random() * ('z' - 'a' + 1));
System.out.println(c1 + ">>>" + c2);
String r = scanner.nextLine();
System.out.println(c1 < c2 ? "T" : "F");
}
}
}

8
src/main/java/com/zhgd/xmgl/util/XiwonUtil.java
View File

@ -65,4 +65,12 @@ public class XiwonUtil {
log.info("postForm: url:{}, appId:{}, appSecret:{}", sendUrl, appId, appSecret);
return restTemplate.postForObject(sendUrl, requestEntity, returnClass);
}
public static void main(String[] args) {
long currentTimeMillis = System.currentTimeMillis();
System.out.println("requestTime>" + currentTimeMillis);
String appId = "1690940695416";
String appSecret = "b6162078-6f1c-4f2c-8cd5-0873f45199b2";
System.out.println("sign>" + SecureUtil.md5(appId + appSecret + currentTimeMillis));
}
}