From 5dd287a0b7125158a3cf9c0d78296ab50b82a2e7 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 20 Feb 2024 18:04:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E7=BD=91=E6=B3=A8=E5=86=8C=E5=92=8C?= =?UTF-8?q?=E9=A2=86=E6=96=99=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/auth/controller/TokenController.java | 8 +- .../sgzb/auth/form/NwLoginConstants.java | 29 ++--- .../service/impl/NwRegisterServiceImpl.java | 43 +++---- sgzb-auth/src/main/resources/bootstrap.yml | 13 ++- .../sgzb/app/controller/TmTaskController.java | 27 ++++- .../bonus/sgzb/app/mapper/TmTaskMapper.java | 4 + .../bonus/sgzb/app/service/TmTaskService.java | 2 + .../app/service/impl/TmTaskServiceImpl.java | 108 +++++++++++++++--- .../resources/mapper/app/TmTaskMapper.xml | 73 ++++++++++++ 9 files changed, 248 insertions(+), 59 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 7e57cad7..216bbf4c 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 @@ -48,8 +48,8 @@ public class TokenController { @Resource private NwUserLoginService nwUserLoginService; - /* @Autowired - private NwRegisterService registerService;*/ + @Autowired + private NwRegisterService registerService; //web端登录 @PostMapping("login") @@ -143,7 +143,7 @@ public class TokenController { } - /* @ApiOperation("用户中心注册") + @ApiOperation("用户中心注册") @PostMapping("/registers") public AjaxResult registers(HttpServletRequest request, @RequestBody RegisterForms registerForms) { AccountRegister accountRegister = new AccountRegister(); @@ -152,5 +152,5 @@ public class TokenController { accountRegister.setRemark("个人用户注册"); registerForms.setIsPersonal(accountRegister.getCode()); return AjaxResult.success("success", registerService.registersNew(request, registerForms)); - }*/ + } } diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/form/NwLoginConstants.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/form/NwLoginConstants.java index 064c45a5..6a7286f4 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/form/NwLoginConstants.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/form/NwLoginConstants.java @@ -76,6 +76,7 @@ public class NwLoginConstants { public static final Long PLATFORM_ID = 20L; public static final String REGISTERIP_SUCCESS = "注册成功"; + public static final String REGISTERIP_SUCCESS_BIND = "该账号已注册"; public static final String REGISTERIP_FAIL = "注册失败"; /** * 授权范围 @@ -139,15 +140,15 @@ public class NwLoginConstants { //短信验证码校验 public static String verifyPhoneCode; - /* @Value("${verifyPhoneCode}") + @Value("${verifyPhoneCode}") public void setVerifyPhoneCode(String verifyPhoneCode) { NwLoginConstants.verifyPhoneCode = verifyPhoneCode; - }*/ + } // 绑定默认系统角色 public static String userBindUrl; - /* @Value("${userBindUrl}") + @Value("${userBindUrl}") public void setUserBindUrl(String userBindUrl) { NwLoginConstants.userBindUrl = userBindUrl; } @@ -155,15 +156,15 @@ public class NwLoginConstants { @Value("${registerPhone}") public void setRegisterPhone(String registerPhone) { NwLoginConstants.registerPhone = registerPhone; - }*/ + } //用户列表查询（简单信息） public static String personEasyList; - /* @Value("${getPersonDetailData}") + @Value("${getPersonDetailData}") public void setGetPersonDetailData(String getPersonDetailData) { NwLoginConstants.getPersonDetailData = getPersonDetailData; - }*/ + } //用户信息查询 详细信息 public static String getPersonDetailData; @@ -182,21 +183,21 @@ public class NwLoginConstants { public static String appAppsecret; - /* @Value("${appAppsecret}") + @Value("${appAppsecret}") public void setAppAppsecret(String appAppsecret) { NwLoginConstants.appAppsecret = appAppsecret; - }*/ + } -/* @Value("${personEasyList}") + @Value("${personEasyList}") public void setPersonEasyList(String personEasyList) { NwLoginConstants.personEasyList = personEasyList; - }*/ + } public static String appsecret; public static String h5Appsecret; - /* @Value("${h5Appsecret}") + @Value("${h5Appsecret}") public void setH5Appsecret(String h5Appsecret) { NwLoginConstants.h5Appsecret = h5Appsecret; } @@ -204,7 +205,7 @@ public class NwLoginConstants { @Value("${appsecret}") public void setAppsecret(String appsecret) { NwLoginConstants.appsecret = appsecret; - }*/ + } public static String appId; @@ -213,7 +214,7 @@ public class NwLoginConstants { public static String appAppId; - /* @Value("${appAppId}") + @Value("${appAppId}") public void setAppAppId(String appAppId) { NwLoginConstants.appAppId = appAppId; } @@ -227,7 +228,7 @@ public class NwLoginConstants { @Value("${appId}") public void setAppId(String appId) { NwLoginConstants.appId = appId; - }*/ + } @Value("${baseUrl}") public void setBaseUrl(String baseUrl) { diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/impl/NwRegisterServiceImpl.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/impl/NwRegisterServiceImpl.java index 902818e3..aa4dee25 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/impl/NwRegisterServiceImpl.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/impl/NwRegisterServiceImpl.java @@ -25,14 +25,14 @@ import java.util.regex.Pattern; * @date: 2021/8/14 18:47 * @description: 注册实现类 */ -/*@Service +@Service @Slf4j public class NwRegisterServiceImpl implements NwRegisterService { @Override public String registersNew(HttpServletRequest request, RegisterForms registerForms) { log.info("统一个人手机注册 registersForPersonal方法 入参 request:{}, registerForms:{}", request, JSON.toJSONString(registerForms)); - *//**校验请求参数*//* + //校验请求参数 this.checkRequestParam(request, registerForms); Integer loginModeType = registerForms.getLoginModeType(); NwApp nwApp = new NwApp(); @@ -56,24 +56,30 @@ public class NwRegisterServiceImpl implements NwRegisterService { try { //发送注册请求(调用南网的注册方法) RespLoginData respLoginData = null; - *//*查询用户中心是否存在当前用户*//* +// 查询用户中心是否存在当前用户 CloudUserVo cloudUserVo = this.queryUserBySso(registerForms); - *//*数据幂等性操作 记录日志*//* +// 数据幂等性操作 记录日志 RegistersVo registersVo = getRegisterVo(registerForms); log.error("check001_registersVo:{}", JSON.toJSONString(registersVo)); if (null == cloudUserVo) { log.info("系统不存在,用户中心不存在,同步数据到用户中心"); respLoginData = HttpUtils.postJson(NwLoginConstants.registerPhone, registersVo, null, Map.class, null); + log.error("check002_respLoginData:{}", JSON.toJSONString(respLoginData)); + if (respLoginData.getCode().equals(NwLoginConstants.HTTP_RESPONSE_CODE_200)) { + return NwLoginConstants.REGISTERIP_SUCCESS; + }else { + return NwLoginConstants.REGISTERIP_FAIL; + } } else { log.info("系统不存在,用户中心存在,操作绑定业务"); respLoginData = this.bindSsoUser(registerForms); - } - log.error("check002_respLoginData:{}", JSON.toJSONString(respLoginData)); - if (respLoginData.getCode().equals(NwLoginConstants.HTTP_RESPONSE_CODE_200)) { - return NwLoginConstants.REGISTERIP_SUCCESS; - } else { - return NwLoginConstants.REGISTERIP_FAIL; + log.error("check002_respLoginData:{}", JSON.toJSONString(respLoginData)); + if (respLoginData.getCode().equals(NwLoginConstants.HTTP_RESPONSE_CODE_200)) { + return NwLoginConstants.REGISTERIP_SUCCESS_BIND; + }else { + return NwLoginConstants.REGISTERIP_FAIL; + } } } catch (Exception e) { throw new BaseException("9999", e.getMessage()); @@ -133,12 +139,12 @@ public class NwRegisterServiceImpl implements NwRegisterService { } } - *//** + /* * * 验证手机号 * * @param phone - * @return 验证成功返回true，验证失败返回false - *//* + * @return 验证成功返回true，验证失败返回false*/ + public static boolean checkPhone(String phone) { String regex = "^1\\d{10}$"; return Pattern.matches(regex, phone); @@ -186,12 +192,9 @@ public class NwRegisterServiceImpl implements NwRegisterService { } } - *//** - * 封装南网需要的注册信息 - * - * @author: LYJ - * @date: 2021/8/17 8:57 - *//* + + /* 封装南网需要的注册信息*/ + private RegistersVo getRegisterVo(RegisterForms registerForms) { RegistersVo registersVo = new RegistersVo(); if (null != registerForms.getEnterpriseName()) { @@ -256,4 +259,4 @@ public class NwRegisterServiceImpl implements NwRegisterService { return HttpUtils.postJson(NwLoginConstants.userBindUrl, lbcloudUserVo, null, Map.class, null); } -}*/ +} diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml index b1223ae0..9e325d85 100644 --- a/sgzb-auth/src/main/resources/bootstrap.yml +++ b/sgzb-auth/src/main/resources/bootstrap.yml @@ -30,4 +30,15 @@ onlineApprove: /lbcloud-oauth/oauth/token wechatAppId: crhmaxnE wechatAppsecret: 3893e6ed90d325f00e34583dd970a56580c05549 getNowPersonDetailData: /lbcloud-user/user/queryLoginUserInfo -baseUrl: https://test-sso.csgmall.com.cn \ No newline at end of file +baseUrl: https://test-sso.csgmall.com.cn +appAppsecret: d8e6db9fa9bb09da0e270fa739233c823bf9c5f0 +personEasyList: /lbcloud-user/api/user/queryAndPaging/basicInfo +h5Appsecret: 3c4a67b7f6a268b4202a5328e6a1726979d5903b +h5AppId: G3NksDH2 +appsecret: 596e4863c8d112842ce820c130b236001297ea73 +appId: akvVFYgy +appAppId: u8LLfynf +getPersonDetailData: /lbcloud-user/api/user/queryById +registerPhone: /lbcloud-user/api/user/registrationByPhone +userBindUrl: /lbcloud-authority/api/RoleClient/bindDefaultSystemRole +verifyPhoneCode: /lbcloud-mbroker/api/broker/simpleVerificationCode \ No newline at end of file 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 30a30696..de1161eb 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 @@ -274,13 +274,13 @@ public class TmTaskController extends BaseController { /** - * 查询机具领料审核列表 + * 查询机具领料申请列表 * * @param task 筛选条件 * @param souceBy app为1 web为0 * @return 列表 */ - @Log(title = "查询机具领料审核列表", businessType = BusinessType.QUERY) + @Log(title = "查询机具领料申请列表", businessType = BusinessType.QUERY) @GetMapping(value = "getLeaseAuditListAll") public AjaxResult getLeaseAuditListAll(TmTask task, Integer souceBy) { if (StringUtils.isNull(task)) { @@ -296,6 +296,29 @@ public class TmTaskController extends BaseController { return AjaxResult.success(getDataTable(leaseAuditList)); } + /** + * 查询机具领料管理列表 + * + * @param task 筛选条件 + * @param souceBy app为1 web为0 + * @return 列表 + */ + @Log(title = "查询机具领料管理列表", businessType = BusinessType.QUERY) + @GetMapping(value = "getLeaseManageListAll") + public AjaxResult getLeaseManageListAll(TmTask task, Integer souceBy) { + if (StringUtils.isNull(task)) { + return AjaxResult.error("参数错误"); + } + List leaseAuditList = new ArrayList<>(); + if (souceBy == 1) { + leaseAuditList = tmTaskService.getLeaseAuditManageList(task); + return AjaxResult.success(leaseAuditList); + } + startPage(); + leaseAuditList = tmTaskService.getLeaseAuditManageList(task); + return AjaxResult.success(getDataTable(leaseAuditList)); + } + /** * 领料申请导出 * 注意：备注字段到时要换 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 02ac634c..c4105427 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -27,9 +27,13 @@ public interface TmTaskMapper { */ List getAuditListByLeaseTmTask(@Param("record") TmTask record); + List getAuditManageListByLeaseTmTask(@Param("record") TmTask record); + List getAuditListByLeaseInfo(@Param("record") TmTask record); + List getAuditManageListByLeaseInfo(@Param("record") TmTask record); List getLeaseApplyDetails(@Param("record") LeaseApplyInfo record); + List getLeaseApplyManageDetails(@Param("record") LeaseApplyInfo record); /** 更新TmTask审批状态 */ int updateTmTaskAuditStatus(@Param("record") TmTask record); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index ee258e04..7bbb3d71 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -19,6 +19,8 @@ public interface TmTaskService{ List getLeaseAuditList(TmTask record); + List getLeaseAuditManageList(TmTask record); + List getLeaseAuditListForApp(TmTask record); /** 领料任务审核通过状态修改 */ 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 e28c3e18..6123aca9 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 @@ -107,36 +107,108 @@ public class TmTaskServiceImpl implements TmTaskService { } /** - * 获取审核列表 - web端 + * 获取领料申请列表 */ @Override public List getLeaseAuditList(TmTask record) { - List tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record); + List collect = tmTaskMapper.getAuditListByLeaseTmTask(record); + String username = SecurityUtils.getLoginUser().getUsername(); + List tmTaskList = collect.stream().filter(t -> t.getCreateBy().equals(username)).collect(Collectors.toList()); + for (TmTask tmTask : tmTaskList) { + int count = 0; + if (tmTask != null) { + // 去查询任务分单表 + List auditListByLeaseInfo = tmTaskMapper.getAuditListByLeaseInfo(tmTask); + if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { + // 对领料任务集合查询具体详情 + for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) { + if (leaseApplyInfo != null) { + // 去查询领料任务详情表 + List leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo); + if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { + for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + if (leaseApplyDetail != null) { + // 统计预领数量 + count += leaseApplyDetail.getPreNum(); + } + } + // 塞入领料任务详情的集合中 + leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); + } + } + } + // 存入领料任务实体集合 + tmTask.setLeaseApplyInfoList(auditListByLeaseInfo); + } + // 塞入预领的合计数量 + tmTask.setPreCountNum(count); + } + } + + return tmTaskList; + } + + /** + * 获取领料管理列表 + */ + @Override + public List getLeaseAuditManageList(TmTask record) { + List tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record); + Set roles = SecurityUtils.getLoginUser().getRoles(); for (TmTask tmTask : tmTaskList) { int count = 0; if (tmTask != null) { // 去查询任务分单表 - List auditListByLeaseInfo = tmTaskMapper.getAuditListByLeaseInfo(tmTask); - if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { - // 对领料任务集合查询具体详情 - for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) { - if (leaseApplyInfo != null) { - // 去查询领料任务详情表 - List leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo); - if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { - for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { - if (leaseApplyDetail != null) { - // 统计预领数量 - count += leaseApplyDetail.getPreNum(); + List collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask); + //施管部只能看到机具分公司（101）的数据 + if (roles.contains("sgb")){ + List auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() == 101).collect(Collectors.toList()); + if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { + // 对领料任务集合查询具体详情 + for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) { + if (leaseApplyInfo != null) { + // 去查询领料任务详情表 + List leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo); + if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { + for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + if (leaseApplyDetail != null) { + // 统计预领数量 + count += leaseApplyDetail.getPreNum(); + } } + // 塞入领料任务详情的集合中 + leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); } - // 塞入领料任务详情的集合中 - leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); } } + // 存入领料任务实体集合 + tmTask.setLeaseApplyInfoList(auditListByLeaseInfo); + } + } + //安监部只能看到设备分公司（102）的数据 + if (roles.contains("ajb")){ + List auditListByLeaseInfo = collect.stream().filter(t -> t.getCompanyId() == 102).collect(Collectors.toList()); + if (auditListByLeaseInfo != null && !auditListByLeaseInfo.isEmpty()) { + // 对领料任务集合查询具体详情 + for (LeaseApplyInfo leaseApplyInfo : auditListByLeaseInfo) { + if (leaseApplyInfo != null) { + // 去查询领料任务详情表 + List leaseApplyDetails = tmTaskMapper.getLeaseApplyManageDetails(leaseApplyInfo); + if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { + for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + if (leaseApplyDetail != null) { + // 统计预领数量 + count += leaseApplyDetail.getPreNum(); + } + } + // 塞入领料任务详情的集合中 + leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); + } + } + } + // 存入领料任务实体集合 + tmTask.setLeaseApplyInfoList(auditListByLeaseInfo); } - // 存入领料任务实体集合 - tmTask.setLeaseApplyInfoList(auditListByLeaseInfo); } // 塞入预领的合计数量 tmTask.setPreCountNum(count); 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 e891d3f9..06acd2c1 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 @@ -503,6 +503,56 @@ ORDER BY tt.update_time DESC + + + +