From c6729d0c3330e3a0284ab636b3776b24b7daf999 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Mon, 18 Sep 2023 11:21:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/CsEquipmentProcessDTO.java | 62 +++++++++++++++++++ .../CsEquipmentProcessController.java | 14 +++++ .../EquipmentDeliveryController.java | 9 +++ .../service/CsEquipmentDeliveryService.java | 2 + .../service/CsEquipmentProcessPOService.java | 9 ++- .../impl/CsEquipmentDeliveryServiceImpl.java | 28 ++++++++- .../impl/CsEquipmentProcessPOServiceImpl.java | 20 ++++++ .../param/CsEventUserQueryParam.java | 3 + .../controller/EventUserController.java | 15 ++++- .../handler/MqttMessageHandler.java | 13 ++++ .../mapper/mapping/CsEventUserPOMapper.xml | 19 +++--- .../impl/CsEventUserPOServiceImpl.java | 17 ++++- 12 files changed, 199 insertions(+), 12 deletions(-) create mode 100644 cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentProcessDTO.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 new file mode 100644 index 0000000..ab50a45 --- /dev/null +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentProcessDTO.java @@ -0,0 +1,62 @@ +package com.njcn.csdevice.pojo.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * + * Description: + * Date: 2023/9/12 16:10【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@NoArgsConstructor +public class CsEquipmentProcessDTO { + private String id; + + /** + * 网络设备ID + */ + private String devId; + + /** + * 操作人员 + */ + private String operator; + + /** + * 起始时间 + */ + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime startTime; + + /** + * 结束时间 + */ + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime endTime; + + + /** + * 设备当前流程（1:设备登记，2：功能调试，3：出厂调试，4：设备投运 + */ + private String process; + + /** + * 流程状态 0:取消 1:成功 + */ + private String status; + +} \ No newline at end of file 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 236214d..f723c9f 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 @@ -5,6 +5,7 @@ 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.csdevice.pojo.dto.CsEquipmentProcessDTO; import com.njcn.csdevice.pojo.po.CsEquipmentProcessPO; import com.njcn.csdevice.service.CsEquipmentProcessPOService; import com.njcn.web.controller.BaseController; @@ -19,6 +20,8 @@ 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; + /** * 类的介绍：设备调试日志记录 * @@ -49,4 +52,15 @@ public class CsEquipmentProcessController extends BaseController { } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/query") + @ApiOperation("新增记录") + @ApiImplicitParam(name = "csEquipmentProcessDTO", value = "逻辑子设备标识", required = true) + public HttpResult> queryList(@RequestBody @Validated CsEquipmentProcessDTO csEquipmentProcessDTO){ + String methodDescribe = getMethodDescribe("query"); + List result = csEquipmentProcessPOService.queryqueryList(csEquipmentProcessDTO); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java index ce8d868..92a5bb1 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java @@ -228,5 +228,14 @@ public class EquipmentDeliveryController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @ResponseBody + @ApiOperation("取消联调") + @PostMapping(value = "deleteTest") + public HttpResult deleteTest(@RequestParam("deviceId") String deviceId,@RequestParam("type") String type){ + String methodDescribe = getMethodDescribe("testCompletion"); + csEquipmentDeliveryService.deleteTest(deviceId,type); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java index 382bf18..926e5c7 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java @@ -98,4 +98,6 @@ public interface CsEquipmentDeliveryService extends IService{ -} + List queryqueryList(CsEquipmentProcessDTO csEquipmentProcessDTO); + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index f14eabf..d7ff747 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -391,6 +391,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl collect1 = new ArrayList<>(); List collect = trueCollect.stream ( ).map (temp -> { CsEquipmentDeliveryPO csEquipmentDeliveryPO = new CsEquipmentDeliveryPO ( ); BeanUtils.copyProperties (temp, csEquipmentDeliveryPO); @@ -401,8 +402,16 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl implements CsEquipmentProcessPOService{ + @Override + public List queryqueryList(CsEquipmentProcessDTO csEquipmentProcessDTO) { + List list = this.lambdaQuery().eq(StringUtils.isNotBlank(csEquipmentProcessDTO.getId()), CsEquipmentProcessPO::getId, csEquipmentProcessDTO.getId()). + eq(StringUtils.isNotBlank(csEquipmentProcessDTO.getDevId()), CsEquipmentProcessPO::getDevId, csEquipmentProcessDTO.getDevId()). + eq(StringUtils.isNotBlank(csEquipmentProcessDTO.getProcess()), CsEquipmentProcessPO::getProcess, csEquipmentProcessDTO.getProcess()).list(); + List collect = list.stream().map(temp -> { + CsEquipmentProcessDTO csEquipmentProcessDTO1 = new CsEquipmentProcessDTO(); + BeanUtils.copyProperties(temp, csEquipmentProcessDTO1); + return csEquipmentProcessDTO1; + }).collect(Collectors.toList()); + return collect; + } } 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 3c92e54..d2b12cf 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 @@ -36,9 +36,12 @@ public class CsEventUserQueryParam { */ private List target; + private String type; /** * 状态(0:未读取 1:已读取) */ private String status; + private String level; + } \ No newline at end of file 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 9c4cabc..b4b8844 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 @@ -6,6 +6,7 @@ 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.CsEventUserQueryParam; +import com.njcn.csharmonic.pojo.vo.EventDetailVO; import com.njcn.csharmonic.service.CsEventUserPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -18,6 +19,8 @@ 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; + /** * Description: * Date: 2023/9/4 16:18【需求编号】 @@ -28,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController @RequestMapping("/eventUser") -@Api(tags = "暂降事件") +@Api(tags = "事件") @AllArgsConstructor public class EventUserController extends BaseController { private final CsEventUserPOService csEventUserPOService; @@ -42,6 +45,16 @@ public class EventUserController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, count, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryEventList") + @ApiOperation("当天暂降事件未读消息") + @ApiImplicitParam(name = "csEventUserQueryParam", value = "暂降事件查询参数", required = true) + public HttpResult> queryEventList(@RequestBody CsEventUserQueryParam csEventUserQueryParam) { + String methodDescribe = getMethodDescribe("queryEventList"); + List list = csEventUserPOService.queryUserEventList(csEventUserQueryParam); + 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/handler/MqttMessageHandler.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java index ac34800..da49456 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java @@ -182,6 +182,19 @@ public class MqttMessageHandler { } }); + List apfRmsI = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_RmsI_TolOut(A)")).collect(Collectors.toList()); + Map> collect2 = apfRmsI.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId)); + collect2.forEach((k,v)->{ + if(!CollectionUtil.isEmpty(v)){ + double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble(); + ThdDataVO thdDataVO = new ThdDataVO(); + BeanUtils.copyProperties(v.get(0),thdDataVO); + thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble))); + thdDataVO.setPhase("avg"); + result.add(thdDataVO); + + } + }); List apfThdISys = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_ThdA_Sys(%)")).collect(Collectors.toList()); Map> collect4 = apfThdISys.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId)); collect4.forEach((k,v)->{ 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 3eaaeb3..60aeb49 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,16 +31,21 @@