xc

efs-bus/src/main/java/com/zjty/efs/bus/controller/NoticeController.java

@@ -60,7 +60,7 @@ public class NoticeController {
     }
 
     @GetMapping("/getNoticeList")
-    @ApiOperation(value = "获取通知列表接口", notes = "获取列表，type为通知类型，接收 0，发送 1，草稿 2，消息提醒　0")
+    @ApiOperation(value = "获取通知列表接口", notes = "获取列表，type为通知类型，接收 0，发送 1，草稿 2")
     @ApiImplicitParams({@ApiImplicitParam(name = "user", value = "当前用户名称", paramType = "query", required = true, example = "account", dataType = "int"),
     @ApiImplicitParam(name = "type", value = "通知类型", paramType = "query", required = true, example = "0", dataType = "int"),
     @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query", required = true, dataType = "int"),

efs-bus/src/main/java/com/zjty/efs/bus/entity/Notice.java

@@ -94,7 +94,7 @@ public class Notice {
     /**
      * 是否推送短信　是　０，否　１
      */
-    @ApiModelProperty(value = "note", example = "0", dataType = "int", name = "是否推送短信")
+    @ApiModelProperty(value = "note", example = "false", dataType = "int", name = "是否推送短信")
     @Column(name = "note")
     private int note;
 

efs-bus/src/main/java/com/zjty/efs/bus/service/AttentionService.java

@@ -6,8 +6,33 @@ import com.zjty.efs.bus.entity.Paging;
 import java.util.List;
 
 public interface AttentionService {
+    /**
+     * 获取消息提醒列表
+     * @param userId 当前登录用户编号
+     * @param pageNum 页码
+     * @param pageSize 　每页条数
+     * @return List<Paging></>
+     */
     Paging<Attention> getAttentionList(String userId, int pageNum, int pageSize);
+
+    /**
+     * 添加消息提醒
+     * @param attention 消息提醒实体
+     * @return
+     */
     boolean addAttention(Attention attention);
+
+    /**
+     * 修改消息提醒为已读
+     * @param attentions　消息提醒实体列表
+     * @return
+     */
     boolean updateStatus(List<Attention> attentions);
+
+    /**
+     * 消息提醒红点
+     * @param userId 当前登录用户编号
+     * @return
+     */
     boolean getRedDot(String userId);
 }

efs-bus/src/main/java/com/zjty/efs/bus/service/impl/AttentionServiceImpl.java

@@ -38,6 +38,7 @@ public class AttentionServiceImpl implements AttentionService {
     }
 
     @Override
+    @Transactional
     public boolean addAttention(Attention attention) {
         try{
             attentionDao.save(attention);

efs-bus/src/main/java/com/zjty/efs/bus/service/impl/NoticeServiceImpl.java

@@ -67,7 +67,7 @@ public class NoticeServiceImpl implements NoticeService {
                 notice1.setSender(notice.getSender());
                 notice1.setStatus(notice.getStatus());
                 notice1.setUpdateTime(notice.getUpdateTime());
-                notice1.setUnit(notice.getUnit());
+                notice1.setUnit(userDo1.getUnit());
                 noticeDao.save(notice1);
                 String data1 = "[" +userDo1.getUnit() + "][" + userDo1.getDepartment() + "]的[" + userDo1.getName()
                         + "]收到了来自[" + userDo.getUnit() + "][" + userDo.getDepartment() + "]的[" + userDo.getName()