diff --git a/docs/pdmaner/remi-cloud.pdma.json b/docs/pdmaner/remi-cloud.pdma.json index 6b5c9e8..ad3b244 100644 --- a/docs/pdmaner/remi-cloud.pdma.json +++ b/docs/pdmaner/remi-cloud.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.9.4", "createdTime": "2022-10-11 11:11:00", - "updatedTime": "2024-8-31 20:09:43", + "updatedTime": "2024-8-31 21:19:33", "dbConns": [], "profile": { "default": { @@ -16051,9 +16051,27 @@ "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", "uiHint": null }, + { + "defKey": "notice_title", + "defName": "通知标题", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", + "extProps": {}, + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "id": "5E79FECE-344B-4366-9CD8-9F17535C1ED3" + }, { "defKey": "notice_type", - "defName": "通知类型", + "defName": "通知类型(1通知公告 2系统消息)", "comment": "", "type": "", "len": "", diff --git a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/client/IamClientApi.java b/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/client/SysClientApi.java similarity index 89% rename from remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/client/IamClientApi.java rename to remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/client/SysClientApi.java index 3040c2d..38432bd 100644 --- a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/client/IamClientApi.java +++ b/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/client/SysClientApi.java @@ -2,7 +2,7 @@ package ai.remi.sys.api.client; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.feign.aspect.FeignAutoConfiguration; -import ai.remi.sys.api.factory.IamClientFactory; +import ai.remi.sys.api.factory.SysClientFactory; import ai.remi.sys.domain.dto.post.LogRecordPostDTO; import ai.remi.sys.domain.vo.ConfigVO; import io.swagger.v3.oas.annotations.Operation; @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam; import java.util.List; -@FeignClient(value = "remi-sys-web", configuration = FeignAutoConfiguration.class, fallbackFactory = IamClientFactory.class) -public interface IamClientApi { +@FeignClient(value = "remi-sys-web", configuration = FeignAutoConfiguration.class, fallbackFactory = SysClientFactory.class) +public interface SysClientApi { @Operation(summary = "保存日志") @PostMapping("/logRecord/add") diff --git a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/factory/IamClientFactory.java b/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/factory/IamClientFactory.java deleted file mode 100644 index 6d1f858..0000000 --- a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/factory/IamClientFactory.java +++ /dev/null @@ -1,18 +0,0 @@ -package ai.remi.sys.api.factory; - -import ai.remi.sys.api.client.IamClientApi; -import ai.remi.sys.api.fallback.IamClientFallback; -import org.springframework.cloud.openfeign.FallbackFactory; -import org.springframework.stereotype.Component; - -@Component -public class IamClientFactory implements FallbackFactory { - - @Override - public IamClientApi create(Throwable cause) { - IamClientFallback fallback = new IamClientFallback(); - fallback.setCause(cause); - return fallback; - } -} - diff --git a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/factory/SysClientFactory.java b/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/factory/SysClientFactory.java new file mode 100644 index 0000000..5859c66 --- /dev/null +++ b/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/factory/SysClientFactory.java @@ -0,0 +1,18 @@ +package ai.remi.sys.api.factory; + +import ai.remi.sys.api.client.SysClientApi; +import ai.remi.sys.api.fallback.SysClientFallback; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +@Component +public class SysClientFactory implements FallbackFactory { + + @Override + public SysClientApi create(Throwable cause) { + SysClientFallback fallback = new SysClientFallback(); + fallback.setCause(cause); + return fallback; + } +} + diff --git a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/fallback/IamClientFallback.java b/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/fallback/SysClientFallback.java similarity index 89% rename from remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/fallback/IamClientFallback.java rename to remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/fallback/SysClientFallback.java index 25d7c91..7028a01 100644 --- a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/fallback/IamClientFallback.java +++ b/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/fallback/SysClientFallback.java @@ -1,7 +1,7 @@ package ai.remi.sys.api.fallback; import ai.remi.comm.core.result.ResultBean; -import ai.remi.sys.api.client.IamClientApi; +import ai.remi.sys.api.client.SysClientApi; import ai.remi.sys.domain.dto.post.LogRecordPostDTO; import ai.remi.sys.domain.vo.ConfigVO; import lombok.Setter; @@ -10,7 +10,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.List; @Slf4j -public class IamClientFallback implements IamClientApi { +public class SysClientFallback implements SysClientApi { @Setter private Throwable cause; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/NoticePostDTO.java b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/NoticePostDTO.java index 05d1477..cbae6d0 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/NoticePostDTO.java +++ b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/NoticePostDTO.java @@ -23,9 +23,15 @@ public class NoticePostDTO implements Serializable { /** - * 通知类型 + * 通知标题 */ - @Schema(description = "通知类型") + @Schema(description = "通知标题") + private Integer noticeTitle; + + /** + * 通知类型(1通知公告 2系统消息) + */ + @Schema(description = "通知类型(1通知公告 2系统消息)") private Integer noticeType; /** diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/NoticePutDTO.java b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/NoticePutDTO.java index dfcd620..c871612 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/NoticePutDTO.java +++ b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/NoticePutDTO.java @@ -28,9 +28,15 @@ public class NoticePutDTO implements Serializable { private String id; /** - * 通知类型 + * 通知标题 */ - @Schema(description = "通知类型") + @Schema(description = "通知标题") + private Integer noticeTitle; + + /** + * 通知类型(1通知公告 2系统消息) + */ + @Schema(description = "通知类型(1通知公告 2系统消息)") private Integer noticeType; /** diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Notice.java b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Notice.java index 63c6ffc..9b7517a 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Notice.java +++ b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Notice.java @@ -19,9 +19,13 @@ import lombok.experimental.SuperBuilder; @TableName("sys_notice") public class Notice extends BaseEntity { + /** + * 通知标题 + */ + private Integer noticeTitle; /** - * 通知类型 + * 通知类型(1通知公告 2系统消息) */ private Integer noticeType; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/NoticeQuery.java b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/NoticeQuery.java index 3bab631..fb717ce 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/NoticeQuery.java +++ b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/NoticeQuery.java @@ -26,9 +26,15 @@ public class NoticeQuery implements Serializable { @Schema(description = "ID") private String id; /** - * 通知类型 + * 通知标题 */ - @Schema(description = "通知类型") + @Schema(description = "通知标题") + private Integer noticeTitle; + + /** + * 通知类型(1通知公告 2系统消息) + */ + @Schema(description = "通知类型(1通知公告 2系统消息)") private Integer noticeType; /** * 通知图标 diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/NoticeVO.java b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/NoticeVO.java index 4d2bbac..d27c4f8 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/NoticeVO.java +++ b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/NoticeVO.java @@ -30,9 +30,15 @@ public class NoticeVO implements Serializable { @Schema(description = "ID") private String id; /** - * 通知类型 + * 通知标题 */ - @Schema(description = "通知类型") + @Schema(description = "通知标题") + private Integer noticeTitle; + + /** + * 通知类型(1通知公告 2系统消息) + */ + @Schema(description = "通知类型(1通知公告 2系统消息)") private Integer noticeType; /** * 通知图标