From 813c76d44514ce8b36bede359885500f81f6c7d2 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 11 三月 2024 11:40:22 +0800
Subject: [PATCH] 整理
---
server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 172f38c..217dc55 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,13 +2,17 @@
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.service.business.ERPSyncService;
+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;
import io.swagger.annotations.ApiImplicitParams;
@@ -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;
@@ -39,6 +44,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private VisitsService visitsService;
@ApiOperation(value = "璋冪敤鍑嵁鑾峰彇鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝鍚慐RP鎻愪緵缁熸帴鍙ｈ皟鐢ㄥ嚟璇�")
@@ -140,8 +148,18 @@
@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;
}
@ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉閫氱煡鎺ュ彛", notes = "璁垮绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇峰鎵圭殑缁撴灉")
@@ -155,9 +173,22 @@
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璐︽埛淇℃伅")
+ @ApiOperation(value = "FTP璐︽埛淇℃伅", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝FTP璐︽埛淇℃伅,鍏朵腑銆怓TP璧勬簮璁块棶鏄犲皠鍦板潃銆戠敤浜庡浘鐗囧洖鏄句娇鐢紝" +
+ "姣斿浜鸿劯鍥剧墖鍥炴樉鎷兼帴锛氥�怓TP璧勬簮璁块棶鏄犲皠鍦板潃銆�+銆怓TP鐢ㄦ埛鍥剧墖瀛樺偍鐩綍銆�+銆愬疄闄呬汉鑴稿浘鐗囧瓨鍌ㄥ瓧娈靛唴瀹广��" +
+ "濡傦細http://175.27.187.84/file4/member/20231211/skjd-skdjf4enc-flgk.png")
@GetMapping("/resource/ftpAccount")
public ApiResponse<Map<String,Object>> ftpAccount() {
Map<String,Object> map = new HashMap<>();
@@ -177,6 +208,8 @@
systemDictDataBiz.queryByCode(Constants.FTP,Constants.DEVICE_EVENT_IMG).getCode());
map.put("FTP鐢ㄦ埛鍥剧墖瀛樺偍鐩綍",
systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode());
+ map.put("FTP璧勬簮璁块棶鏄犲皠鍦板潃",
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode());
return ApiResponse.success(map);
}
--
Gitblit v1.9.3