feat(watch): 手表数据统计与设备管理功能增强

- WatchDataItemVO 新增 Date 类型字段及 JsonFormat 格式化支持
- DeptStatisticDataController 部门统计数据查询逻辑优化
- IWatchDeviceService 接口扩展新业务方法声明

jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java

@@ -105,6 +105,10 @@ public class JeecgBootExceptionHandler implements ResponseBodyAdvice<String> {
             return Result.error(errorInfoEnum.getError());
         }
         //update-end---author:zyf ---date:20220411  for：处理Sentinel限流自定义异常
+        //吞提示信息了，这里先单独处理一下吧
+        if(e.getMessage().startsWith("已存在")){
+            return Result.error(e.getMessage());
+        }
         return Result.error("系统异常，请稍后再试", e.getMessage());
     }
 

jeecg-boot-base-core/src/main/java/org/jeecg/common/export/ExportUtils.java

@@ -18,6 +18,7 @@ import org.jeecgframework.poi.excel.ExcelExportUtil;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.web.context.request.RequestContextHolder;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -108,6 +109,8 @@ public class ExportUtils {
         if (ObjectUtil.isNotNull(threadLocal)) {
             T o = threadLocal.get();
             return executor.submit(() -> {
+                // 清除线程池复用线程可能残留的 HTTP 请求上下文，避免 Feign 拦截器读到过期 token
+                RequestContextHolder.resetRequestAttributes();
                 UserTokenContext.setToken(token);
                 threadLocal.set(o);
                 EXPORT_LOCAL.set(info);
@@ -125,6 +128,8 @@ public class ExportUtils {
             });
         } else {
             return executor.submit(() -> {
+                // 清除线程池复用线程可能残留的 HTTP 请求上下文，避免 Feign 拦截器读到过期 token
+                RequestContextHolder.resetRequestAttributes();
                 UserTokenContext.setToken(token);
                 EXPORT_LOCAL.set(info);
                 try {

jeecg-boot-base-core/src/main/java/org/jeecg/util/RSAEncryptUtils.java

@@ -199,7 +199,7 @@ public class RSAEncryptUtils {
 //        Map<String, Object> keyMap;
 //        String cipherText;
 //        // 原始明文
-        String content = "UserPwd@123!";
+        String content = "v6BQj8452!j8KYj";
 //
 //        // 生成密钥对
 //        keyMap = initKey(1024);