mlx

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/SceneGeneralTemplateController.java

@@ -19,7 +19,6 @@ import com.css.simulation.resource.scene.service.SceneGeneralTemplateService;
 import com.css.simulation.resource.system.service.DictService;
 import com.css.simulation.resource.system.service.SceneImportService;
 import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -46,14 +45,13 @@ public class SceneGeneralTemplateController {
     private FileDownService fileDownService;
     @Resource
     SceneImportService sceneImportService;
-    @Autowired
+    @Resource
     LogService logService;
-    @Autowired
+    @Resource
     DictService dictService;
 
     //查询列表
     @PostMapping("/querySceneGeneralTemplateList")
-    @ResponseBody
     public ResponseBodyVO<List<SceneGeneralTemplatePO>> querySceneGeneralTemplateList(@RequestBody SceneGeneralTemplateParam po) {
         PageUtil.setPageInfo(po);
         List<SceneGeneralTemplatePO> list = sceneGeneralTemplateService.querySceneGeneralTemplateList(po);
@@ -62,7 +60,6 @@ public class SceneGeneralTemplateController {
 
     //查模板详情
     @PostMapping("/querySceneGeneralTemplateById")
-    @ResponseBody
     public ResponseBodyVO<SceneGeneralTemplateVO> querySceneGeneralTemplateById(@RequestBody SceneGeneralTemplateParam param) {
         if (param != null && ObjectUtil.isNotNull(param.getId())) {
             SceneGeneralTemplateVO po = sceneGeneralTemplateService.querySceneGeneralTemplateById(param.getId());
@@ -74,7 +71,6 @@ public class SceneGeneralTemplateController {
 
     //新增泛化模板 带任务的
     @PostMapping("/saveSceneGeneralTemplateNew")
-    @ResponseBody
     public ResponseBodyVO<String> saveSceneGeneralTemplateNew(@RequestParam("file") MultipartFile multipartFile, @RequestBody SceneImportPO sceneImportPO) {
         File file;
         String originalFilename = multipartFile.getOriginalFilename();
@@ -111,7 +107,6 @@ public class SceneGeneralTemplateController {
 
     //新增泛化模板
     @PostMapping("/saveSceneGeneralTemplate")
-    @ResponseBody
     public ResponseBodyVO<String> saveSceneGeneralTemplate(@RequestParam("file") MultipartFile multipartFile) {
         File file;
         String originalFilename = multipartFile.getOriginalFilename();
@@ -145,7 +140,6 @@ public class SceneGeneralTemplateController {
 
     //删除泛化模板
     @PostMapping("/deleteSceneGeneralTemplateById")
-    @ResponseBody
     public ResponseBodyVO<String> deleteSceneGeneralTemplateById(@RequestBody SceneGeneralTemplatePO po) {
         sceneGeneralTemplateService.deleteSceneGeneralTemplateById(po);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
@@ -154,7 +148,6 @@ public class SceneGeneralTemplateController {
 
     //批量删除泛化模板
     @PostMapping("/deleteSceneGeneralTemplateByIds")
-    @ResponseBody
     public ResponseBodyVO<String> deleteSceneGeneralTemplateByIds(@RequestBody SceneGeneralTemplateParam params) {
         List<String> fhNameList = params.getFhNameList();
         SceneGeneralTemplatePO po = new SceneGeneralTemplatePO();
@@ -168,7 +161,6 @@ public class SceneGeneralTemplateController {
     //查看泛化实例详情页面
 
     @PostMapping("/queryGeneralTemplateByFh")
-    @ResponseBody
     public ResponseBodyVO queryGeneralTemplateByFh(@RequestBody SceneGeneralExamplePO param) {
         if (param != null && ObjectUtil.isNotNull(param.getId())) {
             return exampleService.querySceneGeneralExampleById(param.getId());
@@ -181,17 +173,12 @@ public class SceneGeneralTemplateController {
      * 调用外部接口生成泛化数据
      */
     @PostMapping("/saveSceneGeneralExample")
-    @ResponseBody
-    public ResponseBodyVO<Map<String,String>> saveSceneGeneralExample(@RequestBody SceneGeneralTemplateVO vo) {
-        if (ObjectUtil.isNotNull(vo)) {
-            return exampleService.saveSceneGeneralExample(vo);
-        }
-        return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数不能为空，请检查");
+    public ResponseBodyVO<Map<String, String>> saveSceneGeneralExample(@RequestBody SceneGeneralTemplateVO vo) {
+        return exampleService.saveSceneGeneralExample(vo);
     }
 
     //查询模块名称
     @PostMapping("/queryType")
-    @ResponseBody
     public ResponseBodyVO queryType() {
         return exampleService.queryType();
     }
@@ -199,7 +186,6 @@ public class SceneGeneralTemplateController {
 
    /* //测试
     @PostMapping("/test1")
-    @ResponseBody
     public ResponseBodyVO test1(@RequestBody SceneGeneralTemplatePO po) throws IllegalAccessException, IOException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
         Map map = beanToMap(po);
         RequestConfig requestConfig = RequestConfig.custom()
@@ -240,7 +226,6 @@ public class SceneGeneralTemplateController {
 
     //新增泛化模板  现在
     @PostMapping("/saveSceneGeneralTemplateAll")
-    @ResponseBody
     public ResponseBodyVO<String> saveSceneGeneralTemplateAll(@RequestParam("file") MultipartFile multipartFile, HttpServletRequest request) {
 
         SceneImportPO sceneImportPO = new SceneImportPO();
@@ -292,7 +277,6 @@ public class SceneGeneralTemplateController {
 
     //分享·
     @PostMapping("/instShareSceneGeneralTemplate")
-    @ResponseBody
     public ResponseBodyVO<String> instShareSceneGeneralTemplate(@RequestBody SceneGeneralTemplatePO po) {
         sceneGeneralTemplateService.instShareSceneGeneralTemplate(po);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScenePackageController.java

@@ -13,7 +13,7 @@ import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
 import com.css.simulation.resource.scene.service.ScenePackageService;
 import com.css.simulation.resource.system.service.ParameterService;
-import com.css.simulation.resource.util.ScenePackageUtil;
+import com.css.simulation.resource.util.SceneUtil;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -42,7 +42,7 @@ public class ScenePackageController {
     @Resource
     private ParameterService parameterService;
     @Resource
-    private ScenePackageUtil scenePackageUtil;
+    private SceneUtil sceneUtil;
 
     //查询主表列表
     @PostMapping("/queryScenePackageList")
@@ -74,7 +74,7 @@ public class ScenePackageController {
         ScenePackageSublistVO scenePackageSublistVO = params.get(0);
         String packageId = scenePackageSublistVO.getId();
         int packageLevel = scenePackageSublistVO.getPackageLevel();
-        scenePackageUtil.checkRules(packageId);
+        sceneUtil.checkRules(packageId);
         if ("1".equals(packageId)) {
             log.info("新增场景测试包（传 id 为 1）");
             params.get(0).setId("");

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

@@ -12,6 +12,7 @@ import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.scene.mapper.SceneGeneralDataMapper;
 import com.css.simulation.resource.scene.mapper.SceneGeneralExampleMapper;
 import com.css.simulation.resource.scene.mapper.SceneGeneralTemplateMapper;
+import com.css.simulation.resource.util.SceneUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
@@ -31,7 +32,8 @@ import java.util.Map;
 @Slf4j
 @Service
 public class SceneGeneralExampleService {
-
+    @Value("${general.url}")
+    private String generalUrl;
     @Resource
     private SceneGeneralExampleMapper exampleMapper;
     @Resource
@@ -40,8 +42,8 @@ public class SceneGeneralExampleService {
     private SceneGeneralDataMapper dataMapper;
     @Resource
     private SceneGeneralTemplateService sceneGeneralTemplateService;
-    @Value("${general.url}")
-    private String generalUrl;
+    @Resource
+    private SceneUtil sceneUtil;
 
 
     @SneakyThrows
@@ -162,29 +164,17 @@ public class SceneGeneralExampleService {
                 .setRedirectsEnabled(false)
                 .setExpectContinueEnabled(false)
                 .build();
-        log.info("saveSceneGeneralExample() 调用泛化接口--" + generalUrl + "--入参：" + map);
-        // 改为定时执行
-//        String execute = LinuxUtil.execute("ps -ef | grep main_web.py");
-//        if (!execute.contains("main_web.py")) {
-//            LinuxUtil.execute("./service-manager.sh restart", "/root/");
-//            TimeUnit.SECONDS.sleep(60);
-//        }
-        String post = HttpUtil.post(HttpUtil.getHttpClient(), requestConfig, generalUrl, null, map);
-        log.info("saveSceneGeneralExample() 调用泛化接口--" + generalUrl + "--出参：" + post);
-
-        boolean success = JsonUtil.readTree(post).get("success").asBoolean();
-        if (!success) {
-            String message = JsonUtil.readTree(post).get("message").toString();
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, message);
-        }
-        JsonNode params = JsonUtil.readTree(post).get("params");
+        log.info("调用泛化接口：" + generalUrl + "请求参数为：" + map);
+
+        final String generalResult = sceneUtil.callGeneralService(requestConfig, generalUrl, map);
+        JsonNode params = JsonUtil.readTree(generalResult).get("params");
 
         // 实例化 ObjectMapper 对象
         ObjectMapper objectMapper = new ObjectMapper();
         String newjson = objectMapper.writeValueAsString(params);
 
         List<SceneGeneralDataPO> list = JsonUtil.jsonToList(newjson, SceneGeneralDataPO.class);
-        log.info("测试是否调用成功---444--" + list.size());
+        //测试是否调用成功
         String sceneGeneralizationIds = null;
         //生成指标id
         String sublistId = StringUtil.getRandomUUID();

simulation-resource-server/src/main/java/com/css/simulation/resource/util/ProjectUtil.java

@@ -42,7 +42,7 @@ public class ProjectUtil {
     @Resource
     private ScenePackageSublistMapper scenePackageSublistMapper;
     @Resource
-    private ScenePackageUtil scenePackageUtil;
+    private SceneUtil sceneUtil;
 
 
     public String getProjectTypeByProjectId(String projectId) {
@@ -107,7 +107,7 @@ public class ProjectUtil {
             throw new RuntimeException("场景测试包已被禁用，编辑场景测试包后可重新运行。");
         }
         log.info("6 查询评分规则是否被删除。");
-        scenePackageUtil.checkRules(scenePackageId);
+        sceneUtil.checkRules(scenePackageId);
         log.info("7 查询场景测试包是否有场景。");
         final int sceneNum = scenePackageSublistMapper.selectSceneNumByPackageId(scenePackageId);
         if (sceneNum == 0) {

simulation-resource-server/src/main/java/com/css/simulation/resource/util/ScenePackageUtil.java

@@ -1,28 +0,0 @@
-package com.css.simulation.resource.util;
-
-import api.common.util.CollectionUtil;
-import com.css.simulation.resource.scene.mapper.ScoringRulesMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 任务结果打分
- */
-@Component
-@Slf4j
-public class ScenePackageUtil {
-
-    @Resource
-    private ScoringRulesMapper scoringRulesMapper;
-
-    public void checkRules(String scenePackageId){
-        final List<String> ruleIds = scoringRulesMapper.selectDeletedRulesByPackageId(scenePackageId);
-        if (CollectionUtil.isNotEmpty(ruleIds)) {
-            final List<String> ruleNames = scoringRulesMapper.selectRuleNamesByRuleIds(ruleIds);
-            throw new RuntimeException("场景测试包存在已被删除的评分规则：" + ruleNames);
-        }
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/util/SceneUtil.java

@@ -0,0 +1,50 @@
+package com.css.simulation.resource.util;
+
+import api.common.util.CollectionUtil;
+import api.common.util.HttpUtil;
+import api.common.util.JsonUtil;
+import api.common.util.LinuxUtil;
+import com.css.simulation.resource.scene.mapper.ScoringRulesMapper;
+import lombok.SneakyThrows;
+import lombok.Synchronized;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.config.RequestConfig;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 任务结果打分
+ */
+@Component
+@Slf4j
+public class SceneUtil {
+
+    @Resource
+    private ScoringRulesMapper scoringRulesMapper;
+
+    public void checkRules(String scenePackageId) {
+        final List<String> ruleIds = scoringRulesMapper.selectDeletedRulesByPackageId(scenePackageId);
+        if (CollectionUtil.isNotEmpty(ruleIds)) {
+            final List<String> ruleNames = scoringRulesMapper.selectRuleNamesByRuleIds(ruleIds);
+            throw new RuntimeException("场景测试包存在已被删除的评分规则：" + ruleNames);
+        }
+    }
+
+    @Synchronized
+    @SneakyThrows
+    public String callGeneralService(RequestConfig requestConfig, String generalUrl, Map map) {
+        String post = HttpUtil.post(HttpUtil.getHttpClient(), requestConfig, generalUrl, null, map);
+
+        if (!JsonUtil.readTree(post).get("success").asBoolean()) {
+            LinuxUtil.execute("./service-manager.sh restart", "/root/");
+            TimeUnit.SECONDS.sleep(60);
+            post = HttpUtil.post(HttpUtil.getHttpClient(), requestConfig, generalUrl, null, map);
+        }
+        log.info("调用泛化接口：" + generalUrl + "，响应结果为：" + post);
+        return post;
+    }
+}