Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ledger): 实现用户设备权限过滤功能并优化台账数据处理

Browse Source 
- 集成CsCommTerminalFeignClient用于获取用户关联的设备线路
- 新增filterLedgerTree方法实现台账树的递归过滤功能
- 添加isNodeRelevant方法判断节点是否包含目标监测点
- 重构CsLedgerServiceImpl中的线路数据处理逻辑
- 在CsLedgerVO中新增lineNo字段用于监测点线路号显示
- 修复CsLinePOServiceImpl中线路号为空时的默认值处理
- 注释掉过期的线路最新数据查询接口调用
- 优化IcdServiceImpl中的线路排序逻辑并修正默认值处理
This commit is contained in:
xy
2026-06-26 19:12:30 +08:00
parent d43e0dd661
commit bdfdc9e75c
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java
View File

@@ -16,10 +16,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
@@ -48,10 +45,10 @@ public class CsUpgradeLogsController extends BaseController {
} }
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
@PostMapping("/getByDevId") @GetMapping("/getByDevId")
@ApiOperation("查询指定devId的所有升级日志") @ApiOperation("查询指定devId的所有升级日志")
@ApiImplicitParam(name = "devId", value = "装置Id", required = true) @ApiImplicitParam(name = "devId", value = "装置Id", required = true)
public HttpResult<List<CsUpgradeLogs>> getByDevId(@RequestBody String devId) { public HttpResult<List<CsUpgradeLogs>> getByDevId(@RequestParam("devId") String devId) {
String methodDescribe = getMethodDescribe("getByDevId"); String methodDescribe = getMethodDescribe("getByDevId");
List<CsUpgradeLogs> result = csUpgradeLogsService.lambdaQuery().eq(CsUpgradeLogs::getDevId, devId).list(); List<CsUpgradeLogs> result = csUpgradeLogsService.lambdaQuery().eq(CsUpgradeLogs::getDevId, devId).list();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);

12
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
View File

@@ -398,11 +398,11 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
sensitiveUserNameMap = pqSensitiveUserList.stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName)); sensitiveUserNameMap = pqSensitiveUserList.stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName));
} }
// 最新数据时间 // 最新数据时间
// List<CsLineLatestData> lineLatestDataList = csLineLatestDataFeignClient.listData().getData(); List<CsLineLatestData> lineLatestDataList = csLineLatestDataFeignClient.listData().getData();
// Map<String,CsLineLatestData> lineLatestDataMap = new HashMap<>(); Map<String,CsLineLatestData> lineLatestDataMap = new HashMap<>();
// if (CollUtil.isNotEmpty(lineLatestDataList)) { if (CollUtil.isNotEmpty(lineLatestDataList)) {
// lineLatestDataMap = lineLatestDataList.stream().collect(Collectors.toMap(CsLineLatestData::getLineId, item -> item)); lineLatestDataMap = lineLatestDataList.stream().collect(Collectors.toMap(CsLineLatestData::getLineId, item -> item));
// } }
PqSensitiveUserLineVO sensitiveUserLineVO; PqSensitiveUserLineVO sensitiveUserLineVO;
@@ -447,7 +447,7 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
// 报告文件 // 报告文件
sensitiveUserLineVO.setReportFilePath(record.getReportFilePath()); sensitiveUserLineVO.setReportFilePath(record.getReportFilePath());
//最新数据时间 //最新数据时间
//sensitiveUserLineVO.setLatestTime(Objects.isNull(lineLatestDataMap.get(record.getLineId()))? null : lineLatestDataMap.get(record.getLineId()).getTimeId()); sensitiveUserLineVO.setLatestTime(Objects.isNull(lineLatestDataMap.get(record.getLineId()))? null : lineLatestDataMap.get(record.getLineId()).getTimeId());
list.add(sensitiveUserLineVO); list.add(sensitiveUserLineVO);
} }
result.setRecords(list); result.setRecords(list);