tijiao

simulation-gateway/src/main/resources/bootstrap-aliyun.yaml

@@ -4,6 +4,7 @@ spring:
       discovery:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7
+        group: dev
       config:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7

simulation-oauth-client/src/main/resources/bootstrap-aliyun.yaml

@@ -4,6 +4,7 @@ spring:
       discovery:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7
+        group: dev
       config:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7

simulation-oauth-server/src/main/resources/bootstrap-aliyun.yaml

@@ -4,6 +4,7 @@ spring:
       discovery:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7
+        group: dev
       config:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7

simulation-resource-common/src/main/resources/bootstrap-aliyun.yaml

@@ -4,6 +4,7 @@ spring:
       discovery:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7
+        group: dev
       config:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7

simulation-resource-monitor/src/main/resources/bootstrap-aliyun.yaml

@@ -4,6 +4,7 @@ spring:
       discovery:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7
+        group: dev
       config:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7

simulation-resource-scene/src/main/resources/bootstrap-aliyun.yaml

@@ -4,6 +4,7 @@ spring:
       discovery:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7
+        group: dev
       config:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7

simulation-resource-server/src/main/java/com/css/simulation/resource/server/adapter/controller/job_manage/JobManageController.java

@@ -2,9 +2,11 @@ package com.css.simulation.resource.server.adapter.controller.job_manage;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.DictParam;
+import api.common.pojo.param.project.MultiSimulationProjectParam;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.*;
 import api.common.util.StringUtil;
+import com.css.simulation.resource.server.app.service.job_manage.MultiSimulationProjectService;
 import com.css.simulation.resource.server.app.service.job_manage.SimulationProjectService;
 import com.css.simulation.resource.server.app.service.ClusterService;
 import com.github.pagehelper.PageInfo;
@@ -29,6 +31,9 @@ public class JobManageController {
   @Resource
   private ClusterService clusterService;
 
+  @Resource
+  private MultiSimulationProjectService multiSimulationProjectService;
+
   //* -------------------------------- 项目运行 --------------------------------
 
   /**
@@ -314,4 +319,14 @@ public class JobManageController {
   }
 
 
+  @RequestMapping("/selectMultiSimulationProject")
+  public ResponseBodyVO<PageInfo<MultiSimulationProjectVO>> selectMultiSimulationProject(@RequestBody MultiSimulationProjectParam param) {
+    return multiSimulationProjectService.selectMultiSimulationProject(param);
+  }
+  @RequestMapping("/addMultiSimulationProject")
+  public ResponseBodyVO<MultiSimulationProjectDetailVO> addMultiSimulationProject(@RequestBody MultiSimulationProjectParam param) {
+    return multiSimulationProjectService.addMultiSimulationProject(param);
+  }
+
+
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/MultiSimulationProjectServiceImpl.java

@@ -0,0 +1,76 @@
+package com.css.simulation.resource.server.app.impl;
+
+import api.common.pojo.common.PageVO;
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.enums.MultiSimulationStatusEnum;
+import api.common.pojo.param.project.MultiSimulationProjectParam;
+import api.common.pojo.po.project.MultiSimulationProjectPO;
+import api.common.pojo.vo.project.MultiSimulationProjectDetailVO;
+import api.common.pojo.vo.project.MultiSimulationProjectVO;
+import api.common.pojo.vo.project.SimulationManualProjectVO;
+import api.common.util.StringUtil;
+import com.alibaba.cloud.commons.lang.StringUtils;
+import com.css.simulation.resource.server.app.service.job_manage.MultiSimulationProjectService;
+import com.css.simulation.resource.server.infra.db.mysql.mapper.MultiSimulationProjectMapper;
+import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.github.pagehelper.PageInfo;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@Slf4j
+public class MultiSimulationProjectServiceImpl implements MultiSimulationProjectService {
+
+    @Resource
+    private MultiSimulationProjectMapper multiSimulationProjectMapper;
+    @Override
+    @SneakyThrows
+    public ResponseBodyVO<PageInfo<MultiSimulationProjectVO>> selectMultiSimulationProject(MultiSimulationProjectParam param){
+        if (Objects.isNull(param.getPageNum())){
+            param.setPageNum(1);
+        }
+        if (Objects.isNull(param.getPageSize())){
+            param.setPageSize(10);
+        }
+        if (StringUtils.isBlank(param.getProjectName())){
+            param.setProjectName(null);
+        }
+        if (StringUtils.isBlank(param.getProjectKey())){
+            param.setProjectKey(null);
+        }
+
+        setPage(param.getPageNum(), param.getPageSize());
+        List<MultiSimulationProjectVO> multiSimulationProjectVOS = multiSimulationProjectMapper.selectProjectList(param);
+        PageInfo<MultiSimulationProjectVO> pageInfo = new PageInfo<>(multiSimulationProjectVOS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, pageInfo);
+    }
+    @Override
+    @SneakyThrows
+    public ResponseBodyVO<MultiSimulationProjectDetailVO> addMultiSimulationProject(MultiSimulationProjectParam param){
+        MultiSimulationProjectPO build = MultiSimulationProjectPO.builder()
+            .id(StringUtil.getRandomUUID())
+            .projectName(param.getProjectName()== null ? "": param.getProjectName())
+            .projectMaxSeconds(param.getProjectMaxSeconds() == null ? 0: param.getProjectMaxSeconds())
+            .projectKey(param.getProjectKey() == null ? "" : param.getProjectKey())
+            .projectDescription(param.getProjectDescription() == null ? "": param.getProjectDescription())
+            .projectStatus(MultiSimulationStatusEnum.INIT_STATUS.getProjectStatus())
+            .build();
+        int i = multiSimulationProjectMapper.addMultiSimulationProject(build);
+        if (i > 0){
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, MultiSimulationProjectDetailVO.builder().projectId(build.getId()).build());
+        }
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
+    }
+
+    private void setPage(Integer pageNum, Integer pageSize) {
+        PageVO pageVO = new PageVO();
+        pageVO.setCurrentPage(pageNum);
+        pageVO.setPageSize(pageSize);
+        PageUtil.setPageInfo(pageVO);
+    }
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/job_manage/MultiSimulationProjectService.java

@@ -0,0 +1,16 @@
+package com.css.simulation.resource.server.app.service.job_manage;
+
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.param.project.MultiSimulationProjectParam;
+import api.common.pojo.param.project.SimulationManualProjectParam;
+import api.common.pojo.vo.project.MultiSimulationProjectDetailVO;
+import api.common.pojo.vo.project.MultiSimulationProjectVO;
+import api.common.pojo.vo.project.SimulationManualProjectVO;
+import com.github.pagehelper.PageInfo;
+
+public interface MultiSimulationProjectService {
+    ResponseBodyVO<PageInfo<MultiSimulationProjectVO>> selectMultiSimulationProject(MultiSimulationProjectParam param);
+
+    ResponseBodyVO<MultiSimulationProjectDetailVO> addMultiSimulationProject(MultiSimulationProjectParam param);
+
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/db/mysql/mapper/MultiSimulationProjectMapper.java

@@ -0,0 +1,41 @@
+package com.css.simulation.resource.server.infra.db.mysql.mapper;
+
+import api.common.pojo.param.algorithm.AlgorithmParameter;
+import api.common.pojo.param.project.MultiSimulationProjectParam;
+import api.common.pojo.param.project.SimulationManualProjectParam;
+import api.common.pojo.po.algorithm.AlgorithmPO;
+import api.common.pojo.po.project.MultiSimulationProjectPO;
+import api.common.pojo.vo.algorithm.AlgorithmVO;
+import api.common.pojo.vo.algorithm.RunningProjectVO;
+import api.common.pojo.vo.project.MultiSimulationProjectVO;
+import api.common.pojo.vo.project.SimulationManualProjectVO;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface MultiSimulationProjectMapper {
+    @Select("<script>" +
+        "select id,project_key,project_name,project_status,create_time from multi_simulation_project where deleted = 0 " +
+        "<if test='projectKey != null'> " +
+        " AND project_key = #{projectKey}" +
+        "</if>" +
+        "<if test='projectName != null'> " +
+        " AND project_name = #{projectName}" +
+        "</if>" +
+        "<if test='projectStatus != null'> " +
+        " AND project_status = #{projectStatus}" +
+        "</if>" +
+        "order by create_time desc" +
+        "</script>")
+    List<MultiSimulationProjectVO> selectProjectList(MultiSimulationProjectParam param);
+
+
+    @Insert("insert into multi_simulation_project (id,project_key,project_name,project_description,project_max_seconds,project_status) values" +
+        "(#{id},#{projectKey},#{projectName},#{projectDescription},#{projectMaxSeconds},#{projectStatus})")
+    int  addMultiSimulationProject(MultiSimulationProjectPO projectPO);
+
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/service/RedisService.java

@@ -13,13 +13,13 @@ import java.util.Map;
 /**
  * TODO 线上时候将注解替换掉
  */
-@FeignClient(name = "test", url = "http://127.0.0.1:8001",path = "/simulation/resource/common", fallback = RedisServiceFallback.class, configuration = FeignConfiguration.class)
+//@FeignClient(name = "test", url = "http://127.0.0.1:8001",path = "/simulation/resource/common", fallback = RedisServiceFallback.class, configuration = FeignConfiguration.class)
 //@FeignClient(name = "test1", url = "http://47.93.217.159", path = "/simulation/resource/common", fallback = RedisServiceFallback.class, configuration = FeignConfiguration.class)
-//@FeignClient(value = "simulation-resource-common",
-//        contextId = "redis",
-//        path = "/simulation/resource/common",
-//        fallback = RedisServiceFallback.class,
-//        configuration = FeignConfiguration.class)
+@FeignClient(value = "simulation-resource-common",
+        contextId = "redis",
+        path = "/simulation/resource/common",
+        fallback = RedisServiceFallback.class,
+        configuration = FeignConfiguration.class)
 public interface RedisService {
 
     @PostMapping("/redis/setDictLists")

simulation-resource-server/src/main/resources/bootstrap-aliyun.yaml

@@ -4,6 +4,7 @@ spring:
       discovery:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7
+        group: dev
       config:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7

simulation-resource-sms/src/main/resources/bootstrap-aliyun.yaml

@@ -4,6 +4,7 @@ spring:
       discovery:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7
+        group: dev
       config:
         server-addr: 39.107.58.39:8848
         namespace: 41b663fb-0996-4b6e-b10b-c369929762d7