From c19de84fa332a00c651f28e3a52292fd14f143a1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 九月 2025 17:30:07 +0800
Subject: [PATCH] 陆常丽反应软件系统财务对账时而数据不准确,分析源码,找到bug原因是,财务对账统计只有用户点击后才会触发统计功能,把历史上及当天进行了统计,如果当天统计时未下班,例如是中午触发统计了,而下午又进行了充值售水,但下班后未再点击触发对账统计,那么今天的对账统计完成了但数据不对。编写自动任务,在下半夜进行对账统计。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/video/VideoCtrl.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/video/VideoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/video/VideoCtrl.java
index b4b0efc..5811139 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/video/VideoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/video/VideoCtrl.java
@@ -2,6 +2,7 @@
 
 import com.dy.common.webUtil.BaseResponse;
 import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
 import com.dy.common.webUtil.ResultCodeMsg;
 import com.dy.pipIrrGlobal.pojoVi.ViYsApp;
 import com.dy.pipIrrGlobal.voVi.VoCamera;
@@ -17,6 +18,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -74,4 +76,62 @@
             return BaseResponseUtils.buildException(e.getMessage());
         }
     }
+
+    /**
+     * 瀹㈡埛绔垎椤佃姹傛憚鍍忓ご淇℃伅
+     * @param queryQo 鏌ヨ鏉′欢
+     * @return 鍒嗛〉璇锋眰鎽勫儚澶翠俊鎭�
+     * 
+     * 浣跨敤绀轰緥锛�
+     * GET /video/some?pageCurr=1&pageSize=10&name=鎽勫儚澶�1&type=1
+     * 
+     * 鏌ヨ鍙傛暟璇存槑锛�
+     * - pageCurr: 褰撳墠椤电爜锛堥粯璁�1锛�
+     * - pageSize: 姣忛〉璁板綍鏁帮紙榛樿10锛�
+     * - name: 鎽勫儚澶村悕绉帮紙鏀寔妯$硦鏌ヨ锛�
+     * - type: 鎽勫儚澶寸被鍨嬶紙1:钀ょ煶锛�
+     * - onScreen: 鏄惁澶у睆灞曠ず锛�1:鏄紝0:鍚︼級
+     * - devNo: 璁惧搴忓垪鍙�
+     */
+    @Operation(summary = "鍒嗛〉鑾峰彇鎽勫儚澶翠俊鎭�", description = "鏍规嵁鏌ヨ鏉′欢鍒嗛〉杩斿洖鎽勫儚澶翠俊鎭�")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "杩斿洖鍒嗛〉鎽勫儚澶翠俊鎭暟鎹紙BaseResponse.content:QueryResultVo[List[VoVideo]]锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = QueryResultVo.class))}
+            )
+    })
+    @GetMapping(path = "some")
+    public BaseResponse<QueryResultVo<List<VoVideo>>> some(VideoQo queryQo) {
+        try {
+            // 鑾峰彇鍒嗛〉鏌ヨ缁撴灉
+            QueryResultVo<List<VoCamera>> pageResult = this.sv.some(queryQo);
+            
+            List<VoVideo> reList = new ArrayList<>();
+            ViYsApp app = this.sv.ysApp();
+            
+            if (pageResult != null && pageResult.obj != null && pageResult.obj.size() > 0) {
+                for (VoCamera voCamera : pageResult.obj) {
+                    VoVideo vvo = new VoVideo();
+                    vvo.from(voCamera, app == null ? null : app.accessToken);
+                    reList.add(vvo);
+                }
+            }
+            
+            // 鏋勫缓鍒嗛〉缁撴灉
+            QueryResultVo<List<VoVideo>> result = new QueryResultVo<>();
+            result.pageSize = pageResult.pageSize;
+            result.pageCurr = pageResult.pageCurr;
+            result.pageTotal = pageResult.pageTotal;
+            result.itemTotal = pageResult.itemTotal;
+            result.obj = reList;
+            
+            return BaseResponseUtils.buildSuccess(result);
+        } catch (Exception e) {
+            log.error("鍒嗛〉鏌ヨ鎽勫儚澶翠俊鎭紓甯�", e);
+            return BaseResponseUtils.buildException(e.getMessage());
+        }
+    }
+
 }

--
Gitblit v1.8.0