lyhzzz недель назад: 3
Родитель
Сommit
e28c17a0d7

+ 6 - 0
src/main/java/com/fdkankan/ucenter/config/UcenterConfig.java

@@ -24,4 +24,10 @@ public class UcenterConfig {
 
     @Value("${ucenter.contactUs.emailExTime}")
     private Long emailExTime;
+
+    @Value("${ucenter.register.cooperation-mesh-num: }")
+    private String registerCooperationMeshNum;
+
+    @Value("${ucenter.register.cooperation-laser-num: }")
+    private String registerCooperationLaserNum;
 }

+ 1 - 0
src/main/java/com/fdkankan/ucenter/service/ISceneCooperationService.java

@@ -53,4 +53,5 @@ public interface ISceneCooperationService extends IService<SceneCooperation> {
 
      ProductOrder saveCamera(SceneCooperationParam param, String username);
 
+    void saveByRegister(User register, String registerCooperationMeshNum, String mesh);
 }

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/IUserService.java

@@ -24,7 +24,7 @@ public interface IUserService extends IService<User> {
 
     User getByUserName(String phoneNum);
 
-    void register(RegisterParam param);
+    User register(RegisterParam param);
 
     void updatePassword(String phoneNum, String password);
 

+ 9 - 2
src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -14,6 +14,7 @@ import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.common.constants.NacosProperty;
+import com.fdkankan.ucenter.config.UcenterConfig;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.constant.QrCodeFilePath;
 import com.fdkankan.ucenter.entity.Camera;
@@ -30,6 +31,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.netty.util.internal.UnstableApi;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +62,10 @@ public class LoginService {
     private FYunFileServiceInterface fYunFileServiceInterface;
     @Autowired
     private IMailTemplateService mailTemplateService;
+    @Autowired
+    UcenterConfig ucenterConfig;
+    @Autowired
+    ISceneCooperationService sceneCooperationService;
 
 
     public LoginVo login(User user){
@@ -189,8 +195,9 @@ public class LoginService {
             throw new BusinessException(LoginConstant.FAILURE_CODE_3008, LoginConstant.FAILURE_MSG_3008);
         }
         param.setPassword(password);
-        userService.register(param);
-
+        User register = userService.register(param);
+        sceneCooperationService.saveByRegister(register,ucenterConfig.getRegisterCooperationMeshNum(),"mesh");
+        sceneCooperationService.saveByRegister(register,ucenterConfig.getRegisterCooperationLaserNum(),"laser");
     }
 
     public JSONObject createLoginQrCode() throws Exception {

+ 25 - 0
src/main/java/com/fdkankan/ucenter/service/impl/SceneCooperationServiceImpl.java

@@ -659,4 +659,29 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
     public Object cooperationSceneList(SceneParam param, String username) {
         return null;
     }
+
+
+    @Override
+    public void saveByRegister(User register, String registerCooperationNum, String sceneType) {
+        if(StringUtils.isNotBlank(registerCooperationNum)){
+            List<SceneCooperation> list = new ArrayList<>();
+            String[] split = registerCooperationNum.split(",");
+            for (String num : split) {
+                SceneCooperation sceneCooperation = new SceneCooperation();
+                sceneCooperation.setSceneNum(num);
+                sceneCooperation.setUserId(register.getId());
+                sceneCooperation.setSceneType(sceneType);
+                list.add(sceneCooperation);
+
+            }
+            if(!list.isEmpty()){
+                this.saveBatch(list);
+            }
+            if("laser".equals(sceneType)){
+                List<String> collect = list.stream().map(SceneCooperation::getSceneNum).collect(Collectors.toList());
+                laserService.saveBatchCooperation(collect,new ArrayList<>(),Arrays.asList(register.getUserName()),"scene","add");
+
+            }
+        }
+    }
 }

+ 2 - 1
src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -101,7 +101,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
 
     @Override
-    public void register(RegisterParam param) {
+    public User register(RegisterParam param) {
         User userEntity = new User();
         userEntity.setPassword(SecurityUtil.MD5(param.getPassword()));
         userEntity.setEmail(param.getEmail());
@@ -116,6 +116,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         userEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
         userEntity.setAgentKey(param.getAgentKey());
         this.save(userEntity);
+        return userEntity;
     }
 
     @Override