From a0b81b1bdaa6e46992407acb54dbeeb4827799cf Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 22 May 2024 20:24:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8A=95=E8=AF=89=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E5=8D=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../problem/SupervisionUserComplaintVO.java | 11 ----- .../SupervisionUserComplaintController.java | 15 ++++-- .../impl/WarningLeafletServiceImpl.java | 11 +++-- .../SupervisionUserComplaintPOService.java | 1 + ...SupervisionUserComplaintPOServiceImpl.java | 47 ++++++++++++++++++- 5 files changed, 65 insertions(+), 20 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java index 36f30ea72..861b4eb13 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java @@ -1,12 +1,10 @@ package com.njcn.supervision.pojo.vo.problem; -import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @Data @@ -51,15 +49,6 @@ public class SupervisionUserComplaintVO { private Integer initiateWarningFlag; - /** - * 分页查询实体 - */ - @Data - @EqualsAndHashCode(callSuper = true) - public static class SupervisionUserComplaintQueryParam extends BaseParam { - - - } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java index b8cd78e56..8a3054ac2 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java @@ -16,10 +16,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -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.*; @Slf4j @RestController @@ -43,7 +40,7 @@ public class SupervisionUserComplaintController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @PostMapping("/add") @ApiOperation("投诉问题填报") - @ApiImplicitParam(name = "supervisionUserComplaint", value = "实体参数", required = true) + @ApiImplicitParam(name = "supervisionUserComplaintParam", value = "实体参数", required = true) public HttpResult addSupervisionUserComplaint(@RequestBody SupervisionUserComplaintParam supervisionUserComplaintParam) { String methodDescribe = getMethodDescribe("addSupervisionUserComplaint"); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supervisionUserComplaintService.addSupervisionUserComplaint(supervisionUserComplaintParam), methodDescribe); @@ -51,6 +48,14 @@ public class SupervisionUserComplaintController extends BaseController { + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/initiateWarningLeaflet") + @ApiOperation("针对用户投诉发起告警单") + public HttpResult initiateWarningLeaflet(@RequestParam("id") String id){ + String methodDescribe = getMethodDescribe("initiateWarningLeaflet"); + supervisionUserComplaintService.initiateWarningLeaflet(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, Boolean.TRUE, methodDescribe); + } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java index 204788713..096c0a5bc 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.supervision.service.leaflet.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; @@ -12,6 +13,7 @@ import com.njcn.bpm.api.BpmProcessFeignClient; import com.njcn.bpm.enums.BpmTaskStatusEnum; import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.pojo.dto.RMpPartHarmonicDetailDTO; import com.njcn.supervision.enums.FlowStatusEnum; import com.njcn.supervision.enums.LeafletTypeEnum; @@ -29,14 +31,13 @@ import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.UserFeignClient; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; -import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.HashMap; import java.time.LocalDate; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -165,7 +166,11 @@ public class WarningLeafletServiceImpl extends ServiceImpl list = this.lambdaQuery().eq(WarningLeaflet::getIssueDetail, info).list(); + if(CollectionUtil.isNotEmpty(list)){ + throw new BusinessException("该预/告警单以发布"); + } this.createLeaflet( rMpPartHarmonicDetailDTO.getMeasurementPointName(), IdWorker.get32UUID(), diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintPOService.java index 5dce21232..3375dc156 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintPOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintPOService.java @@ -19,4 +19,5 @@ public interface SupervisionUserComplaintPOService extends IService getSupervisionUserComplaint(SupervisionUserComplaintParam.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam); + void initiateWarningLeaflet(String id); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java index e91ef9caa..62e64127b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java @@ -1,15 +1,21 @@ package com.njcn.supervision.service.problem.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.supervision.enums.LeafletTypeEnum; +import com.njcn.supervision.enums.ProblemTypeEnum; import com.njcn.supervision.mapper.problem.SupervisionUserComplaintPOMapper; import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam; import com.njcn.supervision.pojo.po.problem.SupervisionUserComplaintPO; import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaintVO; +import com.njcn.supervision.service.leaflet.IWarningLeafletService; import com.njcn.supervision.service.problem.SupervisionUserComplaintPOService; import com.njcn.user.api.UserFeignClient; import com.njcn.web.factory.PageFactory; @@ -34,13 +40,14 @@ import java.util.Objects; public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl implements SupervisionUserComplaintPOService{ private final UserFeignClient userFeignClient; + private final IWarningLeafletService warningLeafletService; @Override @Transactional(rollbackFor = Exception.class) public String addSupervisionUserComplaint(SupervisionUserComplaintParam supervisionUserComplaintParam) { SupervisionUserComplaintPO supervisionUserComplaintPO = new SupervisionUserComplaintPO(); BeanUtil.copyProperties(supervisionUserComplaintParam,supervisionUserComplaintPO); - supervisionUserComplaintPO.setInitiateWarningFlag(1); + supervisionUserComplaintPO.setInitiateWarningFlag(0); supervisionUserComplaintPO.setState(DataStateEnum.ENABLE.getCode()); this.save(supervisionUserComplaintPO); return supervisionUserComplaintPO.getId(); @@ -66,4 +73,42 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl