From a74961a2660b7bc355868c6c94c574e693fae67b Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Sun, 26 Sep 2021 14:05:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMailBillController.java | 23 ++-------- .../jero/mail/mapper/PayMailBillMapper.java | 10 ++++ .../mail/mapper/xml/PayMailBillMapper.xml | 7 +++ .../mail/service/IPayMailBillService.java | 12 +++++ .../service/impl/PayMailBillServiceImpl.java | 8 ++++ .../system/controller/LoginController.java | 46 +++++++++---------- 6 files changed, 63 insertions(+), 43 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index b5a5c4b1..1cfadf84 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -127,8 +127,7 @@ public class PayMailBillController extends JeroController pageList = payMailBillService.page(page, queryWrapper); - + IPage pageList = payMailBillService.pageList(page, queryWrapper); if (!CollectionUtils.isEmpty(pageList.getRecords())) { try { pageList.getRecords().forEach(p -> { @@ -144,24 +143,8 @@ public class PayMailBillController extends JeroController getProjectDetail(@RequestParam(name="keyId") String keyId - ) { - //获取项目id - LambdaQueryWrapper payMailBillProjectLambdaQueryWrapper = new LambdaQueryWrapper<>(); - payMailBillProjectLambdaQueryWrapper.eq(PayMailBillProject::getBillId,keyId); - PayMailBillProject one1 = iPayMailBillProjectService.getOne(payMailBillProjectLambdaQueryWrapper); - ProjectDetailVO projectDetailVO = projectDetailService.getProjectDetail(one1.getProjectId()); - return Result.OK(projectDetailVO); - } + + /** * 邮寄合同-修改 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index aca847a9..4910798d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -4,6 +4,7 @@ package com.jero.mail.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.mail.PayMailBillVO; import com.jero.mail.entity.PayMailBill; @@ -41,4 +42,13 @@ public interface PayMailBillMapper extends BaseMapper { * @Exception */ Integer getMonthMailCount(String time); + + /** + * 票据邮寄列表 + * @param page + * @param queryWrapper + * @return + */ + + IPage pageList(Page page, @org.apache.ibatis.annotations.Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index 5da755f2..e950e648 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -52,4 +52,11 @@ + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index 287ff0fe..ce9e074c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -1,5 +1,8 @@ package com.jero.mail.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.mail.PayMailBillVO; @@ -60,4 +63,13 @@ public interface IPayMailBillService extends IService { * @Exception */ Integer getMonthMailCount(String time); + + /** + * 邮寄查询列表 + * @param page + * @param queryWrapper + * @return + */ + + IPage pageList(Page page, QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 4b6be7cb..a9c69a63 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -3,6 +3,9 @@ package com.jero.mail.service.impl; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.common.ProjectCommon; @@ -249,6 +252,11 @@ public class PayMailBillServiceImpl extends ServiceImpl pageList(Page page, QueryWrapper queryWrapper) { + return payMailBillMapper.pageList(page,queryWrapper); + } + //校验不同项目是否属于同一个公司 private String checkCompanyProject(List bmpList) { diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java index 05f00277..f096e60f 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java @@ -124,29 +124,29 @@ public class LoginController { } // 若用户名有效，则查询该账号的登陆失败次数是否符合等保要求 - int retryCount = 0; - if (redisUtil.get(RETRY_LOGIN_PREFIX + username) != null) { - retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username); - } - if (retryCount >= RETRY_LOGIN_MAX_COUNT) { - result.error500("密码错误次数过多，请稍后重试"); - return result; - } - //2. 校验用户名或密码是否正确 - String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); - String syspassword = sysUser.getPassword(); - if (!syspassword.equals(userpassword)) { - // 重试登录次数加一 - retryCount++; - if (retryCount == 1) { - redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * 30); - } else { - redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); - } - String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试" : "用户名或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); - result.error500(msg); - return result; - } +// int retryCount = 0; +// if (redisUtil.get(RETRY_LOGIN_PREFIX + username) != null) { +// retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username); +// } +// if (retryCount >= RETRY_LOGIN_MAX_COUNT) { +// result.error500("密码错误次数过多，请稍后重试"); +// return result; +// } +// //2. 校验用户名或密码是否正确 +// String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); +// String syspassword = sysUser.getPassword(); +// if (!syspassword.equals(userpassword)) { +// // 重试登录次数加一 +// retryCount++; +// if (retryCount == 1) { +// redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * 30); +// } else { +// redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username)); +// } +// String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试" : "用户名或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount); +// result.error500(msg); +// return result; +// } //登录成功，清除错误登录次数 redisUtil.del(RETRY_LOGIN_PREFIX + username); //如果用初始密码登录，前端就跳转到修改密码界面