From 928af53cc9696c0610a6292545a467c740039d9a Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 9 May 2024 18:32:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/UserReportQueryParm.java | 53 --------- .../process/mapper/UserReportPOMapper.java | 15 --- .../process/service/UserReportPOService.java | 30 ----- .../pojo/param/user}/UserReportParam.java | 24 +++- .../pojo/po/user}/UserReportPO.java | 18 ++- .../pojo/po/user}/UserReportProjectPO.java | 4 +- .../pojo/po/user}/UserReportSensitivePO.java | 4 +- .../pojo/po/user}/UserReportSubstationPO.java | 4 +- .../pojo/vo/user}/UserReportVO.java | 15 ++- .../user}/UserReportManageController.java | 22 ++-- .../user}/UserReportProjectPOMapper.java | 4 +- .../user}/UserReportSensitivePOMapper.java | 4 +- .../user}/UserReportSubstationPOMapper.java | 4 +- .../user}/mapping/UserReportPOMapper.xml | 24 +++- .../mapping/UserReportProjectPOMapper.xml | 2 +- .../mapping/UserReportSensitivePOMapper.xml | 2 +- .../mapping/UserReportSubstationPOMapper.xml | 2 +- .../user}/UserReportProjectPOService.java | 7 +- .../user}/UserReportSensitivePOService.java | 7 +- .../user}/UserReportSubstationPOService.java | 7 +- .../user}/impl/UserReportPOServiceImpl.java | 104 +++++++----------- .../impl/UserReportProjectPOServiceImpl.java | 14 +-- .../UserReportSensitivePOServiceImpl.java | 14 +-- .../UserReportSubstationPOServiceImpl.java | 14 +-- 24 files changed, 163 insertions(+), 235 deletions(-) delete mode 100644 pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportQueryParm.java delete mode 100644 pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportPOMapper.java delete mode 100644 pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportPOService.java rename {pqs-process/process-api/src/main/java/com/njcn/process/pojo/param => pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user}/UserReportParam.java (81%) rename {pqs-process/process-api/src/main/java/com/njcn/process/pojo/po => pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user}/UserReportPO.java (85%) rename {pqs-process/process-api/src/main/java/com/njcn/process/pojo/po => pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user}/UserReportProjectPO.java (95%) rename {pqs-process/process-api/src/main/java/com/njcn/process/pojo/po => pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user}/UserReportSensitivePO.java (97%) rename {pqs-process/process-api/src/main/java/com/njcn/process/pojo/po => pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user}/UserReportSubstationPO.java (96%) rename {pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo => pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user}/UserReportVO.java (82%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/controller/userreport => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user}/UserReportManageController.java (83%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/mapper => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user}/UserReportProjectPOMapper.java (70%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/mapper => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user}/UserReportSensitivePOMapper.java (70%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/mapper => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user}/UserReportSubstationPOMapper.java (70%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/mapper => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user}/mapping/UserReportPOMapper.xml (69%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/mapper => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user}/mapping/UserReportProjectPOMapper.xml (96%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/mapper => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user}/mapping/UserReportSensitivePOMapper.xml (97%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/mapper => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user}/mapping/UserReportSubstationPOMapper.xml (97%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/service => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user}/UserReportProjectPOService.java (69%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/service => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user}/UserReportSensitivePOService.java (69%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/service => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user}/UserReportSubstationPOService.java (69%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/service => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user}/impl/UserReportPOServiceImpl.java (55%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/service => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user}/impl/UserReportProjectPOServiceImpl.java (53%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/service => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user}/impl/UserReportSensitivePOServiceImpl.java (52%) rename {pqs-process/process-boot/src/main/java/com/njcn/process/service => pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user}/impl/UserReportSubstationPOServiceImpl.java (51%) diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportQueryParm.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportQueryParm.java deleted file mode 100644 index f508f9cb1..000000000 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportQueryParm.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.njcn.process.pojo.param; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * Description: - * 接口文档访问地址：http://serverIP:port/swagger-ui.html - * Date: 2022/11/11 15:20【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class UserReportQueryParm { - - @NotNull(message="当前页不能为空！") - @Min(value = 1, message = "当前页不能为0") - @ApiModelProperty(value = "当前页",name = "currentPage",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 orgNo; - - @ApiModelProperty(value="开始时间") - private String startTime; - - @ApiModelProperty(value="结束时间") - private String endTime; - - - @ApiModelProperty(value = "申请流程类型") - @NotNull(message="申请流程类型为空！") - private Integer applyType; - - @ApiModelProperty(value = "申请单类型") - @NotNull(message="申请单类型为空！") - private Integer type; - - @ApiModelProperty(value = "申请页面1，审核页面2") - @NotNull(message="页面类型为空！") - private String pageType; - - - -} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportPOMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportPOMapper.java deleted file mode 100644 index d1ef85579..000000000 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportPOMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njcn.process.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.process.pojo.po.UserReportPO; - -/** - * - * Description: - * Date: 2024/4/25 10:07【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface UserReportPOMapper extends BaseMapper { -} \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportPOService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportPOService.java deleted file mode 100644 index 9e4e757da..000000000 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportPOService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.njcn.process.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.process.pojo.param.UserReportParam; -import com.njcn.process.pojo.param.UserReportQueryParm; -import com.njcn.process.pojo.po.UserReportPO; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.process.pojo.vo.UserReportVO; - -import java.util.List; - -/** - * - * Description: - * Date: 2024/4/25 10:07【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface UserReportPOService extends IService{ - - - boolean addUserReport(UserReportParam userReportParam); - - boolean auditUserReport(UserReportParam.UserReportUpdate userReportUpdate); - - Page getUserReport(UserReportQueryParm userReportQueryParm); - - Boolean removeUserReport(List ids); -} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java similarity index 81% rename from pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportParam.java rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java index e720236af..1f94bd9ba 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java @@ -1,13 +1,15 @@ -package com.njcn.process.pojo.param; +package com.njcn.supervision.pojo.param.user; import com.fasterxml.jackson.annotation.JsonFormat; import com.njcn.db.bo.BaseEntity; -import com.njcn.process.pojo.po.UserReportProjectPO; -import com.njcn.process.pojo.po.UserReportSensitivePO; -import com.njcn.process.pojo.po.UserReportSubstationPO; +import com.njcn.supervision.pojo.po.user.UserReportProjectPO; +import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; +import com.njcn.supervision.pojo.po.user.UserReportSubstationPO; +import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.time.LocalDate; @@ -121,4 +123,18 @@ public class UserReportParam extends BaseEntity { } + /** + * 分页查询实体 + */ + @Data + @EqualsAndHashCode(callSuper = true) + public static class UserReportQueryParam extends BaseParam { + + @ApiModelProperty(value="所属区域") + private String city; + + + } + + } \ No newline at end of file diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java similarity index 85% rename from pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportPO.java rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java index 2f9cc4e64..318b4864d 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportPO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java @@ -1,4 +1,4 @@ -package com.njcn.process.pojo.po; +package com.njcn.supervision.pojo.po.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -22,7 +22,7 @@ import java.time.LocalDate; @Data @AllArgsConstructor @NoArgsConstructor -@TableName(value = "user_report") +@TableName(value = "supervision_user_report") public class UserReportPO extends BaseEntity { /** * id @@ -108,6 +108,18 @@ public class UserReportPO extends BaseEntity { @TableField(value = "evaluation_conclusion") private String evaluationConclusion; + /** + * 流程实例的编号 + */ + @TableField(value = "process_instance_id") + private String processInstanceId; + + + /** + * 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消 + */ + @TableField(value = "`status`") + private Integer status; /** @@ -115,4 +127,6 @@ public class UserReportPO extends BaseEntity { */ @TableField(value = "`State`") private Integer state; + + } \ No newline at end of file diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportProjectPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java similarity index 95% rename from pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportProjectPO.java rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java index 4aec5bc14..61c28fc0d 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportProjectPO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java @@ -1,4 +1,4 @@ -package com.njcn.process.pojo.po; +package com.njcn.supervision.pojo.po.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -@TableName(value = "user_report_project") +@TableName(value = "supervision_user_report_project") public class UserReportProjectPO extends BaseEntity { /** * 关联id diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSensitivePO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java similarity index 97% rename from pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSensitivePO.java rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java index 102ac08f2..a8fa16349 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSensitivePO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSensitivePO.java @@ -1,4 +1,4 @@ -package com.njcn.process.pojo.po; +package com.njcn.supervision.pojo.po.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -@TableName(value = "user_report_sensitive") +@TableName(value = "supervision_user_report_sensitive") public class UserReportSensitivePO extends BaseEntity { /** * 关联id diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSubstationPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java similarity index 96% rename from pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSubstationPO.java rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java index 57cfff935..8039aa905 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSubstationPO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportSubstationPO.java @@ -1,4 +1,4 @@ -package com.njcn.process.pojo.po; +package com.njcn.supervision.pojo.po.user; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -22,7 +22,7 @@ import java.math.BigDecimal; @Data @AllArgsConstructor @NoArgsConstructor -@TableName(value = "user_report_substation") +@TableName(value = "supervision_user_report_substation") public class UserReportSubstationPO extends BaseEntity { @TableId(value = "id", type = IdType.INPUT) private String id; diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/UserReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java similarity index 82% rename from pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/UserReportVO.java rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java index 39887f8cd..e7179db43 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/UserReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java @@ -1,9 +1,10 @@ -package com.njcn.process.pojo.vo; +package com.njcn.supervision.pojo.vo.user; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; -import com.njcn.process.pojo.po.UserReportProjectPO; -import com.njcn.process.pojo.po.UserReportSensitivePO; -import com.njcn.process.pojo.po.UserReportSubstationPO; +import com.njcn.supervision.pojo.po.user.UserReportProjectPO; +import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; +import com.njcn.supervision.pojo.po.user.UserReportSubstationPO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -100,6 +101,12 @@ public class UserReportVO { @ApiModelProperty(value = "预测评估结论") private String evaluationConclusion; + /** + * 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消 + */ + @TableField(value = "`status`") + private Integer status; + private UserReportProjectPO userReportProjectPO; diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/userreport/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java similarity index 83% rename from pqs-process/process-boot/src/main/java/com/njcn/process/controller/userreport/UserReportManageController.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java index 2d71827f7..6d895a490 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/userreport/UserReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java @@ -1,6 +1,5 @@ -package com.njcn.process.controller.userreport; +package com.njcn.supervision.controller.user; -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; @@ -8,10 +7,9 @@ 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.process.pojo.param.UserReportParam; -import com.njcn.process.pojo.param.UserReportQueryParm; -import com.njcn.process.pojo.vo.UserReportVO; -import com.njcn.process.service.UserReportPOService; +import com.njcn.supervision.pojo.param.user.UserReportParam; +import com.njcn.supervision.pojo.vo.user.UserReportVO; +import com.njcn.supervision.service.user.UserReportPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -33,13 +31,15 @@ import java.util.List; @Slf4j @RestController @RequestMapping("/userReport") -@Api(tags = "干扰源用户管理(新)") +@Api(tags = "干扰源用户管理") @AllArgsConstructor public class UserReportManageController extends BaseController { private final UserReportPOService userReportPOService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) @PostMapping("/addUserReport") @ApiOperation("新增干扰源用户（未建档干扰源用户管理）") @@ -66,11 +66,11 @@ public class UserReportManageController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getUserReport") - @ApiOperation("查询干扰源用户") - @ApiImplicitParam(name = "userReportQueryParm", value = "参数", required = true) - public HttpResult> getUserReport(@RequestBody @Validated UserReportQueryParm userReportQueryParm){ + @ApiOperation("分页查询当前用户能看到的用户建档数据") + @ApiImplicitParam(name = "userReportQueryParam", value = "参数", required = true) + public HttpResult> getUserReport(@RequestBody @Validated UserReportParam.UserReportQueryParam userReportQueryParam){ String methodDescribe = getMethodDescribe("getUserReport"); - Page out = userReportPOService.getUserReport(userReportQueryParm); + Page out = userReportPOService.getUserReport(userReportQueryParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportProjectPOMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportProjectPOMapper.java similarity index 70% rename from pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportProjectPOMapper.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportProjectPOMapper.java index 732d8121d..6aef6e582 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportProjectPOMapper.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportProjectPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.process.mapper; +package com.njcn.supervision.mapper.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.process.pojo.po.UserReportProjectPO; +import com.njcn.supervision.pojo.po.user.UserReportProjectPO; /** * diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSensitivePOMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportSensitivePOMapper.java similarity index 70% rename from pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSensitivePOMapper.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportSensitivePOMapper.java index c84d105ed..b5fec6652 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSensitivePOMapper.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportSensitivePOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.process.mapper; +package com.njcn.supervision.mapper.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.process.pojo.po.UserReportSensitivePO; +import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; /** * diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSubstationPOMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportSubstationPOMapper.java similarity index 70% rename from pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSubstationPOMapper.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportSubstationPOMapper.java index 8d277ef23..b5fc1f533 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSubstationPOMapper.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/UserReportSubstationPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.process.mapper; +package com.njcn.supervision.mapper.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.process.pojo.po.UserReportSubstationPO; +import com.njcn.supervision.pojo.po.user.UserReportSubstationPO; /** * diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml similarity index 69% rename from pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportPOMapper.xml rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml index b194762b9..4967c0ede 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml @@ -1,6 +1,6 @@ - + @@ -30,4 +30,26 @@ user_status, substation, voltage_level, project_name, evaluation_dept, evaluation_conclusion, Create_By, Create_Time, Update_By, Update_Time, `State` + + + \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportProjectPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportProjectPOMapper.xml similarity index 96% rename from pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportProjectPOMapper.xml rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportProjectPOMapper.xml index 87c4a0096..cc91f096a 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportProjectPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportProjectPOMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSensitivePOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSensitivePOMapper.xml similarity index 97% rename from pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSensitivePOMapper.xml rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSensitivePOMapper.xml index 48278e1f4..6594e0586 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSensitivePOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSensitivePOMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSubstationPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSubstationPOMapper.xml similarity index 97% rename from pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSubstationPOMapper.xml rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSubstationPOMapper.xml index 048732b57..a9ca8a154 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSubstationPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportSubstationPOMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportProjectPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportProjectPOService.java similarity index 69% rename from pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportProjectPOService.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportProjectPOService.java index 138c69976..888c9be3d 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportProjectPOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportProjectPOService.java @@ -1,8 +1,9 @@ -package com.njcn.process.service; +package com.njcn.supervision.service.user; -import com.njcn.process.pojo.po.UserReportProjectPO; import com.baomidou.mybatisplus.extension.service.IService; - /** +import com.njcn.supervision.pojo.po.user.UserReportProjectPO; + +/** * * Description: * Date: 2024/4/25 10:08【需求编号】 diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSensitivePOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportSensitivePOService.java similarity index 69% rename from pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSensitivePOService.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportSensitivePOService.java index 9cef0f3fc..69ecdffb1 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSensitivePOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportSensitivePOService.java @@ -1,8 +1,9 @@ -package com.njcn.process.service; +package com.njcn.supervision.service.user; -import com.njcn.process.pojo.po.UserReportSensitivePO; import com.baomidou.mybatisplus.extension.service.IService; - /** +import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; + +/** * * Description: * Date: 2024/4/25 10:09【需求编号】 diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSubstationPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportSubstationPOService.java similarity index 69% rename from pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSubstationPOService.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportSubstationPOService.java index 4e1a58293..f5e1df917 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSubstationPOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportSubstationPOService.java @@ -1,8 +1,9 @@ -package com.njcn.process.service; +package com.njcn.supervision.service.user; -import com.njcn.process.pojo.po.UserReportSubstationPO; import com.baomidou.mybatisplus.extension.service.IService; - /** +import com.njcn.supervision.pojo.po.user.UserReportSubstationPO; + +/** * * Description: * Date: 2024/4/25 10:09【需求编号】 diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java similarity index 55% rename from pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportPOServiceImpl.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index 9850fc798..3af265eec 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -1,33 +1,34 @@ -package com.njcn.process.service.impl; +package com.njcn.supervision.service.user.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -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.process.mapper.UserReportPOMapper; -import com.njcn.process.pojo.param.UserReportParam; -import com.njcn.process.pojo.param.UserReportQueryParm; -import com.njcn.process.pojo.po.UserReportPO; -import com.njcn.process.pojo.po.UserReportProjectPO; -import com.njcn.process.pojo.po.UserReportSensitivePO; -import com.njcn.process.pojo.po.UserReportSubstationPO; -import com.njcn.process.pojo.vo.UserReportVO; -import com.njcn.process.service.UserReportPOService; -import com.njcn.process.service.UserReportProjectPOService; -import com.njcn.process.service.UserReportSensitivePOService; -import com.njcn.process.service.UserReportSubstationPOService; -import com.njcn.user.api.DeptFeignClient; -import com.njcn.user.pojo.vo.PvTerminalTreeVO; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.supervision.mapper.user.UserReportPOMapper; +import com.njcn.supervision.pojo.param.user.UserReportParam; +import com.njcn.supervision.pojo.po.user.UserReportPO; +import com.njcn.supervision.pojo.po.user.UserReportProjectPO; +import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; +import com.njcn.supervision.pojo.po.user.UserReportSubstationPO; +import com.njcn.supervision.pojo.vo.user.UserReportVO; +import com.njcn.supervision.service.user.UserReportPOService; +import com.njcn.supervision.service.user.UserReportProjectPOService; +import com.njcn.supervision.service.user.UserReportSensitivePOService; +import com.njcn.supervision.service.user.UserReportSubstationPOService; +import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; import org.springframework.stereotype.Service; -import java.util.*; -import java.util.stream.Collectors; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; /** * @@ -39,12 +40,11 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class UserReportPOServiceImpl extends ServiceImpl implements UserReportPOService{ +public class UserReportPOServiceImpl extends ServiceImpl implements UserReportPOService { private final UserReportProjectPOService userReportProjectPOService; private final UserReportSubstationPOService userReportSubstationPOService; private final UserReportSensitivePOService userReportSensitivePOService; - private final DeptFeignClient deptFeignClient; @Override @@ -101,54 +101,24 @@ public class UserReportPOServiceImpl extends ServiceImpl getUserReport(UserReportQueryParm userReportQueryParm) { - Page page = new Page<> (userReportQueryParm.getPageNum(), userReportQueryParm.getPageSize()); - IPage tempPage = new Page<> (userReportQueryParm.getPageNum(), userReportQueryParm.getPageSize()); - - String loginUsrId = RequestUtil.getUserIndex(); - //部门处理：根据部门code取名称 - List dept = deptFeignClient.allDeptList().getData(); - Map pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, PvTerminalTreeVO::getName)); - QueryWrapper queryWrapper = new QueryWrapper<> (); - /*type=1：新建页面：查看自己负责的计划；type=2：审核页面：审核者==当前用户；结果页面：查看自己负责的计划*/ -// if (Objects.equals(userReportQueryParm.getPageType(),"1") ) { -// queryWrapper.lambda().eq(UserReportPO::getCreateBy, loginUsrId); -// queryWrapper.lambda().in(UserReportPO::getProcessStatus, Stream.of(1,3,4,5).collect(Collectors.toList())); -// } -// if (Objects.equals(userReportQueryParm.getPageType(),"2")) { -// queryWrapper.lambda().eq(RFlowProcessPO::getChecker, loginUsrId); -// queryWrapper.lambda().in(RFlowProcessPO::getProcessStatus, Stream.of(2).collect(Collectors.toList())); -// } - queryWrapper.lambda().eq(UserReportPO::getUserType,userReportQueryParm.getType()) - .eq(UserReportPO::getState,1) - .between(StringUtils.isNotBlank(userReportQueryParm.getStartTime()) && - StringUtils.isNotBlank(userReportQueryParm.getEndTime()) , - UserReportPO::getCreateTime,userReportQueryParm.getStartTime()+" 00:00:00",userReportQueryParm.getEndTime()+" 23:59:59"); - - IPage tempPageList = this.getBaseMapper().selectPage (tempPage, queryWrapper); - List collect = tempPageList.getRecords().stream().map(temp->{ - UserReportVO userReportVO = new UserReportVO(); - BeanUtils.copyProperties(temp,userReportVO); - if(Objects.equals(userReportVO.getUserType(),"1")|| - Objects.equals(userReportVO.getUserType(),"2")){ - UserReportProjectPO userReportProjectPO = userReportProjectPOService.getById(temp.getId()); - userReportVO.setUserReportProjectPO(userReportProjectPO); - }else if(Objects.equals(userReportVO.getUserType(),"3")|| - Objects.equals(userReportVO.getUserType(),"4")){ - UserReportSubstationPO userReportSubstationPO = userReportSubstationPOService.getById(temp.getId()); - - userReportVO.setUserReportSubstationPO(userReportSubstationPO); - }else if(Objects.equals(userReportVO.getUserType(),"5")){ - UserReportSensitivePO userReportSensitivePO = userReportSensitivePOService.getById(temp.getId()); - userReportVO.setUserReportSensitivePO(userReportSensitivePO); + public Page getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam) { + String userIndex = RequestUtil.getUserIndex(); + QueryWrapper userReportVOQueryWrapper = new QueryWrapper<>(); + userReportVOQueryWrapper.in("supervision_user_report.create_by", CollectionUtil.newArrayList(userIndex)) + .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode()); + if(Objects.nonNull(userReportQueryParam)){ + if(StrUtil.isNotBlank(userReportQueryParam.getCity())){ + //查询所有区域下的数据 + userReportVOQueryWrapper.in("supervision_user_report.city",userReportQueryParam.getCity()); } - - return userReportVO; - }).collect(Collectors.toList()); - page.setRecords(collect); - page.setTotal(page.getTotal()); - return page; + } + userReportVOQueryWrapper.orderByDesc("supervision_user_report.create_time"); + return this.baseMapper.page(new Page<>(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper); } @Override diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportProjectPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportProjectPOServiceImpl.java similarity index 53% rename from pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportProjectPOServiceImpl.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportProjectPOServiceImpl.java index 95ef36ae7..2b3602166 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportProjectPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportProjectPOServiceImpl.java @@ -1,12 +1,10 @@ -package com.njcn.process.service.impl; +package com.njcn.supervision.service.user.impl; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.process.mapper.UserReportProjectPOMapper; -import com.njcn.process.pojo.po.UserReportProjectPO; -import com.njcn.process.service.UserReportProjectPOService; +import com.njcn.supervision.mapper.user.UserReportProjectPOMapper; +import com.njcn.supervision.pojo.po.user.UserReportProjectPO; +import com.njcn.supervision.service.user.UserReportProjectPOService; +import org.springframework.stereotype.Service; /** * * Description: @@ -16,6 +14,6 @@ import com.njcn.process.service.UserReportProjectPOService; * @version V1.0.0 */ @Service -public class UserReportProjectPOServiceImpl extends ServiceImpl implements UserReportProjectPOService{ +public class UserReportProjectPOServiceImpl extends ServiceImpl implements UserReportProjectPOService { } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSensitivePOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportSensitivePOServiceImpl.java similarity index 52% rename from pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSensitivePOServiceImpl.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportSensitivePOServiceImpl.java index 4d8b00cd1..9c79de1cc 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSensitivePOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportSensitivePOServiceImpl.java @@ -1,12 +1,10 @@ -package com.njcn.process.service.impl; +package com.njcn.supervision.service.user.impl; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.process.pojo.po.UserReportSensitivePO; -import com.njcn.process.mapper.UserReportSensitivePOMapper; -import com.njcn.process.service.UserReportSensitivePOService; +import com.njcn.supervision.mapper.user.UserReportSensitivePOMapper; +import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; +import com.njcn.supervision.service.user.UserReportSensitivePOService; +import org.springframework.stereotype.Service; /** * * Description: @@ -16,6 +14,6 @@ import com.njcn.process.service.UserReportSensitivePOService; * @version V1.0.0 */ @Service -public class UserReportSensitivePOServiceImpl extends ServiceImpl implements UserReportSensitivePOService{ +public class UserReportSensitivePOServiceImpl extends ServiceImpl implements UserReportSensitivePOService { } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSubstationPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportSubstationPOServiceImpl.java similarity index 51% rename from pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSubstationPOServiceImpl.java rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportSubstationPOServiceImpl.java index fc8c1e1ce..0af4615ae 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSubstationPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportSubstationPOServiceImpl.java @@ -1,12 +1,10 @@ -package com.njcn.process.service.impl; +package com.njcn.supervision.service.user.impl; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.process.mapper.UserReportSubstationPOMapper; -import com.njcn.process.pojo.po.UserReportSubstationPO; -import com.njcn.process.service.UserReportSubstationPOService; +import com.njcn.supervision.mapper.user.UserReportSubstationPOMapper; +import com.njcn.supervision.pojo.po.user.UserReportSubstationPO; +import com.njcn.supervision.service.user.UserReportSubstationPOService; +import org.springframework.stereotype.Service; /** * * Description: @@ -16,6 +14,6 @@ import com.njcn.process.service.UserReportSubstationPOService; * @version V1.0.0 */ @Service -public class UserReportSubstationPOServiceImpl extends ServiceImpl implements UserReportSubstationPOService{ +public class UserReportSubstationPOServiceImpl extends ServiceImpl implements UserReportSubstationPOService { }