Merge branch 'master' of https://gitee.com/mlx__martin/simulation-cloud

api-common/src/main/java/api/common/util/HttpUtil.java

@@ -85,7 +85,8 @@ public class HttpUtil {
             if (statusCode == 200) {
                 result = EntityUtils.toString(response.getEntity());
             } else {
-                throw new RuntimeException("------- 请求错误：" + statusCode);
+                log.error(response.getEntity().toString());
+                throw new RuntimeException("get() 请求错误：" + response);
             }
         } catch (Exception e) {
             log.info("请求 " + url + " 失败。", e);
@@ -136,6 +137,7 @@ public class HttpUtil {
     public static InputStream getInputStream(CloseableHttpClient closeableHttpClient, RequestConfig requestConfig, String url) throws IOException {
         return getInputStream(closeableHttpClient, requestConfig, url, null);
     }
+
     /**
      * 自定义请求头的 get 请求下载文件
      *

simulation-oauth-client/src/main/java/com/css/simulation/oauth/client/controller/SignController.java

@@ -5,8 +5,8 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.sign.SignRefreshParameter;
 import api.common.pojo.param.sign.SignSingleParameter;
 import api.common.pojo.param.sign.SignUsernameParameter;
-import api.common.pojo.po.system.UserPO;
 import api.common.pojo.po.log.LogLoginPO;
+import api.common.pojo.po.system.UserPO;
 import api.common.pojo.vo.sign.SimulationTokenVO;
 import api.common.pojo.vo.system.UserVO;
 import api.common.util.*;
@@ -47,11 +47,11 @@ public class SignController {
     @Resource
     LogLoginMapper logLoginMapper;
 
-    @Autowired
+    @Resource
     CloseableHttpClient closeableHttpClient;
-    @Autowired
+    @Resource
     RequestConfig requestConfig;
-    @Autowired
+    @Resource
     OauthParameter oauthParameter;
 
     @Autowired

simulation-oauth-server/src/main/java/com/css/simulation/oauth/server/cofiguration/oauth/MyTokenService.java

@@ -34,8 +34,8 @@ public class MyTokenService {
         services.setReuseRefreshToken(false);       //禁止refreshToken重复使用
         services.setTokenStore(tokenStore);         // 令牌存储策略
 //        services.setTokenEnhancer(jwtAccessTokenConverter);         // 使用 jwt 令牌
-        services.setAccessTokenValiditySeconds(accessTokenValiditySeconds);   // 令牌默认有效期 2 小时
-        services.setRefreshTokenValiditySeconds(refreshTokenValiditySeconds);    // 刷新令牌默认有效期 3 天。
+        services.setAccessTokenValiditySeconds(accessTokenValiditySeconds);   // 令牌默认有效期
+        services.setRefreshTokenValiditySeconds(refreshTokenValiditySeconds);    // 刷新令牌默认有效期 。
         return services;
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageMapper.java

@@ -37,41 +37,44 @@ public interface ScenePackageMapper {
 
     //测试包数量
     Integer queryPackageCount(ScenePackagePO params);
+
     //改变状态是否禁用
     void updateIsUnavailable(ScenePackagePO params);
 
     @Update("update scene_package\n" +
             "set is_unavailable = #{isUnavailable}\n" +
             "where package_id in (select root_id from scene_package_sublist where scene_natural_ids like concat('%', #{sceneId}, '%'))")
-    void  updateIsUnavailableByNaturalId(@Param("isUnavailable")String isUnavailable,@Param("sceneId")String sceneId);
+    void updateIsUnavailableByNaturalId(@Param("isUnavailable") String isUnavailable, @Param("sceneId") String sceneId);
+
     @Update("update scene_package\n" +
             "set is_unavailable = #{isUnavailable}\n" +
             "where package_id in (select root_id from scene_package_sublist where scene_statue_ids like concat('%', #{sceneId}, '%'))")
-    void  updateIsUnavailableByStandardsId(@Param("isUnavailable")String isUnavailable,@Param("sceneId")String sceneId);
+    void updateIsUnavailableByStandardsId(@Param("isUnavailable") String isUnavailable, @Param("sceneId") String sceneId);
+
     @Update("update scene_package\n" +
             "set is_unavailable = #{isUnavailable}\n" +
             "where package_id in (select root_id from scene_package_sublist where scene_traffic_ids like concat('%', #{sceneId}, '%'))")
-    void  updateIsUnavailableByAccidentId(@Param("isUnavailable")String isUnavailable,@Param("sceneId")String sceneId);
+    void updateIsUnavailableByAccidentId(@Param("isUnavailable") String isUnavailable, @Param("sceneId") String sceneId);
 
 
     @Select("select is_unavailable from scene_package where package_id = #{packageId}")
-    String  selectIsUnavailableByPackageId(@Param("packageId")String packageId);
+    String selectIsUnavailableByPackageId(@Param("packageId") String packageId);
 
     @Update("update scene_package\n" +
             "set scene_num = scene_num - 1\n" +
             "where package_id in\n" +
             "      (select root_id from scene_package_sublist where scene_natural_ids like concat('%', #{naturalId}, '%'))")
-    void updateSceneNumAfterDeleteSceneByNaturalId(String naturalId);
+    void updateSceneNumAfterDeleteSceneByNaturalId(@Param("naturalId") String naturalId);
 
     @Update("update scene_package\n" +
             "set scene_num = scene_num - 1\n" +
             "where package_id in\n" +
-            "      (select root_id from scene_package_sublist where scene_statue_ids like concat('%', #{naturalId}, '%'))")
-    void updateSceneNumAfterDeleteSceneByStandardsId(String naturalId);
+            "      (select root_id from scene_package_sublist where scene_statue_ids like concat('%', #{sceneId}, '%'))")
+    void updateSceneNumAfterDeleteSceneByStandardsId(@Param("sceneId") String sceneId);
 
     @Update("update scene_package\n" +
             "set scene_num = scene_num - 1\n" +
             "where package_id in\n" +
-            "      (select root_id from scene_package_sublist where scene_traffic_ids like concat('%', #{naturalId}, '%'))")
-    void updateSceneNumAfterDeleteSceneByAccidentId(String naturalId);
+            "      (select root_id from scene_package_sublist where scene_traffic_ids like concat('%', #{sceneId}, '%'))")
+    void updateSceneNumAfterDeleteSceneByAccidentId(@Param("sceneId") String sceneId);
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageSublistMapper.java

@@ -4,6 +4,7 @@ import api.common.pojo.param.scene.SceneDeleteParam;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.vo.scene.ScenePackageSublistVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -31,5 +32,18 @@ public interface ScenePackageSublistMapper {
 
     void updateScenePackageSublistById(SceneDeleteParam param);
 
+    @Update("update scene_package_sublist\n" +
+            "set scene_num = scene_num - 1\n" +
+            "where scene_natural_ids like concat('%', #{naturalId}, '%')")
+    void updateSceneNumAfterDeleteSceneByNaturalId(@Param("naturalId") String naturalId);
 
+    @Update("update scene_package_sublist\n" +
+            "set scene_num = scene_num - 1\n" +
+            "where scene_statue_ids like concat('%', #{sceneId}, '%')")
+    void updateSceneNumAfterDeleteSceneByStandardsId(@Param("sceneId")String sceneId);
+
+    @Update("update scene_package_sublist\n" +
+            "set scene_num = scene_num - 1\n" +
+            "where scene_traffic_ids like concat('%', #{sceneId}, '%')")
+    void updateSceneNumAfterDeleteSceneByAccidentId(@Param("sceneId")String sceneId);
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneAccidentService.java

@@ -386,6 +386,9 @@ public class SceneAccidentService {
         //2 根据场景名称查询出同名的所有场景id，包括公有和私有
         List<String> sceneIdList = sceneAccidentMapper.selectIdByName(sceneName);
         for (String sceneId : sceneIdList) {
+            //5 根据场景id查询场景包id并修改场景数量
+            scenePackageMapper.updateSceneNumAfterDeleteSceneByAccidentId(sceneId);
+            scenePackageSublistMapper.updateSceneNumAfterDeleteSceneByAccidentId(sceneId);
             //3 将所有包含该场景的场景测试包状态为已禁用
             scenePackageMapper.updateIsUnavailableByAccidentId("1", sceneId);
             //4 将所有场景测试包指标中的该场景删除
@@ -394,8 +397,7 @@ public class SceneAccidentService {
             param.setSceneJtId(sceneId);
             param.setModifyUserId(AuthUtil.getCurrentUserId());
             scenePackageSublistMapper.updateScenePackageSublistById(param);
-            //5
-            scenePackageMapper.updateSceneNumAfterDeleteSceneByAccidentId(sceneId);
+
         }
         //5 将所有场景包中的该场景删除
         systemScenePackageSublistMapper.deleteBySceneName(sceneName);

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneNaturalService.java

@@ -367,6 +367,9 @@ public class SceneNaturalService {
         //2 根据场景名称查询出同名的所有场景id，包括公有和私有
         List<String> sceneIdList = sceneNaturalMapper.selectIdByName(sceneName);
         for (String sceneId : sceneIdList) {
+            //5 根据场景id查询场景包id并修改场景数量
+            scenePackageMapper.updateSceneNumAfterDeleteSceneByNaturalId(sceneId);
+            scenePackageSublistMapper.updateSceneNumAfterDeleteSceneByNaturalId(sceneId);
             //3 将所有包含该场景的场景测试包状态为已禁用
             scenePackageMapper.updateIsUnavailableByNaturalId("1", sceneId);
             //4 将所有场景测试包指标中的该场景删除
@@ -375,8 +378,6 @@ public class SceneNaturalService {
             param.setSceneZrId(sceneId);
             param.setModifyUserId(AuthUtil.getCurrentUserId());
             scenePackageSublistMapper.updateScenePackageSublistById(param);
-            //5 根据场景id查询场景包id并修改场景数量
-            scenePackageMapper.updateSceneNumAfterDeleteSceneByNaturalId(sceneId);
         }
         //6 将所有场景包中的该场景删除
         systemScenePackageSublistMapper.deleteBySceneName(sceneName);
@@ -387,9 +388,6 @@ public class SceneNaturalService {
         map.put("sceneName", params.getNaturalName());
         map.put("type", DictConstants.SCENE_NATURAL);
         logService.logSceneDelete(LogConstants.SYS_LOG_SCENE_DELETE, map);
-
-
-
     }
 
     public Integer querySceneNumBySy() {

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/StandardsRegulationsService.java

@@ -183,6 +183,9 @@ public class StandardsRegulationsService {
         //2 根据场景名称查询出同名的所有场景id，包括公有和私有
         List<String> sceneIdList = standardsRegulationsMapper.selectIdByName(sceneName);
         for (String sceneId : sceneIdList) {
+            //5 根据场景id查询场景包id并修改场景数量
+            scenePackageMapper.updateSceneNumAfterDeleteSceneByStandardsId(sceneId);
+            scenePackageSublistMapper.updateSceneNumAfterDeleteSceneByStandardsId(sceneId);
             //4 将所有包含该场景的场景测试包状态为已禁用
             scenePackageMapper.updateIsUnavailableByStandardsId("1", sceneId);
             //3 将所有场景测试包指标中的该场景删除
@@ -191,8 +194,7 @@ public class StandardsRegulationsService {
             param.setSceneBzId(sceneId);
             param.setModifyUserId(AuthUtil.getCurrentUserId());
             scenePackageSublistMapper.updateScenePackageSublistById(param);
-            //5 根据场景id查询场景包id并修改场景数量
-            scenePackageMapper.updateSceneNumAfterDeleteSceneByStandardsId(sceneId);
+
         }
         //5 将所有场景包中的该场景删除
         systemScenePackageSublistMapper.deleteBySceneName(sceneName);

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

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 
 @RestController
 @RequestMapping("/sceneImport")