toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

适配利元亨仿真工况库取消学科节点场景需求

Browse Source
This commit is contained in:
daiqy88
2026-01-09 15:59:43 +08:00
parent 90608e4152
commit 3aeafbb56a
11 changed files with 99 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
task/pom.xml
View File

@@ -91,6 +91,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.5</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>

8
task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java
View File

@@ -76,9 +76,9 @@ public interface SimulationPoolMapper {
@Insert({
"<script>",
"INSERT INTO simulation_pool_task(uuid,nodeName,nodeCode,englishName,poolName,poolVersion,nodeId,days,standard,confidence,flowTemplate,analyseTarget,analyseSoftware,description,difficult,tenantId,imageFileId,bCapacity,department,section,`group`) VALUES ",
"INSERT INTO simulation_pool_task(uuid,nodeName,nodeCode,englishName,poolName,poolVersion,nodeId,days,standard,confidence,discipline,flowTemplate,analyseTarget,analyseSoftware,description,difficult,tenantId,imageFileId,bCapacity,department,section,`group`) VALUES ",
"<foreach collection ='list' item='it' index='index' separator =','>",
"(#{it.uuid},#{it.nodeName},#{it.nodeCode},#{it.englishName},#{it.poolName},#{it.poolVersion},#{it.nodeId},#{it.days},#{it.standard},#{it.confidence},#{it.flowTemplate},#{it.analyseTarget},#{it.analyseSoftware},#{it.description},#{it.difficult},#{it.tenantId},#{it.imageFileId},#{it.bCapacity},#{it.department},#{it.section},#{it.group}) ",
"(#{it.uuid},#{it.nodeName},#{it.nodeCode},#{it.englishName},#{it.poolName},#{it.poolVersion},#{it.nodeId},#{it.days},#{it.standard},#{it.confidence},#{it.discipline},#{it.flowTemplate},#{it.analyseTarget},#{it.analyseSoftware},#{it.description},#{it.difficult},#{it.tenantId},#{it.imageFileId},#{it.bCapacity},#{it.department},#{it.section},#{it.group}) ",
"</foreach>",
"</script>"
})
@@ -121,7 +121,7 @@ public interface SimulationPoolMapper {
@Update("UPDATE simulation_pool_node SET nodeName=#{node.nodeName},nodeCode=#{node.nodeCode},englishName=#{node.englishName},nodeType=#{node.nodeType},nodeSubType=#{node.nodeSubType},nodeOrder=#{node.nodeOrder},description=#{node.description} WHERE uuid=#{node.uuid}")
int updateTaskPoolNode(@Param("node")TaskPoolNode node);
@Update("UPDATE simulation_pool_task SET nodeName=#{task.nodeName},nodeCode=#{task.nodeCode},englishName=#{task.englishName}, days=#{task.days},standard=#{task.standard},flowTemplate=#{task.flowTemplate},analyseTarget=#{task.analyseTarget},analyseSoftware=#{task.analyseSoftware},confidence=#{task.confidence},difficult=#{task.difficult},description=#{task.description},imageFileId=#{task.imageFileId},bCapacity=#{task.bCapacity},department=#{task.department},section=#{task.section},`group`=#{task.group} WHERE uuid = #{task.uuid}")
@Update("UPDATE simulation_pool_task SET nodeName=#{task.nodeName},nodeCode=#{task.nodeCode},englishName=#{task.englishName},discipline=#{task.discipline}, days=#{task.days},standard=#{task.standard},flowTemplate=#{task.flowTemplate},analyseTarget=#{task.analyseTarget},analyseSoftware=#{task.analyseSoftware},confidence=#{task.confidence},difficult=#{task.difficult},description=#{task.description},imageFileId=#{task.imageFileId},bCapacity=#{task.bCapacity},department=#{task.department},section=#{task.section},`group`=#{task.group} WHERE uuid = #{task.uuid}")
int updateTaskPoolItem(@Param("task")TaskPoolItem task);
@Update("UPDATE simulation_pool_performance SET nodeName=#{performance.nodeName},nodeCode=#{performance.nodeCode},englishName=#{performance.englishName},performanceType=#{performance.performanceType},unit=#{performance.unit},lowValue=#{performance.lowValue},highValue=#{performance.highValue},method=#{performance.method},description=#{performance.description} WHERE uuid=#{performance.uuid}")
@@ -164,6 +164,8 @@ public interface SimulationPoolMapper {
@Select("SELECT DISTINCT(nodeName) FROM simulation_pool_node WHERE nodeType=#{nodeType} AND poolName=#{poolName}")
List<String> queryTaskPoolAllNodeNameByNodeType(@Param("poolName") String poolName,@Param("nodeType")String nodeType);
@Select("SELECT DISTINCT (discipline) FROM simulation_pool_task WHERE poolName=#{poolName}")
List<String> queryTaskPoolDisciplines(@Param("poolName")String poolName);
@Delete("DELETE FROM simulation_pool_node_extra WHERE nodeId=#{nodeId}")
int deleteTaskPoolNodeExtra(@Param("nodeId")String nodeId);

1
task/src/main/java/com/sdm/task/model/entity/TaskPoolItem.java
View File

@@ -19,6 +19,7 @@ public class TaskPoolItem extends NodeBase{
public String flowTemplate;
public String analyseTarget;
public float confidence;
public String discipline;
public String analyseSoftware;
public String imageFileId;
public String bCapacity;

21
task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceForLyricImpl.java Normal file
View File

@@ -0,0 +1,21 @@
package com.sdm.task.service.impl;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
@ConditionalOnProperty(name = "simulationPool.chose", havingValue = "lyric")
public class SimulationTaskPoolServiceForLyricImpl extends SimulationTaskPoolServiceImpl{
@Override
public List<String> getSimulationPoolNodeNames(String poolName, String nodeType)
{
if(nodeType.equalsIgnoreCase("discipline"))
{
return mapper.queryTaskPoolDisciplines(poolName);
}
return super.getSimulationPoolNodeNames(poolName,nodeType);
}
}

21
task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java
View File

@@ -38,6 +38,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -47,10 +48,11 @@ import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@ConditionalOnProperty(name = "simulationPool.chose", havingValue = "baseline")
@Service
public class SimulationTaskPoolServiceImpl extends BaseService implements ISimulationTaskPoolService {
@Autowired
private SimulationPoolMapper mapper;
protected SimulationPoolMapper mapper;
@Autowired
private TaskPoolOperate poolOperate;
@@ -2335,6 +2337,17 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
return response;
}
/**
* 获取分析项库某种节点类型所有节点名称
* @param poolName
* @param nodeType
* @return
*/
public List<String> getSimulationPoolNodeNames(String poolName,String nodeType)
{
return mapper.queryTaskPoolAllNodeNameByNodeType(poolName,nodeType);
}
/**
* 统计学科置信度
* @param poolName
@@ -2344,7 +2357,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
{
SdmResponse response = SdmResponse.success();
syncProjectTaskConfidence(nodeType);
List<String> nodeNames = mapper.queryTaskPoolAllNodeNameByNodeType(poolName,nodeType);
List<String> nodeNames = getSimulationPoolNodeNames(poolName,nodeType);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
String month = sdf.format(new Date());
List<DisciplineConfidenceInfo> confidenceInfos = mapper.statisticNodeLastConfidence(month,nodeType);
@@ -2389,7 +2402,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
}
else
{
List<String> nodeNames = mapper.queryTaskPoolAllNodeNameByNodeType(poolName,nodeType);
List<String> nodeNames = getSimulationPoolNodeNames(poolName,nodeType);
String[] yearMonths = timeRange.split(",");
String timeCondition = " 1 ";
if(yearMonths.length == 1)
@@ -2423,7 +2436,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
{
SdmResponse response = SdmResponse.success();
syncProjectTaskDifficulty(nodeType);
List<String> nodeNames = mapper.queryTaskPoolAllNodeNameByNodeType(poolName,nodeType);
List<String> nodeNames = getSimulationPoolNodeNames(poolName,nodeType);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
String month = sdf.format(new Date());
List<DisciplineDifficultyInfo> confidenceInfos = mapper.statisticDisciplineLastDifficulty(month,nodeType);

7
task/src/main/resources/application-dev-190.yml
View File

@@ -127,4 +127,9 @@ security:
whitelist:
paths:
- /taskpool/approveHandleNotice
- /taskPerformance/getRunPerformance
- /taskPerformance/getRunPerformance
simulationPool:
baseline: baseline
lyric: lyric
chose: lyric

7
task/src/main/resources/application-dev-65.yml
View File

@@ -127,4 +127,9 @@ security:
whitelist:
paths:
- /taskpool/approveHandleNotice
- /taskPerformance/getRunPerformance
- /taskPerformance/getRunPerformance
simulationPool:
baseline: baseline
lyric: lyric
chose: lyric

23
task/src/main/resources/application-local.yml
View File

@@ -25,17 +25,26 @@ spring:
password: mysql
jdbc-url: jdbc:mysql://192.168.65.161:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
driver-class-name: com.mysql.cj.jdbc.Driver
#jdbc-url: jdbc:postgresql://192.168.65.161:25432/spdm_baseline
#username: spdm
#password: Spdm@2026
#driverClassName: org.postgresql.Driver
enable: true
slave:
username: root
password: mysql
jdbc-url: jdbc:mysql://192.168.65.161:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
driver-class-name: com.mysql.cj.jdbc.Driver
#jdbc-url: jdbc:postgresql://192.168.65.161:25432/spdm_baseline
#username: spdm
#password: Spdm@2026
#driverClassName: org.postgresql.Driver
enable: true
cloud:
nacos:
discovery:
server-addr: 192.168.65.161:8848
group: LOCAL_GROUP
group: DAI_GROUP
enabled: true
data:
@@ -43,7 +52,7 @@ spring:
# Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0
database: 0
# redis服务器地址（填写自己的服务器地址）
host: 192.168.2.166
host: 192.168.2.161
# redis端口（默认6379）
port: 6379
#redis连接超时等待,10秒
@@ -114,7 +123,7 @@ lombok:
file:
rootPath: /data/home/sdm
scriptPath : D:\\scripts
scriptPath : D:\\share\\scripts
approve:
replyUrl: http:192.168.65.161:7102/simulation/task/taskpool/approveHandleNotice
@@ -132,4 +141,10 @@ security:
whitelist:
paths:
- /taskpool/approveHandleNotice
- /taskPerformance/getRunPerformance
- /taskPerformance/getRunPerformance
simulationPool:
baseline: baseline
lyric: lyric
chose: lyric

7
task/src/main/resources/application-lyric.yml
View File

@@ -127,4 +127,9 @@ security:
whitelist:
paths:
- /taskpool/approveHandleNotice
- /taskPerformance/getRunPerformance
- /taskPerformance/getRunPerformance
simulationPool:
baseline: baseline
lyric: lyric
chose: lyric

7
task/src/main/resources/application-prod.yml
View File

@@ -127,4 +127,9 @@ security:
whitelist:
paths:
- /taskpool/approveHandleNotice
- /taskPerformance/getRunPerformance
- /taskPerformance/getRunPerformance
simulationPool:
baseline: baseline
lyric: lyric
chose: lyric