From 2c65ec1b6ce28dd4c7fb89196d13fbe8f73cf662 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Wed, 29 Jun 2022 12:01:51 +0800
Subject: [PATCH] zh

---
 .../project0512/controller/manage/StatisticsController.java   | 2 +-
 .../project0512/controller/manage/UserAccountController.java  | 4 ++++
 .../zh/project0512/controller/wxApp/AppMessageController.java | 4 ++--
 .../java/com/zh/project0512/mapper/TeachingRefeMapper.java    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java b/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java
index 8537bdb..da58b99 100644
--- a/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java
@@ -85,7 +85,7 @@ public class StatisticsController {
         return Result.success(adminMapper.statistics2(qw), "请求成功");
     }
     @Operation(summary = "排行列表")
-    @PostMapping("/date3")
+    @PostMapping("/data3")
     @AdminTokenValid
     public Result rankList(@Validated @RequestBody RankListDTO rankListDTO) {
         return Result.success(rankService.rankList(rankListDTO), "请求成功");
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 dea9f29..ccb1fc1 100644
--- a/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java
@@ -10,6 +10,7 @@ import com.zh.project0512.model.User;
 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;
@@ -22,6 +23,7 @@ import lombok.Data;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -140,6 +142,7 @@ public class UserAccountController {
     @PostMapping("/valid")
     @AdminTokenValid
     @AdminCheckAuthorityAnnotation(jurisdictionId = "14")
+    @Transactional
     public Result valid(@Validated @RequestBody PassUAParam param) {
         UserAccount ua = userAccountService.getById(param.getId());
         if (ua == null) {
@@ -152,6 +155,7 @@ public class UserAccountController {
         updateWrapper.eq("id", param.getId()).set("status", param.getStatus()).set("updateAt", LocalDateTime.now());
         updateWrapper.set("reason", param.getStatus() == 2 ? param.getReason() : "");
         userAccountService.update(updateWrapper);
+//        AppMessageUtil.sendMessage();
         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 af50ccc..fc25a23 100644
--- a/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java
+++ b/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java
@@ -23,8 +23,8 @@ import javax.annotation.Resource;
  * @since 2022-05-26
  */
 @RestController
-@RequestMapping("/wxApp/appMessage")
-@Tag(name = "app消息")
+@RequestMapping("/wxApp/userMessage")
+@Tag(name = "用户消息")
 public class AppMessageController {
     @Resource
     IAppMessageService appMessageService;
diff --git a/src/main/java/com/zh/project0512/mapper/TeachingRefeMapper.java b/src/main/java/com/zh/project0512/mapper/TeachingRefeMapper.java
index 6881bfe..dc19ccd 100644
--- a/src/main/java/com/zh/project0512/mapper/TeachingRefeMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/TeachingRefeMapper.java
@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Update;
  */
 public interface TeachingRefeMapper extends BaseMapper<TeachingRefe> {
     @Update("update teachingRefe set sortWeight = sortWeight + 1 where sortWeight <> 0;\n" +
-        "insert into teachingRefe ( fileUrl,type,title, creatAt,sortWeight) VALUES ( #{fileUrl},#{type},#{title}, #{creatAt},1 );")
+        "insert into teachingRefe ( fileUrl,type,title, creatAt,duration,sortWeight) VALUES ( #{fileUrl},#{type},#{title}, #{creatAt},#{duration},1 );")
     void addTeachingRefe(TeachingRefe teachingRefe);
     @Update("<script>" +
         "update teachingRefe set sortWeight = -1 where sortWeight = #{origin};\n" +