From 079f3b5a8249ebd7bd876e29be4f0c92340b78f7 Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Thu, 11 Dec 2025 16:31:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A1=B9=E5=BA=93?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=B5=81=E7=A8=8B=E6=A8=A1=E7=89=88=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E6=9E=90=E9=A1=B9=E5=BA=93ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/entity/SimulationFlowTaskBindInfo.java | 2 +- .../com/sdm/capability/service/impl/FlowServiceImpl.java | 8 ++++++++ .../sdm/common/entity/pojo/task/FlowBindTaskPoolItem.java | 2 ++ .../main/java/com/sdm/task/dao/SimulationPoolMapper.java | 6 +++--- .../model/entity/SimulatePoolTaskFlowTemplateRelate.java | 2 ++ .../java/com/sdm/task/model/entity/TaskPoolVersion.java | 2 +- .../task/service/impl/SimulationTaskPoolServiceImpl.java | 8 ++++++-- 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/capability/src/main/java/com/sdm/capability/model/entity/SimulationFlowTaskBindInfo.java b/capability/src/main/java/com/sdm/capability/model/entity/SimulationFlowTaskBindInfo.java index fad7c0aa..134e99a5 100644 --- a/capability/src/main/java/com/sdm/capability/model/entity/SimulationFlowTaskBindInfo.java +++ b/capability/src/main/java/com/sdm/capability/model/entity/SimulationFlowTaskBindInfo.java @@ -7,7 +7,7 @@ import java.util.List; public class SimulationFlowTaskBindInfo { - public String simulationPoolId; + public int simulationPoolId; public String simulationPoolName; diff --git a/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java b/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java index f33f5eef..c6c18e06 100644 --- a/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java +++ b/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java @@ -107,6 +107,7 @@ public class FlowServiceImpl extends BaseService implements IFlowService { FlowBindTaskPoolItem bindTaskPoolItem = new FlowBindTaskPoolItem(); bindTaskPoolItem.flowCode = flowCode; bindTaskPoolItem.poolName = bindInfo.simulationPoolName; + bindTaskPoolItem.poolId = bindInfo.simulationPoolId; bindTaskPoolItem.version = bindInfo.simulationPoolVersion; for(String taskId : bindInfo.simulationPoolTaskIds) { @@ -337,8 +338,15 @@ public class FlowServiceImpl extends BaseService implements IFlowService { { SimulationFlowTaskBindInfo flowTaskBindInfo = new SimulationFlowTaskBindInfo(); flowTaskBindInfo.simulationPoolName = flowBindTaskPoolItem.poolName; + flowTaskBindInfo.simulationPoolId = flowBindTaskPoolItem.poolId; flowTaskBindInfo.simulationPoolVersion = flowBindTaskPoolItem.version; flowTaskBindInfo.taskBaseInfoList = flowBindTaskPoolItem.taskList; + List taskIds = new ArrayList<>(); + for(TaskBaseInfo taskBaseInfo : flowBindTaskPoolItem.taskList) + { + taskIds.add(taskBaseInfo.uuid); + } + flowTaskBindInfo.simulationPoolTaskIds = taskIds; flowTemplate.simulationPoolInfoList.add(flowTaskBindInfo); } diff --git a/common/src/main/java/com/sdm/common/entity/pojo/task/FlowBindTaskPoolItem.java b/common/src/main/java/com/sdm/common/entity/pojo/task/FlowBindTaskPoolItem.java index 3a57f306..a5ddbd3f 100644 --- a/common/src/main/java/com/sdm/common/entity/pojo/task/FlowBindTaskPoolItem.java +++ b/common/src/main/java/com/sdm/common/entity/pojo/task/FlowBindTaskPoolItem.java @@ -7,6 +7,8 @@ public class FlowBindTaskPoolItem { public String poolName; + public int poolId; + public String version; public String flowCode; 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 59f8ce9b..de29d220 100644 --- a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java +++ b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java @@ -218,15 +218,15 @@ public interface SimulationPoolMapper { @Insert({ "" }) int batchAddTaskFlowRelate(@Param("list") List 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}") diff --git a/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java b/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java index b5f952b1..b2987e2d 100644 --- a/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java +++ b/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java @@ -6,6 +6,8 @@ public class SimulatePoolTaskFlowTemplateRelate { public String poolName; + public int poolId; + public String version; public String taskUuid; diff --git a/task/src/main/java/com/sdm/task/model/entity/TaskPoolVersion.java b/task/src/main/java/com/sdm/task/model/entity/TaskPoolVersion.java index ee27602d..76456d08 100644 --- a/task/src/main/java/com/sdm/task/model/entity/TaskPoolVersion.java +++ b/task/src/main/java/com/sdm/task/model/entity/TaskPoolVersion.java @@ -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; } 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 29b15ca0..a08cd666 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 @@ -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 taskPoolItemList) + private void addTaskRelationCheckRepeat(String poolName,String version,List 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); } From 71362298890374ef5d1a0089e96bb6f1894ec279 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Thu, 11 Dec 2025 16:57:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E6=9F=A5=E8=AF=A2=E7=89=A9=E7=90=86?= =?UTF-8?q?=E9=87=8F=E5=92=8C=E5=8D=95=E4=BD=8D=E5=9F=BA=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sdm/common/log/utils/SysLogUtils.java | 2 +- .../controller/SimulationRunController.java | 22 ++++++++++ .../dao/SimulationBaseQuantitiesMapper.java | 12 +++++ .../dao/SimulationBaseUnitsMapper.java | 11 +++++ .../entity/SimulationBaseQuantities.java | 38 ++++++++++++++++ .../model/entity/SimulationBaseUnits.java | 38 ++++++++++++++++ .../ISimulationBaseQuantitiesService.java | 9 ++++ .../service/ISimulationBaseUnitsService.java | 8 ++++ .../service/ISimulationRunService.java | 6 +++ .../SimulationBaseQuantitiesServiceImpl.java | 13 ++++++ .../impl/SimulationBaseUnitsServiceImpl.java | 12 +++++ .../impl/SimulationRunServiceImpl.java | 21 +++++++++ .../model/thirdparty/FreeLinkParamDto.java | 28 ++++++++++++ .../service/ISimulationExternalService.java | 15 +++++++ .../impl/SimulationExternalServiceImpl.java | 44 +++++++++++++++++++ 15 files changed, 278 insertions(+), 1 deletion(-) create mode 100644 project/src/main/java/com/sdm/project/dao/SimulationBaseQuantitiesMapper.java create mode 100644 project/src/main/java/com/sdm/project/dao/SimulationBaseUnitsMapper.java create mode 100644 project/src/main/java/com/sdm/project/model/entity/SimulationBaseQuantities.java create mode 100644 project/src/main/java/com/sdm/project/model/entity/SimulationBaseUnits.java create mode 100644 project/src/main/java/com/sdm/project/service/ISimulationBaseQuantitiesService.java create mode 100644 project/src/main/java/com/sdm/project/service/ISimulationBaseUnitsService.java create mode 100644 project/src/main/java/com/sdm/project/service/SimulationBaseQuantitiesServiceImpl.java create mode 100644 project/src/main/java/com/sdm/project/service/impl/SimulationBaseUnitsServiceImpl.java create mode 100644 system/src/main/java/com/sdm/system/model/thirdparty/FreeLinkParamDto.java create mode 100644 system/src/main/java/com/sdm/system/service/ISimulationExternalService.java create mode 100644 system/src/main/java/com/sdm/system/service/impl/SimulationExternalServiceImpl.java diff --git a/common/src/main/java/com/sdm/common/log/utils/SysLogUtils.java b/common/src/main/java/com/sdm/common/log/utils/SysLogUtils.java index 2f713caa..49bba68e 100644 --- a/common/src/main/java/com/sdm/common/log/utils/SysLogUtils.java +++ b/common/src/main/java/com/sdm/common/log/utils/SysLogUtils.java @@ -62,7 +62,7 @@ public class SysLogUtils { sysLog.setMethod(request.getMethod()); sysLog.setRemoteAddr(JakartaServletUtil.getClientIP(request)); sysLog.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT)); - sysLog.setCreateBy(ObjectUtils.isNotEmpty(ThreadLocalContext.getUserName()) ? ThreadLocalContext.getUserName() : "anonymousUser"); + sysLog.setCreateBy(String.valueOf(ThreadLocalContext.getUserId())); try { // 获取服务名称 sysLog.setServiceId("simulation-" + SpringUtil.getProperty("spring.application.name")); diff --git a/project/src/main/java/com/sdm/project/controller/SimulationRunController.java b/project/src/main/java/com/sdm/project/controller/SimulationRunController.java index a96797a6..af37327f 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationRunController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationRunController.java @@ -11,6 +11,8 @@ import com.sdm.common.entity.resp.data.BatchAddFileInfoResp; import com.sdm.common.entity.resp.data.FileMetadataInfoResp; import com.sdm.common.feign.inter.project.ISimulationRunFeignClient; import com.sdm.common.log.annotation.SysLog; +import com.sdm.project.model.entity.SimulationBaseQuantities; +import com.sdm.project.model.entity.SimulationBaseUnits; import com.sdm.project.model.entity.SimulationRun; import com.sdm.project.model.entity.SimulationRunKeyResult; import com.sdm.project.model.req.*; @@ -269,4 +271,24 @@ public class SimulationRunController implements ISimulationRunFeignClient { return runService.flowRelateReport(req); } + /** + * 查询物理量基表 + * @return + */ + @GetMapping("/listQuantities") + @Operation(summary = "查询物理量基表", description = "查询物理量基表") + public SdmResponse> listQuantities() { + return runService.listQuantities(); + } + + /** + * 查询单位基表 + * @return + */ + @GetMapping("/listUnits") + @Operation(summary = "查询单位基表", description = "查询单位基表") + public SdmResponse> listUnits(@RequestParam(required = false) String quantityType) { + return runService.listUnits(quantityType); + } + } \ No newline at end of file diff --git a/project/src/main/java/com/sdm/project/dao/SimulationBaseQuantitiesMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationBaseQuantitiesMapper.java new file mode 100644 index 00000000..8fcabfa8 --- /dev/null +++ b/project/src/main/java/com/sdm/project/dao/SimulationBaseQuantitiesMapper.java @@ -0,0 +1,12 @@ +package com.sdm.project.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.sdm.project.model.entity.SimulationBaseQuantities; +import com.sdm.project.model.entity.SimulationBaseUnits; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +public interface SimulationBaseQuantitiesMapper extends BaseMapper { + +} diff --git a/project/src/main/java/com/sdm/project/dao/SimulationBaseUnitsMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationBaseUnitsMapper.java new file mode 100644 index 00000000..62f69f65 --- /dev/null +++ b/project/src/main/java/com/sdm/project/dao/SimulationBaseUnitsMapper.java @@ -0,0 +1,11 @@ +package com.sdm.project.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.sdm.project.model.entity.SimulationBaseUnits; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +public interface SimulationBaseUnitsMapper extends BaseMapper { + +} diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationBaseQuantities.java b/project/src/main/java/com/sdm/project/model/entity/SimulationBaseQuantities.java new file mode 100644 index 00000000..7e5d3544 --- /dev/null +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationBaseQuantities.java @@ -0,0 +1,38 @@ +package com.sdm.project.model.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("simulation_base_quantities") +@ApiModel(value="SimulationBaseQuantities对象", description="物理量基表") +public class SimulationBaseQuantities implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id") + private Integer id; + + @TableField("label") + private String label; + + @TableField("family") + private String family; + + @TableField("name") + private String name; + + @TableField("changeFlag") + private String changeFlag; + +} diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationBaseUnits.java b/project/src/main/java/com/sdm/project/model/entity/SimulationBaseUnits.java new file mode 100644 index 00000000..63443fb6 --- /dev/null +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationBaseUnits.java @@ -0,0 +1,38 @@ +package com.sdm.project.model.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("simulation_base_units") +@ApiModel(value="SimulationBaseUnits对象", description="单位基表") +public class SimulationBaseUnits implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id") + private Integer id; + + @TableField("label") + private String label; + + @TableField("family") + private String family; + + @TableField("name") + private String name; + + @TableField("changeFlag") + private String changeFlag; + +} diff --git a/project/src/main/java/com/sdm/project/service/ISimulationBaseQuantitiesService.java b/project/src/main/java/com/sdm/project/service/ISimulationBaseQuantitiesService.java new file mode 100644 index 00000000..4518ec82 --- /dev/null +++ b/project/src/main/java/com/sdm/project/service/ISimulationBaseQuantitiesService.java @@ -0,0 +1,9 @@ +package com.sdm.project.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.sdm.project.model.entity.SimulationBaseQuantities; +import com.sdm.project.model.entity.SimulationBaseUnits; + +public interface ISimulationBaseQuantitiesService extends IService { + +} diff --git a/project/src/main/java/com/sdm/project/service/ISimulationBaseUnitsService.java b/project/src/main/java/com/sdm/project/service/ISimulationBaseUnitsService.java new file mode 100644 index 00000000..8a5f61b1 --- /dev/null +++ b/project/src/main/java/com/sdm/project/service/ISimulationBaseUnitsService.java @@ -0,0 +1,8 @@ +package com.sdm.project.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.sdm.project.model.entity.SimulationBaseUnits; + +public interface ISimulationBaseUnitsService extends IService { + +} diff --git a/project/src/main/java/com/sdm/project/service/ISimulationRunService.java b/project/src/main/java/com/sdm/project/service/ISimulationRunService.java index c15b2e97..cf5ac671 100644 --- a/project/src/main/java/com/sdm/project/service/ISimulationRunService.java +++ b/project/src/main/java/com/sdm/project/service/ISimulationRunService.java @@ -9,6 +9,8 @@ import com.sdm.common.entity.req.system.LaunchApproveReq; import com.sdm.common.entity.resp.PageDataResp; import com.sdm.common.entity.resp.data.BatchAddFileInfoResp; import com.sdm.common.entity.resp.data.FileMetadataInfoResp; +import com.sdm.project.model.entity.SimulationBaseQuantities; +import com.sdm.project.model.entity.SimulationBaseUnits; import com.sdm.project.model.entity.SimulationRun; import com.baomidou.mybatisplus.extension.service.IService; import com.sdm.project.model.entity.SimulationRunKeyResult; @@ -81,4 +83,8 @@ public interface ISimulationRunService extends IService { SdmResponse listFlowNodes(SpdmTaskRunReq req); SdmResponse flowRelateReport(SpdmReportReq req); + + SdmResponse> listQuantities(); + + SdmResponse> listUnits(String quantityType); } \ No newline at end of file diff --git a/project/src/main/java/com/sdm/project/service/SimulationBaseQuantitiesServiceImpl.java b/project/src/main/java/com/sdm/project/service/SimulationBaseQuantitiesServiceImpl.java new file mode 100644 index 00000000..862a310a --- /dev/null +++ b/project/src/main/java/com/sdm/project/service/SimulationBaseQuantitiesServiceImpl.java @@ -0,0 +1,13 @@ +package com.sdm.project.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sdm.project.dao.SimulationBaseQuantitiesMapper; +import com.sdm.project.dao.SimulationBaseUnitsMapper; +import com.sdm.project.model.entity.SimulationBaseQuantities; +import com.sdm.project.model.entity.SimulationBaseUnits; +import org.springframework.stereotype.Service; + +@Service +public class SimulationBaseQuantitiesServiceImpl extends ServiceImpl implements ISimulationBaseQuantitiesService { + +} diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationBaseUnitsServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationBaseUnitsServiceImpl.java new file mode 100644 index 00000000..92774e61 --- /dev/null +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationBaseUnitsServiceImpl.java @@ -0,0 +1,12 @@ +package com.sdm.project.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sdm.project.dao.SimulationBaseUnitsMapper; +import com.sdm.project.model.entity.SimulationBaseUnits; +import com.sdm.project.service.ISimulationBaseUnitsService; +import org.springframework.stereotype.Service; + +@Service +public class SimulationBaseUnitsServiceImpl extends ServiceImpl implements ISimulationBaseUnitsService { + +} diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index ae1ae1d9..dadf1e6d 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -39,6 +39,7 @@ import com.sdm.common.feign.impl.system.SysUserFeignClientImpl; import com.sdm.common.utils.PageUtils; import com.sdm.common.utils.RandomUtil; import com.sdm.project.common.*; +import com.sdm.project.dao.SimulationBaseUnitsMapper; import com.sdm.project.dao.SimulationProjectMapper; import com.sdm.project.dao.SimulationRunMapper; import com.sdm.project.model.bo.ApprovalDeliverableContentsModel; @@ -123,6 +124,12 @@ public class SimulationRunServiceImpl extends ServiceImpl> listQuantities() { + return SdmResponse.success(baseQuantitiesService.list()); + } + + @Override + public SdmResponse> listUnits(String quantityType) { + if (StringUtils.isEmpty(quantityType)) { + return SdmResponse.success(baseUnitsService.list()); + } else { + return SdmResponse.success(baseUnitsService.lambdaQuery().eq(SimulationBaseUnits::getFamily, quantityType).list()); + } + } + public static void deleteFolder(File folder) { if (folder.isDirectory()) { File[] files = folder.listFiles(); diff --git a/system/src/main/java/com/sdm/system/model/thirdparty/FreeLinkParamDto.java b/system/src/main/java/com/sdm/system/model/thirdparty/FreeLinkParamDto.java new file mode 100644 index 00000000..2f83a7de --- /dev/null +++ b/system/src/main/java/com/sdm/system/model/thirdparty/FreeLinkParamDto.java @@ -0,0 +1,28 @@ +package com.sdm.system.model.thirdparty; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "即时通消息通知参数") +public class FreeLinkParamDto { + + @Schema(description = "接收人工号") + private String id; + + @Schema(description = "默认66666") + private String user = "66666"; + + @Schema(description = "默认lyric@123") + private String pawd = "lyric@123"; + + @Schema(description = "消息内容") + private String msg; + + @Schema(description = "消息类型 默认text") + private String type; + + @Schema(description = "业务系统APPID") + private String freelinkAppId = "d7eb3ef7c8e8c93e7c6e978fee848646"; + +} diff --git a/system/src/main/java/com/sdm/system/service/ISimulationExternalService.java b/system/src/main/java/com/sdm/system/service/ISimulationExternalService.java new file mode 100644 index 00000000..fd2a679d --- /dev/null +++ b/system/src/main/java/com/sdm/system/service/ISimulationExternalService.java @@ -0,0 +1,15 @@ +package com.sdm.system.service; + +import com.sdm.common.common.SdmResponse; +import com.sdm.common.entity.req.system.SendMsgReq; +import com.sdm.system.model.thirdparty.FreeLinkParamDto; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 对接外部第三方系统服务 + */ +public interface ISimulationExternalService { + + SdmResponse syncMsgToFreelink(FreeLinkParamDto req); + +} diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationExternalServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationExternalServiceImpl.java new file mode 100644 index 00000000..7b9d3574 --- /dev/null +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationExternalServiceImpl.java @@ -0,0 +1,44 @@ +package com.sdm.system.service.impl; + +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson2.JSON; +import com.sdm.common.common.SdmResponse; +import com.sdm.common.entity.req.system.SendMsgReq; +import com.sdm.common.utils.HttpClientUtil; +import com.sdm.system.model.thirdparty.FreeLinkParamDto; +import com.sdm.system.service.ISimulationExternalService; +import com.sdm.system.service.ISimulationMessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + + +@Service +@Slf4j +public class SimulationExternalServiceImpl implements ISimulationExternalService { + + @Value("${thirdparty.api.freeLinkUrl}") + private String freeLinkUrl; + + @Autowired + private HttpClientUtil httpClientUtil; + + @Override + public SdmResponse syncMsgToFreelink(FreeLinkParamDto req) { + String url = freeLinkUrl; + try { + log.info("[syncMsgToFreelink] url:{}, param:{}", url, JSONUtil.toJsonStr(req)); + String resultString = httpClientUtil.doPostJson(url, JSON.toJSONString(req)); + SdmResponse response = JSON.parseObject(resultString, SdmResponse.class); + if (response.isSuccess()) { + return response; + } + return SdmResponse.failed("同步即时通消息通知失败:"); + } catch (Exception e) { + log.error("同步即时通消息通知失败", e); + return SdmResponse.failed("同步即时通消息通知失败"); + } + } + +} From 3775d153eb72f38980bbaa9a542b517eb384d28b Mon Sep 17 00:00:00 2001 From: yangyang01000846 <15195822163@163.com> Date: Thu, 11 Dec 2025 17:44:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=A9?= =?UTF-8?q?=E5=85=83=E4=BA=A8=E7=8E=B0=E5=9C=BA=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-lyric.yml | 114 +++++++++++ data/src/main/resources/application-lyric.yml | 132 +++++++++++++ .../src/main/resources/application-lyric.yml | 41 ++++ .../src/main/resources/application-lyric.yml | 122 ++++++++++++ pbs/src/main/resources/application-lyric.yml | 141 ++++++++++++++ .../src/main/resources/application-lyric.yml | 126 ++++++++++++ .../src/main/resources/application-lyric.yml | 180 ++++++++++++++++++ task/src/main/resources/application-lyric.yml | 130 +++++++++++++ 8 files changed, 986 insertions(+) create mode 100644 capability/src/main/resources/application-lyric.yml create mode 100644 data/src/main/resources/application-lyric.yml create mode 100644 flowable/src/main/resources/application-lyric.yml create mode 100644 gateway2/src/main/resources/application-lyric.yml create mode 100644 pbs/src/main/resources/application-lyric.yml create mode 100644 project/src/main/resources/application-lyric.yml create mode 100644 system/src/main/resources/application-lyric.yml create mode 100644 task/src/main/resources/application-lyric.yml diff --git a/capability/src/main/resources/application-lyric.yml b/capability/src/main/resources/application-lyric.yml new file mode 100644 index 00000000..1ef4cf07 --- /dev/null +++ b/capability/src/main/resources/application-lyric.yml @@ -0,0 +1,114 @@ +server: + port: 7107 + +spring: + application: + name: capability + 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: + maximum-pool-size: 450 # 连接池最大连接数（关键！） + minimum-idle: 50 # 最小空闲连接数（与最大一致，避免频繁创建销毁） + idle-timeout: 300000 # 空闲连接超时时间（5分钟） + max-lifetime: 600000 # 连接最大存活时间（10分钟） + connection-timeout: 30000 # 获取连接超时时间（30秒，避免线程阻塞） + 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 + +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 + +security: + whitelist: + paths: + - /pbs/jobFileCallback + - /flow/approveHandleNotice + +#logging: +# config: ./config/logback.xml \ No newline at end of file diff --git a/data/src/main/resources/application-lyric.yml b/data/src/main/resources/application-lyric.yml new file mode 100644 index 00000000..425cc443 --- /dev/null +++ b/data/src/main/resources/application-lyric.yml @@ -0,0 +1,132 @@ +server: + port: 7104 + +spring: + application: + name: data + 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 + 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 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # cache-enabled: true + mapper-locations: classpath*:mapper/**/*.xml + global-config: + # 逻辑删除配置 + db-config: + # 删除前 + logic-not-delete-value: 1 + # 删除后 + logic-delete-value: 0 + +# MyBatis SQL日志配置 +logging: + level: + com.baomidou.mybatisplus.core.MybatisConfiguration: debug + com.baomidou.mybatisplus.core.override.MybatisMapperRegistry: trace + com.sdm.data.mapper: debug + java.sql: debug + java.sql.Connection: debug + java.sql.Statement: debug + java.sql.PreparedStatement: debug + +lombok: + anyConstructor: + addConstructorProperties: true + +file: + rootPath: /data/home/sdm + privatePath: /data/home + +#logging: +# config: ./config/logback.xml + +# 配置文件系统类型 +fileSystem: + minio: minio + system: system + chose: minio # 这里选择minio或者system + +# spdmadmin/spdmadmin 作为普通用户只能看到spdm桶的数据 +minio: + endpoint: 192.168.30.146 + port: 9000 + access-key: minioadmin + secret-key: minioadmin + secure: false + secret-business-bucket: secretbusiness # 存放保密业务代码、脚本的桶（仅超级管理员访问） + spdm-bucket: spdm # 普通业务数据桶（分配给用户读写权限） + directMemory: 16384 # 16kb + lifecycleConfig: '{"auto-expire-1d":"1d"}' + +security: + whitelist: + paths: + - /data/previewImage + - /data/approveDataFile + - /data/downloadFile + - /data/flowableUpFileToLocal + - /data/flowableUpFileToLocalMerge + - /data/getFileBaseInfo + +data: + storage-monitor: + cron: 0 0 9 * * ? \ No newline at end of file diff --git a/flowable/src/main/resources/application-lyric.yml b/flowable/src/main/resources/application-lyric.yml new file mode 100644 index 00000000..ee0f7a99 --- /dev/null +++ b/flowable/src/main/resources/application-lyric.yml @@ -0,0 +1,41 @@ +server: + port: 7106 +spring: + application: + name: flowable + datasource: + url: jdbc:mysql://192.168.30.146:3306/flowable?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + username: root + password: mysql + driver-class-name: com.mysql.cj.jdbc.Driver + flowable: + # ????????? + database-schema-update: true + # ??????JOB + async-executor-activate: true + cloud: + nacos: + discovery: + server-addr: 192.168.65.161:8848 + group: LYRIC_GROUP + enabled: true + +logging: + level: + org: + flowable: INFO + +mybatis-plus: + mapper-locations: classpath*:/mapper/**/*.xml + type-aliases-package: com.sdm.flowable.model.entity + configuration: + map-underscore-to-camel-case: true + global-config: + db-config: + id-type: auto + +security: + whitelist: + paths: + - /process/testHpc + - /process/asyncCallback diff --git a/gateway2/src/main/resources/application-lyric.yml b/gateway2/src/main/resources/application-lyric.yml new file mode 100644 index 00000000..0c5ff9f0 --- /dev/null +++ b/gateway2/src/main/resources/application-lyric.yml @@ -0,0 +1,122 @@ +server: + port: 7100 + +spring: + application: + name: gateway2 + cloud: + nacos: + config: + server-addr: 192.168.30.146:8848 + file-extension: yaml + import-check: + enabled: false + discovery: + server-addr: 192.168.30.146:8848 + group: LYRIC_GROUP + enabled: true + gateway: + httpclient: + connect-timeout: 10000 + response-timeout: 10000 + routes: + - id: approve-service + uri: lb://approve + predicates: + - Path=/simulation/approve/** + filters: + - StripPrefix=2 + - id: capability-service + uri: lb://capability + predicates: + - Path=/simulation/capability/** + filters: + - StripPrefix=2 + - id: data-service + uri: lb://data + predicates: + - Path=/simulation/data/** + filters: + - StripPrefix=2 + metadata: + group: LYRIC_GROUP # 指定目标服务的分组 + - id: pbs-service + uri: lb://pbs + predicates: + - Path=/simulation/pbs/** + filters: + - StripPrefix=2 + - id: performance-service + uri: lb://performance + predicates: + - Path=/simulation/performance/** + filters: + - StripPrefix=2 + - id: project-service + uri: lb://project + predicates: + - Path=/simulation/project/** + filters: + - StripPrefix=2 + metadata: + group: LYRIC_GROUP # 指定目标服务的分组 + - id: system-service + uri: lb://system + predicates: + - Path=/simulation/system/** + filters: + - StripPrefix=2 + metadata: + group: LYRIC_GROUP # 指定目标服务的分组 + - id: task-service + uri: lb://task + predicates: + - Path=/simulation/task/** + filters: + - StripPrefix=2 + metadata: + group: LYRIC_GROUP # 指定目标服务的分组 + - id: flowable-service + uri: lb://flowable + predicates: + - Path=/simulation/flowable/** + filters: + - StripPrefix=2 + metadata: + group: LYRIC_GROUP # 指定目标服务的分组 + discovery: + locator: + enabled: true + lower-case-service-id: true + +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 + +logging: + level: + com.sdm.gateway2: INFO + org.springframework.cloud.gateway: INFO + reactor.netty: INFO + +# 0单机处理，1负载均衡轮询 +serverType: 0 +serverIp: 192.168.30.148 + +security: + whitelist: + paths: + - aa \ No newline at end of file diff --git a/pbs/src/main/resources/application-lyric.yml b/pbs/src/main/resources/application-lyric.yml new file mode 100644 index 00000000..63cd3123 --- /dev/null +++ b/pbs/src/main/resources/application-lyric.yml @@ -0,0 +1,141 @@ +server: + port: 7105 + +spring: + application: + name: pbs + 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 + enabled: true +# namespace: 3 +# 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 + +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 + +hpc: + url: http://172.27.3.135/JSONAPI/JSONAPI.ashx # 这个利元亨没用 + # 这个是spdm mock执行cmd命令 +# remoteCmdUrl: http://127.0.0.1:9097/doProcess + # remote： hpc借助工具http远程调用，local:该服务和hpc部署在同一机器 + excuteWay: remote + remoteCmdUrl: http://10.122.38.200:9097/doProcess + remoteCreateDirUrl: http://10.122.38.200:9098/createDir + remoteScanDirUrl: http://10.122.38.200:9098/scanDir + remoteDownLoadFileUrl: http://10.122.38.200:9098/hpcDownload +# remoteDownLoadFileUrl: http://127.0.0.1:9097/hpcDownload + remoteUploadFileUrl: http://10.122.38.200:9098/uploadHpcFile + callHpcUpload: http://10.122.38.200:9098/addJobQueue + + +#logging: +# config: ./config/logback.xml +# pbs 作业提交相关配置 +pbs: + task: + hpc: hpc + qusb: qusb + impl: hpc + +security: + whitelist: + paths: + - /pbs/jobFileCallback + - /pbs/netTest + - /pbs/adapterSubmitHpcJob \ No newline at end of file diff --git a/project/src/main/resources/application-lyric.yml b/project/src/main/resources/application-lyric.yml new file mode 100644 index 00000000..ced0a9b7 --- /dev/null +++ b/project/src/main/resources/application-lyric.yml @@ -0,0 +1,126 @@ +server: + port: 7101 + +spring: + application: + name: project + 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 + enabled: true + group: LYRIC_GROUP +# 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 + +security: + whitelist: + paths: + - /run/deliverableApproveCallback + - /run/getSimulationKeyResultFileIds + - /run/generateReportInternal +#logging: +# config: ./config/logback.xml \ No newline at end of file diff --git a/system/src/main/resources/application-lyric.yml b/system/src/main/resources/application-lyric.yml new file mode 100644 index 00000000..b0b651e7 --- /dev/null +++ b/system/src/main/resources/application-lyric.yml @@ -0,0 +1,180 @@ +server: + port: 7103 + +spring: + application: + name: system + 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 + data: + redis: + # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0 + database: 0 + # redis服务器地址（填写自己的服务器地址） + host: 92.168.30.147 + # 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 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # cache-enabled: true + mapper-locations: classpath*:mapper/**/*.xml + global-config: + # 逻辑删除配置 + db-config: + # 删除前 + logic-not-delete-value: 1 + # 删除后 + logic-delete-value: 0 + +# MyBatis SQL日志配置 +logging: + level: + com.baomidou.mybatisplus.core.MybatisConfiguration: debug + com.baomidou.mybatisplus.core.override.MybatisMapperRegistry: trace + com.sdm.data.mapper: debug + java.sql: debug + java.sql.Connection: debug + java.sql.Statement: debug + java.sql.PreparedStatement: debug + + +lombok: + anyConstructor: + addConstructorProperties: true + +file: + rootPath: /data/home/sdm + + +system: + useCidSwitch: true + +userSystem: + cidUser: cid + localUser: local + +roleSystem: + cidRole: cid + localRole: local + +tenantSystem: + cidTenant: cid + localTenant: local + +cid: + url: http://192.168.30.145:8989/honeycom-spdm # 请根据实际CID服务地址修改 + #url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址 + user: + listUser: /spdm-user/listUser + queryUserDetail: /spdm-user/queryUserDetail + listUserByIds: /spdm-user/listUserByIds + queryUserRole: /spdm-user/queryUserRole + queryGroup: /spdm-user/queryGroup + queryGroupDetail: /spdm-user/queryGroupDetail + queryGroupMember: /spdm-user/queryGroupMember + role: + getRoleByRoleName: /spdm-role/getRoleByRoleName + getRoleByRoleCode: /spdm-role/getRoleByRoleCode + getRoleById: /spdm-role/getRoleById + listRoles: /spdm-role/listRoles + tenant: + getTenantDetailById: /spdm-tenant/getTenantDetailById + listTenant: /spdm-tenant/listTenant + flow: + launchApprove: /spdm-flow/startFlow + queryFlowTemplate: /spdm-flow/listProcessByGroup + queryApproveDetail: /spdm-flow/queryFlowNodeDetail + stopApproveFlow: /spdm-flow/stopFlow + group: SPDM + # 单次批量查询cid审批流详情的条数 + batchCount: 500 + # 批量查询的cid 接口，配合上面url使用 + batchInterfacePath: /spdm-flow/listFlowNodeDetail + msg: + sendMessage: /spdm-msg/sendMessage + log: + saveLog: /spdm-log/saveLog + +security: + whitelist: + paths: + - /systemApprove/approveStatusNotice + - /user/getUserToken + - /systemMsg/sendMessage \ No newline at end of file diff --git a/task/src/main/resources/application-lyric.yml b/task/src/main/resources/application-lyric.yml new file mode 100644 index 00000000..a8246d20 --- /dev/null +++ b/task/src/main/resources/application-lyric.yml @@ -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 \ No newline at end of file