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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gulongcheng
2025-12-11 20:23:03 +08:00
parent 79d311354c 3775d153eb
commit cd5b4c0b69
30 changed files with 1287 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,15 +218,15 @@ public interface SimulationPoolMapper {
@Insert({
"<script>",
"INSERT INTO simulation_taskpool_flowtemplate_relate(poolName,version,taskUuid,flowCode) VALUES ",
"INSERT INTO simulation_taskpool_flowtemplate_relate(poolName,version,taskUuid,flowCode,poolId) VALUES ",
"<foreach collection ='list' item='it' index='index' separator =','>",
"(#{it.poolName},#{it.version},#{it.taskUuid},#{it.flowCode}) ",
"(#{it.poolName},#{it.version},#{it.taskUuid},#{it.flowCode},#{it.poolId}) ",
"</foreach>",
"</script>"
})
int batchAddTaskFlowRelate(@Param("list") List<SimulatePoolTaskFlowTemplateRelate> list);
@Insert("INSERT INTO simulation_taskpool_flowtemplate_relate(poolName,version,taskUuid,flowCode) VALUES (#{relate.poolName},#{relate.version},#{relate.taskUuid},#{relate.flowCode})")
@Insert("INSERT INTO simulation_taskpool_flowtemplate_relate(poolName,version,taskUuid,flowCode,poolId) VALUES (#{relate.poolName},#{relate.version},#{relate.taskUuid},#{relate.flowCode},#{relate.poolId})")
int addTaskFlowRelate(@Param("relate") SimulatePoolTaskFlowTemplateRelate relate);
@Select("SELECT * FROM simulation_taskpool_flowtemplate_relate WHERE flowCode=#{flowCode} AND poolName=#{poolName} AND version=#{version} AND taskUuid=#{taskUuid}")

2
task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java
View File

@@ -6,6 +6,8 @@ public class SimulatePoolTaskFlowTemplateRelate {
public String poolName;
public int poolId;
public String version;
public String taskUuid;

2
task/src/main/java/com/sdm/task/model/entity/TaskPoolVersion.java
View File

@@ -12,7 +12,7 @@ public class TaskPoolVersion extends BaseBean {
public String parentVersion;
public String childVersion;
public String versionContents;
public long poolId;
public int poolId;
public long creator;
public String createTime;
}

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

@@ -76,6 +76,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
SimulatePoolTaskFlowTemplateRelate relate = new SimulatePoolTaskFlowTemplateRelate();
relate.poolName = poolName;
relate.version = version;
relate.poolId = poolId;
relate.taskUuid = taskPoolItem.uuid;
relate.flowCode = template;
flowRelationList.add(relate);
@@ -121,7 +122,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
* @param version
* @param taskPoolItemList
*/
private void addTaskRelationCheckRepeat(String poolName,String version,List<TaskPoolItem> taskPoolItemList)
private void addTaskRelationCheckRepeat(String poolName,String version,List<TaskPoolItem> taskPoolItemList,int poolId)
{
for(TaskPoolItem taskPoolItem:taskPoolItemList) {
String flowTemplate = taskPoolItem.flowTemplate;
@@ -136,6 +137,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
SimulatePoolTaskFlowTemplateRelate templateRelate = new SimulatePoolTaskFlowTemplateRelate();
templateRelate.poolName = poolName;
templateRelate.version = version;
templateRelate.poolId = poolId;
templateRelate.taskUuid = taskPoolItem.uuid;
templateRelate.flowCode = template;
mapper.addTaskFlowRelate(templateRelate);
@@ -173,7 +175,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
}
//将添加和更新task合并一起后一起添加关联关系，需要检查关系是否重复绑定
addTasks.addAll(updateTasks);
addTaskRelationCheckRepeat(poolName,currentVersion,addTasks);
addTaskRelationCheckRepeat(poolName,currentVersion,addTasks,currentBrief.id);
}
@@ -1405,6 +1407,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
currPoolBrief.parentVersion = currPoolBrief.currentVersion;
currPoolBrief.currentVersion = poolVersion.poolVersion;
poolVersion.poolId = mapper.addTaskPoolBreif(currPoolBrief);
currPoolBrief.id = poolVersion.poolId;
TaskPoolTree poolTree = (TaskPoolTree) treeRespond.getData();
poolVersion.versionContents = JSONObject.toJSONString(poolTree);
mapper.addTaskPoolVersion(poolVersion);
@@ -1988,6 +1991,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
templateRelate.flowCode = flowCode;
templateRelate.poolName = taskPoolItem.poolName;
templateRelate.version = taskPoolItem.version;
templateRelate.poolId = taskPoolItem.poolId;
templateRelate.taskUuid = taskBaseInfo.uuid;
relations.add(templateRelate);
}

130
task/src/main/resources/application-lyric.yml Normal file
View File

@@ -0,0 +1,130 @@
# 前后端联调使用该配置文件，本地调试使用local
server:
port: 7102
spring:
application:
name: task
datasource:
username: root
password: mysql
jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
# 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。
maximum-pool-size: 20
# 连接池在空闲时保持的最小连接数。
minimum-idle: 5
# 一个连接在被标记为空闲之前可以保持空闲状态的最长时间（毫秒）。当连接的空闲时间超过此值后，它可能会被连接池 evict（驱逐）。
idle-timeout: 60000 # 1 min
# 一个连接从被创建开始，其生命周期的最大时长（毫秒）。HikariCP的默认值就是30分钟，这是一个非常合理的设置。
max-lifetime: 1800000 # 30 min（Hikari 默认）
# 应用程序尝试从连接池获取一个连接时，等待的最长时间（毫秒）。建议值：30-60秒。
connection-timeout: 30000 # 30s
master:
username: root
password: mysql
jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
driver-class-name: com.mysql.cj.jdbc.Driver
slave:
username: root
password: mysql
jdbc-url: jdbc:mysql://192.168.30.146:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
driver-class-name: com.mysql.cj.jdbc.Driver
enable: true
cloud:
nacos:
discovery:
server-addr: 192.168.30.146:8848
group: LYRIC_GROUP
# server-addr: 127.0.0.1:8848
enabled: true
# username: nacos
# password: ENC(+QKYnI6gAYu1SbLaZQTkZA==)
data:
redis:
# Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0
database: 0
# redis服务器地址（填写自己的服务器地址）
host: 192.168.30.145
# redis端口（默认6379）
port: 6379
#redis连接超时等待,10秒
timeout: PT10S
# redis访问密码（默认为空）
password:
lettuce:
pool:
# 连接池最大连接数（使用负值表示没有限制） 默认 8
max-active: 50
# 连接池中的最大空闲连接 默认 8
max-idle: 20
# 连接池中的最小空闲连接 默认 0
min-idle: 1
# 连接池最大阻塞等待时间(使用负值表示没有限制) 默认 -1，这里配置10s
max-wait: PT10S
# password:
# sentinel:
# master: mymaster
# nodes: 10.18.109.50:26379,10.18.109.51:26379,10.18.109.52:26379
servlet:
multipart:
# 单个文件的最大值
max-file-size: 500MB
# 上传文件总的最大值
max-request-size: 10240MB
management:
endpoints:
web:
exposure:
include: health,info
endpoint:
health:
show-details: always
group:
readiness:
include: discoveryComposite,ping,refreshScope
health:
redis:
enabled: false
db:
enabled: false
mybatis-plus:
configuration:
map-underscore-to-camel-case: true
auto-mapping-behavior: full
# cache-enabled: true
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mapper-locations: classpath*:mapper/**/*.xml
global-config:
# 逻辑删除配置
db-config:
# 删除前
logic-not-delete-value: 1
# 删除后
logic-delete-value: 0
#showSql
#logging:
# level:
# com.sdm.dao: debug
lombok:
anyConstructor:
addConstructorProperties: true
file:
rootPath: /data/home/sdm
scriptPath : /opt/script
approve:
replyUrl: http:192.168.30.148:7102/simulation/task/taskpool/approveHandleNotice
#logging:
# config: ./config/logback.xml
security:
whitelist:
paths:
- /taskpool/approveHandleNotice
- /taskPerformance/getRunPerformance