From a3b2804c00dcd213b9be5ac075d34d04bd323678 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Wed, 15 Jun 2022 10:14:31 +0800 Subject: [PATCH] zh --- .../controller/QywxDepartmentController.java | 20 -------- .../controller/UtilsController.java | 9 ---- .../controller/manage/QYWXController.java | 46 +++++++++++++++++++ .../QYWXUController.java} | 20 ++------ .../serviceImpl/RankServiceImpl.java | 2 +- 5 files changed, 50 insertions(+), 47 deletions(-) delete mode 100644 src/main/java/com/zh/project0512/controller/QywxDepartmentController.java create mode 100644 src/main/java/com/zh/project0512/controller/manage/QYWXController.java rename src/main/java/com/zh/project0512/controller/{QYWXController.java => wxApp/QYWXUController.java} (81%) diff --git a/src/main/java/com/zh/project0512/controller/QywxDepartmentController.java b/src/main/java/com/zh/project0512/controller/QywxDepartmentController.java deleted file mode 100644 index 7c145db..0000000 --- a/src/main/java/com/zh/project0512/controller/QywxDepartmentController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zh.project0512.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author zh - * @since 2022-06-07 - */ -@RestController -@RequestMapping("/qywx-department") -public class QywxDepartmentController { - -} diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java index 2fe7034..7338f2d 100644 --- a/src/main/java/com/zh/project0512/controller/UtilsController.java +++ b/src/main/java/com/zh/project0512/controller/UtilsController.java @@ -100,13 +100,4 @@ public class UtilsController { return Result.fail(HttpStatusEnum.NOT_FOUND); } } - - @PostMapping("/redis") - public void testString() { - ValueOperations stringOps = redisTemplate.opsForValue(); - //普通get，set - stringOps.set("name", "hello"); - System.out.println(stringOps.get("name")); - } - } diff --git a/src/main/java/com/zh/project0512/controller/manage/QYWXController.java b/src/main/java/com/zh/project0512/controller/manage/QYWXController.java new file mode 100644 index 0000000..59daad8 --- /dev/null +++ b/src/main/java/com/zh/project0512/controller/manage/QYWXController.java @@ -0,0 +1,46 @@ +package com.zh.project0512.controller.manage; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.zh.project0512.annotation.tokenValid; +import com.zh.project0512.model.QywxDepartmentUserLink; +import com.zh.project0512.model.User; +import com.zh.project0512.service.IQywxDepartmentService; +import com.zh.project0512.service.IQywxDepartmentUserLinkService; +import com.zh.project0512.service.IUserService; +import com.zh.project0512.utils.HttpUtil; +import com.zh.project0512.utils.JwtUtil; +import com.zh.project0512.utils.result.HttpStatusEnum; +import com.zh.project0512.utils.result.Result; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +@Tag(name = "企业微信管理") +@RestController +@RequestMapping("/manage/qywx") +public class QYWXController { + @Autowired + private HttpUtil httpUtil; + @Autowired + private IQywxDepartmentService qywxDepartmentService; + + @Operation(summary = "刷新企业部门信息") + @PostMapping("/departmentRefresh") + public Result departmentRefresh() { + String access_token = httpUtil.qywxGetToken(); + JSONObject res = httpUtil.qywxDepartmentList(access_token); + List department = res.getJSONArray("department"); + qywxDepartmentService.remove(new QueryWrapper<>()); + qywxDepartmentService.updateAll(department); + return Result.success(res.getJSONArray("department")); + } +} diff --git a/src/main/java/com/zh/project0512/controller/QYWXController.java b/src/main/java/com/zh/project0512/controller/wxApp/QYWXUController.java similarity index 81% rename from src/main/java/com/zh/project0512/controller/QYWXController.java rename to src/main/java/com/zh/project0512/controller/wxApp/QYWXUController.java index 3df606b..f1b50a8 100644 --- a/src/main/java/com/zh/project0512/controller/QYWXController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/QYWXUController.java @@ -1,4 +1,4 @@ -package com.zh.project0512.controller; +package com.zh.project0512.controller.wxApp; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -27,28 +27,14 @@ import java.util.List; @Tag(name = "企业微信管理") @RestController @RequestMapping("/wxApp/qywx") -public class QYWXController { +public class QYWXUController { @Autowired private HttpUtil httpUtil; @Autowired - private IQywxDepartmentService qywxDepartmentService; - @Autowired private IUserService userService; @Resource private IQywxDepartmentUserLinkService qywxDepartmentUserLinkService; - - @Operation(summary = "刷新企业部门信息") - @PostMapping("/departmentRefresh") - public Result departmentRefresh() { - String access_token = httpUtil.qywxGetToken(); - JSONObject res = httpUtil.qywxDepartmentList(access_token); - List department = res.getJSONArray("department"); - qywxDepartmentService.remove(new QueryWrapper<>()); - qywxDepartmentService.updateAll(department); - return Result.success(res.getJSONArray("department")); - } - - @Operation(summary = "用户部门信息", parameters = {@Parameter(name = "code", description = "login返回的code（未使用过！）")}) + @Operation(summary = "刷新用户部门信息", parameters = {@Parameter(name = "code", description = "login返回的code（未使用过！）")}) @PostMapping("/userDepartmentRefresh") @tokenValid public Result userDepartmentRefresh(@RequestBody @Parameter(hidden = true) JSONObject obj, @RequestHeader(value = "token") @Parameter(name = "登录token") String token) { diff --git a/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java index 314cc57..68bbe29 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java +++ b/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java @@ -40,7 +40,7 @@ public class RankServiceImpl implements IRankService { // cal.set(Calendar.MILLISECOND,0); // Date time = cal.getTime(); // SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd 00:00:00"); - LocalDateTime now = LocalDateTime.now(); + LocalDateTime now = LocalDateTime.now().minusMonths(1); String format = now.format(DateTimeFormatter.ofPattern("yyyy-MM")); QueryWrapper queryWrapper = new QueryWrapper<>();