From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/api/system/SystemController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/system/SystemController.java b/server/src/main/java/doumeemes/api/system/SystemController.java
index d500555..f52d886 100644
--- a/server/src/main/java/doumeemes/api/system/SystemController.java
+++ b/server/src/main/java/doumeemes/api/system/SystemController.java
@@ -7,12 +7,14 @@
import doumeemes.core.model.ApiResponse;
import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.utils.Constants;
+import doumeemes.core.utils.DateUtil;
import doumeemes.dao.business.dto.CompanyInitDataDTO;
import doumeemes.dao.ext.dto.WxLoginDTO;
import doumeemes.dao.ext.dto.WxLoginOutDTO;
import doumeemes.dao.ext.vo.WxLoginVO;
import doumeemes.dao.system.dto.LoginDTO;
import doumeemes.dao.system.dto.UpdatePwdDto;
+import doumeemes.service.business.BizLingyangService;
import doumeemes.service.system.SystemLoginService;
import doumeemes.service.system.WxLoginService;
import io.swagger.annotations.Api;
@@ -31,6 +33,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
import java.util.Iterator;
/**
@@ -53,11 +56,21 @@
@Autowired
private WxLoginService wxLoginService;
+ @Autowired
+ BizLingyangService bizLingyangService;
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("鐧诲綍")
@PostMapping("/login")
public ApiResponse<String> login (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) {
return ApiResponse.success(systemLoginService.loginByPassword(dto, request));
+ }
+ @PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("鎵嬪姩鍚屾鏌愬ぉ鐨勬暟鎹�(yyyy-MM-dd HH:mm:ss)")
+ @GetMapping("/syncLingCountData")
+ public ApiResponse<String> syncLingCountData (@RequestParam String dateStr, HttpServletRequest request) {
+ Date date = DateUtil.getDateFromString(dateStr);
+ bizLingyangService.syncLingData(date);
+ return ApiResponse.success("鎿嶄綔瀹屾垚");
}
@PreventRepeat(limit = 10, lockTime = 10000)
@@ -78,8 +91,8 @@
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("寰俊灏忕▼搴忕櫥褰�")
@GetMapping("/wxProgramLogin")
- public ApiResponse<WxLoginVO> wxProgramLogin (@RequestParam String unionId,@RequestParam String openId, HttpServletRequest request) {
- return ApiResponse.success(wxLoginService.wxProgramLogin(unionId,openId, request));
+ public ApiResponse<WxLoginVO> wxProgramLogin (@RequestParam String code, HttpServletRequest request) {
+ return ApiResponse.success(wxLoginService.wxProgramLogin(code, request));
}
@PreventRepeat(limit = 10, lockTime = 10000)
--
Gitblit v1.9.3