2024-07-08 朱宝民 优化根据指定条件获取水卡列表接口

Administrator

2024-07-08 fdecbc710888e8f048f08ec16428f192b8251dfe

 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java

@@ -12,7 +12,6 @@
import com.dy.pipIrrSell.clientCard.LastOperateENUM;
import com.dy.pipIrrSell.result.SellResultCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -54,9 +53,9 @@
                            schema = @Schema(implementation = VoUnlock.class))}
            )
    })
    @GetMapping(path = "/getUnlocks", consumes = MediaType.APPLICATION_JSON_VALUE)
    @SsoAop("-1")
    public BaseResponse<QueryResultVo<List<VoUnlock>>> getUnlocks(@RequestBody @Parameter(description = "查询form表单json数据", required = true) QueryVo vo){
    @GetMapping(path = "/getUnlocks")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoUnlock>>> getUnlocks(QueryVo vo){
        try {
            QueryResultVo<List<VoUnlock>> res = unlockSv.getUnlocks(vo);
            return BaseResponseUtils.buildSuccess(res);
@@ -77,8 +76,8 @@
    })
    @PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop("-1")//@SsoAop(power = "-1")
    public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form表单json数据", required = true) @Valid DtoUnlock po, @Parameter(hidden = true) BindingResult bindingResult){
    @SsoAop()
    public BaseResponse<Boolean> add(@RequestBody @Valid DtoUnlock po, BindingResult bindingResult){
        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -86,16 +85,16 @@

        /**
         * cardId           水卡编号（非传入参数，由cardAddr反查，修改农户卡使用）
         * clientId         农户编号（非传入参数，由cardNum反查）
         * cardNum          水卡地址
         * clientNum        农户编号（非传入参数，由cardNum反查，添加解锁使用）
         * money            余额
         * remarks          备注
         * operator         操作人编号
         * unlockTime       解锁时间
         */
        Long cardId = 0L;
        String cardNum = po.getCardNum();
        String clientNum = "";
        Long cardNum = po.getCardNum();
        Long clientId = 0L;
        Float money = po.getMoney();
        String remarks = po.getRemarks();
        Long operator = po.getOperator();
@@ -109,7 +108,7 @@
            return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
        }
        cardId = Long.parseLong(map.get("cardId").toString());
        clientNum = map.get("clientNum").toString();
        clientId = Long.parseLong(map.get("clientId").toString());

        /**
         * 修改农户卡信息：
@@ -119,6 +118,7 @@
        SeClientCard seClientCard = new SeClientCard();
        seClientCard.setId(cardId);
        seClientCard.setUnlockdt(unlockTime);
        seClientCard.setMoney(money);
        seClientCard.setLastoper(LastOperateENUM.UNLOCK.getCode());
        Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
        if(rec_updateClientCard == 0) {
@@ -129,8 +129,10 @@
         * 添加解锁记录
         */
        SeUnlock seUnlock = new SeUnlock();
        seUnlock.setCardnum(cardNum);
        seUnlock.setClientnum(clientNum);
        //seUnlock.setCardnum(cardNum);
        //seUnlock.setClientnum(clientNum);
        seUnlock.setCardid(cardId);
        seUnlock.setClientid(clientId);
        seUnlock.setMoney(money);
        seUnlock.setRemarks(remarks);
        seUnlock.setOperator(operator);