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

代码提交

Browse Source
This commit is contained in:
huangzj
2023-10-16 10:05:15 +08:00
parent 8ef6f8ce8e
commit da754cc51b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ public class CsDevCapacityController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/addList") @PostMapping("/addList")
@ApiOperation("批量新增") @ApiOperation("批量新增")
@ApiImplicitParam(name = "id", value = "设备id", required = true) @ApiImplicitParam(name = "list", value = "设备id", required = true)
public HttpResult<String> addList(@RequestBody List<CsDevCapacityPO> list){ public HttpResult<String> addList(@RequestBody List<CsDevCapacityPO> list){
String methodDescribe = getMethodDescribe("addList"); String methodDescribe = getMethodDescribe("addList");
csDevCapacityPOService.addList(list); csDevCapacityPOService.addList(list);

6
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java
View File

@@ -39,7 +39,7 @@ public class EventUserController extends BaseController {
private final CsEventUserPOService csEventUserPOService; private final CsEventUserPOService csEventUserPOService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryEvent") @PostMapping("/queryEvent")
@ApiOperation("当天暂降事件未读消息") @ApiOperation("暂降事件未读消息")
@ApiImplicitParam(name = "csEventUserQueryParam", value = "暂降事件查询参数", required = true) @ApiImplicitParam(name = "csEventUserQueryParam", value = "暂降事件查询参数", required = true)
public HttpResult<Integer> queryEvent(@RequestBody CsEventUserQueryParam csEventUserQueryParam) { public HttpResult<Integer> queryEvent(@RequestBody CsEventUserQueryParam csEventUserQueryParam) {
String methodDescribe = getMethodDescribe("queryEvent"); String methodDescribe = getMethodDescribe("queryEvent");
@@ -49,7 +49,7 @@ public class EventUserController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryEventList") @PostMapping("/queryEventList")
@ApiOperation("当天事件消息") @ApiOperation("事件消息")
@ApiImplicitParam(name = "csEventUserQueryParam", value = "暂降事件查询参数", required = true) @ApiImplicitParam(name = "csEventUserQueryParam", value = "暂降事件查询参数", required = true)
public HttpResult<List<EventDetailVO>> queryEventList(@RequestBody CsEventUserQueryParam csEventUserQueryParam) { public HttpResult<List<EventDetailVO>> queryEventList(@RequestBody CsEventUserQueryParam csEventUserQueryParam) {
String methodDescribe = getMethodDescribe("queryEventList"); String methodDescribe = getMethodDescribe("queryEventList");
@@ -59,7 +59,7 @@ public class EventUserController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryEventpage") @PostMapping("/queryEventpage")
@ApiOperation("当天事件消息") @ApiOperation("事件消息")
@ApiImplicitParam(name = "csEventUserQueryPage", value = "暂降事件查询参数", required = true) @ApiImplicitParam(name = "csEventUserQueryPage", value = "暂降事件查询参数", required = true)
public HttpResult<Page<EventDetailVO>> queryEventpage(@RequestBody CsEventUserQueryPage csEventUserQueryPage) { public HttpResult<Page<EventDetailVO>> queryEventpage(@RequestBody CsEventUserQueryPage csEventUserQueryPage) {
String methodDescribe = getMethodDescribe("queryEventpage"); String methodDescribe = getMethodDescribe("queryEventpage");

2
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
View File

@@ -263,6 +263,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
temp.setEngineeringName(devDetail.getEngineeringName()); temp.setEngineeringName(devDetail.getEngineeringName());
EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData(); EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
temp.setShowName(ele.getShowName()); temp.setShowName(ele.getShowName());
temp.setCode(ele.getDefaultValue());
if(Objects.equals(csEventUserQueryPage.getType(),"0")){ if(Objects.equals(csEventUserQueryPage.getType(),"0")){
List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData(); List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();
@@ -285,6 +286,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
List<EventDataSetDTO> evtParamVVaDepth = eventDataSetDTOS.stream(). List<EventDataSetDTO> evtParamVVaDepth = eventDataSetDTOS.stream().
filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_VVaDepth")). filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_VVaDepth")).
collect(Collectors.toList()); collect(Collectors.toList());
if(CollectionUtil.isEmpty(evtParamVVaDepth)){ if(CollectionUtil.isEmpty(evtParamVVaDepth)){
temp.setEvtParamVVaDepth("-"); temp.setEvtParamVVaDepth("-");