From f766d1ae97e523268b4199c10ad1a296839c5e72 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Mon, 27 May 2024 20:45:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/service/impl/TmTaskServiceImpl.java | 14 +++++++++++--- .../src/main/resources/mapper/app/TmTaskMapper.xml | 3 +++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 68ce334b..505f1e27 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -618,12 +618,15 @@ public class TmTaskServiceImpl implements TmTaskService { public List getLeaseAuditManageList(TmTask record) { Set roles = SecurityUtils.getLoginUser().getRoles(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); - if (roles.contains("fgs")) { + List tmTaskList = new ArrayList<>(); + if (roles.contains("fgs") && roles.contains("sgb")) { + record.setCompanyId(101); + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } else if (roles.contains("fgs")) { record.setDeptId(deptId); + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); } - List tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); - for (TmTask tmTask : tmTaskList) { int count = 0; if (tmTask != null) { @@ -651,6 +654,11 @@ public class TmTaskServiceImpl implements TmTaskService { } } } + // 存入领料任务实体集合 + tmTask.setLeaseApplyInfoList(collect); + if (collect.size() > 0) { + tmTask.setRemark(collect.get(0).getRemark()); + } } //施管部只能看到机具分公司（101）的数据 if (roles.contains("jjfgs") || roles.contains("sgb") || deptId == 101) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 135e74c5..30212702 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -561,6 +561,9 @@ AND su.dept_id = #{record.deptId} + + AND lai.company_id = #{record.companyId} + AND tt.task_id = #{record.taskId} From 0b375888545f5a824f1694d35ce0e16b9daf5a87 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Tue, 28 May 2024 09:43:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/auth/service/SysLoginService.java | 2 +- .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index 0ff43bbd..7341ecfc 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -75,7 +75,7 @@ public class SysLoginService { if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在"); - throw new ServiceException("登录用户：" + username + " 不存在"); + throw new ServiceException("用户不存在/密码错误"); } if (R.FAIL == userResult.getCode()) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 505f1e27..c0895487 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -654,11 +654,6 @@ public class TmTaskServiceImpl implements TmTaskService { } } } - // 存入领料任务实体集合 - tmTask.setLeaseApplyInfoList(collect); - if (collect.size() > 0) { - tmTask.setRemark(collect.get(0).getRemark()); - } } //施管部只能看到机具分公司（101）的数据 if (roles.contains("jjfgs") || roles.contains("sgb") || deptId == 101) { From 43e0624cda7550d3c31ca78dac90dc75b2f6ef7c Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Tue, 28 May 2024 15:50:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/auth/controller/TokenController.java | 4 ++-- .../app/service/impl/TmTaskServiceImpl.java | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index 5f85287c..b2b0e9d9 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -58,9 +58,9 @@ public class TokenController { //web端登录 @PostMapping("login") public R login(@RequestBody LoginBody form) throws Exception { - String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); +// String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); // 用户登录 - LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData); + LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); String uuid = form.getUuid(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); if (StringUtils.isBlank(captcha)) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index c0895487..dcd09522 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -442,11 +442,8 @@ public class TmTaskServiceImpl implements TmTaskService { List tmTaskList; if (roles.contains(STRING_ADMIN)) { tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record); - } else if (deptId == 101) { - record.setCompanyId(101); - tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record); - } else if (deptId == 102) { - record.setCompanyId(102); + } else if (deptId != null) { + record.setCompanyId(deptId.intValue()); tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record); } else { String username = SecurityUtils.getLoginUser().getUsername(); @@ -619,12 +616,18 @@ public class TmTaskServiceImpl implements TmTaskService { Set roles = SecurityUtils.getLoginUser().getRoles(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); List tmTaskList = new ArrayList<>(); - if (roles.contains("fgs") && roles.contains("sgb")) { + if (roles.contains("admin")) { + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } else if (roles.contains("fgs") && roles.contains("sgb")) { record.setCompanyId(101); tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); - } else if (roles.contains("fgs")) { + } else if (roles.contains("fgs") && (roles.contains("em01") || roles.contains("em02"))) { //机具书记/副经理内部审批权限 + record.setCompanyId(101); + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } else if (roles.contains("fgs")){ record.setDeptId(deptId); tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); for (TmTask tmTask : tmTaskList) { From 9eda3aa9487e3d1aea30bf3bf2c23a2cd0c97773 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Tue, 28 May 2024 18:30:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/auth/controller/TokenController.java | 19 +----- .../sgzb/app/controller/TmTaskController.java | 1 + .../app/service/impl/TmTaskServiceImpl.java | 60 ++++++++++++++----- 3 files changed, 49 insertions(+), 31 deletions(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index b2b0e9d9..2e6225c4 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -58,25 +58,12 @@ public class TokenController { //web端登录 @PostMapping("login") public R login(@RequestBody LoginBody form) throws Exception { -// String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); - // 用户登录 LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); - String uuid = form.getUuid(); - String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); - if (StringUtils.isBlank(captcha)) { - // 删除验证码缓存 - redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid); - return R.fail("验证码超时，请重新刷新"); - } - if (form.getCode() != null && form.getCode().equals(captcha)) { - // 删除验证码缓存 - redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid); - // 获取登录token + if (userInfo != null) { + userInfo.setLoginMethod("mobile"); return R.ok(tokenService.createToken(userInfo)); } else { - // 删除验证码缓存 - redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid); - return R.fail("验证码错误"); + return R.fail("登录信息为空，请重试"); } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 0ec4aca4..960a1b52 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -217,6 +217,7 @@ public class TmTaskController extends BaseController { leaseApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId()); // 设置设备所属分公司,用于交给哪家审核 leaseApplyInfo.setType("2"); // 设置审批层级，先固定2层，后期根据接口传入Type区分来源设定 leaseApplyInfo.setLeaseType(task.getLeaseType()); + leaseApplyInfo.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); leaseApplyInfo.setEstimateLeaseTime(task.getEstimateLeaseTime()); // 创建领料任务，返回领料任务编号 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index dcd09522..1d88ab8a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -618,25 +618,34 @@ public class TmTaskServiceImpl implements TmTaskService { List tmTaskList = new ArrayList<>(); if (roles.contains("admin")) { tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); - } else if (roles.contains("fgs") && roles.contains("sgb")) { - record.setCompanyId(101); + } else if (roles.contains("em01") || roles.contains("em02")) { //机具经理、机具副经理 + record.setDeptId(101L); tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); - } else if (roles.contains("fgs") && (roles.contains("em01") || roles.contains("em02"))) { //机具书记/副经理内部审批权限 - record.setCompanyId(101); + } else if (roles.contains("sgb")) { //施管部经理 + record.setDeptId(210L); tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); - } else if (roles.contains("fgs")){ + } else if (roles.contains("dm01") || roles.contains("dm04")) { //调试经理、调试安全专责 + record.setDeptId(102L); + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } else if (roles.contains("dm02")) { //调试审核员 + record.setCompanyId(102); + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } else if (roles.contains("fgs")) { //各分公司经理 + record.setDeptId(deptId); + tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + } else { //其他角色只能看到自己部门下的数据 record.setDeptId(deptId); tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); - } - Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + for (TmTask tmTask : tmTaskList) { int count = 0; if (tmTask != null) { + tmTask.setDeptId(deptId); // 去查询任务分单表 List collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask); - //没有companyId的用户或者是分公司账号可以看到所有数据 - if (companyId == null || roles.contains("fgs")) { + //管理员可以看到所有数据 + if (roles.contains("admin")) { // 对领料任务集合查询具体详情 for (LeaseApplyInfo leaseApplyInfo : collect) { if (leaseApplyInfo != null) { @@ -657,9 +666,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } } - } - //施管部只能看到机具分公司（101）的数据 - if (roles.contains("jjfgs") || roles.contains("sgb") || deptId == 101) { + } else if (roles.contains("em01") || roles.contains("em02") || roles.contains("sgb")) { List auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == 101).collect(Collectors.toList()); if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { // 对领料任务集合查询具体详情 @@ -683,9 +690,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } } - } - //安监部只能看到设备分公司（102）的数据 - if (roles.contains("tsfgs") || roles.contains("ajb") || deptId == 102) { + } else if (roles.contains("dm01") || roles.contains("dm04") || roles.contains("dm02")) { List auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() != null).filter(t -> t.getCompanyId() == 102).collect(Collectors.toList()); if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { // 对领料任务集合查询具体详情 @@ -709,6 +714,31 @@ public class TmTaskServiceImpl implements TmTaskService { } } } + } else { + //其他部门人只能看到自己部门下的数据 + List auditListByLeaseInfo = collect.stream().filter(t -> t.getCreateBy().equals(deptId.toString())).collect(Collectors.toList()); + if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { + // 对领料任务集合查询具体详情 + for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) { + if (leaseApplyInfo != null) { + // 去查询领料任务详情表 + List leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo); + if (leaseApplyDetails.size() > 0) { + for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + if (leaseApplyDetail != null) { + // 统计预领数量 + count += leaseApplyDetail.getPreNum(); + } + } + // 塞入领料任务详情的集合中 + leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); + // 存入领料任务实体集合 + tmTask.setLeaseApplyInfoList(auditListByLeaseInfo); + tmTask.setRemark(collect.get(0).getRemark()); + } + } + } + } } // 塞入预领的合计数量 tmTask.setPreCountNum(count); From ac4ee525d2eab22dd92e900ca706b649ab249329 Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Tue, 28 May 2024 18:31:22 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/auth/controller/TokenController.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index 2e6225c4..d3ff12ab 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -58,12 +58,24 @@ public class TokenController { //web端登录 @PostMapping("login") public R login(@RequestBody LoginBody form) throws Exception { + // 用户登录 LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); - if (userInfo != null) { - userInfo.setLoginMethod("mobile"); + String uuid = form.getUuid(); + String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); + if (StringUtils.isBlank(captcha)) { + // 删除验证码缓存 + redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid); + return R.fail("验证码超时，请重新刷新"); + } + if (form.getCode() != null && form.getCode().equals(captcha)) { + // 删除验证码缓存 + redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid); + // 获取登录token return R.ok(tokenService.createToken(userInfo)); } else { - return R.fail("登录信息为空，请重试"); + // 删除验证码缓存 + redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid); + return R.fail("验证码错误"); } } From fd998f1b413a330425aa1c232fbca3384c4f73de Mon Sep 17 00:00:00 2001 From: csyue <1203338439@qq.com> Date: Tue, 28 May 2024 18:37:58 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/auth/controller/TokenController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index 6ea3cc75..14899b7b 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -60,7 +60,7 @@ public class TokenController { public R login(@RequestBody LoginBody form) throws Exception { //String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey); // 用户登录 - LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData); + LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); String uuid = form.getUuid(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); if (StringUtils.isBlank(captcha)) {