diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java index 0857e66..3072fe0 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java @@ -16,10 +16,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -48,10 +45,10 @@ public class CsUpgradeLogsController extends BaseController { } @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) - @PostMapping("/getByDevId") + @GetMapping("/getByDevId") @ApiOperation("查询指定devId的所有升级日志") @ApiImplicitParam(name = "devId", value = "装置Id", required = true) - public HttpResult> getByDevId(@RequestBody String devId) { + public HttpResult> getByDevId(@RequestParam("devId") String devId) { String methodDescribe = getMethodDescribe("getByDevId"); List result = csUpgradeLogsService.lambdaQuery().eq(CsUpgradeLogs::getDevId, devId).list(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java index f4b3526..6ca180f 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java @@ -398,11 +398,11 @@ public class CsLinePOServiceImpl extends ServiceImpl i sensitiveUserNameMap = pqSensitiveUserList.stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName)); } // 最新数据时间 -// List lineLatestDataList = csLineLatestDataFeignClient.listData().getData(); -// Map lineLatestDataMap = new HashMap<>(); -// if (CollUtil.isNotEmpty(lineLatestDataList)) { -// lineLatestDataMap = lineLatestDataList.stream().collect(Collectors.toMap(CsLineLatestData::getLineId, item -> item)); -// } + List lineLatestDataList = csLineLatestDataFeignClient.listData().getData(); + Map lineLatestDataMap = new HashMap<>(); + if (CollUtil.isNotEmpty(lineLatestDataList)) { + lineLatestDataMap = lineLatestDataList.stream().collect(Collectors.toMap(CsLineLatestData::getLineId, item -> item)); + } PqSensitiveUserLineVO sensitiveUserLineVO; @@ -447,7 +447,7 @@ public class CsLinePOServiceImpl extends ServiceImpl i // 报告文件 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); } result.setRecords(list);