算法平台

api-common/src/main/java/api/common/pojo/param/algorithm/AlgorithmParameter.java

@@ -22,4 +22,8 @@ public class AlgorithmParameter extends PageParameter {
     private String isDeleted;           // 是否删除
     private String share;               // 是否公有
     private String createUserId;        // 创建用户ID
+    private String algorithmVersion;   // 算法版本
+    private String team; // 参赛队伍
+    private String topic; // 赛题
+    private String status; // 进度
 }

api-common/src/main/java/api/common/pojo/vo/algorithm/AlgorithmVO.java

@@ -1,31 +1,23 @@
 package api.common.pojo.vo.algorithm;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 /**
  * 算法列表vo
  */
-@Getter
-@Setter
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class AlgorithmVO {
-
-    //算法ID
-    private String id;
-
-    //算法名称
-    private String algorithmCode;
-
-    //算法名称
-    private String algorithmName;
-
-    //算法描述
-    private String description;
-
-    //校验状态
-    private String validationStatus;
-
-    //上传方式
-    private String uploadMode;
-
+    private String id;  //算法ID
+    private String algorithmCode;   //算法名称
+    private String algorithmName;  //算法名称
+    private String description; //算法描述
+    private String algorithmVersion;
+    private String team = "";
+    private String topic = "";
+    private String status = "";
+    private String validationStatus; //校验状态
+    private String uploadMode; //上传方式
 }

simulation-resource-common/src/main/java/com/css/simulation/resource/common/acl/entity/AlgorithmExpandAclEntity.java

@@ -12,19 +12,19 @@ import lombok.NoArgsConstructor;
 @Builder
 public class AlgorithmExpandAclEntity {
     @JsonAlias({"id"})
-    private String id = "默认空值";
+    private String id = "";
     @JsonAlias({"algorithmId"})
-    private String algorithmId = "默认空值";
+    private String algorithmId = "";
     @JsonAlias({"algorithmName"})
-    private String algorithmName = "默认空值";
+    private String algorithmName = "";
     @JsonAlias({"description"})
-    private String description = "默认空值";
+    private String description = "";
     @JsonAlias({"algorithmType"})
-    private String algorithmType = "默认空值";
+    private String algorithmType = "";
     @JsonAlias({"algorithmVersion", "evaluationName"})
-    private String algorithmVersion = "默认空值";
+    private String algorithmVersion = "";
     @JsonAlias({"team", "teamName"})
-    private String team = "默认空值";
+    private String team = "";
     @JsonAlias({"topic", "match"})
-    private String topic = "默认空值";
+    private String topic = "";
 }

simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/mysql/entity/AlgorithmExpandInfrastructureEntity.java

@@ -10,13 +10,13 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @Builder
 public class AlgorithmExpandInfrastructureEntity {
-    private String id = "默认空值";
-    private String algorithmId = "默认空值";
-    private String algorithmName = "默认空值";
-    private String description = "默认空值";
-    private String algorithmType = "默认空值";
-    private String algorithmVersion = "默认空值";
-    private String team = "默认空值";
-    private String topic = "默认空值";
-    private String status = "默认空值";
+    private String id = "";
+    private String algorithmId = "";
+    private String algorithmName = "";
+    private String description = "";
+    private String algorithmType = "";
+    private String algorithmVersion = "";
+    private String team = "";
+    private String topic = "";
+    private String status = "";
 }

simulation-resource-server/pom.xml

@@ -130,6 +130,12 @@
             <groupId>com.itextpdf</groupId>
             <artifactId>itext-asian</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
+            <version>5.0.3</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
     <build>

simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/impl/AlgorithmServiceImpl.java

@@ -10,18 +10,19 @@ import api.common.pojo.po.algorithm.AlgorithmPO;
 import api.common.pojo.vo.algorithm.AlgorithmVO;
 import api.common.pojo.vo.algorithm.RunningProjectVO;
 import api.common.util.*;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.AlgorithmExpandMapper;
-import com.css.simulation.resource.server.infrastructure.mysql.mapper.AlgorithmMapper;
-import com.css.simulation.resource.server.application.AlgorithmService;
-import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
-import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
-import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
-import com.css.simulation.resource.server.infrastructure.common.configuration.git.GitConfiguration;
 import com.css.simulation.resource.server.acl.feign.AlgoPlatformService;
 import com.css.simulation.resource.server.acl.feign.FileDownService;
 import com.css.simulation.resource.server.acl.feign.SchedulerService;
-import com.css.simulation.resource.server.application.SimulationProjectService;
+import com.css.simulation.resource.server.application.AlgorithmService;
 import com.css.simulation.resource.server.application.DictService;
+import com.css.simulation.resource.server.application.SimulationProjectService;
+import com.css.simulation.resource.server.infrastructure.common.configuration.git.GitConfiguration;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.AlgorithmExpandMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.AlgorithmMapper;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -147,17 +148,21 @@ public class AlgorithmServiceImpl implements AlgorithmService {
 
     @Override
     public ResponseBodyVO<Object> selectAlgoPlatformList(AlgorithmParameter param) {
-        //获取参数
-        String algorithmId = param.getAlgorithmCode();
-        String algorithmName = param.getAlgorithmName();
-        String description = param.getDescription();
+        //1 同步算法平台数据到仿真云
+//        final String algorithmId = param.getAlgorithmCode();
+        final String algorithmName = param.getAlgorithmName();
+        final String description = param.getDescription();
+        final String algorithmVersion = param.getAlgorithmVersion();
+        final String team = param.getTeam();
+        final String topic = param.getTopic();
+        final String status = param.getStatus();
         Integer page = param.getPageNum();
         Integer size = param.getPageSize();
         String sort = "algorithmId-desc";
         String urlParam = "";
-        if (StringUtil.isNotEmpty(algorithmId)) {
-            urlParam = urlParam + "&algorithmId=" + algorithmId;
-        }
+//        if (StringUtil.isNotEmpty(algorithmId)) {
+//            urlParam = urlParam + "&algorithmId=" + algorithmId;
+//        }
         if (StringUtil.isNotEmpty(algorithmName)) {
             urlParam = urlParam + "&algorithmName=" + algorithmName;
         }
@@ -171,44 +176,54 @@ public class AlgorithmServiceImpl implements AlgorithmService {
             urlParam = urlParam + "&size=" + size;
         }
         urlParam = urlParam + "&sort=" + sort;
+        // 此接口在此处只作为同步更新数据到仿真云数据库，分页查询通过仿真云数据库来查
+        algoPlatformService.getAlgorithmList(urlParam);
+        //2 查询仿真数据库里的数据
+        PageHelper.startPage(page, size);
+        final List<AlgorithmVO> algorithmVOS = algorithmExpandMapper.select(param);
+        PageInfo<AlgorithmVO> objectPageInfo = new PageInfo<>(algorithmVOS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, objectPageInfo);
+//        //解析数据
+//        final String json = algorithmList.getInfo();
+//        Map jsonMap = JsonUtil.jsonToMap(json);
+//        if (CollectionUtil.isNotEmpty(jsonMap)) {
+//            Map<String, Object> dataMap = (Map<String, Object>) jsonMap.get("data");
+//            if (CollectionUtil.isNotEmpty(dataMap)) {
+//                List<Map<String, String>> contentList = (List<Map<String, String>>) dataMap.get("content");
+//                if (CollectionUtil.isNotEmpty(contentList)) {
+//                    totalElements = (Integer) dataMap.get("totalElements");
+//                    if (totalElements > 0) {
+//                        for (Map<String, String> content : contentList) {
+//                            AlgorithmVO vo = new AlgorithmVO();
+//                            String id0 = content.get("id");
+//                            String algorithmId0 = content.get("algorithmId");
+//                            String algorithmName0 = content.get("algorithmName");
+//                            String description0 = content.get("description");
+//                            String evaluationName0 = content.get("evaluationName");
+//                            String teamName0 = content.get("teamName");
+//                            String match0 = content.get("match");
+//                            vo.setId(id0);
+//                            vo.setAlgorithmCode(algorithmId0);
+//                            vo.setAlgorithmName(algorithmName0);
+//                            vo.setDescription(description0);
+//                            vo.setAlgorithmVersion(evaluationName0);
+//                            vo.setTeam(teamName0);
+//                            vo.setTopic(match0);
+//                            vo.setStatus(algorithmExpandMapper.selectStatusByAlgorithmId(algorithmId0));
+//                            vos.add(vo);
+//                        }
+//                    }
+//                } else {
+//                    log.info("算法列表接口返回值中的 data.content 字段为空：" + contentList);
+//                }
+//            } else {
+//                log.info("算法列表接口返回值中的 data 字段为空：" + dataMap);
+//            }
+//        } else {
+//            log.info("算法列表接口返回值为空：" + json);
+//        }
 
-        ResponseBodyVO<String> algorithmList = algoPlatformService.getAlgorithmList(urlParam);
-
-
-        List<AlgorithmVO> vos = new ArrayList<>();
-        int totalElements = 0;
-        //解析数据
-        final String json = algorithmList.getInfo();
-        Map jsonMap = JsonUtil.jsonToMap(json);
-        if (CollectionUtil.isNotEmpty(jsonMap)) {
-            Map<String, Object> dataMap = (Map<String, Object>) jsonMap.get("data");
-            if (CollectionUtil.isNotEmpty(dataMap)) {
-                List<Map<String, String>> contentList = (List<Map<String, String>>) dataMap.get("content");
-                if (CollectionUtil.isNotEmpty(contentList)) {
-                    totalElements = (Integer) dataMap.get("totalElements");
-                    if (totalElements > 0) {
-                        for (Map<String, String> content : contentList) {
-                            AlgorithmVO vo = new AlgorithmVO();
-                            vo.setId(content.get("id"));
-                            vo.setAlgorithmCode(content.get("algorithmId"));
-                            vo.setAlgorithmName(content.get("algorithmName"));
-                            vo.setDescription(content.get("description"));
-                            vos.add(vo);
-                        }
-                    }
-                } else {
-                    log.info("算法列表接口返回值中的 data.content 字段为空：" + contentList);
-                }
-            } else {
-                log.info("算法列表接口返回值中的 data 字段为空：" + dataMap);
-            }
-        } else {
-            log.info("算法列表接口返回值为空：" + json);
-        }
 
-        PageInfo<AlgorithmVO> objectPageInfo = new PageInfo<>(vos);
-        objectPageInfo.setTotal(totalElements);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, objectPageInfo);
     }
 
 

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infrastructure/mysql/mapper/AlgorithmExpandMapper.java

@@ -1,7 +1,13 @@
 package com.css.simulation.resource.server.infrastructure.mysql.mapper;
 
+import api.common.pojo.param.algorithm.AlgorithmParameter;
+import api.common.pojo.vo.algorithm.AlgorithmVO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface AlgorithmExpandMapper {
+
+    List<AlgorithmVO> select(AlgorithmParameter param);
 }

simulation-resource-server/src/main/resources/mysql/mapper/AlgorithmExpandMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.css.simulation.resource.server.infrastructure.mysql.mapper.AlgorithmExpandMapper">
+
+
+    <select id="select" resultType="api.common.pojo.vo.algorithm.AlgorithmVO">
+        select id,
+        algorithm_id algorithm_code,
+        algorithm_name,
+        description,
+        algorithm_type,
+        algorithm_version,
+        team,
+        topic,
+        status
+        from algorithm_expand
+        where 1=1
+        <if test="algorithmName != null and algorithmName != ''">
+            and algorithm_name like concat('%',#{algorithmName},'%')
+        </if>
+        <if test="description != null and description != ''">
+            and description like concat('%',#{description},'%')
+        </if>
+        <if test="algorithmVersion != null and algorithmVersion != ''">
+            and algorithm_version like concat('%',#{algorithmVersion},'%')
+        </if>
+        <if test="team != null and team != ''">
+            and team like concat('%',#{team},'%')
+        </if>
+        <if test="topic != null and topic != ''">
+            and topic like concat('%',#{topic},'%')
+        </if>
+        <if test="status != null and status != ''">
+            and status = #{status}
+        </if>
+    </select>
+</mapper>