打分复制

simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -3493,17 +3493,18 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             zos = new ZipOutputStream(response.getOutputStream());
             int i = 1;
 //            ArrayList<String> fileList = CollectionUtil.createArrayList("Ego.csv", "evaluation.csv");
-            for (ManualProjectTaskVo v : manualProjectTaskVos) {
-                String runResultFilePath = v.getRunResultFilePath();
+            for (ManualProjectTaskVo task : manualProjectTaskVos) {
+                String taskId = task.getId();
+                String runResultFilePath = task.getRunResultFilePath();
                 if (!isEmpty(runResultFilePath)) {
 
                     //获取场景名
-                    SceneBaseInfoVo sceneBaseInfoVo = getSceneNameAndOther(v.getSceneId(), v.getSceneType());
+                    SceneBaseInfoVo sceneBaseInfoVo = getSceneNameAndOther(task.getSceneId(), task.getSceneType());
                     String sceneName = sceneBaseInfoVo.getCommonSceneName();
 
                     //任务包路径
-//                    String taskPagePath = rootPath + File.separator + sceneName + "(" + i + ")";
-                    String taskPagePath = rootPath + File.separator + sceneName;
+//                    String taskPagePath = rootPath + File.separator + sceneName + "(" + i + ")"; 
+                    String taskPagePath = rootPath + File.separator + sceneName + taskId.substring(0, 8);
 
                     //视频文件路径
                     MinioParameter minioParameter1 = new MinioParameter();

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/UserCtrl.java

@@ -39,20 +39,20 @@ public class UserCtrl {
      */
     @RequestMapping("/saveUser")
     @ResponseBody
-    public ResponseBodyVO<UserPO> saveUser(@RequestBody UserPO userPO) throws Exception {
+    public ResponseBodyVO<UserPO> saveUser(@RequestBody UserPO userPO) {
         if(ObjectUtil.isNull(userPO)){
-            return new ResponseBodyVO(false, 400, "参数必传！",null);
+            return new ResponseBodyVO<>(false, 400, "参数必传！",null);
         }
-        ResponseBodyVO<UserPO> response = new ResponseBodyVO<UserPO>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<UserPO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         userPO = userService.saveUser(userPO);
         if(ObjectUtil.isNull(userPO)){
-            return new ResponseBodyVO(false, 400, "没有创建账户的权限！",null);
+            return new ResponseBodyVO<>(false, 400, "没有创建账户的权限！",null);
         }
         if("checkUsername".equals(userPO.getId())){
-            return new ResponseBodyVO(false, 400, "账户名重复！",null);
+            return new ResponseBodyVO<>(false, 400, "账户名重复！",null);
         }
         if("subUserNum".equals(userPO.getId())){
-            return new ResponseBodyVO(false, 400, "超出可创建子账户数量！",null);
+            return new ResponseBodyVO<>(false, 400, "超出可创建子账户数量！",null);
         }
         response.setInfo(userPO);
         return response;
@@ -76,15 +76,15 @@ public class UserCtrl {
      */
     @RequestMapping("/saveVisible")
     @ResponseBody
-    public ResponseBodyVO saveVisible(@RequestBody UserPO userPO) throws Exception {
+    public ResponseBodyVO<String> saveVisible(@RequestBody UserPO userPO) throws Exception {
         if(ObjectUtil.isNull(userPO)){
-            return new ResponseBodyVO(false, 400, "参数必传！",null);
+            return new ResponseBodyVO<>(false, 400, "参数必传！",null);
         }
         if(ObjectUtil.isNull(userPO.getId()) || ObjectUtil.isNull(userPO.getVisible())){
-            return new ResponseBodyVO(false, 400, "参数必传！",null);
+            return new ResponseBodyVO<>(false, 400, "参数必传！",null);
         }
         userService.saveVisible(userPO);
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
 

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/UserService.java

@@ -9,6 +9,7 @@ import api.common.pojo.vo.system.UserVO;
 import api.common.util.EncryptUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
+import api.common.util.TencentSMSUtil;
 import com.css.simulation.resource.common.oauth.OauthParameter;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
@@ -75,25 +76,26 @@ public class UserService {
         return new PageInfo<>(list);
     }
 
-    public UserPO saveUser(UserPO userPO) throws NoSuchAlgorithmException {
+    @SneakyThrows
+    public UserPO saveUser(UserPO userPO) {
         //权限校验
         String currentUserRoleCode = AuthUtil.getCurrentUserRoleCode();
-        if (DictConstants.ROLE_CODE_SYSADMIN.equals(currentUserRoleCode)) {//超级管理员
+        if (DictConstants.ROLE_CODE_SYSADMIN.equals(currentUserRoleCode)) {// 超级管理员
             if (DictConstants.ROLE_CODE_ADMIN.equals(userPO.getRoleCode())) {
                 userPO.setRoleCode(DictConstants.ROLE_CODE_ADMIN);
             } else {
                 userPO.setRoleCode(DictConstants.ROLE_CODE_UESR);
             }
-        } else if (DictConstants.ROLE_CODE_ADMIN.equals(currentUserRoleCode)) {//子管理员
+        } else if (DictConstants.ROLE_CODE_ADMIN.equals(currentUserRoleCode)) {// 子管理员
             userPO.setRoleCode(DictConstants.ROLE_CODE_UESR);
-        } else if (DictConstants.ROLE_CODE_UESR.equals(currentUserRoleCode)) {//普通用户
+        } else if (DictConstants.ROLE_CODE_UESR.equals(currentUserRoleCode)) { //普通用户
             //新增参数校验
             if (ObjectUtil.isNull(userPO.getId())) {
                 ParameterVO parameter = parameterService.getParameterByUserId();
                 if (ObjectUtil.isNull(parameter)) {
                     return null;
                 }
-                int num = parameter.getNumCreateUser();//最大用户数
+                int num = parameter.getNumCreateUser(); // 最大用户数
                 int subUserNum = 0;
                 String userId = AuthUtil.getCurrentUserId();
                 List<UserPO> subUsers = userMapper.getSubUser(userId);
@@ -106,7 +108,7 @@ public class UserService {
                 }
             }
             userPO.setRoleCode(DictConstants.ROLE_CODE_SUBUESR);
-            //普通用户创建子账户时，占用类型继承
+            // 普通用户创建子账户时，占用类型继承
             userPO.setUseType(AuthUtil.getCurrentUseType());
         } else {
             return null;
@@ -121,16 +123,28 @@ public class UserService {
         String id = userPO.getId();
         if (ObjectUtil.isNull(id)) {//新增
             userPO.setId(StringUtil.getRandomUUID());
-            //初始密码
+            // 初始密码
             userPO.setPassword(EncryptUtil.getLowerMD5(oauthParameter.getSimulationDefaultPassword()));
             userPO.setVisible("1");
             userMapper.insert(userPO);
             logService.logUser(LogConstants.SYS_LOG_USER_INSERT, userPO);
+
+            // 发送短信
+            TencentSMSUtil.send(
+                    smsConfiguration.getSecretId(),
+                    smsConfiguration.getSecretKey(),
+                    smsConfiguration.getSdkAppId(),
+                    smsConfiguration.getSignName(),
+                    smsConfiguration.getTemplateIdForCreate(),
+                    new String[]{},
+                    new String[]{userPO.getPhone()}
+            );
+
         } else {
             userMapper.update(userPO);
             logService.logUser(LogConstants.SYS_LOG_USER_UPDATE, userPO);
         }
-        //密码清空
+        // 密码清空
         userPO.setPassword(null);
         return userPO;
     }
@@ -143,7 +157,15 @@ public class UserService {
         logService.logUser(LogConstants.SYS_LOG_USER_RESET, userPO);
 
         // 发送短信
-        
+        TencentSMSUtil.send(
+                smsConfiguration.getSecretId(),
+                smsConfiguration.getSecretKey(),
+                smsConfiguration.getSdkAppId(),
+                smsConfiguration.getSignName(),
+                smsConfiguration.getTemplateIdForReset(),
+                new String[]{},
+                new String[]{userPO.getPhone()}
+        );
     }
 
     public void saveVisible(UserPO userPO) {