inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
@@ -45,7 +45,7 @@ @ApiOperation(value = "更具零件号获取标准树") @GetMapping("/selectStandardTreeListByPartNo") public Result selectStandardTreeListByPartNo(String partNo) { return Result.success(rawMaterialOrderService.selectStandardTreeListByPartNo(partNo)); return rawMaterialOrderService.selectStandardTreeListByPartNo(partNo); } @ApiOperation(value = "原材料检验查询代下单") inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.basic.dto.*; import com.ruoyi.basic.pojo.IfsInventoryQuantity; import com.ruoyi.common.core.domain.Result; import com.ruoyi.inspect.dto.SampleProductDto; import com.ruoyi.inspect.pojo.InsOrder; import com.ruoyi.inspect.dto.CopperInsOrderDto; @@ -20,7 +21,7 @@ */ public interface RawMaterialOrderService { RawMaterialStandardTreeDto selectStandardTreeListByPartNo(String partNo); Result selectStandardTreeListByPartNo(String partNo); /** * 报检查询 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -18,6 +18,7 @@ import com.ruoyi.basic.dto.*; import com.ruoyi.basic.pojo.IfsInventoryQuantity; import com.ruoyi.common.constant.InsOrderTypeConstants; import com.ruoyi.common.core.domain.Result; import com.ruoyi.common.core.domain.entity.User; import com.ruoyi.common.properties.WechatProperty; import com.ruoyi.common.utils.LimsDateUtil; @@ -82,13 +83,10 @@ @Override public RawMaterialStandardTreeDto selectStandardTreeListByPartNo(String partNo) { if (StringUtils.isBlank(partNo)) { throw new ErrorException("零件号丢失"); } public Result selectStandardTreeListByPartNo(String partNo) { List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeListByPartNo(partNo); if (CollectionUtil.isEmpty(factoryDtos)) { throw new ErrorException("零件号为" + partNo + "的原材料没有对应的标准库配置"); return Result.success(null, "零件号为" + partNo + "的原材料没有对应的标准库配置"); } RawMaterialStandardTreeDto rawMaterialStandardTreeDto = new RawMaterialStandardTreeDto(); for (FactoryDto factoryDto : factoryDtos) { @@ -125,7 +123,7 @@ } } } return rawMaterialStandardTreeDto; return Result.success(rawMaterialStandardTreeDto); } @Override ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -111,7 +111,7 @@ @GetMapping("/getSsoAuthUrl") public AjaxResult getSsoAuthUrl() { String uuid = UUID.randomUUID().toString(); return AjaxResult.success(ssoBean.getUrl() + "/oauth2/auth?response_type=code&scope=openid&client_id=" + ssoBean.getClientId() + "&redirect_uri=" + ssoBean.getCallbackUrl() + "&state=" + uuid); return AjaxResult.success("操作成功", ssoBean.getUrl() + "/oauth2/auth?response_type=code&scope=openid&client_id=" + ssoBean.getClientId() + "&redirect_uri=" + ssoBean.getCallbackUrl() + "&state=" + uuid); } /** ruoyi-admin/src/main/resources/application.yml
@@ -69,7 +69,7 @@ # 令牌自定义标识 header: Authorization # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz secret: awertgbadrtawetfgfbsdfawerghbfdsftreagd # 令牌有效期（默认30分钟） expireTime: 450 @@ -90,9 +90,9 @@ #集团统一登录 sso: url: clientId: clientSecret: callbackUrl: url: https://ztt-sso.asuncloud.net clientId: 47ded514-f447-43b4-afdf-181c10e2222d clientSecret: appSecret:ea93d26a68863da5d71a6e3355ec22df callbackUrl: https://ztzb-lims.ztt.cn/logindemo
@@ -4,6 +4,7 @@ user.jcaptcha.expire=\u9A8C\u8BC1\u7801\u5DF2\u5931\u6548 user.not.exists=\u7528\u6237\u4E0D\u5B58\u5728/\u5BC6\u7801\u9519\u8BEF user.password.not.match=\u7528\u6237\u4E0D\u5B58\u5728/\u5BC6\u7801\u9519\u8BEF user.sso.not.match=\u5355\u70B9\u767B\u5F55\u9A8C\u8BC1\u5931\u8D25 user.password.retry.limit.count=\u5BC6\u7801\u8F93\u5165\u9519\u8BEF{0}\u6B21 user.password.retry.limit.exceed=\u5BC6\u7801\u8F93\u5165\u9519\u8BEF{0}\u6B21\uFF0C\u5E10\u6237\u9501\u5B9A{1}\u5206\u949F user.password.delete=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u8D26\u53F7\u5DF2\u88AB\u5220\u9664 @@ -11,7 +12,7 @@ role.blocked=\u89D2\u8272\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458 login.blocked=\u5F88\u9057\u61BE\uFF0C\u8BBF\u95EEIP\u5DF2\u88AB\u5217\u5165\u7CFB\u7EDF\u9ED1\u540D\u5355 user.logout.success=\u9000\u51FA\u6210\u529F user.single.logout.success=\u5355\u70B9\u767B\u5F55\u9000\u51FA\u6210\u529F user.sso.logout.success=\u5355\u70B9\u767B\u5F55\u9000\u51FA\u6210\u529F length.not.valid=\u957F\u5EA6\u5FC5\u987B\u5728{min}\u5230{max}\u4E2A\u5B57\u7B26\u4E4B\u95F4 @@ -21,7 +22,7 @@ user.email.not.valid=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF user.mobile.phone.number.not.valid=\u624B\u673A\u53F7\u683C\u5F0F\u9519\u8BEF user.login.success=\u767B\u5F55\u6210\u529F user.single.login.success=\u5355\u70B9\u767B\u5F55\u6210\u529F user.sso.login.success=\u5355\u70B9\u767B\u5F55\u6210\u529F user.register.success=\u6CE8\u518C\u6210\u529F user.notfound=\u8BF7\u91CD\u65B0\u767B\u5F55 user.forcelogout=\u7BA1\u7406\u5458\u5F3A\u5236\u9000\u51FA\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55 ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
@@ -60,7 +60,7 @@ if (idToken != null) { loginOutUrl = ssoBean.getUrl() + "/oauth2/sessions/logout?id_token_hint=" + idToken; redisTemplate.delete("ssoOauthToken:idToken:" + SecurityUtils.getUsername()); AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.single.logout.success"))); AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.sso.logout.success"))); } else { AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.logout.success"))); } ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -246,7 +246,7 @@ recordLoginInfo(loginUser.getUserId()); // 创建登录信息 AsyncManager.me().execute(AsyncFactory.recordLogininfor(userInfo.getEmployeeId(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.single.login.success"))); AsyncManager.me().execute(AsyncFactory.recordLogininfor(userInfo.getEmployeeId(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.sso.login.success"))); redisTemplate.opsForValue().set("ssoOauthToken:idToken:" + userInfo.getEmployeeId(), tokenModel.getId_token(), 3, TimeUnit.DAYS); // 生成token return tokenService.createToken(loginUser); @@ -262,7 +262,7 @@ Authentication authentication = null; SysUser sysUser = sysUserService.selectUserByUserName(username); if (sysUser == null) { throw new ServiceException("用户不存在"); throw new ServiceException("单点登录验证失败"); } try { @@ -273,7 +273,7 @@ { if (e instanceof BadCredentialsException) { AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.sso.not.match"))); throw new UserPasswordNotMatchException(); } else @@ -286,7 +286,7 @@ { AuthenticationContextHolder.clearContext(); } AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.sso.login.success"))); return (LoginUser) authentication.getPrincipal(); }
