diff --git a/1-sql/2026-01-09/task/task_change.sql b/1-sql/2026-01-09/task/task_change.sql new file mode 100644 index 00000000..d03f104f --- /dev/null +++ b/1-sql/2026-01-09/task/task_change.sql @@ -0,0 +1,7 @@ +SET FOREIGN_KEY_CHECKS=0; +ALTER TABLE `simulation_pool_task` MODIFY COLUMN `flowTemplate` mediumtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '流程模版名称'; +ALTER TABLE `simulation_pool_task` ADD COLUMN `discipline` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT '所属学科名称' AFTER `nodeId`; +ALTER TABLE `simulation_task_confidence_difficulty_month_record` ADD COLUMN `nodeName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '统计节点名称' AFTER `taskCode`; +ALTER TABLE `simulation_task_confidence_difficulty_month_record` ADD COLUMN `nodeType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '统计节点类型' AFTER `nodeName`; +ALTER TABLE `simulation_task_confidence_difficulty_month_record` DROP COLUMN `discipline`; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/task/pom.xml b/task/pom.xml index fa9c45b7..ab9697b3 100644 --- a/task/pom.xml +++ b/task/pom.xml @@ -91,6 +91,11 @@ org.springframework.boot spring-boot-starter-actuator + + org.postgresql + postgresql + 42.2.5 + diff --git a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java index 584d88b1..a1260270 100644 --- a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java +++ b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java @@ -76,9 +76,9 @@ public interface SimulationPoolMapper { @Insert({ "" }) @@ -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 queryTaskPoolAllNodeNameByNodeType(@Param("poolName") String poolName,@Param("nodeType")String nodeType); + @Select("SELECT DISTINCT (discipline) FROM simulation_pool_task WHERE poolName=#{poolName}") + List queryTaskPoolDisciplines(@Param("poolName")String poolName); @Delete("DELETE FROM simulation_pool_node_extra WHERE nodeId=#{nodeId}") int deleteTaskPoolNodeExtra(@Param("nodeId")String nodeId); diff --git a/task/src/main/java/com/sdm/task/model/entity/TaskPoolItem.java b/task/src/main/java/com/sdm/task/model/entity/TaskPoolItem.java index b89c7276..0b484021 100644 --- a/task/src/main/java/com/sdm/task/model/entity/TaskPoolItem.java +++ b/task/src/main/java/com/sdm/task/model/entity/TaskPoolItem.java @@ -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; diff --git a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceForLyricImpl.java b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceForLyricImpl.java new file mode 100644 index 00000000..e73f1b1e --- /dev/null +++ b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceForLyricImpl.java @@ -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 getSimulationPoolNodeNames(String poolName, String nodeType) + { + if(nodeType.equalsIgnoreCase("discipline")) + { + return mapper.queryTaskPoolDisciplines(poolName); + } + return super.getSimulationPoolNodeNames(poolName,nodeType); + } +} diff --git a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java index 77a11ab9..5d3e8b7a 100644 --- a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java +++ b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java @@ -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 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 nodeNames = mapper.queryTaskPoolAllNodeNameByNodeType(poolName,nodeType); + List nodeNames = getSimulationPoolNodeNames(poolName,nodeType); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); String month = sdf.format(new Date()); List confidenceInfos = mapper.statisticNodeLastConfidence(month,nodeType); @@ -2389,7 +2402,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul } else { - List nodeNames = mapper.queryTaskPoolAllNodeNameByNodeType(poolName,nodeType); + List 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 nodeNames = mapper.queryTaskPoolAllNodeNameByNodeType(poolName,nodeType); + List nodeNames = getSimulationPoolNodeNames(poolName,nodeType); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); String month = sdf.format(new Date()); List confidenceInfos = mapper.statisticDisciplineLastDifficulty(month,nodeType); diff --git a/task/src/main/resources/application-dev-190.yml b/task/src/main/resources/application-dev-190.yml index 5222c44e..cc77c796 100644 --- a/task/src/main/resources/application-dev-190.yml +++ b/task/src/main/resources/application-dev-190.yml @@ -127,4 +127,9 @@ security: whitelist: paths: - /taskpool/approveHandleNotice - - /taskPerformance/getRunPerformance \ No newline at end of file + - /taskPerformance/getRunPerformance + +simulationPool: + baseline: baseline + lyric: lyric + chose: lyric \ No newline at end of file diff --git a/task/src/main/resources/application-dev-65.yml b/task/src/main/resources/application-dev-65.yml index 4f3fc492..d735fbcb 100644 --- a/task/src/main/resources/application-dev-65.yml +++ b/task/src/main/resources/application-dev-65.yml @@ -127,4 +127,9 @@ security: whitelist: paths: - /taskpool/approveHandleNotice - - /taskPerformance/getRunPerformance \ No newline at end of file + - /taskPerformance/getRunPerformance + +simulationPool: + baseline: baseline + lyric: lyric + chose: lyric \ No newline at end of file diff --git a/task/src/main/resources/application-local.yml b/task/src/main/resources/application-local.yml index c076128e..88f88662 100644 --- a/task/src/main/resources/application-local.yml +++ b/task/src/main/resources/application-local.yml @@ -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 \ No newline at end of file + - /taskPerformance/getRunPerformance + + +simulationPool: + baseline: baseline + lyric: lyric + chose: lyric \ No newline at end of file diff --git a/task/src/main/resources/application-lyric.yml b/task/src/main/resources/application-lyric.yml index a8246d20..21e878e1 100644 --- a/task/src/main/resources/application-lyric.yml +++ b/task/src/main/resources/application-lyric.yml @@ -127,4 +127,9 @@ security: whitelist: paths: - /taskpool/approveHandleNotice - - /taskPerformance/getRunPerformance \ No newline at end of file + - /taskPerformance/getRunPerformance + +simulationPool: + baseline: baseline + lyric: lyric + chose: lyric \ No newline at end of file diff --git a/task/src/main/resources/application-prod.yml b/task/src/main/resources/application-prod.yml index 0b7118c1..6bb935b5 100644 --- a/task/src/main/resources/application-prod.yml +++ b/task/src/main/resources/application-prod.yml @@ -127,4 +127,9 @@ security: whitelist: paths: - /taskpool/approveHandleNotice - - /taskPerformance/getRunPerformance \ No newline at end of file + - /taskPerformance/getRunPerformance + +simulationPool: + baseline: baseline + lyric: lyric + chose: lyric \ No newline at end of file