From ed27ac8115ce27b913da4c49d7c61671eff3c92e Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Tue, 18 Apr 2023 11:09:20 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=BE=85=E9=98=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/NotificationFeignClient.java       |  17 ++
 .../NotificationFeignFallbackFactory.java     |  14 ++
 .../controller/BizReadingController.java      |  37 ++++
 .../entity/NoticeReadingPO.java               | 204 ++++++++++++++++++
 .../NoticeReadingUpdateRequestBody.java       |  50 +++++
 .../service/BizReadingService.java            |  21 ++
 .../service/impl/BizReadingServiceImpl.java   |  35 +++
 7 files changed, 378 insertions(+)
 create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/controller/BizReadingController.java
 create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingPO.java
 create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java
 create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/BizReadingService.java
 create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignClient.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignClient.java
index 4220e7e..1323887 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignClient.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignClient.java
@@ -2,13 +2,20 @@ package com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.client;
 
 
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.mall.ebtp.common.log.OperationLogDetail;
+import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogBusinessModule;
+import com.chinaunicom.mall.ebtp.common.log.enums.EbtpLogType;
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.EshopMailPendingPO;
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.EshopSmsPendingPO;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingPO;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingUpdateRequestBody;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.validation.Valid;
+
 @FeignClient(value = "${mconfig.feign.name.notification}", fallbackFactory = NotificationFeignFallbackFactory.class)
 public interface NotificationFeignClient {
 
@@ -20,4 +27,14 @@ public interface NotificationFeignClient {
     @PostMapping("/v1/notification/sendMail")
     BaseResponse sendMail(@RequestBody EshopMailPendingPO eshopMailPendingPO);
 
+    @ApiOperation(value = "新增待阅", tags = "新增待阅", notes = "新增待阅")
+    @PostMapping("/v1/notification/sendReading")
+    @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "待阅-新增")
+    BaseResponse sendPending(@Valid @RequestBody NoticeReadingPO noticeReadingPO);
+
+    @ApiOperation(value = "待阅更新或删除", tags = "待阅更新或删除", notes = "待阅更新或删除")
+    @PostMapping("/v1/notification/updateReading")
+    @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "待阅-更新或删除")
+    BaseResponse updateReading(@Valid @RequestBody NoticeReadingUpdateRequestBody noticeReadingUpdateRequestBody);
+
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignFallbackFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignFallbackFactory.java
index 246f90a..29a5916 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignFallbackFactory.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignFallbackFactory.java
@@ -4,10 +4,14 @@ import cn.hutool.core.exceptions.ExceptionUtil;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.EshopMailPendingPO;
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.EshopSmsPendingPO;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingPO;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingUpdateRequestBody;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import javax.validation.Valid;
+
 @Component
 @Slf4j
 public class NotificationFeignFallbackFactory implements FallbackFactory<NotificationFeignClient> {
@@ -26,6 +30,16 @@ public class NotificationFeignFallbackFactory implements FallbackFactory<Notific
                 log.error(eshopMailPendingPO.toString());
                 return new BaseResponse();
             }
+
+            @Override
+            public BaseResponse sendPending(@Valid NoticeReadingPO noticeReadingPO) {
+                return BaseResponse.fail("云门户-新增待阅失败：" + ExceptionUtil.stacktraceToString(throwable), noticeReadingPO);
+            }
+
+            @Override
+            public BaseResponse updateReading(@Valid NoticeReadingUpdateRequestBody noticeReadingUpdateRequestBody) {
+                return BaseResponse.fail("云门户-待阅更新或删除失败：" + ExceptionUtil.stacktraceToString(throwable), noticeReadingUpdateRequestBody);
+            }
         };
         log.error(ExceptionUtil.stacktraceToString(throwable));
         return back;
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/controller/BizReadingController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/controller/BizReadingController.java
new file mode 100644
index 0000000..89b0834
--- /dev/null
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/controller/BizReadingController.java
@@ -0,0 +1,37 @@
+package com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.controller;
+
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.BizSendMsgInfoVO;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingPO;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingUpdateRequestBody;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.BizReadingService;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.BizSendMsgTemplateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(tags = "待阅")
+@RequestMapping("/v1/send/reading")
+public class BizReadingController {
+
+    @Resource
+    private BizReadingService readingService;
+
+    @ApiOperation("发送待阅")
+    @PostMapping("save")
+    public BaseResponse sendPending(@RequestBody NoticeReadingPO noticeReadingPO) {
+        return BaseResponse.success(readingService.sendPending(noticeReadingPO));
+    }
+    @ApiOperation("待阅更新或删除-readingStatus:0:待阅 1:已阅 d:待阅删除")
+    @PostMapping("update")
+    public BaseResponse updateReading(@RequestBody NoticeReadingUpdateRequestBody noticeReadingUpdateRequestBody) {
+        return BaseResponse.success(readingService.updateReading(noticeReadingUpdateRequestBody));
+    }
+
+}
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingPO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingPO.java
new file mode 100644
index 0000000..7b7fb4c
--- /dev/null
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingPO.java
@@ -0,0 +1,204 @@
+package com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity;
+
+
+import io.swagger.annotations.ApiModel;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+import lombok.EqualsAndHashCode;
+
+import lombok.experimental.Accessors;
+
+import org.hibernate.validator.constraints.Length;
+
+
+import javax.validation.constraints.NotBlank;
+
+import javax.validation.constraints.NotNull;
+
+import java.io.Serializable;
+
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "EshopBpmReading对象",description = "待阅表信息实体")
+public class NoticeReadingPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("发送中心标识")
+    @NotBlank(message = "发送中心标识不能为空")
+    @Length(message = "发送中心标识不能超过{max}个字符",max = 36)
+    private String sendCenter;
+
+    @ApiModelProperty("发送业务模块标识")
+    @NotBlank(message = "发送业务模块标识不能为空")
+    @Length(message = "发送业务模块标识不能超过{max}个字符",max = 36)
+    private String sendModule;
+
+    @ApiModelProperty("待阅信息的编号")
+    @NotBlank(message = "待阅信息的编号不能为空")
+    @Length(message = "待阅信息的编号不能超过{max}个字符",max = 100)
+    private String readingCode;
+
+    @ApiModelProperty("待阅标题")
+    @NotBlank(message = "待阅标题不能为空")
+    @Length(message = "待阅标题不能超过{max}个字符",max = 500)
+    private String readingTitle;
+
+    @ApiModelProperty("待阅产生时间")
+    private String readingDate;
+
+    @ApiModelProperty("待阅人用户标识,门户待办为邮箱前缀；非门户待办为用户账号")
+    @NotBlank(message = "待阅人用户标识不能为空")
+    @Length(message = "待阅人用户标识不能超过{max}个字符",max = 128)
+    private String readingUserId;
+
+    @ApiModelProperty("待阅人名")
+    @NotBlank(message = "待阅人名不能为空")
+    @Length(message = "待阅人名不能超过{max}个字符",max = 50)
+    private String readingUserCn;
+
+    @ApiModelProperty("待阅信息URL")
+    @NotBlank(message = "待阅信息URL不能为空")
+    @Length(message = "待阅信息URL不能超过{max}个字符",max = 4000)
+    private String readingUrl;
+
+    @ApiModelProperty("待阅状态 0:待阅 1:以阅")
+    @NotBlank(message = "待阅状态不能为空")
+    @Length(message = "待阅状态不能超过{max}个字符",max = 1)
+    private String readingStatus;
+
+    @ApiModelProperty("待阅等级 0.普通，1.重要，2加急")
+    @NotNull(message = "待阅等级不能为空")
+    private Integer readingLevel;
+
+    @ApiModelProperty("省分代码")
+    @Length(message = "省分代码不能超过{max}个字符",max = 10)
+    private String readingCityCode;
+
+    @ApiModelProperty("待阅类型 1:门户待阅 2：门户流程待阅 3:商城待阅")
+    @NotBlank(message = "待阅类型不能为空")
+    @Length(message = "待阅类型不能超过{max}个字符",max = 1)
+    private String readingType;
+
+    @ApiModelProperty("待阅信息上一步处理人邮件前缀 上一步处理人的帐号,若为发起待办则填发起人的账号")
+    @NotBlank(message = "上一步处理人的帐号不能为空")
+    @Length(message = "上一步处理人的帐号不能超过{max}个字符",max = 128)
+    private String readingSourceUserId;
+
+    @ApiModelProperty("上一步处理人的姓名")
+    @NotBlank(message = "上一步处理人的姓名不能为空")
+    @Length(message = "上一步处理人的姓名不能超过{max}个字符",max = 50)
+    private String readingSourceUserCn;
+
+    @ApiModelProperty("a:新增待阅 u:更新待阅 t:更新待阅标题 d:删除待阅")
+    @NotBlank(message = "操作类型不能为空")
+    @Length(message = "操作类型不能超过{max}个字符",max = 1)
+    private String operatorType;
+
+    @ApiModelProperty("省ou")
+    @Length(message = "省ou不能超过{max}个字符",max = 20)
+    private String provinceOu;
+
+    @ApiModelProperty("省ou名")
+    @Length(message = "省ou名不能超过{max}个字符",max = 100)
+    private String provinceOuName;
+
+    @ApiModelProperty("市ou")
+    @Length(message = "市ou不能超过{max}个字符",max = 20)
+    private String cityOu;
+
+    @ApiModelProperty("市ou名")
+    @Length(message = "市ou名不能超过{max}个字符",max = 100)
+    private String cityOuName;
+
+    @ApiModelProperty("待办所属系统简称")
+    private String readingNote;
+
+    @ApiModelProperty("待阅接口入参信息")
+    private String inputMessage;
+
+    @ApiModelProperty("待阅接口返回结果")
+    private String returnResult;
+
+    @ApiModelProperty("创建人uid")
+    private String createBy;
+
+    @ApiModelProperty("更新人uid")
+    private String updateBy;
+
+    @ApiModelProperty("表插入生成时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty("待办生成时间")
+    private LocalDateTime launchDate;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateDate;
+
+    @ApiModelProperty("租户标识")
+    private String tenantId;
+
+    @ApiModelProperty("逻辑删除，normal表示正常（默认），deleted表示删除")
+    private String deleteFlag;
+
+    @ApiModelProperty("乐观锁")
+    private Integer versions;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved1;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved2;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved3;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved4;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved5;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved6;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved7;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved8;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved9;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved10;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved11;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved12;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved13;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved14;
+
+    @ApiModelProperty("云门户预留字段")
+    private String dbReserved15;
+
+    @ApiModelProperty("最后一次更新时间")
+    private LocalDateTime lastUpdateTime;
+
+}
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java
new file mode 100644
index 0000000..66539f1
--- /dev/null
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java
@@ -0,0 +1,50 @@
+package com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity;
+
+
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class NoticeReadingUpdateRequestBody {
+
+    @ApiModelProperty("待阅信息的编号")
+    @NotBlank(message = "待阅编号不能为空"    )
+    @Length(message = "待阅编号不能超过{max}个字符",max = 100    )
+    private String readingCode;
+
+    @ApiModelProperty("待阅状态 0:待阅 1:已阅 d:待阅删除")
+    @NotBlank(message = "待阅状态不能为空"    )
+    @Length(message = "待阅状态不能超过{max}个字符",max = 1    )
+    private String readingStatus;
+
+    @ApiModelProperty("待阅状态更新时间")
+    @Length(message = "待阅更新时间不能超过{max}个字符",max = 20    )
+    private String lastUpdateDate;
+
+    @ApiModelProperty("待办类型：1 门户待阅 2 门户流程待办 3 商城待阅")
+    @NotBlank(message = "待阅类型不能为空"    )
+    @Length(message = "待阅类型不能超过{max}个字符",max = 1    )
+    private String readingType;
+
+    @ApiModelProperty("待阅产生时间")
+    private String readingDate;
+
+    @ApiModelProperty("待阅接口入参信息")
+    private String inputMessage;
+
+    @ApiModelProperty("待阅接口返回结果:100为成功")
+    private String returnCode;
+
+    @ApiModelProperty("待阅接口返回信息")
+    private String returnMessage;
+
+}
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/BizReadingService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/BizReadingService.java
new file mode 100644
index 0000000..68b3aa4
--- /dev/null
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/BizReadingService.java
@@ -0,0 +1,21 @@
+package com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service;
+
+
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.BizSendEmailVO;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.BizSendMsgVO;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingPO;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingUpdateRequestBody;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+import java.io.IOException;
+
+@Component
+public interface BizReadingService {
+
+    BaseResponse sendPending(NoticeReadingPO noticeReadingPO);
+
+    BaseResponse updateReading(NoticeReadingUpdateRequestBody noticeReadingUpdateRequestBody);
+}
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
new file mode 100644
index 0000000..013e662
--- /dev/null
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
@@ -0,0 +1,35 @@
+package com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.impl;
+
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.client.NotificationFeignClient;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingPO;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingUpdateRequestBody;
+import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.BizReadingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author yanss
+ */
+@Service
+@Slf4j
+public class BizReadingServiceImpl implements BizReadingService {
+
+    @Resource
+    private NotificationFeignClient notificationFeignClient;
+
+    @Override
+    public BaseResponse sendPending(NoticeReadingPO noticeReadingPO) {
+//        noticeReadingPO.setSendCenter("na134");
+        noticeReadingPO.setSendCenter("ebtp");
+        noticeReadingPO.setSendModule("biz-service-ebtp-extend");
+        return notificationFeignClient.sendPending(noticeReadingPO);
+    }
+
+    @Override
+    public BaseResponse updateReading(NoticeReadingUpdateRequestBody noticeReadingUpdateRequestBody) {
+        return notificationFeignClient.updateReading(noticeReadingUpdateRequestBody);
+    }
+}

From acff63646f4982fa8231f7e76f3bc1b10399adb5 Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Tue, 18 Apr 2023 13:45:41 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=BE=85=E9=98=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NoticeReadingUpdateRequestBody.java       | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java
index 66539f1..2a0b564 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java
@@ -2,37 +2,29 @@ package com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity;
 
 
 import io.swagger.annotations.ApiModelProperty;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
-
-
 import javax.validation.constraints.NotBlank;
 
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
+
 public class NoticeReadingUpdateRequestBody {
 
     @ApiModelProperty("待阅信息的编号")
-    @NotBlank(message = "待阅编号不能为空"    )
-    @Length(message = "待阅编号不能超过{max}个字符",max = 100    )
+    @NotBlank(message = "待阅编号不能为空")
+    @Length(message = "待阅编号不能超过{max}个字符",max = 100)
     private String readingCode;
 
     @ApiModelProperty("待阅状态 0:待阅 1:已阅 d:待阅删除")
-    @NotBlank(message = "待阅状态不能为空"    )
-    @Length(message = "待阅状态不能超过{max}个字符",max = 1    )
+    @NotBlank(message = "待阅状态不能为空")
+    @Length(message = "待阅状态不能超过{max}个字符",max = 1)
     private String readingStatus;
 
     @ApiModelProperty("待阅状态更新时间")
-    @Length(message = "待阅更新时间不能超过{max}个字符",max = 20    )
+    @Length(message = "待阅更新时间不能超过{max}个字符",max = 20)
     private String lastUpdateDate;
 
     @ApiModelProperty("待办类型：1 门户待阅 2 门户流程待办 3 商城待阅")
-    @NotBlank(message = "待阅类型不能为空"    )
-    @Length(message = "待阅类型不能超过{max}个字符",max = 1    )
+    @NotBlank(message = "待阅类型不能为空")
+    @Length(message = "待阅类型不能超过{max}个字符",max = 1)
     private String readingType;
 
     @ApiModelProperty("待阅产生时间")

From ab730ad2c5d9e04fae675458210b150577a473b3 Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Tue, 18 Apr 2023 13:57:45 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=BE=85=E9=98=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BizReadingServiceImpl.java          | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
index 013e662..fe7bf06 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
@@ -1,11 +1,14 @@
 package com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.impl;
 
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService;
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.client.NotificationFeignClient;
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingPO;
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingUpdateRequestBody;
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.BizReadingService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -19,12 +22,21 @@ public class BizReadingServiceImpl implements BizReadingService {
 
     @Resource
     private NotificationFeignClient notificationFeignClient;
+    @Autowired
+    private IBaseCacheUserService cacheUserService;
 
     @Override
     public BaseResponse sendPending(NoticeReadingPO noticeReadingPO) {
 //        noticeReadingPO.setSendCenter("na134");
         noticeReadingPO.setSendCenter("ebtp");
         noticeReadingPO.setSendModule("biz-service-ebtp-extend");
+        if(StringUtils.isBlank(noticeReadingPO.getOperatorType())){
+            noticeReadingPO.setOperatorType("a");
+        }
+        if(StringUtils.isBlank(noticeReadingPO.getReadingSourceUserId())){
+            noticeReadingPO.setReadingSourceUserId(cacheUserService.getCacheUser().getUserId());
+            noticeReadingPO.setReadingSourceUserCn(cacheUserService.getCacheUser().getFullName());
+        }
         return notificationFeignClient.sendPending(noticeReadingPO);
     }
 

From 984cab3089b6b0adadcb91bed4adfc2fa2ee5003 Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Tue, 18 Apr 2023 17:20:23 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=BE=85=E9=98=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/NotificationFeignClient.java       |  2 +-
 .../NotificationFeignFallbackFactory.java     |  2 +-
 .../controller/BizReadingController.java      | 19 +++++++-----
 .../NoticeReadingUpdateRequestBody.java       |  7 ++++-
 .../service/BizReadingService.java            |  4 ++-
 .../service/impl/BizReadingServiceImpl.java   | 29 ++++++++++++++++---
 6 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignClient.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignClient.java
index 1323887..8f28a9d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignClient.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignClient.java
@@ -30,7 +30,7 @@ public interface NotificationFeignClient {
     @ApiOperation(value = "新增待阅", tags = "新增待阅", notes = "新增待阅")
     @PostMapping("/v1/notification/sendReading")
     @OperationLogDetail(businessModule = EbtpLogBusinessModule.OTHER,operationType = EbtpLogType.SELECT,detail = "待阅-新增")
-    BaseResponse sendPending(@Valid @RequestBody NoticeReadingPO noticeReadingPO);
+    BaseResponse sendReading(@Valid @RequestBody NoticeReadingPO noticeReadingPO);
 
     @ApiOperation(value = "待阅更新或删除", tags = "待阅更新或删除", notes = "待阅更新或删除")
     @PostMapping("/v1/notification/updateReading")
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignFallbackFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignFallbackFactory.java
index 29a5916..21c86c5 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignFallbackFactory.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/client/NotificationFeignFallbackFactory.java
@@ -32,7 +32,7 @@ public class NotificationFeignFallbackFactory implements FallbackFactory<Notific
             }
 
             @Override
-            public BaseResponse sendPending(@Valid NoticeReadingPO noticeReadingPO) {
+            public BaseResponse sendReading(@Valid NoticeReadingPO noticeReadingPO) {
                 return BaseResponse.fail("云门户-新增待阅失败：" + ExceptionUtil.stacktraceToString(throwable), noticeReadingPO);
             }
 
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/controller/BizReadingController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/controller/BizReadingController.java
index 89b0834..fd0167c 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/controller/BizReadingController.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/controller/BizReadingController.java
@@ -8,16 +8,13 @@ import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.BizReadingS
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.BizSendMsgTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
 @RestController
 @Api(tags = "待阅")
-@RequestMapping("/v1/send/reading")
+@RequestMapping("/v1/reading")
 public class BizReadingController {
 
     @Resource
@@ -25,13 +22,19 @@ public class BizReadingController {
 
     @ApiOperation("发送待阅")
     @PostMapping("save")
-    public BaseResponse sendPending(@RequestBody NoticeReadingPO noticeReadingPO) {
-        return BaseResponse.success(readingService.sendPending(noticeReadingPO));
+    public BaseResponse sendReading(@RequestBody NoticeReadingPO noticeReadingPO) {
+        return readingService.sendReading(noticeReadingPO);
     }
     @ApiOperation("待阅更新或删除-readingStatus:0:待阅 1:已阅 d:待阅删除")
     @PostMapping("update")
     public BaseResponse updateReading(@RequestBody NoticeReadingUpdateRequestBody noticeReadingUpdateRequestBody) {
-        return BaseResponse.success(readingService.updateReading(noticeReadingUpdateRequestBody));
+        return readingService.updateReading(noticeReadingUpdateRequestBody);
+    }
+
+    @ApiOperation("待阅更新1:已阅")
+    @PostMapping("updateReaded")
+    public BaseResponse updateReaded(@RequestParam String readingCode) {
+        return readingService.updateReaded(readingCode);
     }
 
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java
index 2a0b564..08beffa 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingUpdateRequestBody.java
@@ -2,10 +2,15 @@ package com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity;
 
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotBlank;
 
-
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
 public class NoticeReadingUpdateRequestBody {
 
     @ApiModelProperty("待阅信息的编号")
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/BizReadingService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/BizReadingService.java
index 68b3aa4..560bc53 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/BizReadingService.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/BizReadingService.java
@@ -15,7 +15,9 @@ import java.io.IOException;
 @Component
 public interface BizReadingService {
 
-    BaseResponse sendPending(NoticeReadingPO noticeReadingPO);
+    BaseResponse sendReading(NoticeReadingPO noticeReadingPO);
 
     BaseResponse updateReading(NoticeReadingUpdateRequestBody noticeReadingUpdateRequestBody);
+
+    BaseResponse updateReaded(String readingCode);
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
index fe7bf06..a8f2fba 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 
 /**
  * @author yanss
@@ -26,8 +27,7 @@ public class BizReadingServiceImpl implements BizReadingService {
     private IBaseCacheUserService cacheUserService;
 
     @Override
-    public BaseResponse sendPending(NoticeReadingPO noticeReadingPO) {
-//        noticeReadingPO.setSendCenter("na134");
+    public BaseResponse sendReading(NoticeReadingPO noticeReadingPO) {
         noticeReadingPO.setSendCenter("ebtp");
         noticeReadingPO.setSendModule("biz-service-ebtp-extend");
         if(StringUtils.isBlank(noticeReadingPO.getOperatorType())){
@@ -37,11 +37,32 @@ public class BizReadingServiceImpl implements BizReadingService {
             noticeReadingPO.setReadingSourceUserId(cacheUserService.getCacheUser().getUserId());
             noticeReadingPO.setReadingSourceUserCn(cacheUserService.getCacheUser().getFullName());
         }
-        return notificationFeignClient.sendPending(noticeReadingPO);
+        BaseResponse baseResponse=notificationFeignClient.sendReading(noticeReadingPO);
+        if(baseResponse.isSuccess() && baseResponse.getCode()==1){
+            BaseResponse.success(baseResponse.getMessage(),null);
+        }
+        return baseResponse;
     }
 
     @Override
     public BaseResponse updateReading(NoticeReadingUpdateRequestBody noticeReadingUpdateRequestBody) {
-        return notificationFeignClient.updateReading(noticeReadingUpdateRequestBody);
+        BaseResponse baseResponse=notificationFeignClient.updateReading(noticeReadingUpdateRequestBody);
+        if(baseResponse.isSuccess() && baseResponse.getCode()==1){
+            BaseResponse.success(baseResponse.getMessage(),null);
+        }
+        return baseResponse;
+    }
+
+    @Override
+    public BaseResponse updateReaded(String readingCode) {
+        NoticeReadingUpdateRequestBody noticeReadingUpdateRequestBody=new NoticeReadingUpdateRequestBody();
+        noticeReadingUpdateRequestBody.setReadingCode(readingCode);
+        noticeReadingUpdateRequestBody.setReadingStatus("1");
+        noticeReadingUpdateRequestBody.setReadingType("1");
+        BaseResponse baseResponse=notificationFeignClient.updateReading(noticeReadingUpdateRequestBody);
+        if(baseResponse.isSuccess() && baseResponse.getCode()==1){
+            BaseResponse.success(baseResponse.getMessage(),null);
+        }
+        return baseResponse;
     }
 }

From 4549d65e2e1e1f60246346b2ce331e8fd2cbc983 Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Wed, 19 Apr 2023 14:37:49 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=BE=85=E9=98=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bizshortmessageemail/entity/NoticeReadingPO.java       | 3 +++
 .../service/impl/BizReadingServiceImpl.java                | 7 +++++++
 .../extend/funcswitch/dao/BizFuncSwitchConfigMapper.java   | 3 +++
 .../funcswitch/dao/mapper/BizFuncSwitchConfigMapper.xml    | 5 +++++
 4 files changed, 18 insertions(+)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingPO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingPO.java
index 7b7fb4c..3c2e0bc 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingPO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/entity/NoticeReadingPO.java
@@ -201,4 +201,7 @@ public class NoticeReadingPO implements Serializable {
     @ApiModelProperty("最后一次更新时间")
     private LocalDateTime lastUpdateTime;
 
+    @ApiModelProperty("功能标识：字典中包含才发送，所以要在字典中配置")
+    private String functionFlag;
+
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
index a8f2fba..e61582d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizReadingServiceImpl.java
@@ -6,6 +6,7 @@ import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.client.Notification
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingPO;
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.entity.NoticeReadingUpdateRequestBody;
 import com.chinaunicom.mall.ebtp.extend.bizshortmessageemail.service.BizReadingService;
+import com.chinaunicom.mall.ebtp.extend.funcswitch.dao.BizFuncSwitchConfigMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,9 +26,15 @@ public class BizReadingServiceImpl implements BizReadingService {
     private NotificationFeignClient notificationFeignClient;
     @Autowired
     private IBaseCacheUserService cacheUserService;
+    @Autowired
+    private BizFuncSwitchConfigMapper funcSwitchConfigMapper;
 
     @Override
     public BaseResponse sendReading(NoticeReadingPO noticeReadingPO) {
+        String active =funcSwitchConfigMapper.getValueByKey("sendReading");
+        if(StringUtils.isBlank(active) || !active.contains(noticeReadingPO.getFunctionFlag())){
+            return BaseResponse.fail("字典中未配置此功能");
+        }
         noticeReadingPO.setSendCenter("ebtp");
         noticeReadingPO.setSendModule("biz-service-ebtp-extend");
         if(StringUtils.isBlank(noticeReadingPO.getOperatorType())){
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/BizFuncSwitchConfigMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/BizFuncSwitchConfigMapper.java
index be26038..a09a7ce 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/BizFuncSwitchConfigMapper.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/BizFuncSwitchConfigMapper.java
@@ -3,10 +3,13 @@ package com.chinaunicom.mall.ebtp.extend.funcswitch.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chinaunicom.mall.ebtp.extend.funcswitch.entity.BizFuncSwitchConfig;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface BizFuncSwitchConfigMapper extends BaseMapper<BizFuncSwitchConfig> {
 
     Integer selectByType(String type);
+
+    String getValueByKey(@Param("key")String key);
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/mapper/BizFuncSwitchConfigMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/mapper/BizFuncSwitchConfigMapper.xml
index 6d745e8..8d899ed 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/mapper/BizFuncSwitchConfigMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/funcswitch/dao/mapper/BizFuncSwitchConfigMapper.xml
@@ -13,4 +13,9 @@
             resultType="java.lang.Integer">
         SELECT active FROM biz_func_switch_config WHERE `type` = #{type}
     </select>
+    <select id="getValueByKey" resultType="java.lang.String" >
+        select
+        value
+        from biz_extend_dict where `key`=#{key }
+    </select>
 </mapper>
\ No newline at end of file