|
|
|
|
@ -12,12 +12,16 @@ import com.ruoyi.tc.regular.entity.AssetDbxx;
|
|
|
|
|
import com.ruoyi.tc.regular.entity.AssetJcxx;
|
|
|
|
|
import com.ruoyi.tc.service.AssetCurrentService;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
|
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
|
|
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.time.Duration;
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.HashMap;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
|
|
@ -27,9 +31,8 @@ import java.util.Map;
|
|
|
|
|
* @author du
|
|
|
|
|
* @since 2024/12/3 17:06
|
|
|
|
|
*/
|
|
|
|
|
//@Configuration
|
|
|
|
|
//@EnableScheduling
|
|
|
|
|
@Component
|
|
|
|
|
@Configuration
|
|
|
|
|
@EnableScheduling
|
|
|
|
|
public class AssetCurrentChange {
|
|
|
|
|
|
|
|
|
|
@Value("${isTime}")
|
|
|
|
|
@ -47,7 +50,7 @@ public class AssetCurrentChange {
|
|
|
|
|
/**
|
|
|
|
|
* 定时更新系统基础信息
|
|
|
|
|
*/
|
|
|
|
|
// @Scheduled(cron = "0 0 3 * * *")
|
|
|
|
|
@Scheduled(cron = "0 0 3 * * *")
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void assetTotal() {
|
|
|
|
|
if (isTime) {
|
|
|
|
|
@ -61,10 +64,8 @@ public class AssetCurrentChange {
|
|
|
|
|
.header("Content-Type", "application/json;charset=utf-8")
|
|
|
|
|
.formStr(new HashMap<>())
|
|
|
|
|
.execute();
|
|
|
|
|
System.out.println(response.getStatus());
|
|
|
|
|
if (response.getStatus() == 200) {
|
|
|
|
|
JSONObject jsonObj = JSONUtil.parseObj(response.body());
|
|
|
|
|
System.out.println(jsonObj);
|
|
|
|
|
if ("200".equals(jsonObj.get("code").toString())) {
|
|
|
|
|
JSONObject reqData = JSONUtil.parseObj(jsonObj.get("data"));
|
|
|
|
|
JSONArray arr = reqData.getJSONArray("result"); // 直接获取数组，无需再次解析
|
|
|
|
|
@ -192,10 +193,8 @@ public class AssetCurrentChange {
|
|
|
|
|
.formStr(new HashMap<>())
|
|
|
|
|
.body(jo.toString())
|
|
|
|
|
.execute();
|
|
|
|
|
System.out.println(response.getStatus());
|
|
|
|
|
if (response.getStatus() == 200) {
|
|
|
|
|
JSONObject jsonObj = JSONUtil.parseObj(response.body());
|
|
|
|
|
System.out.println(jsonObj);
|
|
|
|
|
if ("200".equals(jsonObj.get("code").toString())) {
|
|
|
|
|
JSONArray arr = jsonObj.getJSONArray("data"); // 直接获取数组，无需再次解析
|
|
|
|
|
if (arr.size() > 0) {
|
|
|
|
|
@ -216,19 +215,12 @@ public class AssetCurrentChange {
|
|
|
|
|
/**
|
|
|
|
|
* 判断两个LocalDateTime哪个离现在时间最近
|
|
|
|
|
*/
|
|
|
|
|
public Boolean getDateBoolean(LocalDateTime a, LocalDateTime b) {
|
|
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
|
|
Duration duration1 = Duration.between(now, a);
|
|
|
|
|
Duration duration2 = Duration.between(now, b);
|
|
|
|
|
if (duration1.isNegative()) {
|
|
|
|
|
duration1 = duration1.negated();
|
|
|
|
|
}
|
|
|
|
|
if (duration2.isNegative()) {
|
|
|
|
|
duration2 = duration2.negated();
|
|
|
|
|
}
|
|
|
|
|
if (duration1.compareTo(duration2) < 0) {
|
|
|
|
|
public Boolean getDateBoolean(Date a, Date b) {
|
|
|
|
|
long diff1 = Math.abs(System.currentTimeMillis() - a.getTime());
|
|
|
|
|
long diff2 = Math.abs(System.currentTimeMillis() - b.getTime());
|
|
|
|
|
if (diff1 < diff2) {
|
|
|
|
|
return true;
|
|
|
|
|
} else if (duration1.compareTo(duration2) > 0) {
|
|
|
|
|
} else if (diff1 > diff2) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
|
dongdingding
1 month ago