From 62d986383bd6ce6ac5ed382dce683e70e1a8d8ed Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期三, 27 三月 2024 19:11:13 +0800 Subject: [PATCH] 2024-03-27 朱宝民 优化Application下的获取交易统计记录 --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 44 insertions(+), 12 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java index 12af178..9fb3d15 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java @@ -1,7 +1,10 @@ package com.dy.pipIrrProject.controller; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.daoPr.PrControllerMapper; +import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper; import com.dy.pipIrrGlobal.pojoPr.PrController; import com.dy.pipIrrGlobal.voPr.VoController; import lombok.extern.slf4j.Slf4j; @@ -12,6 +15,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Optional; /** * @author ZhuBaoMin @@ -26,6 +30,9 @@ @Autowired private PrControllerMapper prControllerMapper; + @Autowired + private PrIntakeMapper prIntakeMapper; + /** * 鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰� * @param queryVo @@ -37,18 +44,8 @@ Long itemTotal = prControllerMapper.getRecordCount(params); QueryResultVo<List<VoController>> rsVo = new QueryResultVo<>() ; - Integer pageCurr = 0; - Integer pageSize = 10000; - rsVo.pageCurr = 1; - rsVo.pageSize = 10000; - if(queryVo.pageSize != null && queryVo.pageCurr != null) { - rsVo.pageSize = queryVo.pageSize ; - rsVo.pageCurr = queryVo.pageCurr; - pageSize = queryVo.pageSize ; - pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString()); - } - params.put("pageCurr", pageCurr); - params.put("pageSize", pageSize); + rsVo.pageSize = queryVo.pageSize ; + rsVo.pageCurr = queryVo.pageCurr ; rsVo.calculateAndSet(itemTotal, params); rsVo.obj = prControllerMapper.getControllers(params); @@ -94,7 +91,42 @@ return rsVo ; } + /** + * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨湭鍒犻櫎鐨勬帶鍒跺櫒鏁伴噺 + * @param controllerId + * @return + */ public Integer getRecordCountOfController(Long controllerId) { return prControllerMapper.getRecordCountOfController(controllerId); } + /** + * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栧凡缁戝畾璁板綍鏁� + * @param controllerId + * @return + */ + public Integer getBindedCount(Long controllerId) { + return prControllerMapper.getBindedCount(controllerId); + } + + /** + * 鏍规嵁涓婚敭鍒犻櫎澶栭敭 + * @param controllerId + * @return + */ + public Integer deleteIntakeId(Long controllerId) { + return prControllerMapper.deleteIntakeId(controllerId); + } + + /** + * 鑾峰彇鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙e垪琛� + * @return + */ + public JSONArray getNoBindingIntakes() { + List<Map<String, Object>> list = Optional.ofNullable(prIntakeMapper.getNoBindingIntakes()).orElse(new ArrayList<>()); + JSONArray array= null; + if(list.size() > 0) { + array= JSONArray.parseArray(JSON.toJSONString(list)); + } + return array; + } } -- Gitblit v1.8.0