From 0bf22f2cfb8f6d74be1680db17944b44602c65a1 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 11 三月 2024 15:23:14 +0800
Subject: [PATCH] 整理
---
server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 c7b1c55..e5a2eae 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
@@ -2,12 +2,16 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.ErpLoginRequired;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.erp.model.openapi.request.*;
import com.doumee.core.erp.model.openapi.response.*;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.web.reqeust.ErpVisitDTO;
+import com.doumee.service.business.VisitsService;
import com.doumee.service.business.ext.ERPSyncService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -17,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -40,6 +45,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private VisitsService visitsService;
+
@ApiOperation(value = "璋冪敤鍑嵁鑾峰彇鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝鍚慐RP鎻愪緵缁熸帴鍙ｈ皟鐢ㄥ嚟璇�")
@GetMapping("/accesstoken")
@@ -62,6 +70,7 @@
return ApiResponse.success(erpSyncService.erpQueryDeviceList(param));
}
+ @ErpLoginRequired
@ApiOperation(value = "鍋滆溅鍦哄叏閲忎俊鎭帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔悓姝ュ叏閮ㄥ仠杞﹀満鏁版嵁")
@PostMapping("/resource/park/list")
@ApiImplicitParams({
@@ -72,6 +81,7 @@
return ApiResponse.success(erpSyncService.parkList(param));
}
+ @ErpLoginRequired
@ApiOperation(value = "璁垮鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栬瀹㈠嚭鍏ヨ褰曚俊鎭�")
@PostMapping("/resource/visit/list")
@ApiImplicitParams({
@@ -82,6 +92,7 @@
return ApiResponse.success(erpSyncService.visitListPage(pageWrap));
}
+ @ErpLoginRequired
@ApiOperation(value = "闂ㄧ鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栭棬绂佸嚭鍏ヨ褰曚俊鎭�")
@PostMapping("/resource/doorEvent/list")
@ApiImplicitParams({
@@ -92,6 +103,7 @@
return ApiResponse.success(erpSyncService.doorEventListPage(pageWrap));
}
+ @ErpLoginRequired
@ApiOperation(value = "杞﹁締鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栬溅杈嗗嚭鍏ヨ褰曚俊鎭�")
@PostMapping("/resource/carvisit/list")
@ApiImplicitParams({
@@ -102,6 +114,7 @@
return ApiResponse.success(erpSyncService.carEventList(pageWrap));
}
+ @ErpLoginRequired
@ApiOperation(value = "缁勭粐鍙樺寲鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝瀹屾垚璁垮绔粍缁囦俊鎭悓姝ワ紝璇ユ帴鍙ｆ敮鎸佸崟涓粍缁囨柊澧炪�佹洿鏂般�佸垹闄ら渶姹�")
@PostMapping("/event/org/update")
@ApiImplicitParams({
@@ -113,6 +126,7 @@
return ApiResponse.success(null);
}
+ @ErpLoginRequired
@ApiOperation(value = "浜哄憳鍙樺寲鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝瀹屾垚璁垮绔汉鍛樹俊鎭悓姝ワ紝璇ユ帴鍙ｆ敮鎸佸崟涓汉鍛樻柊澧炪�佹洿鏂般�佸垹闄ら渶姹�")
@PostMapping("/event/user/update")
@ApiImplicitParams({
@@ -124,6 +138,7 @@
return ApiResponse.success(null);
}
+ @ErpLoginRequired
@ApiOperation(value = "浜哄憳闂ㄧ缁勬巿鏉冩帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝璁垮绔汉鍛樺悓姝ラ棬绂佺粍鎺堟潈淇℃伅锛岃鎺ュ彛鏀寔浜哄憳闂ㄧ缁勬巿鏉冩柊澧炪�佹洿鏂般�佹竻绌洪渶姹傘��")
@PostMapping("/event/role/userAuthor")
@ApiImplicitParams({
@@ -134,16 +149,28 @@
return ApiResponse.success(null);
}
+ @ErpLoginRequired
@ApiOperation(value = "杞﹁締鎺堟潈鍋滆溅鍦烘帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝璁垮绔悓姝ヨ溅杈嗗鍋滆溅鍦虹殑浣跨敤鏉冮檺锛岃鎺ュ彛鏀寔杞﹁締缁戝畾銆佽В缁戝綊灞炰汉锛屾敮鎸佹柊澧炪�佹洿鏂般�佹竻绌鸿溅杈嗘巿鏉冧俊鎭�")
@PostMapping("/event/park/carAuthor")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
})
public ApiResponse parkCarAuthor(@RequestBody CarAuthorRequest param) {
- erpSyncService.parkCarAuthor(param);
- return ApiResponse.success(null);
+ ApiResponse response = ApiResponse.success(null);
+ try {
+ erpSyncService.parkCarAuthor(param);
+ }catch (BusinessException e){
+ response = ApiResponse.failed(e.getCode(), e.getMessage());
+ }catch (Exception e){
+ response = ApiResponse.failed(ResponseStatus.SERVER_ERROR.getCode(),ResponseStatus.SERVER_ERROR.getMessage());
+ }
+ //-----TODO-------璁版棩蹇�-------start-----
+
+ //-----TODO-------璁版棩蹇�-------end-----
+ return response;
}
+ @ErpLoginRequired
@ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉閫氱煡鎺ュ彛", notes = "璁垮绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇峰鎵圭殑缁撴灉")
@PostMapping("/event/approve/notice")
@ApiImplicitParams({
@@ -155,6 +182,17 @@
return ApiResponse.success(null);
}
+ @ErpLoginRequired
+ @ApiOperation(value = "鍙戣捣璁垮鐢宠", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔彂璧疯瀹㈢敵璇�")
+ @PostMapping("/resource/createVisit")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
+ })
+ public ApiResponse createVisit(@Valid @RequestBody ErpVisitDTO param) {
+ param.setToken(this.getToken());
+ visitsService.createFKForErp(param);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
@ApiOperation(value = "FTP璐︽埛淇℃伅", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝FTP璐︽埛淇℃伅,鍏朵腑銆怓TP璧勬簮璁块棶鏄犲皠鍦板潃銆戠敤浜庡浘鐗囧洖鏄句娇鐢紝" +
--
Gitblit v1.9.3