diff --git a/start/src/main/resources/sdk-prod-gwj.yml b/start/src/main/resources/sdk-prod-gwj.yml index 48efa33..217336c 100644 --- a/start/src/main/resources/sdk-prod-gwj.yml +++ b/start/src/main/resources/sdk-prod-gwj.yml @@ -57,16 +57,17 @@ openapi: sg: enabled: true - url: http://10.168.11.13:8080/ + url: http://10.168.11.13:8080 # url: http://safety.ngrok.shebaocard.com/ token_url: /admin/login reference_url: /safety/experience/receive + notice_feedback_url: /system/notice/feedback supervise_url: /safety/superviseInfo/feedback duty_url: /safety/statistics/receiveDutyStatistics calendar_url: /safety/safetyCalendar/receive accident_url: /safety/accidentReport/receive - levelxgf_url: safety/firstRelevantParty/receive - supervise_offline_url: safety/superviseInfo/offline/feedback + levelxgf_url: /safety/firstRelevantParty/receive + supervise_offline_url: /safety/superviseInfo/offline/feedback message: code: - forward: MS000116 \ No newline at end of file + forward: MS000116 diff --git a/start/src/main/resources/sdk-prod.yml b/start/src/main/resources/sdk-prod.yml index 0d3e696..6ac96e3 100644 --- a/start/src/main/resources/sdk-prod.yml +++ b/start/src/main/resources/sdk-prod.yml @@ -61,6 +61,7 @@ sg: # url: http://safety.ngrok.shebaocard.com/ token_url: /admin/login reference_url: /safety/experience/receive + notice_feedback_url: /system/notice/feedback supervise_url: /safety/superviseInfo/feedback duty_url: /safety/statistics/receiveDutyStatistics calendar_url: /safety/safetyCalendar/receive @@ -69,4 +70,4 @@ sg: supervise_offline_url: safety/superviseInfo/offline/feedback message: code: - forward: MS000145 \ No newline at end of file + forward: MS000145 diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index 1ccab42..dd08209 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -61,6 +61,7 @@ sg: # url: http://safety.ngrok.shebaocard.com/ token_url: /admin/login reference_url: /safety/experience/receive + notice_feedback_url: /system/notice/feedback supervise_url: /safety/superviseInfo/feedback duty_url: /safety/statistics/receiveDutyStatistics calendar_url: /safety/safetyCalendar/receive @@ -71,4 +72,4 @@ spring: servlet: multipart: # 关键配置：允许解析多个同名文件 - resolve-lazily: true \ No newline at end of file + resolve-lazily: true diff --git a/web-app/src/main/java/com/zcloud/safety/command/SgNoticeAddExe.java b/web-app/src/main/java/com/zcloud/safety/command/SgNoticeAddExe.java index 1d830d8..f02fb41 100644 --- a/web-app/src/main/java/com/zcloud/safety/command/SgNoticeAddExe.java +++ b/web-app/src/main/java/com/zcloud/safety/command/SgNoticeAddExe.java @@ -78,7 +78,7 @@ public class SgNoticeAddExe { deleteOldImages(byNoticeId.getNoticeId(), files); log.info("检测到已存在公告数据，执行更新，公告业务主键：{}", noticeId); } else { - sgNoticeE.setNoticeId(Tools.get32UUID()); + sgNoticeE.setNoticeId(noticeId); log.info("检测到首次接收公告数据，执行新增，公告业务主键：{}", noticeId); } } else { diff --git a/web-app/src/main/java/com/zcloud/safety/command/SgNoticeFeedbackSupport.java b/web-app/src/main/java/com/zcloud/safety/command/SgNoticeFeedbackSupport.java new file mode 100644 index 0000000..0ec87a6 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/safety/command/SgNoticeFeedbackSupport.java @@ -0,0 +1,92 @@ +package com.zcloud.safety.command; + +import com.zcloud.safety.domain.config.SgProperties; +import com.zcloud.safety.domain.enums.PushSourceEnum; +import com.zcloud.safety.domain.gateway.SgNoticeGateway; +import com.zcloud.safety.domain.model.SgNoticeE; +import com.zcloud.safety.domain.utils.TokenUtils; +import com.zcloud.safety.persistence.dataobject.SgNoticeDO; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * 公告首次查看反馈支持。 + */ +@Slf4j +@Component +@AllArgsConstructor +public class SgNoticeFeedbackSupport { + + private static final PushSourceEnum DEFAULT_SOURCE = PushSourceEnum.QINGANG_GUFEN; + + private final SgProperties sgProperties; + private final SgNoticeGateway sgNoticeGateway; + + /** + * 仅在首次查看时回调数港，并在回调成功后更新公告阅读状态为已阅读。 + * 反馈失败不阻断详情查看，下次继续重试。 + */ + public void feedbackOnFirstView(SgNoticeDO sgNoticeDO) { + if (sgNoticeDO == null || sgNoticeDO.getId() == null || !StringUtils.hasText(sgNoticeDO.getNoticeId())) { + return; + } + if (Integer.valueOf(1).equals(sgNoticeDO.getReadingFlag())) { + log.info("公告已读状态已是已阅读，跳过首次查看反馈，公告主键：{}，公告业务主键：{}", + sgNoticeDO.getId(), sgNoticeDO.getNoticeId()); + return; + } + if (!StringUtils.hasText(sgProperties.getNoticeFeedbackUrl())) { + log.warn("公告首次查看反馈地址未配置，跳过反馈，公告主键：{}，公告业务主键：{}", + sgNoticeDO.getId(), sgNoticeDO.getNoticeId()); + return; + } + + String source = DEFAULT_SOURCE.getCode(); + Map requestData = buildRequestData(sgNoticeDO, source); + try { + String token = resolveToken(); + log.info("开始执行公告首次查看反馈，公告主键：{}，公告业务主键：{}，来源：{}，请求数据：{}", + sgNoticeDO.getId(), sgNoticeDO.getNoticeId(), source, requestData); + if (Boolean.TRUE.equals(sgProperties.getEnabled())) { + TokenUtils.sendDataToThirdParty(sgProperties.getNoticeFeedbackUrl(), requestData, token); + } else { + log.info("模拟公告首次查看反馈，公告主键：{}，公告业务主键：{}，来源：{}，url：{}，请求数据：{}", + sgNoticeDO.getId(), sgNoticeDO.getNoticeId(), source, sgProperties.getNoticeFeedbackUrl(), requestData); + } + updateReadingFlag(sgNoticeDO); + log.info("公告首次查看反馈成功，并已更新阅读状态，公告主键：{}，公告业务主键：{}", + sgNoticeDO.getId(), sgNoticeDO.getNoticeId()); + } catch (Exception e) { + log.error("公告首次查看反馈失败，将在下次查看时继续重试，公告主键：{}，公告业务主键：{}", + sgNoticeDO.getId(), sgNoticeDO.getNoticeId(), e); + } + } + + private Map buildRequestData(SgNoticeDO sgNoticeDO, String source) { + Map requestData = new HashMap<>(); + requestData.put("source", source); + requestData.put("noticeId", sgNoticeDO.getNoticeId()); + return requestData; + } + + private String resolveToken() throws Exception { + if (!Boolean.TRUE.equals(sgProperties.getEnabled())) { + return "tokenAAAA"; + } + return TokenUtils.getTokenFromThirdParty(sgProperties.getTokenUrl()); + } + + private void updateReadingFlag(SgNoticeDO sgNoticeDO) { + SgNoticeE sgNoticeE = new SgNoticeE(); + sgNoticeE.setId(sgNoticeDO.getId()); + sgNoticeE.setNoticeId(sgNoticeDO.getNoticeId()); + sgNoticeE.setReadingFlag(1); + sgNoticeGateway.update(sgNoticeE); + sgNoticeDO.setReadingFlag(1); + } +} diff --git a/web-app/src/main/java/com/zcloud/safety/command/query/SgNoticeQueryExe.java b/web-app/src/main/java/com/zcloud/safety/command/query/SgNoticeQueryExe.java index 51e8e3f..3c97592 100644 --- a/web-app/src/main/java/com/zcloud/safety/command/query/SgNoticeQueryExe.java +++ b/web-app/src/main/java/com/zcloud/safety/command/query/SgNoticeQueryExe.java @@ -2,6 +2,7 @@ package com.zcloud.safety.command.query; import com.alibaba.cola.dto.PageResponse; import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.safety.command.SgNoticeFeedbackSupport; import com.zcloud.safety.command.convertor.ImgFilesCoConvertor; import com.zcloud.safety.command.convertor.SgNoticeCoConvertor; import com.zcloud.safety.dto.SgNoticePageQry; @@ -29,6 +30,7 @@ public class SgNoticeQueryExe { private final ImgFilesRepository imgFilesRepository; private final SgNoticeCoConvertor sgNoticeCoConvertor; private final ImgFilesCoConvertor imgFilesCoConvertor; + private final SgNoticeFeedbackSupport sgNoticeFeedbackSupport; /** * 分页查询。 @@ -49,6 +51,9 @@ public class SgNoticeQueryExe { return null; } + // 公告详情首次查看时，同步向数港发送查看反馈，并把公告表阅读状态更新为已阅读。 + sgNoticeFeedbackSupport.feedbackOnFirstView(sgNoticeDO); + SgNoticeCO sgNoticeCO = sgNoticeCoConvertor.converDOToCO(sgNoticeDO); if (sgNoticeDO.getNoticeId() == null || sgNoticeDO.getNoticeId().isEmpty()) { sgNoticeCO.setImgFilesList(Collections.emptyList()); diff --git a/web-client/src/main/java/com/zcloud/safety/dto/clientobject/SgNoticeCO.java b/web-client/src/main/java/com/zcloud/safety/dto/clientobject/SgNoticeCO.java index 2cf50bb..2fbd5da 100644 --- a/web-client/src/main/java/com/zcloud/safety/dto/clientobject/SgNoticeCO.java +++ b/web-client/src/main/java/com/zcloud/safety/dto/clientobject/SgNoticeCO.java @@ -8,65 +8,63 @@ import lombok.Data; import java.time.LocalDateTime; import java.util.List; - /** - * web-client - * - * @Author zhaokai - * @Date 2026-06-01 16:20:44 + * 公告返回对象。 */ @Data public class SgNoticeCO extends ClientObject { - //主键 @ApiModelProperty(value = "主键") private Long id; - //业务主键id + @ApiModelProperty(value = "业务主键id") private String noticeId; - //公告标题 + @ApiModelProperty(value = "公告标题") private String noticeTitle; - //公告内容 + @ApiModelProperty(value = "公告内容") private String noticeContent; - //乐观锁 + + @ApiModelProperty(value = "是否阅读，0：否，1：是") + private Integer readingFlag; + @ApiModelProperty(value = "乐观锁") private Integer version; - //创建人 + @ApiModelProperty(value = "创建人") private Long createId; - //创建人姓名 - @ApiModelProperty(value = "创建人姓名") + + @ApiModelProperty(value = "创建人名称") private String createName; - //创建时间 + @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; - //更新人 + @ApiModelProperty(value = "更新人") private Long updateId; - //修改人名称 + @ApiModelProperty(value = "修改人名称") private String updateName; - //更新时间 + @ApiModelProperty(value = "更新时间") private LocalDateTime updateTime; - //描述 + @ApiModelProperty(value = "描述") private String remarks; - //是否删除 + @ApiModelProperty(value = "是否删除") private String deleteEnum; - //租户ID + @ApiModelProperty(value = "租户ID") private Long tenantId; - //机构ID + @ApiModelProperty(value = "机构ID") private Long orgId; - //环境 + @ApiModelProperty(value = "环境") private String env; + @ApiModelProperty(value = "图片列表") private List imgFilesList; } - diff --git a/web-domain/src/main/java/com/zcloud/safety/domain/config/SgProperties.java b/web-domain/src/main/java/com/zcloud/safety/domain/config/SgProperties.java index 20d250d..2186d89 100644 --- a/web-domain/src/main/java/com/zcloud/safety/domain/config/SgProperties.java +++ b/web-domain/src/main/java/com/zcloud/safety/domain/config/SgProperties.java @@ -40,6 +40,10 @@ public class SgProperties { * 互学互鉴推送接口地址。 */ private String referenceUrl; + /** + * 公告首次查看反馈接口地址。 + */ + private String noticeFeedbackUrl; /** * 事故上报推送接口地址。 diff --git a/web-domain/src/main/java/com/zcloud/safety/domain/model/SgNoticeE.java b/web-domain/src/main/java/com/zcloud/safety/domain/model/SgNoticeE.java index c51a6fa..569dae8 100644 --- a/web-domain/src/main/java/com/zcloud/safety/domain/model/SgNoticeE.java +++ b/web-domain/src/main/java/com/zcloud/safety/domain/model/SgNoticeE.java @@ -6,44 +6,28 @@ import lombok.Data; import java.time.LocalDateTime; /** - * web-domain - * - * @Author zhaokai - * @Date 2026-06-01 16:20:44 + * 公告领域对象。 */ @Data public class SgNoticeE extends BaseE { - //主键 private Long id; - //业务主键id private String noticeId; - //公告标题 private String noticeTitle; - //公告内容 private String noticeContent; - //乐观锁 + /** + * 是否阅读，0：否，1：是。 + */ + private Integer readingFlag; private Integer version; - //创建人 private Long createId; - //创建人姓名 private String createName; - //创建时间 private LocalDateTime createTime; - //更新人 private Long updateId; - //修改人名称 private String updateName; - //更新时间 private LocalDateTime updateTime; - //描述 private String remarks; - //是否删除 private String deleteEnum; - //租户ID private Long tenantId; - //机构ID private Long orgId; - //环境 private String env; } - diff --git a/web-domain/src/main/java/com/zcloud/safety/domain/utils/TokenUtils.java b/web-domain/src/main/java/com/zcloud/safety/domain/utils/TokenUtils.java index 5404dff..f895b40 100644 --- a/web-domain/src/main/java/com/zcloud/safety/domain/utils/TokenUtils.java +++ b/web-domain/src/main/java/com/zcloud/safety/domain/utils/TokenUtils.java @@ -101,7 +101,7 @@ public class TokenUtils { // SM4加密准备 SM4 sm4 = SmUtil.sm4(); SecretKey secretKey = sm4.getSecretKey(); // 自动生成随机密钥 - System.out.println("发送到第三方接口的参数: " + JSON.toJSONString(data)); + log.info("发送到第三方接口的参数: {}", JSON.toJSONString(data)); // 构造并加密请求参数 String encryptedValue = sm4.encryptHex(JSON.toJSONString(data)); // 请求参数加密 diff --git a/web-infrastructure/src/main/java/com/zcloud/safety/persistence/dataobject/SgNoticeDO.java b/web-infrastructure/src/main/java/com/zcloud/safety/persistence/dataobject/SgNoticeDO.java index 8eceee9..e33e0db 100644 --- a/web-infrastructure/src/main/java/com/zcloud/safety/persistence/dataobject/SgNoticeDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/safety/persistence/dataobject/SgNoticeDO.java @@ -27,6 +27,10 @@ public class SgNoticeDO extends BaseDO { //公告内容 @ApiModelProperty(value = "公告内容") private String noticeContent; + //是否阅读，0：否，1：是 + @ApiModelProperty(value = "是否阅读，0：否，1：是") + private Integer readingFlag; + public SgNoticeDO(String noticeId) { this.noticeId = noticeId; diff --git a/web-infrastructure/src/main/resources/mapper/SgNoticeMapper.xml b/web-infrastructure/src/main/resources/mapper/SgNoticeMapper.xml index aa95de0..dbf3d19 100644 --- a/web-infrastructure/src/main/resources/mapper/SgNoticeMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/SgNoticeMapper.xml @@ -10,6 +10,7 @@ notice_id AS noticeId, notice_title AS noticeTitle, notice_content AS noticeContent, + reading_flag AS readingFlag, version, create_id AS createId, create_name AS createName, @@ -33,6 +34,7 @@ notice_id AS noticeId, notice_title AS noticeTitle, notice_content AS noticeContent, + reading_flag AS readingFlag, version, create_id AS createId, create_name AS createName,