|
@@ -4,17 +4,20 @@ import cn.dev33.satoken.annotation.SaIgnore;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
|
+import io.seata.common.util.StringUtils;
|
|
|
import jakarta.servlet.http.HttpServletRequest;
|
|
import jakarta.servlet.http.HttpServletRequest;
|
|
|
import jakarta.servlet.http.Part;
|
|
import jakarta.servlet.http.Part;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
|
|
+import org.dromara.common.core.constant.CacheNames;
|
|
|
import org.dromara.common.core.domain.R;
|
|
import org.dromara.common.core.domain.R;
|
|
|
import org.dromara.common.core.domain.model.ErrorInfo;
|
|
import org.dromara.common.core.domain.model.ErrorInfo;
|
|
|
import org.dromara.common.core.domain.model.ErrorResult;
|
|
import org.dromara.common.core.domain.model.ErrorResult;
|
|
|
import org.dromara.common.core.enums.CreditTypeEnum;
|
|
import org.dromara.common.core.enums.CreditTypeEnum;
|
|
|
import org.dromara.common.redis.utils.CacheUtils;
|
|
import org.dromara.common.redis.utils.CacheUtils;
|
|
|
|
|
+import org.dromara.common.redis.utils.RedisUtils;
|
|
|
import org.dromara.consume.api.RemoteConsumeService;
|
|
import org.dromara.consume.api.RemoteConsumeService;
|
|
|
import org.dromara.consume.api.domain.bo.RemoteConsumeBo;
|
|
import org.dromara.consume.api.domain.bo.RemoteConsumeBo;
|
|
|
import org.dromara.consume.api.domain.bo.RemoteResultDto;
|
|
import org.dromara.consume.api.domain.bo.RemoteResultDto;
|
|
@@ -37,10 +40,7 @@ import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
import java.io.InputStream;
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
import java.nio.charset.Charset;
|
|
import java.nio.charset.Charset;
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
-import java.util.Collection;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 海康消费机
|
|
* 海康消费机
|
|
@@ -512,4 +512,23 @@ public class TestController {
|
|
|
return R.ok();
|
|
return R.ok();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ // 清理和设置 最近一次下发时间
|
|
|
|
|
+ @PostMapping("/init/setSendTimeCache")
|
|
|
|
|
+ public R<Void> setSendTimeCache(@RequestBody SetSendTimeCache setSendTimeCache) {
|
|
|
|
|
+ if(StringUtils.isBlank(setSendTimeCache.macAddress)){
|
|
|
|
|
+ return R.fail("macAddress不能为空");
|
|
|
|
|
+ }
|
|
|
|
|
+ String newMacAddress = setSendTimeCache.macAddress.replaceAll(":","-");
|
|
|
|
|
+ if(setSendTimeCache.date == null){
|
|
|
|
|
+ //清理缓存
|
|
|
|
|
+ RedisUtils.deleteObject(CacheNames.XF_MAC_DOWN_SEND_TIME + newMacAddress);
|
|
|
|
|
+ return R.ok("清理缓存成功");
|
|
|
|
|
+ }
|
|
|
|
|
+ RedisUtils.setCacheObject(CacheNames.XF_MAC_DOWN_SEND_TIME + newMacAddress, setSendTimeCache.date.getTime());
|
|
|
|
|
+ return R.ok("缓存设置成功");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ public record SetSendTimeCache(Date date, String macAddress) {
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|