From 7d1abc56db2b67657070016c19640f815f627994 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期四, 14 十二月 2023 17:48:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java b/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
index a6d2a65..c0c9384 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
+++ b/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
@@ -1,17 +1,30 @@
package com.doumee.api.web;
+import com.doumee.config.Jwt.JwtPayLoad;
+import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.config.annotation.ErpLoginRequired;
+import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.openapi.request.*;
import com.doumee.core.model.openapi.response.*;
+import com.doumee.core.utils.Constants;
+import com.doumee.service.business.DeviceRoleService;
+import com.doumee.service.business.DeviceService;
+import com.doumee.service.business.ERPSyncService;
+import com.doumee.service.business.MemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpRequest;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
@@ -24,9 +37,13 @@
@Api(tags = "1銆併�愯瀹㈢銆戞暟鎹祫婧愭帴鍙ｏ紙鍚慐RP绔彁渚涙垨鎻愪氦鏁版嵁淇℃伅锛�")
@RestController
-@RequestMapping("/visitbiz/resource")
+@RequestMapping("/visitbiz")
@Slf4j
public class BizResourceController extends ApiController{
+
+ @Autowired
+ private ERPSyncService erpSyncService;
+
@ApiOperation(value = "璋冪敤鍑嵁鑾峰彇鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝鍚慐RP鎻愪緵缁熸帴鍙ｈ皟鐢ㄥ嚟璇�")
@GetMapping("/accesstoken")
@@ -34,16 +51,19 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "accessKey", value = "璁块棶key锛岀敱璁垮绔彁渚�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "accessSecret", value = "璁块棶绉橀挜锛岀敱璁垮绔彁渚�", required = true)
})
- public ApiResponse<AccessTokenResponse> roleList(@RequestParam String accessKey, @RequestParam String accessSecret) {
- return ApiResponse.success(new AccessTokenResponse());
+ public ApiResponse<AccessTokenResponse> accesstoken(@RequestParam String accessKey, @RequestParam String accessSecret) {
+ return ApiResponse.success(erpSyncService.createERPToken(accessKey,accessSecret));
}
+
+ @ErpLoginRequired
@ApiOperation(value = "闂ㄧ缁勫叏閲忔帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔悓姝ヨ幏鍙栭棬绂佺粍鍏ㄩ噺淇℃伅")
@PostMapping("/resource/role/list")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse<List<RoleListResponse>> roleList(@RequestBody RoleListRequest param) {
- return ApiResponse.success(new ArrayList<RoleListResponse>());
+ param.setToken(this.getToken());
+ return ApiResponse.success(erpSyncService.erpQueryDeviceList(param));
}
@ApiOperation(value = "鍋滆溅鍦哄叏閲忎俊鎭帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔悓姝ュ叏閮ㄥ仠杞﹀満鏁版嵁")
@@ -51,8 +71,9 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
- public ApiResponse<ParkListResponse> parkList(@RequestBody ParkListRequest param) {
- return ApiResponse.success(new ParkListResponse());
+ public ApiResponse<List<ParkListResponse>> parkList(@RequestBody ParkListRequest param) {
+ param.setToken(this.getToken());
+ return ApiResponse.success(erpSyncService.parkList(param));
}
@ApiOperation(value = "璁垮鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栬瀹㈠嚭鍏ヨ褰曚俊鎭�")
@@ -61,40 +82,52 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse<PageData<VisitEventListResponse>> visitList (@RequestBody PageWrap<VisitListRequest> pageWrap) {
- return ApiResponse.success(null);
+ pageWrap.getModel().setToken(this.getToken());
+ return ApiResponse.success(erpSyncService.visitListPage(pageWrap));
}
+
@ApiOperation(value = "闂ㄧ鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栭棬绂佸嚭鍏ヨ褰曚俊鎭�")
@PostMapping("/resource/doorEvent/list")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse<PageData<DoorEventListResponse>> doorEventList (@RequestBody PageWrap<DoorEventListRequest> pageWrap) {
- return ApiResponse.success(null);
+ pageWrap.getModel().setToken(this.getToken());
+ return ApiResponse.success(erpSyncService.doorEventListPage(pageWrap));
}
+
@ApiOperation(value = "杞﹁締鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栬溅杈嗗嚭鍏ヨ褰曚俊鎭�")
@PostMapping("/resource/carvisit/list")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
- public ApiResponse<PageData<CarEventListResponse>> carEventList (@RequestBody PageWrap<CarEventListResponse> pageWrap) {
- return ApiResponse.success(null);
+ public ApiResponse<PageData<CarEventListResponse>> carEventList (@RequestBody PageWrap<CarEventListRequest> pageWrap) {
+ pageWrap.getModel().setToken(this.getToken());
+ return ApiResponse.success(erpSyncService.carEventList(pageWrap));
}
+
@ApiOperation(value = "缁勭粐鍙樺寲鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝瀹屾垚璁垮绔粍缁囦俊鎭悓姝ワ紝璇ユ帴鍙ｆ敮鎸佸崟涓粍缁囨柊澧炪�佹洿鏂般�佸垹闄ら渶姹�")
@PostMapping("/event/org/update")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse orgUpdate(@RequestBody OrgUpdateRequest param) {
+ param.setToken(this.getToken());
+ erpSyncService.orgUpdate(param);
return ApiResponse.success(null);
}
+
@ApiOperation(value = "浜哄憳鍙樺寲鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝瀹屾垚璁垮绔汉鍛樹俊鎭悓姝ワ紝璇ユ帴鍙ｆ敮鎸佸崟涓汉鍛樻柊澧炪�佹洿鏂般�佸垹闄ら渶姹�")
@PostMapping("/event/user/update")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse userUpdate(@RequestBody UserUpdateRequest param) {
+ param.setToken(this.getToken());
+ erpSyncService.userUpdate(param);
return ApiResponse.success(null);
}
+
@ApiOperation(value = "浜哄憳闂ㄧ缁勬巿鏉冩帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝璁垮绔汉鍛樺悓姝ラ棬绂佺粍鎺堟潈淇℃伅锛岃鎺ュ彛鏀寔浜哄憳闂ㄧ缁勬巿鏉冩柊澧炪�佹洿鏂般�佹竻绌洪渶姹傘��")
@PostMapping("/event/role/userAuthor")
@ApiImplicitParams({
@@ -103,6 +136,7 @@
public ApiResponse roleUserAuthor(@RequestBody UserAuthorRequest param) {
return ApiResponse.success(null);
}
+
@ApiOperation(value = "杞﹁締鎺堟潈鍋滆溅鍦烘帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝璁垮绔悓姝ヨ溅杈嗗鍋滆溅鍦虹殑浣跨敤鏉冮檺锛岃鎺ュ彛鏀寔杞﹁締缁戝畾銆佽В缁戝綊灞炰汉锛屾敮鎸佹柊澧炪�佹洿鏂般�佹竻绌鸿溅杈嗘巿鏉冧俊鎭�")
@PostMapping("/event/park/carAuthor")
@ApiImplicitParams({
@@ -111,6 +145,7 @@
public ApiResponse parkCarAuthor(@RequestBody CarAuthorRequest param) {
return ApiResponse.success(null);
}
+
@ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉閫氱煡鎺ュ彛", notes = "璁垮绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇峰鎵圭殑缁撴灉")
@PostMapping("/event/approve/notice")
@ApiImplicitParams({
--
Gitblit v1.9.3