From aed88e2632bdca221ff20d2a5be3ce136393fbef Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 9 Jan 2026 10:09:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86][=E6=9A=82=E5=AD=98=E6=9F=9C=EF=BC=8C?= =?UTF-8?q?=E9=BA=BB=E7=B2=BE=E8=8D=AF=EF=BC=8C=E7=BB=99=E8=8D=AF=E5=88=B6?= =?UTF-8?q?=E5=89=82]=E5=AF=86=E7=A0=81=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/GyzjServiceImpl.java | 177 ++++++++++++------- .../hxhq/business/service/impl/MjyServiceImpl.java | 195 ++++++++++++--------- .../service/impl/StudyFormApplyServiceImpl.java | 47 +++-- .../service/impl/StudyFormFillServiceImpl.java | 53 ++++-- .../service/impl/StudyFormPlanServiceImpl.java | 35 +++- .../service/impl/StudyFormPreServiceImpl.java | 34 +++- .../hxhq/business/service/impl/ZcgServiceImpl.java | 108 +++++++----- 7 files changed, 425 insertions(+), 224 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index 1696622..0d339cd 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -106,8 +106,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void jd(JdForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -135,8 +135,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void jy(JyForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -171,8 +171,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void plgd(GdForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -216,8 +216,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void gd(GdForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -246,8 +246,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void plsd(SdForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -291,8 +291,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void sd(SdForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -320,8 +320,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void js(JsForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -352,6 +352,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser clr = sysUserService.selectUserById(form.getClrId()); SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); + //验证处理人密码 + checkPassword(clr,form.getClrmm()); + //验证复核人密码 + checkPassword(fhr,form.getFhrmm()); + //验证监督人密码 + checkPassword(jdr,form.getJdrmm()); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); @@ -431,12 +437,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void czyj(CzyjForm form) { + SysUser clr = sysUserService.selectUserById(form.getClrId()); + SysUser fhr = sysUserService.selectUserById(form.getFhrId()); + SysUser jdr = sysUserService.selectUserById(form.getJdrId()); + + //验证处理人密码 + checkPassword(clr,form.getClrmm()); + //验证复核人密码 + checkPassword(fhr,form.getFhrmm()); + //验证监督人密码 + checkPassword(jdr,form.getJdrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } - SysUser clr = sysUserService.selectUserById(form.getClrId()); - //验证处理人，复核人，监督人密码 todo - Gyzj gyzjOld = this.getById(form.getId()); if (gyzjOld == null) { throw new ServiceException("给药制剂不存在或已删除"); @@ -495,18 +508,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Transactional(rollbackFor = Exception.class) public void plczrq(PlczrqForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); - if (clr == null) { - throw new ServiceException("处理人不存在"); - } SysUser fhr = sysUserService.selectUserById(form.getFhrId()); - if (fhr == null) { - throw new ServiceException("复核人不存在"); - } SysUser jdr = sysUserService.selectUserById(form.getJdrId()); - if (jdr == null) { - throw new ServiceException("监督人不存在"); - } - //验证处理人，复核人，监督人密码 todo + //验证处理人密码 + checkPassword(clr,form.getClrmm()); + //验证复核人密码 + checkPassword(fhr,form.getFhrmm()); + //验证监督人密码 + checkPassword(jdr,form.getJdrmm()); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -577,18 +586,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Transactional(rollbackFor = Exception.class) public void czrq(CzrqForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); - if (clr == null) { - throw new ServiceException("处理人不存在"); - } SysUser fhr = sysUserService.selectUserById(form.getFhrId()); - if (fhr == null) { - throw new ServiceException("复核人不存在"); - } SysUser jdr = sysUserService.selectUserById(form.getJdrId()); - if (jdr == null) { - throw new ServiceException("监督人不存在"); - } - //验证处理人，复核人，监督人密码 todo + //验证处理人密码 + checkPassword(clr,form.getClrmm()); + //验证复核人密码 + checkPassword(fhr,form.getFhrmm()); + //验证监督人密码 + checkPassword(jdr,form.getJdrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -634,7 +639,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = sysUserService.selectUserById(form.getFfrId()); - //验证领取人1,领取人2,发放人密码 todo + //验证领取人1密码 + checkPassword(lqr1,form.getLqr1mm()); + //验证领取人2密码 + checkPassword(lqr2,form.getLqr2mm()); + //验证发放人密码 + checkPassword(ffr1,form.getFfrmm()); Zcg zcg = zcgService.getById(form.getZcgId()); if (zcg == null) { throw new ServiceException("暂存柜不存在或已删除"); @@ -698,6 +708,18 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void ff(FfForm form) { + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); + SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + //验证领取人1密码 + checkPassword(lqr1,form.getLqr1mm()); + //验证领取人2密码 + checkPassword(lqr2,form.getLqr2mm()); + //验证发放人1密码 + checkPassword(ffr1,form.getFfr1mm()); + //验证发放人2密码 + checkPassword(ffr2,form.getFfr2mm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -708,11 +730,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (!gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue())) { throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是入库状态，不能发放"); } - SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); - SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); - SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); - SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); - //验证领取人1、领取人2、发放人1、发放人2密码 todo Date now = new Date(); gyzjFfjlService.ff(form.getCkmz(), form.getCkmzdw(), form.getZytj(), form.getRemark(), form.getMdIds(), gyzjOld, lqr1, lqr2, ffr1, ffr2, now); //region 稽查轨迹 @@ -766,7 +783,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); - //验证领取人1、领取人2、发放人1、发放人2密码 todo + //验证领取人1密码 + checkPassword(lqr1,form.getLqr1mm()); + //验证领取人2密码 + checkPassword(lqr2,form.getLqr2mm()); + //验证发放人1密码 + checkPassword(ffr1,form.getFfr1mm()); + //验证发放人2密码 + checkPassword(ffr2,form.getFfr2mm()); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); @@ -853,8 +877,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void bj(BjForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -881,8 +905,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjJcgj.setJcmc("申请编辑"); gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); gyzjJcgj.setJcnr(fieldChange.toString()); - gyzjJcgj.setQmrId(qmr.getUserId()); - gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); gyzjJcgjList.add(gyzjJcgj); } gyzjOld.setMcbj(form.getMc()); @@ -893,8 +917,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setCcwzbj(form.getCcwz()); gyzjOld.setBjbz(form.getBjbz()); - gyzjOld.setBjrId(qmr.getUserId()); - gyzjOld.setBjrMc(qmr.getNickName()); + gyzjOld.setBjrId(SecurityUtils.getUserId()); + gyzjOld.setBjrMc(SecurityUtils.getNickName()); gyzjOld.setBjzt(BjEnum.shz.getValue()); this.updateById(gyzjOld); gyzjJcgjService.saveBatch(gyzjJcgjList); @@ -908,8 +932,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void shbj(ShbjForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -937,8 +961,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("申请备注", gyzjOld.getBjbz()); formData.put("审核备注", form.getRemark()); gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjJcgj.setQmrId(qmr.getUserId()); - gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); gyzjJcgjService.save(gyzjJcgj); //endregion @@ -976,8 +1000,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void xgkc(XgkcForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1004,16 +1028,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjJcgj.setJcmc("修改库存申请"); gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); gyzjJcgj.setJcnr(fieldChange.toString()); - gyzjJcgj.setQmrId(qmr.getUserId()); - gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); gyzjJcgjList.add(gyzjJcgj); } //endregion gyzjOld.setKcdwbj(form.getKcdw()); gyzjOld.setKcbj(form.getKc()); - gyzjOld.setKcbjrId(qmr.getUserId()); - gyzjOld.setKcbjrMc(qmr.getNickName()); + gyzjOld.setKcbjrId(SecurityUtils.getUserId()); + gyzjOld.setKcbjrMc(SecurityUtils.getNickName()); gyzjOld.setKcbjzt(KcbjEnum.shz.getValue()); gyzjOld.setKcbjbz(form.getKcbjbz()); this.updateById(gyzjOld); @@ -1030,8 +1054,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Override @Transactional(rollbackFor = Exception.class) public void shxgkc(ShxgkcForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1059,8 +1083,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("申请备注", gyzjOld.getKcbjbz()); formData.put("审核备注", form.getRemark()); gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjJcgj.setQmrId(qmr.getUserId()); - gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgj.setQmrId(SecurityUtils.getUserId()); + gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); gyzjJcgjService.save(gyzjJcgj); //endregion @@ -1079,7 +1103,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG //region 台账 if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { gyzjTzService.saveTz(gyzjOld.getId(), "", "", - "", "", qmr.getUserId(), qmr.getNickName(), + "", "", SecurityUtils.getUserId(), SecurityUtils.getNickName(), "修改库存", form.getKc(), form.getKcdw(), gyzjOld.getKcbjbz()); } //endregion @@ -1098,8 +1122,15 @@ public class GyzjServiceImpl extends ServiceImpl implements IG SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id()); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证密码 todo + //验证归还人1密码 + checkPassword(ghr1,form.getGhr1mm()); + //验证归还人2密码 + checkPassword(ghr2,form.getGhr2mm()); + //验证接收人1密码 + checkPassword(jsr1,form.getJsr1mm()); + //验证接收人2密码 + checkPassword(jsr2,form.getJsr2mm()); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1145,4 +1176,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } + /** + * 验证密码 + * @param user + * @param qmrmm + */ + public void checkPassword(SysUser user,String qmrmm){ + if(StringUtils.isBlank(qmrmm)){ + throw new ServiceException("签名密码不能为空"); + } + sysUserService.checkPassword(user,qmrmm,false); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index fb5ca33..e45d331 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -106,8 +106,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void jd( JdForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -135,8 +135,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void jy( JyForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -171,8 +171,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void plgd( GdForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -216,8 +216,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void gd( GdForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -246,8 +246,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void plsd( SdForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -291,8 +291,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void sd( SdForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -320,8 +320,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void js( JsForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -352,7 +352,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser clr = sysUserService.selectUserById(form.getClrId()); SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); - //验证处理人，复核人，监督人密码 todo + //验证处理人密码 + checkPassword(clr,form.getClrmm()); + //验证复核人密码 + checkPassword(fhr,form.getFhrmm()); + //验证监督人密码 + checkPassword(jdr,form.getJdrmm()); + QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); @@ -434,23 +440,20 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void czyj( CzyjForm form) { - if (form.getId() == null || form.getId().longValue() < 0) { - throw new ServiceException("参数id不正确"); - } + SysUser clr = sysUserService.selectUserById(form.getClrId()); - if (clr == null) { - throw new ServiceException("处理人不存在"); - } SysUser fhr = sysUserService.selectUserById(form.getFhrId()); - if (fhr == null) { - throw new ServiceException("复核人不存在"); - } SysUser jdr = sysUserService.selectUserById(form.getJdrId()); - if (jdr == null) { - throw new ServiceException("监督人不存在"); - } - //验证处理人，复核人，监督人密码 todo + //验证处理人密码 + checkPassword(clr,form.getClrmm()); + //验证复核人密码 + checkPassword(fhr,form.getFhrmm()); + //验证监督人密码 + checkPassword(jdr,form.getJdrmm()); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } Mjy mjyOld = this.getById(form.getId()); if (mjyOld == null) { throw new ServiceException("麻精药不存在或已删除"); @@ -511,18 +514,15 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Transactional(rollbackFor = Exception.class) public void plczrq( PlczrqForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); - if (clr == null) { - throw new ServiceException("处理人不存在"); - } SysUser fhr = sysUserService.selectUserById(form.getFhrId()); - if (fhr == null) { - throw new ServiceException("复核人不存在"); - } SysUser jdr = sysUserService.selectUserById(form.getJdrId()); - if (jdr == null) { - throw new ServiceException("监督人不存在"); - } - //验证处理人，复核人，监督人密码 todo + //验证处理人密码 + checkPassword(clr,form.getClrmm()); + //验证复核人密码 + checkPassword(fhr,form.getFhrmm()); + //验证监督人密码 + checkPassword(jdr,form.getJdrmm()); + if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -593,18 +593,15 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Transactional(rollbackFor = Exception.class) public void czrq( CzrqForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); - if (clr == null) { - throw new ServiceException("处理人不存在"); - } SysUser fhr = sysUserService.selectUserById(form.getFhrId()); - if (fhr == null) { - throw new ServiceException("复核人不存在"); - } SysUser jdr = sysUserService.selectUserById(form.getJdrId()); - if (jdr == null) { - throw new ServiceException("监督人不存在"); - } - //验证处理人，复核人，监督人密码 todo + //验证处理人密码 + checkPassword(clr,form.getClrmm()); + //验证复核人密码 + checkPassword(fhr,form.getFhrmm()); + //验证监督人密码 + checkPassword(jdr,form.getJdrmm()); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -650,7 +647,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = sysUserService.selectUserById(form.getFfrId()); - //验证领取人1,领取人2,发放人密码 todo + //验证领取人1密码 + checkPassword(lqr1,form.getLqr1mm()); + //验证领取人2密码 + checkPassword(lqr2,form.getLqr2mm()); + //验证发放人密码 + checkPassword(ffr1,form.getFfrmm()); + Zcg zcg = zcgService.getById(form.getZcgId()); if (zcg == null) { throw new ServiceException("暂存柜不存在或已删除"); @@ -714,6 +717,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void ff( FfForm form) { + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); + SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + //验证领取人1密码 + checkPassword(lqr1,form.getLqr1mm()); + //验证领取人2密码 + checkPassword(lqr2,form.getLqr2mm()); + //验证发放人1密码 + checkPassword(ffr1,form.getFfr1mm()); + //验证发放人2密码 + checkPassword(ffr2,form.getFfr2mm()); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -724,11 +740,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (!mjyOld.getZjzt().equals(ZjztEnum.rk.getValue())) { throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是入库状态，不能发放"); } - SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); - SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); - SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); - SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); - //验证领取人1、领取人2、发放人1、发放人2密码 todo Date now = new Date(); mjyFfjlService.ff(form.getCkmz(),form.getCkmzdw(),form.getZytj(),form.getRemark(),form.getMdIds(),mjyOld,lqr1,lqr2,ffr1,ffr2,now); //region 稽查轨迹 @@ -782,7 +793,15 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); - //验证领取人1、领取人2、发放人1、发放人2密码 todo + //验证领取人1密码 + checkPassword(lqr1,form.getLqr1mm()); + //验证领取人2密码 + checkPassword(lqr2,form.getLqr2mm()); + //验证发放人1密码 + checkPassword(ffr1,form.getFfr1mm()); + //验证发放人2密码 + checkPassword(ffr2,form.getFfr2mm()); + QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); @@ -869,8 +888,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void bj( BjForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -897,8 +916,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyJcgj.setJcmc("申请编辑"); mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); mjyJcgj.setJcnr(fieldChange.toString()); - mjyJcgj.setQmrId(qmr.getUserId()); - mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setQmrId(SecurityUtils.getUserId()); + mjyJcgj.setQmrMc(SecurityUtils.getNickName()); mjyJcgjList.add(mjyJcgj); } mjyOld.setMcbj(form.getMc()); @@ -909,8 +928,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setCcwzbj(form.getCcwz()); mjyOld.setBjbz(form.getBjbz()); - mjyOld.setBjrId(qmr.getUserId()); - mjyOld.setBjrMc(qmr.getNickName()); + mjyOld.setBjrId(SecurityUtils.getUserId()); + mjyOld.setBjrMc(SecurityUtils.getNickName()); mjyOld.setBjzt(BjEnum.shz.getValue()); this.updateById(mjyOld); mjyJcgjService.saveBatch(mjyJcgjList); @@ -924,8 +943,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void shbj( ShbjForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -953,8 +972,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("申请备注", mjyOld.getBjbz()); formData.put("审核备注", form.getRemark()); mjyJcgj.setJcnr(JctUtil.formatStr(formData)); - mjyJcgj.setQmrId(qmr.getUserId()); - mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setQmrId(SecurityUtils.getUserId()); + mjyJcgj.setQmrMc(SecurityUtils.getNickName()); mjyJcgjService.save(mjyJcgj); //endregion @@ -992,8 +1011,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void xgkc( XgkcForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1020,16 +1039,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyJcgj.setJcmc("修改库存申请"); mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); mjyJcgj.setJcnr(fieldChange.toString()); - mjyJcgj.setQmrId(qmr.getUserId()); - mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setQmrId(SecurityUtils.getUserId()); + mjyJcgj.setQmrMc(SecurityUtils.getNickName()); mjyJcgjList.add(mjyJcgj); } //endregion mjyOld.setKcdwbj(form.getKcdw()); mjyOld.setKcbj(form.getKc()); - mjyOld.setKcbjrId(qmr.getUserId()); - mjyOld.setKcbjrMc(qmr.getNickName()); + mjyOld.setKcbjrId(SecurityUtils.getUserId()); + mjyOld.setKcbjrMc(SecurityUtils.getNickName()); mjyOld.setKcbjzt(KcbjEnum.shz.getValue()); mjyOld.setKcbjbz(form.getKcbjbz()); this.updateById(mjyOld); @@ -1046,8 +1065,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Override @Transactional(rollbackFor = Exception.class) public void shxgkc( ShxgkcForm form) { - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + //验证签名人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1075,8 +1094,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("申请备注", mjyOld.getKcbjbz()); formData.put("审核备注", form.getRemark()); mjyJcgj.setJcnr(JctUtil.formatStr(formData)); - mjyJcgj.setQmrId(qmr.getUserId()); - mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setQmrId(SecurityUtils.getUserId()); + mjyJcgj.setQmrMc(SecurityUtils.getNickName()); mjyJcgjService.save(mjyJcgj); //endregion @@ -1095,7 +1114,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS //region 台账 if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { mjyTzService.saveTz(mjyOld.getId(), "", "", - "", "", qmr.getUserId(), qmr.getNickName(), + "", "", SecurityUtils.getUserId(), SecurityUtils.getNickName(), "修改库存", form.getKc(), form.getKcdw(), mjyOld.getKcbjbz()); } //endregion @@ -1114,8 +1133,15 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id()); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); - SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证密码 todo + //验证归还人1密码 + checkPassword(ghr1,form.getGhr1mm()); + //验证归还人2密码 + checkPassword(ghr2,form.getGhr2mm()); + //验证接收人1密码 + checkPassword(jsr1,form.getJsr1mm()); + //验证接收人2密码 + checkPassword(jsr2,form.getJsr2mm()); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1159,4 +1185,17 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } + + /** + * 验证密码 + * @param user + * @param qmrmm + */ + public void checkPassword(SysUser user,String qmrmm){ + if(StringUtils.isBlank(qmrmm)){ + throw new ServiceException("签名密码不能为空"); + } + sysUserService.checkPassword(user,qmrmm,false); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java index aa10094..c3b3815 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java @@ -25,6 +25,7 @@ import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; import com.hxhq.system.api.domain.SysUser; +import com.hxhq.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormApplyMapper; @@ -45,6 +46,8 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注",studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.bj.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); } //签名信息 @@ -304,7 +311,8 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.bj.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); } else { studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue()); studyFormFill.setUserId(SecurityUtils.getUserId()); @@ -293,7 +300,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); } //签名信息 @@ -309,7 +316,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); } else { studyFormFill.setBdzt(StudyFormFillBdztEnum.ytj.getValue()); studyFormFill.setUserId(SecurityUtils.getUserId()); @@ -353,7 +361,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); } //签名信息 studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并提交记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark()); @@ -368,7 +376,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注",studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.bj.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); } //签名信息 @@ -183,7 +188,8 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注",studyFormPlan.getRemark()); @@ -208,7 +215,8 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.xg.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); } //签名信息 @@ -159,8 +164,8 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData1 = new LinkedHashMap<>(); formData1.put("备注",studyFormFill.getRemark()); - studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "创建记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData1), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData1), SecurityUtils.getUserId(), SecurityUtils.getNickName()); //签名信息 studyFormFillQmxxService.saveQmxx(studyFormFill.getId(),"创建记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark()); } + /** + * 验证密码 + * @param user + * @param qmrmm + */ + public void checkPassword(SysUser user,String qmrmm){ + if(StringUtils.isBlank(qmrmm)){ + throw new ServiceException("签名密码不能为空"); + } + sysUserService.checkPassword(user,qmrmm,false); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java index 2ba782a..93bc5f6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java @@ -13,7 +13,9 @@ import com.hxhq.business.form.zcg.ZcgYsffForm; import com.hxhq.business.form.zcg.ZcgYsghForm; import com.hxhq.business.form.zcg.ZcgSearchForm; import com.hxhq.business.service.IZcgTzService; +import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.common.security.utils.SecurityUtils; import com.hxhq.system.api.domain.SysUser; import com.hxhq.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -84,6 +86,21 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS @Override @Transactional(rollbackFor = Exception.class) public void ysgh(ZcgYsghForm form) { + SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id()); + if (ghr1 == null) { + throw new SecurityException("归还人1不存在"); + } + SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); + if (ghr2 == null) { + throw new SecurityException("归还人2不存在"); + } + //验证接收人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm()); + //验证钥匙1归还人密码 + checkPassword(ghr1,form.getGhr1mm()); + //验证钥匙2归还人密码 + checkPassword(ghr2,form.getGhr2mm()); + if (form.getId() == null || form.getId().longValue() < 0) { throw new SecurityException("参数id不正确"); } @@ -94,16 +111,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS if (!zcgOld.getZt().equals(zcgJyztEnum.jyz.getValue())) { throw new SecurityException("暂存柜未借用"); } - SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id()); - if (ghr1 == null) { - throw new SecurityException("归还人1不存在"); - } - SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); - if (ghr2 == null) { - throw new SecurityException("归还人2不存在"); - } - SysUser jsr = sysUserService.selectUserById(form.getJsrId()); - //验证钥匙1领取人密码，钥匙2领取人密码，发放人密码 todo + zcgOld.setLqr1Id(null); zcgOld.setLqr1Mc(null); zcgOld.setLqr2Id(null); @@ -121,8 +129,8 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS zcgTz.setGhr2Id(ghr2.getUserId()); zcgTz.setGhr2Mc(ghr2.getNickName()); - zcgTz.setJsrId(jsr.getUserId()); - zcgTz.setJsrMc(jsr.getNickName()); + zcgTz.setJsrId(SecurityUtils.getUserId()); + zcgTz.setJsrMc(SecurityUtils.getNickName()); zcgTz.setCreateTime(new Date()); zcgTz.setQmyy("钥匙归还"); zcgTzService.save(zcgTz); @@ -137,6 +145,20 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS @Override @Transactional(rollbackFor = Exception.class) public void ysghBatch(ZcgYsghForm form) { + SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id()); + if (ghr1 == null) { + throw new SecurityException("归还人1不存在"); + } + SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); + if (ghr2 == null) { + throw new SecurityException("归还人2不存在"); + } + //验证接收人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm()); + //验证钥匙1归还人密码 + checkPassword(ghr1,form.getGhr1mm()); + //验证钥匙2归还人密码 + checkPassword(ghr2,form.getGhr2mm()); if (form.getIds().length<0) { throw new SecurityException("参数ids不正确"); } @@ -145,16 +167,6 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS List zcgList = this.list(queryWrapper); List zcgTzList = new ArrayList<>(); if (zcgList.size() > 0) { - SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id()); - if (ghr1 == null) { - throw new SecurityException("归还人1不存在"); - } - SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); - if (ghr2 == null) { - throw new SecurityException("归还人2不存在"); - } - SysUser jsr = sysUserService.selectUserById(form.getJsrId()); - //验证钥匙1归还人密码，钥匙2归还人密码，接收人密码 todo for (Zcg zcg : zcgList) { if (!zcg.getZt().equals(zcgJyztEnum.jyz.getValue())) { throw new SecurityException("暂存柜" + zcg.getMc() + "未借用"); @@ -170,15 +182,12 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS //存台账 ZcgTz zcgTz = new ZcgTz(); zcgTz.setZcgId(zcg.getId()); - zcgTz.setGhr1Id(ghr1.getUserId()); zcgTz.setGhr1Mc(ghr1.getNickName()); - zcgTz.setGhr2Id(ghr2.getUserId()); zcgTz.setGhr2Mc(ghr2.getNickName()); - - zcgTz.setJsrId(jsr.getUserId()); - zcgTz.setJsrMc(jsr.getNickName()); + zcgTz.setJsrId(SecurityUtils.getUserId()); + zcgTz.setJsrMc(SecurityUtils.getNickName()); zcgTz.setCreateTime(new Date()); zcgTz.setQmyy("钥匙归还"); zcgTzList.add(zcgTz); @@ -197,16 +206,6 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS @Override @Transactional(rollbackFor = Exception.class) public void ysff(ZcgYsffForm form) { - if (form.getId() == null || form.getId().longValue() < 0) { - throw new SecurityException("参数id不正确"); - } - Zcg zcgOld = this.getById(form.getId()); - if (zcgOld == null) { - throw new SecurityException("暂存柜不存在或已删除"); - } - if (!zcgOld.getZt().equals(zcgJyztEnum.wjy.getValue())) { - throw new SecurityException("暂存柜已借用"); - } //获取领取人信息 SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); if (lqr1 == null) { @@ -216,9 +215,23 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS if (lqr2 == null) { throw new SecurityException("领取人2不存在"); } - //验证钥匙1领取人密码，钥匙2领取人密码，发放人密码 todo - SysUser ffr = sysUserService.selectUserById(form.getFfrId()); + //验证发放人密码 + checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getFfrmm()); + //验证钥匙1领取人密码 + checkPassword(lqr1,form.getLqr1mm()); + //验证钥匙2领取人密码 + checkPassword(lqr2,form.getLqr2mm()); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new SecurityException("参数id不正确"); + } + Zcg zcgOld = this.getById(form.getId()); + if (zcgOld == null) { + throw new SecurityException("暂存柜不存在或已删除"); + } + if (!zcgOld.getZt().equals(zcgJyztEnum.wjy.getValue())) { + throw new SecurityException("暂存柜已借用"); + } zcgOld.setLqr1Id(form.getLqr1Id()); zcgOld.setLqr1Mc(lqr1.getNickName()); zcgOld.setLqr2Id(form.getLqr2Id()); @@ -240,12 +253,25 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS zcgTz.setLqr2Id(lqr2.getUserId()); zcgTz.setLqr2Mc(lqr2.getNickName()); - zcgTz.setFfrId(ffr.getUserId()); - zcgTz.setFfrMc(ffr.getNickName()); + zcgTz.setFfrId(SecurityUtils.getUserId()); + zcgTz.setFfrMc(SecurityUtils.getNickName()); zcgTz.setCreateTime(new Date()); zcgTz.setQmyy("钥匙发放"); zcgTzService.save(zcgTz); } + + /** + * 验证密码 + * @param user + * @param qmrmm + */ + public void checkPassword(SysUser user,String qmrmm){ + if(StringUtils.isBlank(qmrmm)){ + throw new ServiceException("签名密码不能为空"); + } + sysUserService.checkPassword(user,qmrmm,false); + } + }