From 39739e34af928aae204c55db7974213c9b938c5a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 二月 2024 18:33:14 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_screen/src/main/java/com/doumee/api/web/YlScreenController.java |  194 ++++++++---------------------------------------
 1 files changed, 35 insertions(+), 159 deletions(-)

diff --git a/server/dmvisit_screen/src/main/java/com/doumee/api/web/YlScreenController.java b/server/dmvisit_screen/src/main/java/com/doumee/api/web/YlScreenController.java
index f120330..5c8ef6c 100644
--- a/server/dmvisit_screen/src/main/java/com/doumee/api/web/YlScreenController.java
+++ b/server/dmvisit_screen/src/main/java/com/doumee/api/web/YlScreenController.java
@@ -1,190 +1,66 @@
 package com.doumee.api.web;
 
 import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.config.annotation.ErpLoginRequired;
 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.model.*;
+import com.doumee.service.ScreenService;
 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.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by IntelliJ IDEA.
  *
- * @Author : Rk
+ * @Author : JP
  * @create 2023/5/5 16:02
  */
 
-@Api(tags = "1銆併�愯瀹㈢銆戞暟鎹祫婧愭帴鍙o紙鍚慐RP绔彁渚涙垨鎻愪氦鏁版嵁淇℃伅锛�")
+@Api(tags = "銆愪紛鍒╁ぇ灞忋�戞暟鎹祫婧愭帴鍙�")
 @RestController
-@RequestMapping("/visitbiz")
+@RequestMapping("/screen")
 @Slf4j
-public class BizResourceController extends ApiController {
+public class YlScreenController extends ApiController {
 
     @Autowired
-    private ERPSyncService erpSyncService;
+    private ScreenService screenService;
 
-    @Autowired
-    private SystemDictDataBiz systemDictDataBiz;
-
-
-    @ApiOperation(value = "璋冪敤鍑嵁鑾峰彇鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝鍚慐RP鎻愪緵缁熸帴鍙h皟鐢ㄥ嚟璇�")
-    @GetMapping("/accesstoken")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "accessKey", value = "璁块棶key锛岀敱璁垮绔彁渚�", required = true),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "accessSecret", value = "璁块棶绉橀挜锛岀敱璁垮绔彁渚�", required = true)
-    })
-    public ApiResponse<AccessTokenResponse> accesstoken(@RequestParam  String accessKey, @RequestParam  String accessSecret) {
-        return  ApiResponse.success(erpSyncService.createERPToken(accessKey,accessSecret));
+    @ApiOperation(value = "鑾峰彇鍗曢」缁熻鏁版嵁", notes = "鑾峰彇鍗曢」缁熻鏁版嵁锛屼粖鏃ヨ瀹㈡暟銆佹嫓璁夸腑銆佺绂绘暟銆佽繘鍦鸿溅娆°�佸嚭鍦鸿溅娆°�侀绾︽暟銆佸凡瀹℃壒棰勭害鏁般�佽瀹㈣溅杈嗚繘鍦烘暟銆佸憳宸ヨ溅杈嗚繘鍦烘暟")
+    @PostMapping("/countData")
+    public ApiResponse<CountDataResponse> countData(@RequestBody BaseRequest param) {
+        return  ApiResponse.success(screenService.countData(param));
     }
-
-    @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) {
-        param.setToken(this.getToken());
-        return  ApiResponse.success(erpSyncService.erpQueryDeviceList(param));
+    @ApiOperation(value = "杞﹁締杩涘嚭鍦烘暟鎹褰曪紙鏈�杩�50鏉★級", notes = "杞﹁締杩涘嚭鍦烘暟鎹褰曪紙鏈�杩�50鏉★級")
+    @PostMapping("/carsDataList")
+    public ApiResponse<List<CarsDataListResponse>> carsDataList(@RequestBody BaseRequest param) {
+        return  ApiResponse.success(screenService.carsDataList(param));
     }
-
-    @ApiOperation(value = "鍋滆溅鍦哄叏閲忎俊鎭帴鍙�", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔悓姝ュ叏閮ㄥ仠杞﹀満鏁版嵁")
-    @PostMapping("/resource/park/list")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
-    })
-    public ApiResponse<List<ParkListResponse>> parkList(@RequestBody ParkListRequest param) {
-        param.setToken(this.getToken());
-        return  ApiResponse.success(erpSyncService.parkList(param));
+    @ApiOperation(value = "璁垮杩涘嚭鍦烘暟鎹褰曪紙鏈�杩�50鏉★級", notes = "璁垮杩涘嚭鍦烘暟鎹褰曪紙鏈�杩�50鏉★級")
+    @PostMapping("/visitDataList")
+    public ApiResponse<List<VisitDataListResponse>> visitDataList(@RequestBody BaseRequest param) {
+        return  ApiResponse.success(screenService.visitDataList(param));
     }
-
-    @ApiOperation(value = "璁垮鍑哄叆浜嬩欢鍚屾鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝ERP绔幏鍙栬瀹㈠嚭鍏ヨ褰曚俊鎭�")
-    @PostMapping("/resource/visit/list")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
-    })
-    public ApiResponse<PageData<VisitEventListResponse>> visitList (@RequestBody PageWrap<VisitListRequest> pageWrap) {
-        pageWrap.getModel().setToken(this.getToken());
-        return ApiResponse.success(erpSyncService.visitListPage(pageWrap));
+    @ApiOperation(value = "杞﹁締杩涘嚭鍦烘洸绾垮浘鏁版嵁锛堜粖鏃ワ級", notes = "杞﹁締杩涘嚭鍦烘洸绾垮浘鏁版嵁锛堜粖鏃ワ級")
+    @PostMapping("/todayCarsData")
+    public ApiResponse<CountListResponse> todayCarsData(@RequestBody BaseRequest param) {
+        return  ApiResponse.success(screenService.todayCarsData(param));
     }
-
-    @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) {
-        pageWrap.getModel().setToken(this.getToken());
-        return ApiResponse.success(erpSyncService.doorEventListPage(pageWrap));
+    @ApiOperation(value = "杞﹁締杩涘嚭鍦烘洸绾垮浘鏁版嵁锛堣繎鏈� 7銆�15銆�30澶╋級", notes = "杞﹁締杩涘嚭鍦烘洸绾垮浘鏁版嵁锛堣繎鏈� 7銆�15銆�30澶╋級")
+    @PostMapping("/carsDaysData")
+    public ApiResponse<CountListResponse> carsDaysData(@RequestBody BaseRequest param) {
+        return  ApiResponse.success(screenService.carsDaysData(param));
     }
-
-    @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<CarEventListRequest> pageWrap) {
-        pageWrap.getModel().setToken(this.getToken());
-        return ApiResponse.success(erpSyncService.carEventList(pageWrap));
+    @ApiOperation(value = "璁垮杩涘嚭鍦烘洸绾垮浘鏁版嵁锛堣繎鏈� 7銆�15銆�30澶╋級", notes = "璁垮杩涘嚭鍦烘洸绾垮浘鏁版嵁锛堣繎鏈� 7銆�15銆�30澶╋級")
+    @PostMapping("/visitDaysData")
+    public ApiResponse<CountListResponse> visitDaysData(@RequestBody BaseRequest param) {
+        return  ApiResponse.success(screenService.visitDaysData(param));
     }
-
-    @ApiOperation(value = "缁勭粐鍙樺寲鎺ュ彛", notes = "璁垮绔彁渚涳紝渚汦RP绔皟鐢紝瀹屾垚璁垮绔粍缁囦俊鎭悓姝ワ紝璇ユ帴鍙f敮鎸佸崟涓粍缁囨柊澧炪�佹洿鏂般�佸垹闄ら渶姹�")
-    @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绔皟鐢紝瀹屾垚璁垮绔汉鍛樹俊鎭悓姝ワ紝璇ユ帴鍙f敮鎸佸崟涓汉鍛樻柊澧炪�佹洿鏂般�佸垹闄ら渶姹�")
-    @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({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
-    })
-    public ApiResponse roleUserAuthor(@RequestBody UserAuthorRequest param) {
-        erpSyncService.roleUserAuthor(param);
-        return  ApiResponse.success(null);
-    }
-
-    @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);
-    }
-
-    @ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉閫氱煡鎺ュ彛", notes = "璁垮绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇峰鎵圭殑缁撴灉")
-    @PostMapping("/event/approve/notice")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鎺堟潈token鍊�", required = true)
-    })
-    public ApiResponse approveApply(@RequestBody ApproveNoticeRequest param) {
-        param.setToken(this.getToken());
-        erpSyncService.approveApply(param);
-        return  ApiResponse.success(null);
-    }
-
-
-
-    @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<>();
-        map.put("FTP涓绘満鍦板潃IP",
-        systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode());
-        map.put("FTP璁块棶绔彛",
-        systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode());
-        map.put("FTP璁块棶鐧诲綍鍚�",
-        systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode());
-        map.put("FTP璁块棶鐧婚檰瀵嗙爜",
-        systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PWD).getCode());
-        map.put("FTP璁垮浜嬩欢鍥剧墖瀛樺偍鐩綍",
-        systemDictDataBiz.queryByCode(Constants.FTP,Constants.VISIT_EVENT_IMG).getCode());
-        map.put("FTP杞﹁締浜嬩欢鍥剧墖瀛樺偍鐩綍",
-        systemDictDataBiz.queryByCode(Constants.FTP,Constants.CAR_EVENT_IMG).getCode());
-        map.put("FTP闂ㄧ浜嬩欢鍥剧墖瀛樺偍鐩綍",
-        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