From 31290bdc487e80c26b2e81d55e46ca27d80e385c Mon Sep 17 00:00:00 2001
From: wangmengzhao <1036088376@qq.com>
Date: 星期二, 28 十一月 2023 23:46:02 +0800
Subject: [PATCH] 设备安装单/维修单优化，一级联营商合伙人登录之后可以看到别人给他创建的安装单和他给别人创建的安装单20231128wmz
---
wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ToolServiceImpl.java | 90 ++++++++++++++++-----------------------------
1 files changed, 32 insertions(+), 58 deletions(-)
diff --git a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ToolServiceImpl.java b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ToolServiceImpl.java
index 9273b8c..1ac54e0 100644
--- a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ToolServiceImpl.java
+++ b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ToolServiceImpl.java
@@ -1,6 +1,5 @@
package com.ruoyi.iot.service.impl;
-import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -37,13 +36,11 @@
import java.util.Random;
/**
- *
* @author kerwincui
* @date 2021-12-16
*/
@Service
-public class ToolServiceImpl implements IToolService
-{
+public class ToolServiceImpl implements IToolService {
private static final Logger log = LoggerFactory.getLogger(ToolServiceImpl.class);
@Autowired
@@ -76,14 +73,14 @@
String val = "";
Random random = new Random();
//鍙傛暟length锛岃〃绀虹敓鎴愬嚑浣嶉殢鏈烘暟
- for(int i = 0; i < length; i++) {
+ for (int i = 0; i < length; i++) {
String charOrNum = random.nextInt(2) % 2 == 0 ? "char" : "num";
//杈撳嚭瀛楁瘝杩樻槸鏁板瓧
- if( "char".equalsIgnoreCase(charOrNum) ) {
+ if ("char".equalsIgnoreCase(charOrNum)) {
//杈撳嚭鏄ぇ鍐欏瓧姣嶈繕鏄皬鍐欏瓧姣�
// int temp = random.nextInt(2) % 2 == 0 ? 65 : 97;
- val += (char)(random.nextInt(26) + 65);
- } else if( "num".equalsIgnoreCase(charOrNum) ) {
+ val += (char) (random.nextInt(26) + 65);
+ } else if ("num".equalsIgnoreCase(charOrNum)) {
val += String.valueOf(random.nextInt(10));
}
}
@@ -95,47 +92,33 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public String register(RegisterUserInput registerBody)
- {
+ public String register(RegisterUserInput registerBody) {
String msg = "";
String username = registerBody.getUsername();
String password = registerBody.getPassword();
- String phonenumber=registerBody.getPhonenumber();
+ String phonenumber = registerBody.getPhonenumber();
boolean captchaOnOff = configService.selectCaptchaOnOff();
// 楠岃瘉鐮佸紑鍏�
- if (captchaOnOff)
- {
+ if (captchaOnOff) {
validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
}
- if (StringUtils.isEmpty(username))
- {
+ if (StringUtils.isEmpty(username)) {
msg = "鐢ㄦ埛鍚嶄笉鑳戒负绌�";
- }
- else if (StringUtils.isEmpty(password))
- {
+ } else if (StringUtils.isEmpty(password)) {
msg = "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖";
- }
- else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
- || username.length() > UserConstants.USERNAME_MAX_LENGTH)
- {
+ } else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
+ || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
msg = "璐︽埛闀垮害蹇呴』鍦�2鍒�20涓瓧绗︿箣闂�";
- }
- else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
- || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
- {
+ } else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
+ || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
msg = "瀵嗙爜闀垮害蹇呴』鍦�5鍒�20涓瓧绗︿箣闂�";
- }
- else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username)))
- {
+ } else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username))) {
msg = "淇濆瓨鐢ㄦ埛'" + username + "'澶辫触锛屾敞鍐岃处鍙峰凡瀛樺湪";
- }else if (UserConstants.NOT_UNIQUE.equals(checkPhoneUnique(phonenumber)))
- {
+ } else if (UserConstants.NOT_UNIQUE.equals(checkPhoneUnique(phonenumber))) {
msg = "淇濆瓨鐢ㄦ埛'" + username + "'澶辫触锛屾敞鍐屾墜鏈哄彿鐮佸凡瀛樺湪";
- }
- else
- {
+ } else {
SysUser sysUser = new SysUser();
sysUser.setUserName(username);
sysUser.setNickName(username);
@@ -143,14 +126,11 @@
sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
boolean regFlag = userService.registerUser(sysUser);
//鍒嗛厤鏅�氱敤鎴疯鑹�(1=瓒呯骇绠＄悊鍛橈紝2=璁惧绉熸埛锛�3=鏅�氱敤鎴凤紝4=娓稿)
- Long[] roleIds={3L};
- userService.insertUserAuth(sysUser.getUserId(),roleIds);
- if (!regFlag)
- {
+ Long[] roleIds = {3L};
+ userService.insertUserAuth(sysUser.getUserId(), roleIds);
+ if (!regFlag) {
msg = "娉ㄥ唽澶辫触,璇疯仈绯荤郴缁熺鐞嗕汉鍛�";
- }
- else
- {
+ } else {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER,
MessageUtils.message("user.register.success")));
}
@@ -165,8 +145,7 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- public List<SysUser> selectUserList(SysUser user)
- {
+ public List<SysUser> selectUserList(SysUser user) {
return userMapper.selectUserList(user);
}
@@ -176,11 +155,9 @@
* @param phonenumber 鎵嬫満鍙风爜
* @return
*/
- public String checkPhoneUnique(String phonenumber)
- {
+ public String checkPhoneUnique(String phonenumber) {
SysUser info = userMapper.checkPhoneUnique(phonenumber);
- if (StringUtils.isNotNull(info))
- {
+ if (StringUtils.isNotNull(info)) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -190,21 +167,18 @@
* 鏍￠獙楠岃瘉鐮�
*
* @param username 鐢ㄦ埛鍚�
- * @param code 楠岃瘉鐮�
- * @param uuid 鍞竴鏍囪瘑
+ * @param code 楠岃瘉鐮�
+ * @param uuid 鍞竴鏍囪瘑
* @return 缁撴灉
*/
- public void validateCaptcha(String username, String code, String uuid)
- {
+ public void validateCaptcha(String username, String code, String uuid) {
String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
String captcha = redisCache.getCacheObject(verifyKey);
redisCache.deleteObject(verifyKey);
- if (captcha == null)
- {
+ if (captcha == null) {
throw new CaptchaExpireException();
}
- if (!code.equalsIgnoreCase(captcha))
- {
+ if (!code.equalsIgnoreCase(captcha)) {
throw new CaptchaException();
}
}
@@ -215,7 +189,7 @@
@Override
public ResponseEntity simpleMqttAuthentication(MqttAuthenticationModel mqttModel, ProductAuthenticateModel productModel) {
// 1=绠�鍗曡璇侊紝2=鍔犲瘑璁よ瘉锛�3=绠�鍗�+鍔犲瘑璁よ瘉
- if(productModel.getVertificateMethod()!=1 && productModel.getVertificateMethod()!=3){
+ if (productModel.getVertificateMethod() != 1 && productModel.getVertificateMethod() != 3) {
return returnUnauthorized(mqttModel, "璁惧绠�鍗曡璇侊紝璁惧瀵瑰簲浜у搧涓嶆敮鎸佺畝鍗曡璇�");
}
String[] passwordArray = mqttModel.getPassword().split("&");
@@ -265,7 +239,7 @@
@Override
public ResponseEntity encryptAuthentication(MqttAuthenticationModel mqttModel, ProductAuthenticateModel productModel) throws Exception {
// 1=绠�鍗曡璇侊紝2=鍔犲瘑璁よ瘉锛�3=绠�鍗�+鍔犲瘑璁よ瘉
- if(productModel.getVertificateMethod()!=2 && productModel.getVertificateMethod()!=3){
+ if (productModel.getVertificateMethod() != 2 && productModel.getVertificateMethod() != 3) {
return returnUnauthorized(mqttModel, "璁惧鍔犲瘑璁よ瘉锛岃澶囧搴斾骇鍝佷笉鏀寔鍔犲瘑璁よ瘉");
}
String decryptPassword = AESUtils.decrypt(mqttModel.getPassword(), productModel.getMqttSecret());
@@ -334,7 +308,7 @@
}
if (authorize.getSerialNumber() != null && !authorize.getSerialNumber().equals("")) {
// 鎺堟潈鐮佸凡鍏宠仈璁惧
- if (!authorize.getSerialNumber().equals( productModel.getSerialNumber())) {
+ if (!authorize.getSerialNumber().equals(productModel.getSerialNumber())) {
message = "璁惧璁よ瘉锛岃澶囨巿鏉冪爜宸茬粡鍒嗛厤缁欏叾浠栬澶�";
return message;
}
--
Gitblit v1.8.0