From d83e4be3fe4e5a3c52d70ab36d64584e966c1800 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期一, 17 六月 2024 09:02:09 +0800 Subject: [PATCH] 2024-06-17 朱宝民 优化微信支付代码 --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java | 98 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 82 insertions(+), 16 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 8f9fdd2..90767c5 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,17 +1,24 @@ 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.PrIntakeControllerMapper; +import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper; import com.dy.pipIrrGlobal.pojoPr.PrController; +import com.dy.pipIrrGlobal.pojoPr.PrIntakeController; import com.dy.pipIrrGlobal.voPr.VoController; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Optional; /** * @author ZhuBaoMin @@ -26,8 +33,19 @@ @Autowired private PrControllerMapper prControllerMapper; + @Autowired + private PrIntakeMapper prIntakeMapper; + + @Autowired + private PrIntakeControllerMapper prIntakeControllerMapper; + + @Autowired + private RestTemplate restTemplate; + + /** * 鏍规嵁鎸囧畾鑾峰彇鎺у埗鍣ㄨ褰� + * * @param queryVo * @return */ @@ -36,36 +54,44 @@ 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); + QueryResultVo<List<VoController>> rsVo = new QueryResultVo<>(); + rsVo.pageSize = queryVo.pageSize; + rsVo.pageCurr = queryVo.pageCurr; rsVo.calculateAndSet(itemTotal, params); rsVo.obj = prControllerMapper.getControllers(params); - return rsVo ; + + return rsVo; } /** * 娣诲姞鎺у埗鍣� + * * @param po * @return */ public Integer addController(PrController po) { - return prControllerMapper.insert(po); + int rows = prControllerMapper.insert(po); + if(rows == 0) { + return 0; + } + PrIntakeController addPrIntakeController = new PrIntakeController(); + addPrIntakeController.setIntakeid(po.getIntakeId()); + addPrIntakeController.setControllerid(po.getId()); + addPrIntakeController.setOperatetype((byte) 1); + addPrIntakeController.setOperator(po.getOperator()); + addPrIntakeController.setOperatedt(po.getOperateDt()); + addPrIntakeController.setRemarks("缁戝畾"); + int rec = prIntakeControllerMapper.insert(addPrIntakeController); + if(rec == 0) { + return 0; + } + return 1 ; } /** * 鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛� + * * @param rtuAddr * @return */ @@ -75,6 +101,7 @@ /** * 鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗 + * * @param controllerId * @return */ @@ -84,6 +111,7 @@ /** * 鏍规嵁鎸囧畾鏉′欢瀵煎嚭鎺у埗鍣ㄥ垪琛� + * * @param queryVo * @return */ @@ -91,19 +119,22 @@ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); List<VoController> rsVo = new ArrayList<>(); rsVo = prControllerMapper.getControllers(params); - return rsVo ; + return rsVo; } /** * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨湭鍒犻櫎鐨勬帶鍒跺櫒鏁伴噺 + * * @param controllerId * @return */ public Integer getRecordCountOfController(Long controllerId) { return prControllerMapper.getRecordCountOfController(controllerId); } + /** * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栧凡缁戝畾璁板綍鏁� + * * @param controllerId * @return */ @@ -113,10 +144,45 @@ /** * 鏍规嵁涓婚敭鍒犻櫎澶栭敭 + * * @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; + } + + /** + * 鏍规嵁鎺у埗鍣ㄧ紪鍙风墿鐞嗗垹闄ゆ帶鍒� + *2024-6-7 + * @param controllerId + * @return + */ + public Integer deleteControllerByIdTwo(Long controllerId) { + return prControllerMapper.deleteByPrimaryKey(controllerId); + } + + /** + * 鏍规嵁涓婚敭鏌ヨ鎺у埗鍣ㄥ垪琛� + *2024-6-7 + * @param controllerId + * @return + */ + public PrController getByControllerId(Long controllerId) { + return prControllerMapper.selectByPrimaryKey(controllerId); + } } -- Gitblit v1.8.0