From 5a8fd2f708339b3d8f88e7a8e701b2b19677eeb4 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Wed, 29 Jun 2022 15:57:39 +0800
Subject: [PATCH] zh

---
 .../manage/UserAccountController.java         | 21 +++++--
 .../controller/manage/VideoController.java    | 31 +++++++++-
 .../wxApp/AppMessageController.java           | 42 +++++++-------
 .../com/zh/project0512/model/AppMessage.java  | 57 ++++++++++---------
 .../model/dto/AppMessageListDTO.java          | 30 ----------
 .../model/vo/AppMessageListVo.java            | 38 -------------
 .../service/IAppMessageService.java           | 23 ++++----
 .../serviceImpl/AppMessageServiceImpl.java    | 49 ++++------------
 .../zh/project0512/utils/AppMessageUtil.java  | 13 ++---
 9 files changed, 124 insertions(+), 180 deletions(-)
 delete mode 100644 src/main/java/com/zh/project0512/model/dto/AppMessageListDTO.java
 delete mode 100644 src/main/java/com/zh/project0512/model/vo/AppMessageListVo.java

diff --git a/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java b/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java
index ccb1fc1..e874b87 100644
--- a/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java
@@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation;
 import com.zh.project0512.annotation.AdminTokenValid;
-import com.zh.project0512.model.User;
+import com.zh.project0512.model.AppMessage;
 import com.zh.project0512.model.UserAccount;
 import com.zh.project0512.service.IUserAccountService;
 import com.zh.project0512.service.IUserService;
 import com.zh.project0512.utils.AppMessageUtil;
-import com.zh.project0512.utils.CustomUtil;
 import com.zh.project0512.utils.ExcelUtil;
 import com.zh.project0512.utils.MybatisPlusUtil;
 import com.zh.project0512.utils.result.HttpStatusEnum;
@@ -107,7 +106,7 @@ public class UserAccountController {
             //平台：1抖音；2快手；3朋友圈；4视频号
             Integer platform = (Integer) m.get("platform");
             if (platform != null) {
-                m.replace("platform",platform ==1?"抖音":(platform ==2?"快手":(platform ==3?"朋友圈":platform ==4?"朋友圈":null)) );
+                m.replace("platform", platform == 1 ? "抖音" : (platform == 2 ? "快手" : (platform == 3 ? "朋友圈" : platform == 4 ? "朋友圈" : null)));
             }
         }
         Workbook wb = ExcelUtil.writeToExcelByList(array, iPage.getRecords());
@@ -152,10 +151,20 @@ public class UserAccountController {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "账号状态不在审核中");
         }
         UpdateWrapper<UserAccount> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", param.getId()).set("status", param.getStatus()).set("updateAt", LocalDateTime.now());
-        updateWrapper.set("reason", param.getStatus() == 2 ? param.getReason() : "");
+        Integer status = param.getStatus();
+        updateWrapper.eq("id", param.getId()).set("status",status).set("updateAt", LocalDateTime.now());
+        String description = "恭喜您，抖音关联账号审核通过。";
+        if(status == 2){
+            String reason = param.getReason();
+            if(null == reason){
+                return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "请说明拒绝理由");
+            }
+            updateWrapper.set("reason", reason);
+            description = "您的抖音关联账号审核未通过，未通过原因："+ reason+"。";
+        }
         userAccountService.update(updateWrapper);
-//        AppMessageUtil.sendMessage();
+            AppMessageUtil.sendMessage(new AppMessage().setTitle("关联账号审核结果").setDescription(description)
+                .setUrl("pages/user/subpage/relation/relation").setCreateDate(LocalDateTime.now()).setReceiverId(ua.getUserId()));
         return Result.success("修改完成");
     }
 }
diff --git a/src/main/java/com/zh/project0512/controller/manage/VideoController.java b/src/main/java/com/zh/project0512/controller/manage/VideoController.java
index ea8b6fb..14fc14d 100644
--- a/src/main/java/com/zh/project0512/controller/manage/VideoController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/VideoController.java
@@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation;
 import com.zh.project0512.annotation.AdminTokenValid;
+import com.zh.project0512.model.AppMessage;
 import com.zh.project0512.model.Video;
 import com.zh.project0512.model.VideoEffectSetting;
 import com.zh.project0512.service.IUserService;
 import com.zh.project0512.service.IVideoEffectSettingService;
 import com.zh.project0512.service.IVideoService;
+import com.zh.project0512.utils.AppMessageUtil;
 import com.zh.project0512.utils.MybatisPlusUtil;
 import com.zh.project0512.utils.result.HttpStatusEnum;
 import com.zh.project0512.utils.result.Result;
@@ -19,6 +21,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -118,10 +121,12 @@ public class VideoController {
     }
     @Operation(summary = "视频审核")
     @PostMapping("/valid")
+    @Transactional
     @AdminTokenValid
     @AdminCheckAuthorityAnnotation(jurisdictionId = "13")
     public Result valid(@Validated @RequestBody VVParam param) {
         int id = param.getId();
+        Video video = videoService.getById(id);
         if (param.getStatus() == 3) {
             String reason = param.getReason();
             if (reason == null) {
@@ -129,7 +134,12 @@ public class VideoController {
             }
             UpdateWrapper<Video> set = new UpdateWrapper<>();
             set.eq("id", id).set("status", 3).set("reason", param.getReason()).set("updateAt", LocalDateTime.now());
-            videoService.update(set);
+            boolean op = videoService.update(set);
+            if(!op){
+                return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "无效操作");
+            }
+            AppMessageUtil.sendMessage(new AppMessage().setTitle("传播效果审核结果").setDescription("您的抖音传播效果审核未通过，未通过原因："+ param.getReason()+"。")
+                .setUrl("pages/quest/subpage/detail/detail?id="+video.getTaskId()).setReceiverId(video.getUserId()));
             return Result.success( "","审核拒绝完成");
         }
         UpdateWrapper<Video> up = new UpdateWrapper<>();
@@ -148,6 +158,25 @@ public class VideoController {
         up.set("effectResult", effectResult);
         up.set("updateAt", LocalDateTime.now());
         videoService.update(up);
+        String platForm = "未知平台";
+        System.out.println("video"+video);
+        switch (video.getType()){
+            case 1:
+                platForm = "抖音";
+                break;
+            case 2:
+                platForm = "快手";
+                break;
+            case 3:
+                platForm = "朋友圈";
+                break;
+            case 4:
+                platForm = "视频号";
+                break;
+            default:
+        }
+        AppMessageUtil.sendMessage(new AppMessage().setTitle("传播效果审核结果").setDescription("恭喜您，"+platForm+"传播效果审核通过，平台评定传播值为"+effectResult+"。")
+            .setUrl("pages/quest/subpage/detail/detail?id="+video.getTaskId()).setReceiverId(video.getUserId()));
         return Result.success( "","审核完成");
     }
 
diff --git a/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java b/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java
index fc25a23..864f0eb 100644
--- a/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java
+++ b/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java
@@ -1,18 +1,19 @@
 package com.zh.project0512.controller.wxApp;
 
-import com.zh.project0512.model.dto.AppMessageListDTO;
-import com.zh.project0512.model.vo.AppMessageListVo;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zh.project0512.model.AppMessage;
+import com.zh.project0512.model.User;
 import com.zh.project0512.service.IAppMessageService;
+import com.zh.project0512.service.IUserService;
 import com.zh.project0512.utils.JwtUtil;
-import com.zh.project0512.utils.result.ResultPageInfo;
+import com.zh.project0512.utils.MybatisPlusUtil;
+import com.zh.project0512.utils.result.Result;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -26,19 +27,18 @@ import javax.annotation.Resource;
 @RequestMapping("/wxApp/userMessage")
 @Tag(name = "用户消息")
 public class AppMessageController {
-    @Resource
-    IAppMessageService appMessageService;
-
-
-    /**
-     * 查询所有的app消息
-     * @param appMessageListDTO app消息 list DTO
-     * @return 所有的app消息
-     */
-    @GetMapping("/list")
-    public ResultPageInfo<AppMessageListVo> list(AppMessageListDTO appMessageListDTO,@RequestHeader(value = "token") @Parameter(name = "登录token") String token){
+    @Autowired
+    private IAppMessageService appMessageService;
+    @Autowired
+    private IUserService userService;
+    @PostMapping("/list")
+    public Result list( @RequestBody JSONObject obj, @RequestHeader(value = "token") @Parameter(name = "登录token") String token){
         String openid = new JwtUtil().parseOpenid(token);
-        return ResultPageInfo.success(appMessageService.list(appMessageListDTO,openid),"请求成功");
+        User user = userService.selByOpenid(openid);
+        QueryWrapper<AppMessage> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("receiverId",user.getId());
+        queryWrapper.orderByDesc("createDate");
+        return Result.success( appMessageService.page(MybatisPlusUtil.SetPage(obj),queryWrapper),"请求成功");
     }
 
 }
diff --git a/src/main/java/com/zh/project0512/model/AppMessage.java b/src/main/java/com/zh/project0512/model/AppMessage.java
index 2c13d84..f52ae6e 100644
--- a/src/main/java/com/zh/project0512/model/AppMessage.java
+++ b/src/main/java/com/zh/project0512/model/AppMessage.java
@@ -1,70 +1,73 @@
 package com.zh.project0512.model;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
- * app消息
+ * <p>
+ *
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-29
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
 @TableName("appMessage")
-public class AppMessage implements Serializable {
+public class AppMessage extends Model {
+
     private static final long serialVersionUID = 1L;
 
     /**
      * 主键id
      */
     @TableId(value = "id", type = IdType.AUTO)
-    @TableField("id")
     private Integer id;
+
     /**
      * 消息类型
      */
-    @TableField("type")
     private Integer type;
+
     /**
      * 标题
      */
-    @TableField("title")
     private String title;
+
     /**
      * 描述
      */
-    @TableField("describe")
-    private String describe;
+    private String description;
+
     /**
      * url
      */
-    @TableField("url")
     private String url;
+
     /**
-     * 发送人openid
-     */
-    @TableField("sendId")
-    private String sendOpenId;
-    /**
-     * 接收人openid
+     * 接收用户id
      */
     @TableField("receiverId")
-    private String receiverOpenId;
+    private Integer receiverId;
+
     /**
      * 创建时间
      */
     @TableField("createDate")
-    private Date createDate;
+    private LocalDateTime createDate;
+
     /**
      * 是否已读，1.已读，0.未读
      */
-    @TableField("reads")
-    private Integer reads;
+    private Integer settled;
+
+
 }
diff --git a/src/main/java/com/zh/project0512/model/dto/AppMessageListDTO.java b/src/main/java/com/zh/project0512/model/dto/AppMessageListDTO.java
deleted file mode 100644
index 36fb6e3..0000000
--- a/src/main/java/com/zh/project0512/model/dto/AppMessageListDTO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zh.project0512.model.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * app消息 list DTO
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class AppMessageListDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 当前页数
-     */
-    private int pageNum;
-    /**
-     * 每页记录数
-     */
-    private int pageSize;
-    /**
-     * 消息类型
-     */
-    private Integer type;
-}
diff --git a/src/main/java/com/zh/project0512/model/vo/AppMessageListVo.java b/src/main/java/com/zh/project0512/model/vo/AppMessageListVo.java
deleted file mode 100644
index b9f7fdd..0000000
--- a/src/main/java/com/zh/project0512/model/vo/AppMessageListVo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.zh.project0512.model.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * app消息 list Vo
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class AppMessageListVo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    private Integer id;
-    /**
-     * 消息类型
-     */
-    private Integer type;
-    /**
-     * 标题
-     */
-    private String title;
-    /**
-     * 描述
-     */
-    private String describe;
-    /**
-     * url
-     */
-    private String url;
-}
diff --git a/src/main/java/com/zh/project0512/service/IAppMessageService.java b/src/main/java/com/zh/project0512/service/IAppMessageService.java
index 0a78754..f77b51e 100644
--- a/src/main/java/com/zh/project0512/service/IAppMessageService.java
+++ b/src/main/java/com/zh/project0512/service/IAppMessageService.java
@@ -1,15 +1,16 @@
 package com.zh.project0512.service;
 
-import com.zh.project0512.model.dto.AppMessageListDTO;
-import com.zh.project0512.model.vo.AppMessageListVo;
-import com.zh.project0512.utils.page.PageInfo;
+import com.zh.project0512.model.AppMessage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-29
+ */
+public interface IAppMessageService extends IService<AppMessage> {
 
-public interface IAppMessageService {
-    /**
-     * 查询所有的app消息
-     * @param appMessageListDTO app消息 list DTO
-     * @param openid openid
-     * @return app消息 list Vo
-     */
-    PageInfo<AppMessageListVo> list(AppMessageListDTO appMessageListDTO, String openid);
 }
diff --git a/src/main/java/com/zh/project0512/serviceImpl/AppMessageServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/AppMessageServiceImpl.java
index fabddcb..e837728 100644
--- a/src/main/java/com/zh/project0512/serviceImpl/AppMessageServiceImpl.java
+++ b/src/main/java/com/zh/project0512/serviceImpl/AppMessageServiceImpl.java
@@ -1,47 +1,20 @@
 package com.zh.project0512.serviceImpl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zh.project0512.mapper.AppMessageMapper;
-import com.zh.project0512.model.AdminRole;
 import com.zh.project0512.model.AppMessage;
-import com.zh.project0512.model.dto.AppMessageListDTO;
-import com.zh.project0512.model.vo.AdminRoleListVo;
-import com.zh.project0512.model.vo.AppMessageListVo;
+import com.zh.project0512.mapper.AppMessageMapper;
 import com.zh.project0512.service.IAppMessageService;
-import com.zh.project0512.utils.PropertyUtils;
-import com.zh.project0512.utils.page.PageInfo;
-import org.apache.commons.lang3.StringUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-29
+ */
 @Service
-public class AppMessageServiceImpl implements IAppMessageService {
-    @Resource
-    AppMessageMapper appMessageMapper;
-
-    @Override
-    public PageInfo<AppMessageListVo> list(AppMessageListDTO appMessageListDTO, String openid) {
-        ArrayList<AppMessageListVo> appMessageListVos = new ArrayList<>();
-        QueryWrapper<AppMessage> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(appMessageListDTO.getType() != null,"type", appMessageListDTO.getType()).eq("receiver_open_id",openid);
-
-
-        Page<AppMessage> page = new Page<>(appMessageListDTO.getPageNum(), appMessageListDTO.getPageSize());
-        IPage<AppMessage> appMessageIPage = appMessageMapper.selectPage(page, queryWrapper);
-        List<AppMessage> records = appMessageIPage.getRecords();
-        if (records != null && records.size()>0){
-            for (AppMessage record : records) {
-                AppMessageListVo appMessageListVo = new AppMessageListVo();
-                PropertyUtils.copyProperties(record, appMessageListVo);
-                appMessageListVos.add(appMessageListVo);
-            }
-        }
+public class AppMessageServiceImpl extends ServiceImpl<AppMessageMapper, AppMessage> implements IAppMessageService {
 
-        return new PageInfo<>(appMessageIPage.getPages(), appMessageListVos, appMessageIPage.getTotal());
-    }
 }
diff --git a/src/main/java/com/zh/project0512/utils/AppMessageUtil.java b/src/main/java/com/zh/project0512/utils/AppMessageUtil.java
index c8c675f..1e2945c 100644
--- a/src/main/java/com/zh/project0512/utils/AppMessageUtil.java
+++ b/src/main/java/com/zh/project0512/utils/AppMessageUtil.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * app消息工具类
@@ -26,21 +26,18 @@ public class AppMessageUtil {
         appMessageUtil=this;
     }
 
-    public static Boolean sendMessage(Integer type,String title,String describe,String url,String sendOpenId,String receiverOpenId){
+    public static Boolean sendMessage(Integer type,String title,String description,String url,Integer receiverId){
         AppMessage appMessage = new AppMessage();
         appMessage.setType(type);
         appMessage.setTitle(title);
-        appMessage.setDescribe(describe);
+        appMessage.setDescription(description);
         appMessage.setUrl(url);
-        appMessage.setSendOpenId(sendOpenId);
-        appMessage.setReceiverOpenId(receiverOpenId);
+        appMessage.setReceiverId(receiverId);
         return sendMessage(appMessage);
     }
 
     public static Boolean sendMessage(AppMessage appMessage){
-        appMessage.setId(null);
-        appMessage.setCreateDate(new Date());
-        appMessage.setReads(0);
+        appMessage.setCreateDate(LocalDateTime.now());
         int insert = appMessageUtil.appMessageMapper.insert(appMessage);
         return insert > 0;
     }