From b86cb8ddd88d62c4964cfc3cc2027fecb696fcde Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Thu, 21 Sep 2023 15:58:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/CsEquipmentProcessDTO.java | 7 +- .../csdevice/pojo/vo/CsEventSendMsgVO.java | 20 ++++++ .../CsEquipmentProcessController.java | 19 +++++- .../equipment/CsEventSendMsgController.java | 5 +- .../mapper/CsEquipmentProcessPOMapper.java | 5 ++ .../mapper/mapping/CsDevModelMapper.xml | 6 +- .../mapping/CsEquipmentProcessPOMapper.xml | 15 +++++ .../mapper/mapping/CsEventSendMsgMapper.xml | 10 ++- .../service/CsEquipmentProcessPOService.java | 6 +- .../service/ICsEventSendMsgService.java | 3 +- .../impl/CsEquipmentProcessPOServiceImpl.java | 32 ++++++++++ .../impl/CsEventSendMsgServiceImpl.java | 33 +++++++++- .../service/impl/CsLedgerServiceImpl.java | 25 ++++++-- .../param/CsEventUserQueryPage.java | 45 +++++++++++++ .../param/CsEventUserQueryParam.java | 7 ++ .../csharmonic/pojo/vo/EventDetailVO.java | 1 + .../controller/EventUserController.java | 14 +++- .../mapper/mapping/CsEventUserPOMapper.xml | 13 +++- .../service/CsEventUserPOService.java | 4 ++ .../impl/CsEventUserPOServiceImpl.java | 64 +++++++++++++++++++ .../service/impl/StableDataServiceImpl.java | 12 +++- .../pojo/param/CsFeedbackQueryParm.java | 7 ++ .../njcn/cssystem/pojo/vo/CsFeedbackVO.java | 4 +- .../service/impl/CsFeedbackServiceImpl.java | 6 +- 24 files changed, 336 insertions(+), 27 deletions(-) create mode 100644 cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentProcessDTO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentProcessDTO.java index ab50a45..23b5563 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentProcessDTO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentProcessDTO.java @@ -23,7 +23,10 @@ import java.time.LocalDateTime; @NoArgsConstructor public class CsEquipmentProcessDTO { private String id; - + /** + * 设备名称 + */ + private String devName; /** * 网络设备ID */ @@ -33,7 +36,7 @@ public class CsEquipmentProcessDTO { * 操作人员 */ private String operator; - + private String operatorName; /** * 起始时间 */ diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEventSendMsgVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEventSendMsgVO.java index f736781..05de9dd 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEventSendMsgVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEventSendMsgVO.java @@ -1,5 +1,6 @@ package com.njcn.csdevice.pojo.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; @@ -24,6 +25,7 @@ public class CsEventSendMsgVO { * 用户id */ private String userId; + private String userName; /** * 事件id @@ -34,6 +36,7 @@ public class CsEventSendMsgVO { * 推送事件时用户的devCode */ private String devCode; + private String deviceId; private String devName; @@ -53,6 +56,23 @@ public class CsEventSendMsgVO { * 备注 */ private String remark; + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime startTime; + + /** + * 事件类型 + */ + private String tag; + private String showName; + + + + /** + * 事件类型(0:暂态事件1:稳态事件 2:设备事 + * 件) + */ + private Integer type; } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEquipmentProcessController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEquipmentProcessController.java index f723c9f..c5419de 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEquipmentProcessController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEquipmentProcessController.java @@ -1,5 +1,6 @@ package com.njcn.csdevice.controller.equipment; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -7,8 +8,10 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.csdevice.pojo.dto.CsEquipmentProcessDTO; import com.njcn.csdevice.pojo.po.CsEquipmentProcessPO; +import com.njcn.csdevice.pojo.vo.CsEventSendMsgVO; import com.njcn.csdevice.service.CsEquipmentProcessPOService; import com.njcn.web.controller.BaseController; +import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -54,13 +57,23 @@ public class CsEquipmentProcessController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/query") - @ApiOperation("新增记录") - @ApiImplicitParam(name = "csEquipmentProcessDTO", value = "逻辑子设备标识", required = true) + @ApiOperation("查询记录") + @ApiImplicitParam(name = "csEquipmentProcessDTO", value = "查询参数", required = true) public HttpResult> queryList(@RequestBody @Validated CsEquipmentProcessDTO csEquipmentProcessDTO){ - String methodDescribe = getMethodDescribe("query"); + String methodDescribe = getMethodDescribe("queryList"); List result = csEquipmentProcessPOService.queryqueryList(csEquipmentProcessDTO); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryPage") + @ApiOperation("分页查询记录") + @ApiImplicitParam(name = "baseParam", value = "查询参数", required = true) + public HttpResult> queryPage(@RequestBody BaseParam baseParam){ + String methodDescribe = getMethodDescribe("queryPage"); + Page list = csEquipmentProcessPOService.queryPage(baseParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEventSendMsgController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEventSendMsgController.java index 6072c97..178b6fd 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEventSendMsgController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEventSendMsgController.java @@ -2,6 +2,7 @@ package com.njcn.csdevice.controller.equipment; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; @@ -57,9 +58,9 @@ public class CsEventSendMsgController extends BaseController { @PostMapping("/queryLog") @ApiOperation("查询推送日志") @ApiImplicitParam(name = "baseParam", value = "查询日志参数", required = true) - public HttpResult> queryLog(@RequestBody BaseParam baseParam){ + public HttpResult> queryLog(@RequestBody BaseParam baseParam){ String methodDescribe = getMethodDescribe("queryLog"); - IPage list = csEventSendMsgService.queryPage(baseParam); + Page list = csEventSendMsgService.queryPage(baseParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentProcessPOMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentProcessPOMapper.java index 33c50fa..f8a8b8c 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentProcessPOMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentProcessPOMapper.java @@ -1,7 +1,11 @@ package com.njcn.csdevice.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.csdevice.pojo.dto.CsEquipmentProcessDTO; import com.njcn.csdevice.pojo.po.CsEquipmentProcessPO; +import com.njcn.web.pojo.param.BaseParam; +import org.apache.ibatis.annotations.Param; /** * @@ -12,4 +16,5 @@ import com.njcn.csdevice.pojo.po.CsEquipmentProcessPO; * @version V1.0.0 */ public interface CsEquipmentProcessPOMapper extends BaseMapper { + Page selectPages(Page returnpage, @Param("baseParam") BaseParam baseParam); } \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml index d3783ef..f89f979 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml @@ -34,9 +34,9 @@ AND a.dev_type_name LIKE concat('%',#{csDevModelQueryParm.devName},'%') - - AND a.dev_type = #{csDevModelQueryParm.devType} - + + + AND a.name = #{csDevModelQueryParm.name} diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentProcessPOMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentProcessPOMapper.xml index cf33055..b3d98cc 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentProcessPOMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentProcessPOMapper.xml @@ -16,4 +16,19 @@ id, dev_id, `operator`, start_time, end_time, `status`, `process` + + \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEventSendMsgMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEventSendMsgMapper.xml index f96d8ca..5b303a3 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEventSendMsgMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEventSendMsgMapper.xml @@ -3,6 +3,14 @@ \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentProcessPOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentProcessPOService.java index 094db9f..9445381 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentProcessPOService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentProcessPOService.java @@ -1,8 +1,10 @@ package com.njcn.csdevice.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.csdevice.pojo.dto.CsEquipmentProcessDTO; import com.njcn.csdevice.pojo.po.CsEquipmentProcessPO; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.web.pojo.param.BaseParam; import java.util.List; @@ -18,4 +20,6 @@ public interface CsEquipmentProcessPOService extends IService queryqueryList(CsEquipmentProcessDTO csEquipmentProcessDTO); - } + + Page queryPage(BaseParam baseParam); +} diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsEventSendMsgService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsEventSendMsgService.java index 3402f56..53ece75 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsEventSendMsgService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsEventSendMsgService.java @@ -1,6 +1,7 @@ package com.njcn.csdevice.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.po.CsEventSendMsg; import com.njcn.csdevice.pojo.vo.CsEventSendMsgVO; @@ -16,5 +17,5 @@ import com.njcn.web.pojo.param.BaseParam; */ public interface ICsEventSendMsgService extends IService { - IPage queryPage(BaseParam baseParam); + Page queryPage(BaseParam baseParam); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentProcessPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentProcessPOServiceImpl.java index 1b09301..7481406 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentProcessPOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentProcessPOServiceImpl.java @@ -2,15 +2,25 @@ package com.njcn.csdevice.service.impl; import com.alibaba.cloud.commons.lang.StringUtils; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.csdevice.pojo.dto.CsEquipmentProcessDTO; +import com.njcn.csdevice.pojo.vo.CsEventSendMsgVO; +import com.njcn.system.pojo.po.EleEpdPqd; +import com.njcn.user.api.UserFeignClient; +import com.njcn.user.pojo.po.User; +import com.njcn.web.pojo.param.BaseParam; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.mapper.CsEquipmentProcessPOMapper; import com.njcn.csdevice.pojo.po.CsEquipmentProcessPO; import com.njcn.csdevice.service.CsEquipmentProcessPOService; +import org.springframework.util.CollectionUtils; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -22,7 +32,9 @@ import java.util.stream.Collectors; * @version V1.0.0 */ @Service +@RequiredArgsConstructor public class CsEquipmentProcessPOServiceImpl extends ServiceImpl implements CsEquipmentProcessPOService{ + private final UserFeignClient userFeignClient; @Override public List queryqueryList(CsEquipmentProcessDTO csEquipmentProcessDTO) { @@ -36,4 +48,24 @@ public class CsEquipmentProcessPOServiceImpl extends ServiceImpl queryPage(BaseParam baseParam) { + Page returnpage = new Page<> (baseParam.getPageNum ( ), baseParam.getPageSize ( )); + + Page result = this.getBaseMapper().selectPages(returnpage,baseParam); + List collect1 = result.getRecords().stream().map(CsEquipmentProcessDTO::getOperator).distinct().collect(Collectors.toList()); + Map collect2; + if(!CollectionUtils.isEmpty(collect1)){ + List userTem = userFeignClient.getUserByIdList(collect1).getData(); + collect2 = userTem.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2)); + + } else { + collect2 = new HashMap<>(); + } + result.getRecords().forEach(temp->{ + temp.setOperatorName(collect2.get(temp.getOperator())); + }); + return result; + } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEventSendMsgServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEventSendMsgServiceImpl.java index 4b9b4fa..ab358ed 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEventSendMsgServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEventSendMsgServiceImpl.java @@ -8,8 +8,20 @@ import com.njcn.csdevice.pojo.po.CsEventSendMsg; import com.njcn.csdevice.pojo.po.CsLogsPO; import com.njcn.csdevice.pojo.vo.CsEventSendMsgVO; import com.njcn.csdevice.service.ICsEventSendMsgService; +import com.njcn.cssystem.pojo.po.CsFeedbackChatPO; +import com.njcn.system.api.EpdFeignClient; +import com.njcn.system.pojo.po.EleEpdPqd; +import com.njcn.user.api.UserFeignClient; +import com.njcn.user.pojo.po.User; import com.njcn.web.pojo.param.BaseParam; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -20,13 +32,32 @@ import org.springframework.stereotype.Service; * @since 2023-09-18 */ @Service +@RequiredArgsConstructor public class CsEventSendMsgServiceImpl extends ServiceImpl implements ICsEventSendMsgService { + private final EpdFeignClient epdFeignClient; + private final UserFeignClient userFeignClient; @Override - public IPage queryPage(BaseParam baseParam) { + public Page queryPage(BaseParam baseParam) { Page returnpage = new Page<> (baseParam.getPageNum ( ), baseParam.getPageSize ( )); Page result = this.getBaseMapper().selectPages(returnpage,baseParam); + List collect1 = result.getRecords().stream().map(CsEventSendMsgVO::getUserId).distinct().collect(Collectors.toList()); + Map collect2; + if(!CollectionUtils.isEmpty(collect1)){ + List userTem = userFeignClient.getUserByIdList(collect1).getData(); + collect2 = userTem.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2)); + + } else { + collect2 = new HashMap<>(); + } + result.getRecords().forEach(temp->{ + EleEpdPqd data = epdFeignClient.findByName(temp.getTag()).getData(); + temp.setShowName(data.getShowName()); + temp.setUserName(collect2.get(temp.getUserId())); + }); + + return result; } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 4018957..8abff62 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.enums.LineBaseEnum; import com.njcn.csdevice.mapper.AppProjectMapper; import com.njcn.csdevice.mapper.AppTopologyDiagramMapper; @@ -12,17 +14,17 @@ import com.njcn.csdevice.mapper.CsLedgerMapper; import com.njcn.csdevice.pojo.dto.DevDetailDTO; import com.njcn.csdevice.pojo.dto.LineParamDTO; import com.njcn.csdevice.pojo.param.CsLedgerParam; -import com.njcn.csdevice.pojo.po.AppProjectPO; -import com.njcn.csdevice.pojo.po.AppTopologyDiagramPO; -import com.njcn.csdevice.pojo.po.CsEngineeringPO; -import com.njcn.csdevice.pojo.po.CsLedger; +import com.njcn.csdevice.pojo.po.*; import com.njcn.csdevice.pojo.vo.CsLedgerVO; +import com.njcn.csdevice.service.CsLinePOService; import com.njcn.csdevice.service.ICsEngineeringUserService; import com.njcn.csdevice.service.ICsLedgerService; import com.njcn.csdevice.service.RoleEngineerDevService; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.redis.utils.RedisUtil; import com.njcn.system.api.AreaFeignClient; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; import com.njcn.system.pojo.po.Area; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -49,7 +51,8 @@ public class CsLedgerServiceImpl extends ServiceImpl i private final AppTopologyDiagramMapper appTopologyDiagramMapper; private final AppProjectMapper appProjectMapper; private final CsEngineeringMapper csEngineeringMapper; - + private final CsLinePOService csLinePOService; + private final DicDataFeignClient dicDataFeignClient; private final FileStorageUtil fileStorageUtil; private final RoleEngineerDevService roleEngineerDevService; @@ -73,6 +76,8 @@ public class CsLedgerServiceImpl extends ServiceImpl i public List getLineTree() { List engineeringList = new ArrayList<>(); List allList = this.baseMapper.getAll(); + String areaId = dicDataFeignClient.getDicDataByCode(DicDataEnum.OUTPUT_SIDE.getCode()).getData().getId(); + /*获取用户工程，设备信息过滤*/ List roleengineer = roleEngineerDevService.getRoleengineer(); List device = roleEngineerDevService.getDevice(); @@ -89,7 +94,15 @@ public class CsLedgerServiceImpl extends ServiceImpl i List deviceList = allList.stream().filter(item -> device.contains(item.getId())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); List lineList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); - deviceList.forEach(dev -> dev.setChildren(getChildren(dev, lineList))); +// List collect = lineList.stream().map(CsLedgerVO::getId).collect(Collectors.toList()); +// List csLinePOS = csLinePOService.listByIds(collect); +// List collect1 = csLinePOS.stream().filter(temp -> Objects.equals(temp.getPosition(), areaId)).collect(Collectors.toList()); +// List collect2 = collect1.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); +// lineList = lineList.stream().filter(temp -> collect2.contains(temp.getId())).collect(Collectors.toList()); + + + List finalLineList = lineList; + deviceList.forEach(dev -> dev.setChildren(getChildren(dev, finalLineList))); projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList))); engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList))); return engineeringList; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java new file mode 100644 index 0000000..8bb8d6e --- /dev/null +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java @@ -0,0 +1,45 @@ +package com.njcn.csharmonic.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * + * Description: + * Date: 2023/9/4 15:15【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@NoArgsConstructor +public class CsEventUserQueryPage extends CsEventUserQueryParam{ + + @NotNull(message="当前页不能为空！") + @Min(value = 1, message = "当前页不能为0") + @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true) + private Integer pageNum; + /**显示条数*/ + @NotNull(message="显示条数不能为空！") + @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) + private Integer pageSize; + + @ApiModelProperty(value = "工程id") + private String engineeringid; + + + @ApiModelProperty(value = "项目id") + private String projectId; + /** + * 装置id + */ + private String deviceId; + + + +} \ No newline at end of file diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java index d2b12cf..1ba3de8 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java @@ -2,6 +2,7 @@ package com.njcn.csharmonic.param; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; @@ -43,5 +44,11 @@ public class CsEventUserQueryParam { private String status; private String level; + @ApiModelProperty(value="起始时间") +// @NotNull(message="起始时间不能为空！") + private String startTime; + @ApiModelProperty(value="结束时间") +// @NotNull(message="结束时间不能为空！") + private String endTime; } \ No newline at end of file diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java index dd5ceaa..ae1f6da 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java @@ -64,6 +64,7 @@ public class EventDetailVO { * 事件类型 */ private String tag; + private String showName; /** * 暂态事件波形文件路 diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java index 6b31624..dda17b7 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java @@ -1,10 +1,12 @@ package com.njcn.csharmonic.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.csharmonic.param.CsEventUserQueryPage; import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.vo.EventDetailVO; import com.njcn.csharmonic.service.CsEventUserPOService; @@ -47,7 +49,7 @@ public class EventUserController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryEventList") - @ApiOperation("当天事件未读消息") + @ApiOperation("当天事件消息") @ApiImplicitParam(name = "csEventUserQueryParam", value = "暂降事件查询参数", required = true) public HttpResult> queryEventList(@RequestBody CsEventUserQueryParam csEventUserQueryParam) { String methodDescribe = getMethodDescribe("queryEventList"); @@ -55,6 +57,16 @@ public class EventUserController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryEventpage") + @ApiOperation("当天事件消息") + @ApiImplicitParam(name = "csEventUserQueryPage", value = "暂降事件查询参数", required = true) + public HttpResult> queryEventpage(@RequestBody CsEventUserQueryPage csEventUserQueryPage) { + String methodDescribe = getMethodDescribe("queryEventpage"); + Page list = csEventUserPOService.queryEventpage(csEventUserQueryPage); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/updateStatus") @ApiOperation("已读事件") diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml index 60aeb49..adaab2f 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml @@ -31,7 +31,14 @@ \ No newline at end of file diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java index ef2c6f9..5252298 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java @@ -1,5 +1,7 @@ package com.njcn.csharmonic.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.csharmonic.param.CsEventUserQueryPage; import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.baomidou.mybatisplus.extension.service.IService; @@ -23,4 +25,6 @@ public interface CsEventUserPOService extends IService{ List queryUserEventList(CsEventUserQueryParam csEventUserQueryParam); void updateStatus(CsEventUserQueryParam csEventUserQueryParam); + + Page queryEventpage(CsEventUserQueryPage csEventUserQueryPage); } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java index 6dc8e0a..4ebb360 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java @@ -2,12 +2,19 @@ package com.njcn.csharmonic.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.csdevice.api.CsLedgerFeignClient; import com.njcn.csdevice.pojo.dto.DevDetailDTO; +import com.njcn.csdevice.pojo.po.AppTopologyDiagramPO; +import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO; +import com.njcn.csharmonic.param.CsEventUserQueryPage; import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.vo.EventDetailVO; import com.njcn.influx.pojo.dto.EventDataSetDTO; +import com.njcn.influx.service.EvtDataService; import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.api.EleEvtFeignClient; +import com.njcn.system.api.EpdFeignClient; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.system.pojo.po.EleEpdPqd; @@ -29,6 +36,7 @@ import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.csharmonic.mapper.CsEventUserPOMapper; import com.njcn.csharmonic.service.CsEventUserPOService; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; /** * @@ -44,6 +52,9 @@ public class CsEventUserPOServiceImpl extends ServiceImpl data = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.APP_EVENT.getCode()).getData(); @@ -79,8 +93,38 @@ public class CsEventUserPOServiceImpl extends ServiceImpl{ + DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(temp.getDeviceId()).getData(); + temp.setEquipmentName(devDetail.getEquipmentName()); + temp.setProjectId(devDetail.getProjectId()); + temp.setProjectName(devDetail.getProjectName()); + temp.setEngineeringid(devDetail.getEngineeringid()); + temp.setEngineeringName(devDetail.getEngineeringName()); + EleEpdPqd data = epdFeignClient.findByName(temp.getTag()).getData(); + temp.setShowName(data.getShowName()); + List data1 = eleEvtFeignClient.queryByPid(data.getId()).getData(); + List eventDataSetDTOS = new ArrayList<>(); + for (EleEvtParm eleEvtParm : data1) { + EventDataSetDTO eventDataSetDTO = new EventDataSetDTO(); + BeanUtils.copyProperties(eleEvtParm,eventDataSetDTO); + EventDataSetDTO evtData = evtDataService.getEventDataSet("evt_data", temp.getId(), eleEvtParm.getName()); + if (evtData == null) { + eventDataSetDTO.setValue("3.1415926"); + }else { + eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("3.1415926")); + + } + + eventDataSetDTOS.add(eventDataSetDTO); + } + temp.setDataSet(eventDataSetDTOS); + }); + } return list; } @@ -95,4 +139,24 @@ public class CsEventUserPOServiceImpl extends ServiceImpl queryEventpage(CsEventUserQueryPage csEventUserQueryPage) { + Page returnpage = new Page<> (csEventUserQueryPage.getPageNum ( ), csEventUserQueryPage.getPageSize ( )); + + List list = this.queryUserEventList(csEventUserQueryPage); + if(!StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())){ + list =list.stream().filter(temp->Objects.equals(temp.getEngineeringid(),csEventUserQueryPage.getEngineeringid())).collect(Collectors.toList()); + } + if(!StringUtils.isEmpty(csEventUserQueryPage.getProjectId())){ + list =list.stream().filter(temp->Objects.equals(temp.getProjectId(),csEventUserQueryPage.getProjectId())).collect(Collectors.toList()); + } + if(!StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())){ + list =list.stream().filter(temp->Objects.equals(temp.getDeviceId(),csEventUserQueryPage.getDeviceId())).collect(Collectors.toList()); + } + returnpage.setRecords (list); + returnpage.setTotal(list.size()); + + return returnpage; + } } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java index 687ecf4..e77d045 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java @@ -236,15 +236,19 @@ public class StableDataServiceImpl implements StableDataService { throw new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR); } List collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); + String areaId = dicDataFeignClient.getDicDataByCode(DicDataEnum.OUTPUT_SIDE.getCode()).getData().getId(); + Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR)); + collect = csLinePOList.stream().filter(temp->Objects.equals(areaId,temp.getPosition())).map(CsLinePO::getLineId).collect(Collectors.toList()); List data = csStatisticalSetFeignClient.queryStatisticalSelect(commonStatisticalQueryParam.getStatisticalId()).getData(); // EleEpdPqd data = epdFeignClient.selectById(commonStatisticalQueryParam.getStatisticalId()).getData(); // Optional.ofNullable(data).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.ELEEPDPQD_DATA_ERROR)); if(CollectionUtil.isNotEmpty(data)){ + List finalCollect = collect; data.forEach(epdPqd->{ String frequency = Optional.ofNullable(commonStatisticalQueryParam.getFrequency()).orElse(""); - List deviceRtData = commonService.getDeviceRtDataByTime(collect, epdPqd.getClassId(), epdPqd.getName()+frequency, epdPqd.getPhase(), commonStatisticalQueryParam.getValueType(),commonStatisticalQueryParam.getStartTime(),commonStatisticalQueryParam.getEndTime()); + List deviceRtData = commonService.getDeviceRtDataByTime(finalCollect, epdPqd.getClassId(), epdPqd.getName()+frequency, epdPqd.getPhase(), commonStatisticalQueryParam.getValueType(),commonStatisticalQueryParam.getStartTime(),commonStatisticalQueryParam.getEndTime()); List collect1 = deviceRtData.stream().map(temp -> { @@ -281,6 +285,9 @@ public class StableDataServiceImpl implements StableDataService { throw new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR); } List collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); + String areaId = dicDataFeignClient.getDicDataByCode(DicDataEnum.OUTPUT_SIDE.getCode()).getData().getId(); + Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR)); + collect = csLinePOList.stream().filter(temp->Objects.equals(areaId,temp.getPosition())).map(CsLinePO::getLineId).collect(Collectors.toList()); List data = csStatisticalSetFeignClient.queryStatisticalSelect(commonStatisticalQueryParam.getStatisticalId()).getData(); @@ -289,8 +296,9 @@ public class StableDataServiceImpl implements StableDataService { String frequency = Optional.ofNullable(commonStatisticalQueryParam.getFrequency()).orElse(""); if(CollectionUtil.isNotEmpty(data)){ + List finalCollect = collect; data.forEach(epdPqd->{ - List deviceRtData = commonService.getDeviceRtDataByTime(collect, epdPqd.getClassId(), epdPqd.getName()+frequency, epdPqd.getPhase(), commonStatisticalQueryParam.getValueType(),commonStatisticalQueryParam.getStartTime(),commonStatisticalQueryParam.getEndTime()); + List deviceRtData = commonService.getDeviceRtDataByTime(finalCollect, epdPqd.getClassId(), epdPqd.getName()+frequency, epdPqd.getPhase(), commonStatisticalQueryParam.getValueType(),commonStatisticalQueryParam.getStartTime(),commonStatisticalQueryParam.getEndTime()); List collect1 = deviceRtData.stream().map(temp -> { diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java index f6ed84d..40b6206 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java @@ -28,6 +28,13 @@ public class CsFeedbackQueryParm { @NotNull(message="显示条数不能为空！") @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) private Integer pageSize; + + @ApiModelProperty("搜索值") + private String searchValue; + @ApiModelProperty("开始时间") + private String searchBeginTime; + @ApiModelProperty("结束时间") + private String searchEndTime; // /** // * 用户id // */ diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackVO.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackVO.java index 9c86a8a..0b5b471 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackVO.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackVO.java @@ -57,8 +57,8 @@ public class CsFeedbackVO { private String status; - @ApiModelProperty(value = "未读消息条数") - private int chatCount; +// @ApiModelProperty(value = "未读消息条数") +// private int chatCount; @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java index dc2dd9e..bb4a99d 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.api.RoleEngineerDevFeignClient; +import com.njcn.csdevice.pojo.po.CsLogsPO; import com.njcn.cssystem.mapper.CsFeedbackChatMapper; import com.njcn.cssystem.mapper.CsFeedbackMapper; import com.njcn.cssystem.pojo.param.CsFeedbackAddParm; @@ -91,7 +92,10 @@ public class CsFeedbackServiceImpl extends ServiceImpl csFeedbackPOPage = this.getBaseMapper ( ).selectPage (page, queryWrapper); QueryWrapper csFeedbackChatPOQueryWrapper = new QueryWrapper<> (); List collect = csFeedbackPOPage.getRecords ( ).stream ( ).map (temp -> {