zh

src/main/java/com/zh/project0512/controller/manage/StatisticsController.java

@@ -96,8 +96,6 @@ public class StatisticsController {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate dat = LocalDate.parse((CharSequence) first.get("dat"), df);
         LocalDate dat2 = LocalDate.parse((CharSequence) last.get("dat"), df);
-        System.out.println(dat + "" + dat2);
-        System.out.println(ChronoUnit.DAYS.between(dat, dat2));
         for (int i = 0; i <= ChronoUnit.DAYS.between(dat, dat2); i++) {
             LocalDate today = dat.plusDays(i);
             JSONObject obj = null;

src/main/java/com/zh/project0512/controller/manage/VideoController.java

@@ -7,8 +7,10 @@ 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.UserEffectRecords;
 import com.zh.project0512.model.Video;
 import com.zh.project0512.model.VideoEffectSetting;
+import com.zh.project0512.service.IUserEffectRecordsService;
 import com.zh.project0512.service.IUserService;
 import com.zh.project0512.service.IVideoEffectSettingService;
 import com.zh.project0512.service.IVideoService;
@@ -49,6 +51,8 @@ public class VideoController {
     private IUserService userService;
     @Autowired
     private IVideoEffectSettingService videoEffectSettingService;
+    @Autowired
+    private IUserEffectRecordsService userEffectRecordsService;
 
     @Data
     static class VParam {
@@ -115,10 +119,11 @@ public class VideoController {
         Integer effectResult = cal(param.getPlayNum(), list.get(0).getEffectTimes()) + cal(param.getCommendNum(), list.get(1).getEffectTimes())
             + cal(param.getCollectionNum(), list.get(2).getEffectTimes()) + cal(param.getCommentNum(), list.get(3).getEffectTimes())
             + cal(param.getReSendNum(), list.get(4).getEffectTimes()) + cal(param.getRecommendNum(), list.get(5).getEffectTimes());
-        jsonObject.put("effectResult",effectResult);
+        jsonObject.put("effectResult", effectResult);
 
-        return Result.success(jsonObject,"计算完成");
+        return Result.success(jsonObject, "计算完成");
     }
+
     @Operation(summary = "视频审核")
     @PostMapping("/valid")
     @Transactional
@@ -127,6 +132,7 @@ public class VideoController {
     public Result valid(@Validated @RequestBody VVParam param) {
         int id = param.getId();
         Video video = videoService.getById(id);
+        Integer originEffectResult = video.getEffectResult() == null ? 0 : video.getEffectResult();
         if (param.getStatus() == 3) {
             String reason = param.getReason();
             if (reason == null) {
@@ -135,15 +141,15 @@ public class VideoController {
             UpdateWrapper<Video> set = new UpdateWrapper<>();
             set.eq("id", id).set("status", 3).set("reason", param.getReason()).set("updateAt", LocalDateTime.now());
             boolean op = videoService.update(set);
-            if(!op){
+            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( "","审核拒绝完成");
+            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<>();
-        up.eq("id",id).ne("status", 0);
+        up.eq("id", id).ne("status", 0);
         up.set(param.getPlayNum() != null, "playNum", param.getPlayNum());
         up.set(param.getCommendNum() != null, "commendNum", param.getCommendNum());
         up.set(param.getCollectionNum() != null, "collectionNum", param.getCollectionNum());
@@ -158,9 +164,9 @@ public class VideoController {
         up.set("effectResult", effectResult);
         up.set("updateAt", LocalDateTime.now());
         videoService.update(up);
+        userEffectRecordsService.save(new UserEffectRecords().setUserId(video.getUserId()).setEffectResultTran(effectResult-originEffectResult).setCreateAt(LocalDateTime.now()));
         String platForm = "未知平台";
-        System.out.println("video"+video);
-        switch (video.getType()){
+        switch (video.getType()) {
             case 1:
                 platForm = "抖音";
                 break;
@@ -175,9 +181,9 @@ public class VideoController {
                 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( "","审核完成");
+        AppMessageUtil.sendMessage(new AppMessage().setTitle("传播效果审核结果").setDescription("恭喜您，" + platForm + "传播效果审核通过，平台评定传播值为" + effectResult + "。")
+            .setUrl("pages/quest/subpage/detail/detail?id=" + video.getTaskId()).setReceiverId(video.getUserId()));
+        return Result.success("", "审核完成");
     }
 
     static int cal(Integer value, Integer effectTimes) {

src/main/java/com/zh/project0512/mapper/UserEffectRecordsMapper.java

@@ -0,0 +1,16 @@
+package com.zh.project0512.mapper;
+
+import com.zh.project0512.model.UserEffectRecords;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-30
+ */
+public interface UserEffectRecordsMapper extends BaseMapper<UserEffectRecords> {
+
+}

src/main/java/com/zh/project0512/mapper/UserMapper.java

@@ -31,7 +31,7 @@ public interface UserMapper extends BaseMapper<User> {
     @Select("UPDATE user set token=#{token},lastLoginAt=#{time} where openid=#{openid}")
     void updByOpenid(String openid, String token, LocalDateTime time);
 
-    @Select("SELECT t1.name,t1.tel,t1.avatar,t1.main_department,t1.sub_department,t1.creatAt,t1.updateAt,t1.lastLoginAt" +
+    @Select("SELECT t1.name,t1.tel,t1.avatar,t1.main_department,t1.sub_department,t1.points,t1.historyPoints,t1.creatAt,t1.updateAt,t1.lastLoginAt" +
         ",t2.name as main_departmentName,t3.name as sub_departmentName " +
         "from user as t1 " +
         "left join qywxDepartment as t2 on t1.main_department = t2.departmentId " +

src/main/java/com/zh/project0512/model/UserEffectRecords.java

@@ -0,0 +1,45 @@
+package com.zh.project0512.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("userEffectRecords")
+public class UserEffectRecords extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("userId")
+    private Integer userId;
+
+    /**
+     * 传播效果改变量
+     */
+    @TableField("effectResultTran")
+    private Integer effectResultTran;
+
+    @TableField("createAt")
+    private LocalDateTime createAt;
+
+
+}

src/main/java/com/zh/project0512/service/IUserEffectRecordsService.java

@@ -0,0 +1,16 @@
+package com.zh.project0512.service;
+
+import com.zh.project0512.model.UserEffectRecords;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-30
+ */
+public interface IUserEffectRecordsService extends IService<UserEffectRecords> {
+
+}

src/main/java/com/zh/project0512/serviceImpl/UserEffectRecordsServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zh.project0512.serviceImpl;
+
+import com.zh.project0512.model.UserEffectRecords;
+import com.zh.project0512.mapper.UserEffectRecordsMapper;
+import com.zh.project0512.service.IUserEffectRecordsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zh
+ * @since 2022-06-30
+ */
+@Service
+public class UserEffectRecordsServiceImpl extends ServiceImpl<UserEffectRecordsMapper, UserEffectRecords> implements IUserEffectRecordsService {
+
+}