From 73ef6809ba86e87049aa20d822deefaaada6ebd4 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 15 Apr 2026 16:00:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?add[project]:=20=E5=9B=A2=E9=98=9F=E6=88=90?= =?UTF-8?q?=E5=91=98=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SimulationNodeController.java | 26 ++++++++ .../model/req/SpdmAddNodeMemberReq.java | 17 +++++ .../model/req/SpdmDeleteNodeMemberReq.java | 16 +++++ .../com/sdm/project/service/INodeService.java | 14 ++++ .../project/service/impl/NodeServiceImpl.java | 64 +++++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 project/src/main/java/com/sdm/project/model/req/SpdmAddNodeMemberReq.java create mode 100644 project/src/main/java/com/sdm/project/model/req/SpdmDeleteNodeMemberReq.java diff --git a/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java b/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java index 700191e1..8dbd8e21 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java @@ -466,5 +466,31 @@ public class SimulationNodeController implements ISimulationNodeFeignClient { return nodeService.togglePinProject(req.getNodeId(), req.getPinned()); } + /** + * 新增团队成员 + * + * @param req + * @return + */ + @SysLog("新增团队成员") + @PostMapping("/addNodeMember") + @Operation(summary = "新增团队成员", description = "新增团队成员") + public SdmResponse addNodeMember(@RequestBody SpdmAddNodeMemberReq req) { + return nodeService.addNodeMember(req); + } + + /** + * 删除团队成员 + * + * @param req + * @return + */ + @SysLog("删除团队成员") + @PostMapping("/deleteNodeMember") + @Operation(summary = "删除团队成员", description = "删除团队成员") + public SdmResponse deleteNodeMember(@RequestBody SpdmDeleteNodeMemberReq req) { + return nodeService.deleteNodeMember(req); + } + } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmAddNodeMemberReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmAddNodeMemberReq.java new file mode 100644 index 00000000..5314515c --- /dev/null +++ b/project/src/main/java/com/sdm/project/model/req/SpdmAddNodeMemberReq.java @@ -0,0 +1,17 @@ +package com.sdm.project.model.req; + +import com.sdm.project.model.bo.TaskNodeTag; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.util.List; + +@Data +public class SpdmAddNodeMemberReq { + + String projectId; + + List addNodeMemberIdList; + +} diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmDeleteNodeMemberReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmDeleteNodeMemberReq.java new file mode 100644 index 00000000..dad65306 --- /dev/null +++ b/project/src/main/java/com/sdm/project/model/req/SpdmDeleteNodeMemberReq.java @@ -0,0 +1,16 @@ +package com.sdm.project.model.req; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.util.List; + +@Data +public class SpdmDeleteNodeMemberReq { + + String projectId; + + List deleteNodeMemberIdList; + +} diff --git a/project/src/main/java/com/sdm/project/service/INodeService.java b/project/src/main/java/com/sdm/project/service/INodeService.java index 4db9b797..e25ebc0a 100644 --- a/project/src/main/java/com/sdm/project/service/INodeService.java +++ b/project/src/main/java/com/sdm/project/service/INodeService.java @@ -117,4 +117,18 @@ public interface INodeService extends IService { SdmResponse exportProjectByScript(HttpServletResponse httpservletResponse, ProjectExportExcelFormat projectExportExcelFormat); + /** + * 新增团队成员 + * @param req + * @return + */ + SdmResponse addNodeMember(SpdmAddNodeMemberReq req); + + /** + * 删除团队成员 + * @param req + * @return + */ + SdmResponse deleteNodeMember(SpdmDeleteNodeMemberReq req); + } diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index 52f52c84..05a5a2d9 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -5223,4 +5223,68 @@ public class NodeServiceImpl extends ServiceImpl addNodeMemberIdList = req.getAddNodeMemberIdList(); + if (StringUtils.isBlank(projectId) || CollectionUtils.isEmpty(addNodeMemberIdList)) { + return SdmResponse.failed("参数不能为空"); + } + Long userId = ThreadLocalContext.getUserId(); + String currentDateTime = DateUtils.getCurrentDateTime(); + List nodeMemberList = new ArrayList<>(); + for (Long addNodeMemberId : addNodeMemberIdList) { + SimulationNodeMember simulationNodeMember = new SimulationNodeMember(); + simulationNodeMember.setNodeId(projectId); + simulationNodeMember.setUserId(addNodeMemberId); + simulationNodeMember.setCreator(userId); + simulationNodeMember.setCreateTime(currentDateTime); + simulationNodeMember.setType(NodeMemberTypeEnum.PARTICIPANT.getCode()); + nodeMemberList.add(simulationNodeMember); + } + simulationNodeMemberService.saveBatch(nodeMemberList); + // 批量设置权限 + List filePermissions = new ArrayList<>(); + BatchUpdatePermissionReq.FilePermissionItem memberItem = new BatchUpdatePermissionReq.FilePermissionItem(); + memberItem.setUuid(projectId); + Map memberPermissions = new HashMap<>(); + for (Long addNodeMemberId : addNodeMemberIdList) { + memberPermissions.put(addNodeMemberId, FilePermissionEnum. BASE.getValue()); + memberItem.setUserPermissions(memberPermissions); + filePermissions.add(memberItem); + } + // 批量更新权限 + BatchUpdatePermissionReq batchReq = new BatchUpdatePermissionReq(); + batchReq.setFilePermissions(filePermissions); + CompletableFuture.runAsync(() -> { + log.info("新增团队成员，批量更新权限，参数为：{}", batchReq); + SdmResponse response = dataFeignClient.batchUpdatePermission(batchReq); + log.info("新增团队成员，批量更新权限结果：{}", response); + if (!response.isSuccess()) { + log.error("新增团队成员，批量更新权限失败：{}", response.getMessage()); + } + }); + return SdmResponse.success(); + } + + @Override + public SdmResponse deleteNodeMember(SpdmDeleteNodeMemberReq req) { + String projectId = req.getProjectId(); + List deleteNodeMemberIdList = req.getDeleteNodeMemberIdList(); + if (StringUtils.isBlank(projectId) || CollectionUtils.isEmpty(deleteNodeMemberIdList)) { + return SdmResponse.failed("参数不能为空"); + } + simulationNodeMemberService.remove( + new LambdaQueryWrapper().eq(SimulationNodeMember::getNodeId, projectId) + .in(SimulationNodeMember::getUserId,deleteNodeMemberIdList) + .eq(SimulationNodeMember::getType,NodeMemberTypeEnum.PARTICIPANT.getCode())); + + for (Long deleteNodeMemberId : deleteNodeMemberIdList) { + deletePermission(deleteNodeMemberId, projectId); + } + return SdmResponse.success(); + } + } \ No newline at end of file From 542fb33e6dd93dfeffe38cd90add9c0d3f34802c Mon Sep 17 00:00:00 2001 From: yangyang Date: Wed, 15 Apr 2026 16:21:56 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Abug=201522=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2hpc=E8=B5=84=E6=BA=90=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BF=87=E4=B9=85504=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gateway2/src/main/resources/application-dev-100.yml | 11 ++++++++++- gateway2/src/main/resources/application-dev-190.yml | 9 +++++++++ gateway2/src/main/resources/application-dev-65.yml | 9 +++++++++ gateway2/src/main/resources/application-lyric.yml | 9 +++++++++ gateway2/src/main/resources/application-yian.yml | 9 +++++++++ 5 files changed, 46 insertions(+), 1 deletion(-) diff --git a/gateway2/src/main/resources/application-dev-100.yml b/gateway2/src/main/resources/application-dev-100.yml index 3182a008..1f53ab1b 100644 --- a/gateway2/src/main/resources/application-dev-100.yml +++ b/gateway2/src/main/resources/application-dev-100.yml @@ -50,6 +50,15 @@ spring: - StripPrefix=2 metadata: group: DEV_GROUP # 指定目标服务的分组 + - id: pbs-service-queryHpcResource + uri: lb://pbs + predicates: + - Path=/simulation/pbs/pbs/queryHpcResource + filters: + - StripPrefix=2 + metadata: + response-timeout: 50000 + connect-timeout: 10000 - id: pbs-service uri: lb://pbs predicates: @@ -125,7 +134,7 @@ logging: # 0单机处理，1负载均衡轮询 serverType: 0 serverIp: 192.168.190.100 -#serverIp: 192.168.65.73 +#serverIp: 192.168.65.76 security: whitelist: diff --git a/gateway2/src/main/resources/application-dev-190.yml b/gateway2/src/main/resources/application-dev-190.yml index cdab3430..6da5ca76 100644 --- a/gateway2/src/main/resources/application-dev-190.yml +++ b/gateway2/src/main/resources/application-dev-190.yml @@ -50,6 +50,15 @@ spring: - StripPrefix=2 metadata: group: DEV_GROUP # 指定目标服务的分组 + - id: pbs-service-queryHpcResource + uri: lb://pbs + predicates: + - Path=/simulation/pbs/pbs/queryHpcResource + filters: + - StripPrefix=2 + metadata: + response-timeout: 50000 + connect-timeout: 10000 - id: pbs-service uri: lb://pbs predicates: diff --git a/gateway2/src/main/resources/application-dev-65.yml b/gateway2/src/main/resources/application-dev-65.yml index eed73b0b..7a96a5ef 100644 --- a/gateway2/src/main/resources/application-dev-65.yml +++ b/gateway2/src/main/resources/application-dev-65.yml @@ -50,6 +50,15 @@ spring: - StripPrefix=2 metadata: group: DEV_GROUP # 指定目标服务的分组 + - id: pbs-service-queryHpcResource + uri: lb://pbs + predicates: + - Path=/simulation/pbs/pbs/queryHpcResource + filters: + - StripPrefix=2 + metadata: + response-timeout: 50000 + connect-timeout: 10000 - id: pbs-service uri: lb://pbs predicates: diff --git a/gateway2/src/main/resources/application-lyric.yml b/gateway2/src/main/resources/application-lyric.yml index 764a2a72..6ea75f2b 100644 --- a/gateway2/src/main/resources/application-lyric.yml +++ b/gateway2/src/main/resources/application-lyric.yml @@ -50,6 +50,15 @@ spring: - StripPrefix=2 metadata: group: LYRIC_GROUP # 指定目标服务的分组 + - id: pbs-service-queryHpcResource + uri: lb://pbs + predicates: + - Path=/simulation/pbs/pbs/queryHpcResource + filters: + - StripPrefix=2 + metadata: + response-timeout: 50000 + connect-timeout: 10000 - id: pbs-service uri: lb://pbs predicates: diff --git a/gateway2/src/main/resources/application-yian.yml b/gateway2/src/main/resources/application-yian.yml index 58d0bb3e..828814c3 100644 --- a/gateway2/src/main/resources/application-yian.yml +++ b/gateway2/src/main/resources/application-yian.yml @@ -50,6 +50,15 @@ spring: - StripPrefix=2 metadata: group: DEV_GROUP # 指定目标服务的分组 + - id: pbs-service-queryHpcResource + uri: lb://pbs + predicates: + - Path=/simulation/pbs/pbs/queryHpcResource + filters: + - StripPrefix=2 + metadata: + response-timeout: 50000 + connect-timeout: 10000 - id: pbs-service uri: lb://pbs predicates: From 11dcfb49939f596e86054344ed1ab0fd6a42e806 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Wed, 15 Apr 2026 16:36:11 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=E6=95=B0=E5=AD=97=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6&?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=AE=97=E4=BE=8B=E6=8C=87=E6=A0=87bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/model/req/SpdmAddTaskRunReq.java | 3 ++ .../impl/SimulationRunServiceImpl.java | 31 ++++++++++++++----- .../project/service/impl/TaskServiceImpl.java | 2 +- .../SimulationSystemConfigController.java | 6 ++-- .../ISimulationSystemConfigService.java | 2 +- .../service/impl/ISysLogServiceImpl.java | 4 +++ .../SimulationSystemConfigServiceImpl.java | 10 +++++- 7 files changed, 45 insertions(+), 13 deletions(-) diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmAddTaskRunReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmAddTaskRunReq.java index 928fd101..081b4ad4 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmAddTaskRunReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmAddTaskRunReq.java @@ -12,6 +12,9 @@ public class SpdmAddTaskRunReq { @Schema(description = "算例名称") private String runName; + @Schema(description = "复制的算例ID") + private String copyRunId; + @Schema(description = "备注") private String description; 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 40445090..6beb7ae9 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 @@ -874,11 +874,24 @@ public class SimulationRunServiceImpl extends ServiceImpl simulationTaskPerformances = simulationPerformanceService.lambdaQuery() - .eq(SimulationPerformance::getTaskId, simulationTask.getUuid()) - .isNull(SimulationPerformance::getRunId) - .list(); + List simulationTaskPerformances = new ArrayList<>(); + // 若传了runId，为复制的算例，则复制算例下的指标； + if (StringUtils.isNotBlank(req.getCopyRunId())) { + simulationTaskPerformances = simulationPerformanceService.lambdaQuery() + .eq(SimulationPerformance::getRunId, req.getCopyRunId()) + .list(); + } else if (StringUtils.isNotBlank(req.getParentId())) { + // 若传了parentId，为子算例，也复制算例下的指标 + simulationTaskPerformances = simulationPerformanceService.lambdaQuery() + .eq(SimulationPerformance::getRunId, req.getParentId()) + .list(); + } else { + // taskId不为null，runId为null，查询所有工况设定的标准指标 + simulationTaskPerformances = simulationPerformanceService.lambdaQuery() + .eq(SimulationPerformance::getTaskId, simulationTask.getUuid()) + .isNull(SimulationPerformance::getRunId) + .list(); + } if (CollectionUtils.isNotEmpty(simulationTaskPerformances)) { List runPerformanceList = new ArrayList<>(); for (SimulationPerformance performanceBean : simulationTaskPerformances) { @@ -1498,6 +1511,7 @@ public class SimulationRunServiceImpl extends ServiceImpl command = new ArrayList<>(); diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index 64b9e2b1..c27baf82 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -5252,7 +5252,7 @@ public class TaskServiceImpl implements ITaskService { DirNodeInfo taskDirNodeInfo = new DirNodeInfo(); taskDirNodeInfo.setUuId(taskId); taskDirNodeInfo.setUuIdOwnType(NodeTypeEnum.TASK.getValue()); - taskDirNodeInfo.setDirName(taskName); + taskDirNodeInfo.setDirName(StringUtils.isNotBlank(taskName) ? taskName : spdmTaskVo.getTaskName()); TagReq taskTagReq = new TagReq(); BeanUtils.copyProperties(spdmTaskVo,taskTagReq); taskDirNodeInfo.setTagReq(taskTagReq); diff --git a/system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java b/system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java index 748f01f0..1c90507f 100644 --- a/system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java +++ b/system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java @@ -125,10 +125,12 @@ public class SimulationSystemConfigController implements ISysConfigFeignClient { SdmResponse getDictionaryDefineClass(@RequestParam(required = false) String titleName, @RequestParam(required = false) String className, @RequestParam(required = false) String dictName, - @RequestParam(required = false) String dictValue + @RequestParam(required = false) String dictValue, + @RequestParam(required = false) String classType, + @RequestParam(required = false) String comment ,int current,int size) { - return service.queryDictionaryDefineClass(titleName,className,dictName,dictValue,current,size); + return service.queryDictionaryDefineClass(titleName,className,dictName,dictValue,classType,comment,current,size); } @GetMapping(value = "/getDictionaryClassDetail") diff --git a/system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java b/system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java index eb5051d2..97537e1b 100644 --- a/system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java +++ b/system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java @@ -33,7 +33,7 @@ public interface ISimulationSystemConfigService { SdmResponse deleteDictionaryDefineClass(String uuid); - SdmResponse queryDictionaryDefineClass(String titleName, String className, String dictName, String dictValue, int current, int size); + SdmResponse queryDictionaryDefineClass(String titleName, String className, String dictName, String dictValue, String classType, String comment, int current, int size); SdmResponse queryDictinaryClassDetail(String uuid); diff --git a/system/src/main/java/com/sdm/system/service/impl/ISysLogServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/ISysLogServiceImpl.java index df5a2f7a..3ecb4f1e 100644 --- a/system/src/main/java/com/sdm/system/service/impl/ISysLogServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/ISysLogServiceImpl.java @@ -3,6 +3,7 @@ package com.sdm.system.service.impl; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -163,12 +164,15 @@ public class ISysLogServiceImpl extends ServiceImpl implem // 2. 获取所有在目标日期之前登录的用户及其最后登录时间 List UserLastLoginDtos = baseMapper.findLastLoginBeforeDate(targetDayEnd, tenantId); + log.info("[getHourlyOnlineUsers] UserLastLoginDtos:{}", JSON.toJSONString(UserLastLoginDtos)); // 3. 获取这些用户在目标日期及之后的退出时间 Map userLogoutTimes = getUserNextLogoutTimes( UserLastLoginDtos, tenantId ); + log.info("[getHourlyOnlineUsers] userLogoutTimes:{}", JSON.toJSONString(userLogoutTimes)); + // 4. 构建用户会话 List activeSessions = buildActiveSessions(UserLastLoginDtos, userLogoutTimes, targetDayStart, targetDayEnd); diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java index b809783d..562c06e6 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java @@ -229,7 +229,7 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS * 查询所有定义的字典分类 * @return */ - public SdmResponse queryDictionaryDefineClass(String titleName,String className,String dictName,String dictValue,int pageNo,int size) + public SdmResponse queryDictionaryDefineClass(String titleName,String className,String dictName,String dictValue,String classType, String comment,int pageNo,int size) { long tenantId = ThreadLocalContext.getTenantId(); SdmResponse response = SdmResponse.success(); @@ -242,6 +242,14 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS { condition += " AND className LIKE '%"+className+"%'"; } + if(bStringNotBlank(classType)) + { + condition += " AND classType LIKE '%"+classType+"%'"; + } + if(bStringNotBlank(comment)) + { + condition += " AND comment LIKE '%"+comment+"%'"; + } if(bStringNotBlank(dictName) || bStringNotBlank(dictValue)) { List allDictionaryData = mapper.getAllDictionaryData(tenantId); From f67487e3ae825210a765418dbe1187600a297093 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 15 Apr 2026 17:25:17 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix[project]:=20=E9=A1=B9=E7=9B=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/SimulationNodeMapper.xml | 48 ++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/project/src/main/resources/mapper/SimulationNodeMapper.xml b/project/src/main/resources/mapper/SimulationNodeMapper.xml index 2c7ea75f..5dda1e09 100644 --- a/project/src/main/resources/mapper/SimulationNodeMapper.xml +++ b/project/src/main/resources/mapper/SimulationNodeMapper.xml @@ -976,12 +976,34 @@ and sn.nodeName like #{searchKey3} - or sn.uuid in + or (sn.uuid in ( #{projectId} ) + + and sn.nodeType = #{nodeType} + + + and sn.nodeSubType = #{nodeSubType} + + + and sn.exe_status = #{exeStatus} + + + + and sn.nodeCode like #{searchKey4} + + + + and snm.name like #{searchKey5} + + + + and sn.nodeName like #{searchKey6} + + ) order by IFNULL(pin.pinnedType, 0) desc, pin.pinnedTime desc, sn.create_time desc limit #{pos},#{limit} @@ -1026,12 +1048,34 @@ and sn.nodeName like #{searchKey3} - or sn.uuid in + or (sn.uuid in ( #{projectId} ) + + and sn.nodeType = #{nodeType} + + + and sn.nodeSubType = #{nodeSubType} + + + and sn.exe_status = #{exeStatus} + + + + and sn.nodeCode like #{searchKey4} + + + + and snm.name like #{searchKey5} + + + + and sn.nodeName like #{searchKey6} + + ) From c7e4ec95579a47c26667eb79a586420012e605f6 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 15 Apr 2026 17:57:16 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix[project]:=20=E4=BF=AE=E6=94=B9=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5MES=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=BA=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LyricInternalServiceImpl.java | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index 6829f1e4..fe29623a 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -245,6 +245,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { // 用于判断查询事业部用户信息的一些常量 private static final String DESIGN_PHASE = "设计"; + private static final String UN_DESIGN_PHASE = "非设计"; private static final String STRUCTURE = "结构仿真"; private static final String TECHNOLOGY_CENTER = "技术中心"; @@ -4720,25 +4721,17 @@ public class LyricInternalServiceImpl implements ILyricInternalService { * @param projectUndertaker * @return */ - private SysDeptUserResp queryMemberByGroup(String projectUndertaker, String currenPhase) { - String deptName; - if (DESIGN_PHASE.equals(currenPhase)) { - deptName = projectUndertaker + "-" + STRUCTURE; - } else { - deptName = projectUndertaker + "-" + STRUCTURE + "-" + TECHNOLOGY_CENTER; - } - // 待调用system的查询部门用户feign接口 + private SysDeptUserResp queryMemberByGroup(String projectUndertaker, String currentPhase) { DeptQueryReq req = new DeptQueryReq(); - req.setDeptName(deptName); - req.setCurrent(1); - req.setSize(1); - log.info("listDept params：{}", req); - SdmResponse>> pageDataRespSdmResponse = sysDeptFeignClient.listDept(req); - SysDeptUserResp sysDeptUserResp = null; - if (pageDataRespSdmResponse.isSuccess()) { - sysDeptUserResp = pageDataRespSdmResponse.getData().getData().get(0); + req.setDeptName(projectUndertaker); + req.setDiscipline(STRUCTURE); + SdmResponse> resp = sysDeptFeignClient.queryByDeptAndDiscipline(req); + List userRespList = resp.getData(); + if (!resp.isSuccess() || CollectionUtils.isEmpty(userRespList)) { + return null; } - return sysDeptUserResp; + String stage = DESIGN_PHASE.equals(currentPhase) ? DESIGN_PHASE : UN_DESIGN_PHASE; + return userRespList.stream().filter(userResp -> stage.equals(userResp.getStage())).findFirst().orElse(null); } private List syncProjectInfo(LyricVProjectToDM lyricVProjectToDM, Long tenantId, Long userId, String jobNumber, String userName) { From 8a24c727fe7702343fe4b8e22adb3ea14312e328 Mon Sep 17 00:00:00 2001 From: yangyang Date: Wed, 15 Apr 2026 18:12:05 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E8=A1=A8=E6=A0=BC=EF=BC=8C=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9F=90=E4=B8=AA=E8=A1=A8=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E5=85=A8=E9=87=8F=E8=A6=86=E7=9B=96=E7=94=A8=E6=88=B7=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- capability/src/main/resources/logback.xml | 9 +- data/src/main/resources/logback.xml | 15 +- flowable/src/main/resources/logback.xml | 10 +- gateway2/src/main/resources/logback.xml | 10 +- job/src/main/resources/logback.xml | 9 +- pbs/src/main/resources/logback.xml | 131 +++++++++--------- project/src/main/resources/logback.xml | 15 +- .../SimulationSystemConfigServiceImpl.java | 25 +++- system/src/main/resources/logback.xml | 10 +- task/src/main/resources/logback.xml | 9 +- 10 files changed, 142 insertions(+), 101 deletions(-) diff --git a/capability/src/main/resources/logback.xml b/capability/src/main/resources/logback.xml index e6a80844..d760db13 100644 --- a/capability/src/main/resources/logback.xml +++ b/capability/src/main/resources/logback.xml @@ -29,9 +29,9 @@ 100MB - 15 + 15 - 3GB + 3GB true @@ -46,9 +46,10 @@ ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 + 15 - 2GB + 2GB + true [%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} diff --git a/data/src/main/resources/logback.xml b/data/src/main/resources/logback.xml index 8c5d2338..6a9f0dd7 100644 --- a/data/src/main/resources/logback.xml +++ b/data/src/main/resources/logback.xml @@ -26,8 +26,9 @@ ${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 3GB + 15 + 3GB + true ${FILE_LOG_PATTERN} @@ -43,8 +44,9 @@ ${LOG_HOME}/running_debug.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 2GB + 15 + 2GB + true ${FILE_LOG_PATTERN} @@ -62,8 +64,9 @@ ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 1GB + 15 + 1GB + true [%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} diff --git a/flowable/src/main/resources/logback.xml b/flowable/src/main/resources/logback.xml index 4ebe463e..3cb7e8a8 100644 --- a/flowable/src/main/resources/logback.xml +++ b/flowable/src/main/resources/logback.xml @@ -26,8 +26,9 @@ ${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 3GB + 15 + 3GB + true ${FILE_LOG_PATTERN} @@ -43,8 +44,9 @@ ${LOG_HOME}/running_debug.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 2GB + 15 + 2GB + true ${FILE_LOG_PATTERN} diff --git a/gateway2/src/main/resources/logback.xml b/gateway2/src/main/resources/logback.xml index d7ea9b70..1073b255 100644 --- a/gateway2/src/main/resources/logback.xml +++ b/gateway2/src/main/resources/logback.xml @@ -31,9 +31,10 @@ 100MB - 15 + 15 - 3GB + 3GB + true @@ -49,8 +50,9 @@ ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 2GB + 15 + 2GB + true diff --git a/job/src/main/resources/logback.xml b/job/src/main/resources/logback.xml index e85a5bf2..7dbfc0bd 100644 --- a/job/src/main/resources/logback.xml +++ b/job/src/main/resources/logback.xml @@ -25,8 +25,8 @@ ${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 3GB + 15 + 3GB true @@ -40,8 +40,9 @@ ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 2GB + 15 + 2GB + true [%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} diff --git a/pbs/src/main/resources/logback.xml b/pbs/src/main/resources/logback.xml index 1f122f41..66b81e79 100644 --- a/pbs/src/main/resources/logback.xml +++ b/pbs/src/main/resources/logback.xml @@ -1,107 +1,114 @@ - - + + + + + - - - - - + + + - + + + + + + + + - + ${CONSOLE_LOG_PATTERN} + UTF-8 - - + + + + 2048 + 200 + true + + + + + ${LOG_HOME}/running.log - ${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz + + ${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 3GB + 15 + 3GB true - + ${FILE_LOG_PATTERN} + UTF-8 - + + ${LOG_HOME}/core.log - - ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz - 100MB - 15 - 2GB - - - [%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} - + + INFO + + + ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz + 100MB + 15 + 2GB + true + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5p [%15.15t] %X{callerInfo} : [%X{traceId:-}] %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}} + UTF-8 + - + - + + - + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - \ No newline at end of file diff --git a/project/src/main/resources/logback.xml b/project/src/main/resources/logback.xml index 70474a5a..cfc36fa3 100644 --- a/project/src/main/resources/logback.xml +++ b/project/src/main/resources/logback.xml @@ -26,8 +26,9 @@ ${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 3GB + 15 + 3GB + true ${FILE_LOG_PATTERN} @@ -43,8 +44,9 @@ ${LOG_HOME}/running_debug.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 2GB + 15 + 2GB + true ${FILE_LOG_PATTERN} @@ -62,8 +64,9 @@ ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 1GB + 15 + 1GB + true [%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java index 562c06e6..b9d20cae 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java @@ -445,8 +445,8 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS updateWrapper.set(SysFormConfigure::getComment, configure.getComment()); } formConfigureService.update(updateWrapper); - // 调用抽取后的管理员批量更新用户配置方法 - batchUpdateUserConfigure(configure); + // 调用抽取后的管理员覆盖用户的配置 + batchUpdateUserConfigureNew(configure); } else { response = SdmResponse.failed("该表单配置不存在"); } @@ -761,8 +761,27 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS return SdmResponse.success(); } + // 管理员操作某个表，直接删除用户的自定义配置的数据，这样相当于管理员覆盖了用户的自定义配置 + private void batchUpdateUserConfigureNew(FormConfigure configure) { + // 查询当前租户下关联该主配置的所有用户自定义配置 + List dbUserConfigs = formUserConfigureService.lambdaQuery() + .eq(SysFormUserConfigure::getFormConfigureId, configure.getId()) + .eq(SysFormUserConfigure::getTenantId, ThreadLocalContext.getTenantId()) + .list(); + + if (CollectionUtils.isNotEmpty(dbUserConfigs)) { + // 提取所有 id → 得到 List + List idList = dbUserConfigs.stream() + .map(SysFormUserConfigure::getId) // 取每个对象的 id + .collect(Collectors.toList()); + boolean b = formUserConfigureService.removeBatchByIds(idList); + log.info("batchUpdateUserConfigureNew user config delete table name {},result:{}", configure.getFormName(),b); + } + } + /** - * 管理员批量更新关联的用户自定义表单配置 + * 管理员批量更新关联的用户自定义表单配置 V1 版本，管理员修改后，管理员有权限覆盖规定的3个字段之外的字段，用户自定义的三个字段还保留，字段删除，名称修改除外 + * 2026-04-15 该方法暂时废弃 * @param configure 表单配置参数 */ private void batchUpdateUserConfigure(FormConfigure configure) { diff --git a/system/src/main/resources/logback.xml b/system/src/main/resources/logback.xml index 6a84329b..b9d30c7b 100644 --- a/system/src/main/resources/logback.xml +++ b/system/src/main/resources/logback.xml @@ -26,8 +26,9 @@ ${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 3GB + 15 + 3GB + true ${FILE_LOG_PATTERN} @@ -40,8 +41,9 @@ ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 2GB + 15 + 2GB + true [%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} diff --git a/task/src/main/resources/logback.xml b/task/src/main/resources/logback.xml index c472d775..a1a1c808 100644 --- a/task/src/main/resources/logback.xml +++ b/task/src/main/resources/logback.xml @@ -26,8 +26,9 @@ ${LOG_HOME}/running.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 3GB + 15 + 3GB + true ${FILE_LOG_PATTERN} @@ -40,8 +41,8 @@ ${LOG_HOME}/core.log.%d{yyyy-MM-dd}.%i.log.gz 100MB - 15 - 2GB + 15 + 2GB [%X{traceId}] %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%15.15t] %X{callerInfo} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} From 9068e081a2ff1b2e882bc4b91722c7303ebea566 Mon Sep 17 00:00:00 2001 From: yangyang Date: Wed, 15 Apr 2026 18:15:41 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=AE=9C?= =?UTF-8?q?=E5=AE=89=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/src/main/resources/application-yian.yml | 10 +++++----- gateway2/src/main/resources/application-yian.yml | 6 +++--- project/src/main/resources/application-yian.yml | 8 ++++---- system/src/main/resources/application-yian.yml | 10 +++++----- task/src/main/resources/application-yian.yml | 12 ++++++------ 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/data/src/main/resources/application-yian.yml b/data/src/main/resources/application-yian.yml index f8ee554d..221aa37b 100644 --- a/data/src/main/resources/application-yian.yml +++ b/data/src/main/resources/application-yian.yml @@ -7,7 +7,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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。 @@ -23,18 +23,18 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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.0.88:8848 + server-addr: 192.168.0.89:8848 group: DEV_GROUP # server-addr: 127.0.0.1:8848 enabled: true @@ -108,7 +108,7 @@ fileSystem: # spdmadmin/spdmadmin 作为普通用户只能看到spdm桶的数据 minio: - endpoint: 192.168.0.88 + endpoint: 192.168.0.89 port: 9000 access-key: minioadmin secret-key: minioadmin diff --git a/gateway2/src/main/resources/application-yian.yml b/gateway2/src/main/resources/application-yian.yml index 828814c3..234beac0 100644 --- a/gateway2/src/main/resources/application-yian.yml +++ b/gateway2/src/main/resources/application-yian.yml @@ -7,13 +7,13 @@ spring: cloud: nacos: config: - server-addr: 192.168.0.88:8848 + server-addr: 192.168.0.89:8848 file-extension: yaml import-check: enabled: false enabled: false discovery: - server-addr: 192.168.0.88:8848 + server-addr: 192.168.0.89:8848 group: DEV_GROUP enabled: true gateway: @@ -133,7 +133,7 @@ logging: # 0单机处理，1负载均衡轮询 serverType: 0 -serverIp: 192.168.0.88 +serverIp: 192.168.0.89 #serverIp: 192.168.65.73 security: diff --git a/project/src/main/resources/application-yian.yml b/project/src/main/resources/application-yian.yml index a102b66d..5b6797d0 100644 --- a/project/src/main/resources/application-yian.yml +++ b/project/src/main/resources/application-yian.yml @@ -7,7 +7,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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。 @@ -23,18 +23,18 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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.0.88:8848 + server-addr: 192.168.0.89:8848 enabled: true group: DEV_GROUP # username: nacos diff --git a/system/src/main/resources/application-yian.yml b/system/src/main/resources/application-yian.yml index fe18b1c2..743502c5 100644 --- a/system/src/main/resources/application-yian.yml +++ b/system/src/main/resources/application-yian.yml @@ -7,7 +7,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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。 @@ -23,18 +23,18 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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.0.88:8848 + server-addr: 192.168.0.89:8848 group: DEV_GROUP # server-addr: localhost:8848 enabled: true @@ -140,7 +140,7 @@ tenantSystem: cid: - url: http://192.168.0.88:7101 # 请根据实际CID服务地址修改 + url: http://192.168.0.89:7101 # 请根据实际CID服务地址修改 ## url: http://192.168.65.75:8989/honeycom-spdm # 朱欣茹地址 user: listUser: /spdm-user/listUser diff --git a/task/src/main/resources/application-yian.yml b/task/src/main/resources/application-yian.yml index af2ec426..191afccb 100644 --- a/task/src/main/resources/application-yian.yml +++ b/task/src/main/resources/application-yian.yml @@ -8,7 +8,7 @@ spring: datasource: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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。 @@ -24,18 +24,18 @@ spring: master: username: root password: mysql - jdbc-url: jdbc:mysql://192.168.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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.0.88:3306/spdm_baseline?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://192.168.0.89: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.0.88:8848 + server-addr: 192.168.0.89:8848 group: DEV_GROUP # server-addr: 127.0.0.1:8848 enabled: true @@ -46,7 +46,7 @@ spring: # Redis默认情况下有16个分片(库)，这里配置具体使用的分片，默认是0 database: 0 # redis服务器地址（填写自己的服务器地址） - host: 192.168.0.88 + host: 192.168.0.89 # redis端口（默认6379） port: 6379 #redis连接超时等待,10秒 @@ -119,7 +119,7 @@ file: rootPath: /data/home/sdm scriptPath : /opt/script approve: - replyUrl: http:192.168.0.88:7102/simulation/task/taskpool/approveHandleNotice + replyUrl: http:192.168.0.89:7102/simulation/task/taskpool/approveHandleNotice #logging: # config: ./config/logback.xml From 5bc397bc0e5aa3310c46897662fd18e2dd11e6c0 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Thu, 16 Apr 2026 09:52:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix[project]:=20=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E7=AE=97=E4=BE=8B=E3=80=81=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=90=8D=E7=A7=B0=E7=9A=84=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LyricInternalServiceImpl.java | 8 ++-- .../project/service/impl/TaskServiceImpl.java | 41 +++++++++++++++---- .../mapper/SimulationProjectMapper.xml | 4 +- 3 files changed, 38 insertions(+), 15 deletions(-) diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index fe29623a..4bf7f007 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -30,10 +30,7 @@ import com.sdm.common.feign.impl.system.SysDeptFeignClientImpl; import com.sdm.common.feign.impl.system.SysUserFeignClientImpl; import com.sdm.common.log.CoreLogger; import com.sdm.common.service.UserNameCacheService; -import com.sdm.common.utils.FilesUtil; -import com.sdm.common.utils.MdcUtil; -import com.sdm.common.utils.PageUtils; -import com.sdm.common.utils.RandomUtil; +import com.sdm.common.utils.*; import com.sdm.outbridge.entity.*; import com.sdm.outbridge.mode.GetProcessDataReq; import com.sdm.outbridge.mode.HkUploadFileReq; @@ -657,6 +654,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { log.error("待办的创建时间为空，待办id为：{}", todo.getTodoId()); } req.setCreateTime(createTime.replace("T", " ")); + req.setUpdateTime(DateUtils.getCurrentDateTime()); req.setDemandSource(SYNC_PROJECT_SOURCE); // if (isConvertibleToInt(todo.getIntroduceBy())) { // req.setCreator(Long.valueOf(todo.getIntroduceBy())); @@ -3123,6 +3121,8 @@ public class LyricInternalServiceImpl implements ILyricInternalService { spdmProjectNodeEditReq.setPid(""); spdmProjectNodeEditReq.setCreateTime(curDateStr); spdmProjectNodeEditReq.setCreator(jobNumber); + spdmProjectNodeEditReq.setUpdateTime(DateUtils.getCurrentDateTime()); + spdmProjectNodeEditReq.setUpdater(jobNumber); spdmProjectNodeEditReq.setTenantId(tenantId); spdmProjectNodeEditReq.setProjectSource(SYNC_PROJECT_SOURCE); spdmProjectNodeEditReq.setProjectId(Math.toIntExact(lyricVProjectToDM.getId())); diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index c27baf82..ee65421d 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -47,10 +47,7 @@ import com.sdm.project.bo.ExportOperate; import com.sdm.project.common.MemberTypeEnum; import com.sdm.project.common.TaskExeStatusEnum; import com.sdm.project.common.TaskQryTypeEnum; -import com.sdm.project.dao.SimulationDemandMapper; -import com.sdm.project.dao.SimulationNodeMapper; -import com.sdm.project.dao.SimulationProjectMapper; -import com.sdm.project.dao.SimulationTaskMapper; +import com.sdm.project.dao.*; import com.sdm.project.model.bo.*; import com.sdm.project.model.entity.*; import com.sdm.project.model.po.PerformanceNodePo; @@ -2009,6 +2006,7 @@ public class TaskServiceImpl implements ITaskService { @Override public SdmResponse analysisPerformanceList(SpdmAnalysisPerformanceListReq req) { + Long tenantId = ThreadLocalContext.getTenantId(); SpdmAnalysisTaskListReq taskReq = new SpdmAnalysisTaskListReq(); BeanUtils.copyProperties(req, taskReq); taskReq.setCurrent(1); @@ -2023,6 +2021,11 @@ public class TaskServiceImpl implements ITaskService { if (performanceTagReq != null) { performanceTagReq.setTaskId(req.getTaskNodeId()); } + TagReq tagReq = req.getTagReq(); + String runName = ""; + if (tagReq != null && StringUtils.isNotBlank(tagReq.getRunName())) { + runName = tagReq.getRunName(); + } SdmResponse response = analysisTaskList(taskReq); if (ObjectUtils.isEmpty(response)) { log.info("指标查询中，未查询到任务1"); @@ -2055,6 +2058,19 @@ public class TaskServiceImpl implements ITaskService { log.info("指标查询中，未查询到指标3"); return SdmResponse.success(new ArrayList<>()); } + }else if (StringUtils.isNotBlank(runName)) { + List runList = simulationRunService.lambdaQuery().like(SimulationRun::getRunName, runName).eq(SimulationRun::getTenantId, tenantId) + .list(); + if (CollectionUtils.isEmpty(runList)) { + log.info("runList is empty"); + return SdmResponse.success(new ArrayList<>()); + } + List runIdList = runList.stream().map(SimulationRun::getUuid).toList(); + performanceNodePoList = performanceNodePoList.stream().filter(performanceNodePo -> runIdList.contains(performanceNodePo.getRunId())).toList(); + if (CollectionUtils.isEmpty(performanceNodePoList)) { + log.info("指标查询中，未查询到指标3"); + return SdmResponse.success(new ArrayList<>()); + } } else { // 不传runId 为导出任务下的指标 筛除掉算例下的指标 if (req.getIsExportFlag()) { @@ -2181,10 +2197,10 @@ public class TaskServiceImpl implements ITaskService { continue; } performanceNodePo.setRunName(simulationRun.getRunName()); - TagReq tagReq = performanceNodePo.getTagReq(); - if (tagReq != null) { - tagReq.setRunId(simulationRun.getUuid()); - tagReq.setRunName(simulationRun.getRunName()); + TagReq returnTagReq = performanceNodePo.getTagReq(); + if (returnTagReq != null) { + returnTagReq.setRunId(simulationRun.getUuid()); + returnTagReq.setRunName(simulationRun.getRunName()); } } jsonObject.put("data", performanceList); @@ -2261,6 +2277,10 @@ public class TaskServiceImpl implements ITaskService { req.setToDoMarkerList(Arrays.stream(req.getToDoMarker().split(",")).toList()); } + // 20260416 数据查询中的任务、算例名称需要支持模糊搜索 + String taskName = tagReq.getTaskName(); + req.setTaskName(taskName); + String taskNodeId = tagReq.getTaskId(); List taskVoList; @@ -2649,6 +2669,10 @@ public class TaskServiceImpl implements ITaskService { log.info("指标查询中，未查询到任务2"); return SdmResponse.success(new ArrayList<>()); } + TagReq tagReq = req.getTagReq(); + if (tagReq != null && StringUtils.isNotBlank(tagReq.getRunName())) { + req.setRunName(tagReq.getRunName()); + } List taskIdList = taskVoList.stream().map(SpdmAnalysisTaskVo::getUuid).toList(); List runPoList = projectMapper.queryRunListByNodeIdList(taskIdList, req); if (CollectionUtils.isEmpty(runPoList)) { @@ -2660,7 +2684,6 @@ public class TaskServiceImpl implements ITaskService { List filterRunList = new ArrayList<>(); // 根据runId过滤 - TagReq tagReq = req.getTagReq(); if (tagReq != null && StringUtils.isNotBlank(tagReq.getRunId())) { runPoList = runPoList.stream().filter(run -> tagReq.getRunId().equals(run.getUuid())).collect(Collectors.toList()); } diff --git a/project/src/main/resources/mapper/SimulationProjectMapper.xml b/project/src/main/resources/mapper/SimulationProjectMapper.xml index 0a37bec2..12801856 100644 --- a/project/src/main/resources/mapper/SimulationProjectMapper.xml +++ b/project/src/main/resources/mapper/SimulationProjectMapper.xml @@ -690,8 +690,8 @@ and STR_TO_DATE(createTime,'%Y-%m-%d %H:%i:%s') <= #{req.endTime} ]]> - - + + and runName like #{searchKey1}