From 06bb6146abb3cf667deae79ddfb6f7752a76d250 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 8 Jan 2024 16:27:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E7=AB=99=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=8E=A2=E6=B5=8B=E5=99=A8=E7=AE=A1=E7=90=86=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=96=B9=E6=B3=95moddate=E8=B5=8B=E5=80=BC=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/configuration/GardsDetectors.java | 1 + .../java/org/jeecg/common/util/SSEUtil.java | 40 ------------------- ...aServiceImpl.java => DataServiceImpl.java} | 2 +- .../system/mapper/SysTaskStationMapper.java | 2 + .../modules/system/mapper/SysUserMapper.java | 2 + .../impl/GardsDetectorsServiceImpl.java | 1 - .../impl/GardsStationsServiceImpl.java | 1 - 7 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SSEUtil.java rename jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/{IDataServiceImpl.java => DataServiceImpl.java} (99%) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java index 095e3658..337d645a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsDetectors.java @@ -101,6 +101,7 @@ public class GardsDetectors implements Serializable { @TableField(value = "MODDATE") @NotNull(message = "不能为空", groups = {InsertGroup.class, UpdateGroup.class}) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date moddate; /** diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SSEUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SSEUtil.java deleted file mode 100644 index 921b8970..00000000 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SSEUtil.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.jeecg.common.util; - -import org.springframework.stereotype.Component; -import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; - -import java.io.IOException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -@Component -public class SSEUtil { - private static Map sseCache = new ConcurrentHashMap<>(); - - public SseEmitter subscribe(String id) { - // 超时时间设置为1小时 - SseEmitter sseEmitter = new SseEmitter(3600_000L); - sseCache.put(id, sseEmitter); - sseEmitter.onTimeout(() -> sseCache.remove(id)); - sseEmitter.onCompletion(() -> System.out.println("完成！！！")); - return sseEmitter; - } - - public String push(String id, String content) throws IOException { - SseEmitter sseEmitter = sseCache.get(id); - if (sseEmitter != null) { - sseEmitter.send(content); - } - return "over"; - } - - public String over(String id) { - SseEmitter sseEmitter = sseCache.get(id); - if (sseEmitter != null) { - sseEmitter.complete(); - sseCache.remove(id); - } - return "over"; - } - -} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/IDataServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/DataServiceImpl.java similarity index 99% rename from jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/IDataServiceImpl.java rename to jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/DataServiceImpl.java index a169409e..ae2a7a9e 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/IDataServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/DataServiceImpl.java @@ -16,7 +16,7 @@ import java.util.*; import java.util.stream.Collectors; @Service -public class IDataServiceImpl implements IDataService { +public class DataServiceImpl implements IDataService { @Value("${inland.url}") private String url; // 本地数据源url，即为主数据源 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java index c7cf5460..0a2c705a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysTaskStationMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.system.entity.SysTaskStationSystem; +@Mapper public interface SysTaskStationMapper extends BaseMapper { } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java index b9ad66e5..d7b50dbe 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.system.model.SysUserSysDepartModel; @@ -20,6 +21,7 @@ import java.util.List; * @Author scott * @since 2018-12-20 */ +@Mapper public interface SysUserMapper extends BaseMapper { /** * 通过用户账号查询用户信息 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java index fa9f4668..9c609559 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java @@ -86,7 +86,6 @@ public class GardsDetectorsServiceImpl extends ServiceImpl