用户投诉提交

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java

@@ -3,7 +3,6 @@ package com.njcn.supervision.pojo.param.problem;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.web.pojo.param.BaseParam;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +12,6 @@ import lombok.NoArgsConstructor;
 import java.time.LocalDateTime;
 
 @Data
-@ApiModel(description="用户投诉信息")
 @AllArgsConstructor
 @NoArgsConstructor
 public class SupervisionUserComplaintParam {
@@ -34,12 +32,17 @@ public class SupervisionUserComplaintParam {
     @ApiModelProperty(value = "投诉内容")
     private String complaintText;
 
+    @ApiModelProperty(value = "稳态指标")
+    private String steadyIndicator;
+
+    @ApiModelProperty(value = "暂态指标")
+    private String transientIndicators;
+
     @ApiModelProperty(value = "异常指标")
     private String anomalyMetrics;
 
-    @ApiModelProperty(value = "是否实现检测(1：是 2：否)")
+    @ApiModelProperty(value = "是否实现检测(0-否 1-是)")
-    private String status;
+    private Integer detectionFlag;
-
 
     @ApiModelProperty(value = "监测点编号")
     private String monitorNumber;
@@ -47,8 +50,8 @@ public class SupervisionUserComplaintParam {
     @ApiModelProperty(value = "监测点名称")
     private String monitorName;
 
-    @ApiModelProperty(value = "是否发起警告单(1：是；2：否)")
+    @ApiModelProperty(value = "是否发起警告单(0-否 1-是)")
-    private String initiateWarningFlag;
+    private Integer initiateWarningFlag;
 
     @ApiModelProperty(value = "状态：0-删除 1-正常")
     private Integer state;
@@ -64,6 +67,14 @@ public class SupervisionUserComplaintParam {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public  static class SupervisionUserComplaintUpdate extends SupervisionUserComplaintParam {
+
+        @ApiModelProperty("id")
+        private String Id;
+
+    }
 
     /**
      * 分页查询实体
@@ -75,5 +86,4 @@ public class SupervisionUserComplaintParam {
 
     }
 
-
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/problem/SupervisionUserComplaintPO.java

@@ -0,0 +1,111 @@
+package com.njcn.supervision.pojo.po.problem;
+
+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.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/5/22  16:25【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@ApiModel(description="")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "supervision_user_complaint")
+public class SupervisionUserComplaintPO extends BaseEntity {
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 用户类别
+     */
+    @TableField(value = "user_category")
+    private String userCategory;
+
+    /**
+     * 用户编号
+     */
+    @TableField(value = "user_number")
+    private String userNumber;
+
+    /**
+     * 用户名称
+     */
+    @TableField(value = "user_name")
+    private String userName;
+
+    /**
+     * 投诉名称
+     */
+    @TableField(value = "complaint_name")
+    private String complaintName;
+
+    /**
+     * 投诉内容
+     */
+    @TableField(value = "complaint_text")
+    private String complaintText;
+
+    /**
+     * 稳态指标
+     */
+    @TableField(value = "steady_Indicator")
+    private String steadyIndicator;
+
+    /**
+     * 暂态指标
+     */
+    @TableField(value = "transient_Indicators")
+    private String transientIndicators;
+
+    /**
+     * 异常指标
+     */
+    @TableField(value = "anomaly_metrics")
+    private String anomalyMetrics;
+
+    /**
+     * 是否实现检测(0：否；1：是)
+     */
+    @TableField(value = "`detection_flag`")
+    private Integer detectionFlag;
+
+
+
+    /**
+     * 监测点编号
+     */
+    @TableField(value = "monitor_number")
+    private String monitorNumber;
+
+    /**
+     * 检测点名称
+     */
+    @TableField(value = "monitor_name")
+    private String monitorName;
+
+    /**
+     * 是否发起警告单(0：否；1：是)
+     */
+    @TableField(value = "initiate_warning_flag")
+    private Integer initiateWarningFlag;
+
+    /**
+     * 状态：0-删除 1-正常
+     */
+    @TableField(value = "`state`")
+    private Integer state;
+
+
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java

@@ -1,6 +1,7 @@
 package com.njcn.supervision.pojo.vo.device;
 
 import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -14,12 +15,19 @@ import lombok.Data;
 public class SupervisionTempLineDebugVO extends BaseEntity {
 
      private String id;
+     @ApiModelProperty(value="监测点编号")
      private String lineId;
+     @ApiModelProperty(value="监测点名称")
      private String lineName;
+     @ApiModelProperty(value="关联干扰源用户id名称")
      private String userName;
+     @ApiModelProperty(value="接入母线")
      private String connectedBus;
+     @ApiModelProperty(value="监测终端编码")
      private String monitoringTerminalCode;
+     @ApiModelProperty(value="监测终端名称")
      private String monitoringTerminalName;
+     @ApiModelProperty(value="电网侧变电站")
      private String powerSubstationName;
      private String reason;
      private String processInstanceId;

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java

@@ -1,7 +1,6 @@
 package com.njcn.supervision.pojo.vo.problem;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,17 +9,15 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDateTime;
-
 @Data
+@ApiModel(description="用户投诉信息")
 @AllArgsConstructor
 @NoArgsConstructor
-public class SupervisionUserComplaint {
+public class SupervisionUserComplaintVO {
 
-    private String id;
+    @ApiModelProperty("id")
+    private String Id;
 
-    @ApiModelProperty(value = "用户类别")
-    private String userCategory;
 
     @ApiModelProperty(value = "用户编号")
     private String userNumber;
@@ -40,11 +37,9 @@ public class SupervisionUserComplaint {
     @ApiModelProperty(value = "暂态指标")
     private String transientIndicators;
 
-    @ApiModelProperty(value = "异常指标")
+    @ApiModelProperty(value = "是否实现检测(0：否；1：是)")
-    private String anomalyMetrics;
+    private Integer detectionFlag;
 
-    @ApiModelProperty(value = "是否实现检测(1：是 2：否)")
-    private String status;
 
     @ApiModelProperty(value = "监测点编号")
     private String monitorNumber;
@@ -52,23 +47,9 @@ public class SupervisionUserComplaint {
     @ApiModelProperty(value = "监测点名称")
     private String monitorName;
 
-    @ApiModelProperty(value = "是否发起警告单(1：是；2：否)")
+    @ApiModelProperty(value = "是否发起警告单(0：否；1：是)")
-    private String initiateWarningFlag;
+    private Integer initiateWarningFlag;
 
-    @ApiModelProperty(value = "状态：0-删除 1-正常")
-    private Integer state;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
 
     /**
      * 分页查询实体
@@ -80,4 +61,5 @@ public class SupervisionUserComplaint {
 
     }
 
+
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java

@@ -7,8 +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.supervision.pojo.vo.problem.SupervisionUserComplaint;
+import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam;
-import com.njcn.supervision.service.problem.impl.SupervisionUserComplaintServiceImpl;
+import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaintVO;
+import com.njcn.supervision.service.problem.SupervisionUserComplaintPOService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -27,15 +28,15 @@ import org.springframework.web.bind.annotation.RestController;
 @AllArgsConstructor
 public class SupervisionUserComplaintController extends BaseController {
 
-    private final SupervisionUserComplaintServiceImpl supervisionUserComplaintService;
+    private final SupervisionUserComplaintPOService supervisionUserComplaintService;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/list")
     @ApiOperation("分页用户投诉数据")
     @ApiImplicitParam(name = "supervisionUserComplaintQueryParam", value = "参数", required = true)
-    public HttpResult<Page<SupervisionUserComplaint>> getSupervisionUserComplaint(@RequestBody SupervisionUserComplaint.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) {
+    public HttpResult<Page<SupervisionUserComplaintVO>> getSupervisionUserComplaint(@RequestBody SupervisionUserComplaintParam.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) {
         String methodDescribe = getMethodDescribe("getSupervisionUserComplaint");
-        Page<SupervisionUserComplaint> out = supervisionUserComplaintService.getSupervisionUserComplaint(supervisionUserComplaintQueryParam);
+        Page<SupervisionUserComplaintVO> out = supervisionUserComplaintService.getSupervisionUserComplaint(supervisionUserComplaintQueryParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
     }
 
@@ -43,9 +44,9 @@ public class SupervisionUserComplaintController extends BaseController {
     @PostMapping("/add")
     @ApiOperation("投诉问题填报")
     @ApiImplicitParam(name = "supervisionUserComplaint", value = "实体参数", required = true)
-    public HttpResult<String> addSupervisionUserComplaint(@RequestBody SupervisionUserComplaint supervisionUserComplaint) {
+    public HttpResult<String> addSupervisionUserComplaint(@RequestBody SupervisionUserComplaintParam supervisionUserComplaintParam) {
         String methodDescribe = getMethodDescribe("addSupervisionUserComplaint");
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supervisionUserComplaintService.addSupervisionUserComplaint(supervisionUserComplaint), methodDescribe);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supervisionUserComplaintService.addSupervisionUserComplaint(supervisionUserComplaintParam), methodDescribe);
     }
 
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml

@@ -23,6 +23,11 @@
   <select id="page" resultType="com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO">
     SELECT
     supervision_temp_line_report.id id,
+    supervision_temp_line_report.user_name,
+    supervision_temp_line_report.connected_bus,
+    supervision_temp_line_report.monitoring_terminal_code,
+    supervision_temp_line_report.monitoring_terminal_name,
+    supervision_temp_line_report.Power_Substation_Name,
     supervision_temp_line_report.line_id lineId,
     supervision_temp_line_report.line_name lineName,
     supervision_temp_line_debug.reason reason,

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/SupervisionUserComplaintMapper.java

@@ -1,12 +0,0 @@
-package com.njcn.supervision.mapper.problem;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaint;
-import org.apache.ibatis.annotations.Param;
-
-public interface SupervisionUserComplaintMapper extends BaseMapper<SupervisionUserComplaint> {
-
-    Page<SupervisionUserComplaint> page(@Param("page")Page<Object> objectPage, @Param("ew")QueryWrapper<SupervisionUserComplaint> supervisionUserComplaintQueryWrapper);
-}

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/SupervisionUserComplaintPOMapper.java

@@ -0,0 +1,21 @@
+package com.njcn.supervision.mapper.problem;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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 org.apache.ibatis.annotations.Param;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/5/22  16:25【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface SupervisionUserComplaintPOMapper extends BaseMapper<SupervisionUserComplaintPO> {
+    Page<SupervisionUserComplaintVO> getPage(@Param("page")Page<Object> objectPage, @Param("ew") QueryWrapper<SupervisionUserComplaintParam> supervisionUserComplaintQueryWrapper);
+}

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapper/SupervisionUserComplaintMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.njcn.supervision.mapper.problem.SupervisionUserComplaintMapper">
 
 
-    <select id="page" resultType="com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaint">
+    <select id="page" resultType="com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam">
             SELECT
                 supervision_user_complaint.id,
                 supervision_user_complaint.user_category,
@@ -12,8 +12,8 @@
                 supervision_user_complaint.complaint_name,
                 supervision_user_complaint.complaint_text,
                 supervision_user_complaint.anomaly_metrics,
-                supervision_user_complaint.status,
+                supervision_user_complaint.detection_flag,
-                supervision_user_complaint.monitor_id,
+                supervision_user_complaint.monitor_number,
                 supervision_user_complaint.initiate_warning_flag,
                 supervision_user_complaint.state,
                 supervision_user_complaint.create_by,

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/problem/mapping/SupervisionUserComplaintPOMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.supervision.mapper.problem.SupervisionUserComplaintPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.problem.SupervisionUserComplaintPO">
+    <!--@mbg.generated-->
+    <!--@Table supervision_user_complaint-->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="user_category" jdbcType="VARCHAR" property="userCategory" />
+    <result column="user_number" jdbcType="VARCHAR" property="userNumber" />
+    <result column="user_name" jdbcType="VARCHAR" property="userName" />
+    <result column="complaint_name" jdbcType="VARCHAR" property="complaintName" />
+    <result column="complaint_text" jdbcType="VARCHAR" property="complaintText" />
+    <result column="steady_Indicator" jdbcType="VARCHAR" property="steadyIndicator" />
+    <result column="transient_Indicators" jdbcType="VARCHAR" property="transientIndicators" />
+    <result column="anomaly_metrics" jdbcType="VARCHAR" property="anomalyMetrics" />
+    <result column="status" jdbcType="CHAR" property="status" />
+    <result column="monitor_number" jdbcType="VARCHAR" property="monitorNumber" />
+    <result column="monitor_name" jdbcType="VARCHAR" property="monitorName" />
+    <result column="initiate_warning_flag" jdbcType="CHAR" property="initiateWarningFlag" />
+    <result column="state" jdbcType="BIT" property="state" />
+    <result column="create_by" jdbcType="CHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="CHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, user_category, user_number, user_name, complaint_name, complaint_text, steady_Indicator, 
+    transient_Indicators, anomaly_metrics, `status`, monitor_number, monitor_name, initiate_warning_flag, 
+    `state`, create_by, create_time, update_by, update_time
+  </sql>
+
+  <select id="getPage" resultType="com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaintVO">
+    select
+    *
+
+    from supervision_user_complaint supervision_user_complaint  WHERE ${ew.sqlSegment}
+  </select>
+</mapper>

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java

@@ -135,6 +135,14 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         SupervisionTempLineReport supervisionTempLineReport = supervisionTempLineReportService.getById(id);
         SupervisionTempLineDebugPO supervisionTempLineDebugPO = this.getById(id);
         supervisionTempLineDebugVO.setId(id);
+
+        supervisionTempLineDebugVO.setUserName(supervisionTempLineReport.getUserName());
+        supervisionTempLineDebugVO.setConnectedBus(supervisionTempLineReport.getConnectedBus());
+        supervisionTempLineDebugVO.setMonitoringTerminalCode(supervisionTempLineReport.getMonitoringTerminalCode());
+        supervisionTempLineDebugVO.setMonitoringTerminalName(supervisionTempLineReport.getMonitoringTerminalName());
+        supervisionTempLineDebugVO.setPowerSubstationName(supervisionTempLineReport.getPowerSubstationName());
+
+
         supervisionTempLineDebugVO.setLineId(supervisionTempLineReport.getLineId());
         supervisionTempLineDebugVO.setLineName(supervisionTempLineReport.getLineName());
         supervisionTempLineDebugVO.setReason(supervisionTempLineDebugPO.getReason());

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintPOService.java

@@ -0,0 +1,22 @@
+package com.njcn.supervision.service.problem;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.supervision.pojo.po.problem.SupervisionUserComplaintPO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam;
+import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaintVO;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/5/22  16:25【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface SupervisionUserComplaintPOService extends IService<SupervisionUserComplaintPO>{
+    String addSupervisionUserComplaint(SupervisionUserComplaintParam supervisionUserComplaintParam);
+
+    Page<SupervisionUserComplaintVO> getSupervisionUserComplaint(SupervisionUserComplaintParam.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam);
+
+}

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/SupervisionUserComplaintService.java

@@ -1,12 +0,0 @@
-package com.njcn.supervision.service.problem;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam;
-import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaint;
-
-public interface SupervisionUserComplaintService extends IService<SupervisionUserComplaint> {
-    String addSupervisionUserComplaint(SupervisionUserComplaint supervisionUserComplaint);
-
-    Page<SupervisionUserComplaint> getSupervisionUserComplaint(SupervisionUserComplaint.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam);
-}

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java

@@ -0,0 +1,69 @@
+package com.njcn.supervision.service.problem.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.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.problem.SupervisionUserComplaintPOService;
+import com.njcn.user.api.UserFeignClient;
+import com.njcn.web.factory.PageFactory;
+import com.njcn.web.utils.RequestUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/5/22  16:25【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+@RequiredArgsConstructor
+public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl<SupervisionUserComplaintPOMapper, SupervisionUserComplaintPO> implements SupervisionUserComplaintPOService{
+
+    private final UserFeignClient userFeignClient;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addSupervisionUserComplaint(SupervisionUserComplaintParam supervisionUserComplaintParam) {
+        SupervisionUserComplaintPO supervisionUserComplaintPO = new SupervisionUserComplaintPO();
+        BeanUtil.copyProperties(supervisionUserComplaintParam,supervisionUserComplaintPO);
+        supervisionUserComplaintPO.setInitiateWarningFlag(1);
+        supervisionUserComplaintPO.setState(DataStateEnum.ENABLE.getCode());
+        this.save(supervisionUserComplaintPO);
+        return supervisionUserComplaintPO.getId();
+    }
+
+    @Override
+    public Page<SupervisionUserComplaintVO> getSupervisionUserComplaint(SupervisionUserComplaintParam.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) {
+        QueryWrapper<SupervisionUserComplaintParam> supervisionUserComplaintQueryWrapper = new QueryWrapper<>();
+
+        if (Objects.nonNull(supervisionUserComplaintQueryParam)) {
+            //添加上时间范围
+            supervisionUserComplaintQueryWrapper.between("supervision_user_complaint.Create_Time",
+                    DateUtil.beginOfDay(DateUtil.parse(supervisionUserComplaintQueryParam.getSearchBeginTime())),
+                    DateUtil.endOfDay(DateUtil.parse(supervisionUserComplaintQueryParam.getSearchEndTime())));
+        }
+        //获取当前用户部门所有同事的id，查看该部门下所有的数据
+        List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
+        supervisionUserComplaintQueryWrapper.in("supervision_user_complaint.Create_By", colleaguesIds)
+                .eq("supervision_user_complaint.state",DataStateEnum.ENABLE.getCode())
+                .orderByDesc("supervision_user_complaint.Update_Time");
+        Page<SupervisionUserComplaintVO> page = this.baseMapper.getPage(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper);
+
+        return page;
+    }
+
+}

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintServiceImpl.java

@@ -1,29 +0,0 @@
-package com.njcn.supervision.service.problem.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.supervision.mapper.problem.SupervisionUserComplaintMapper;
-import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaint;
-import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam;
-import com.njcn.supervision.service.problem.SupervisionUserComplaintService;
-import com.njcn.web.factory.PageFactory;
-import org.springframework.stereotype.Service;
-
-@Service
-public class SupervisionUserComplaintServiceImpl extends ServiceImpl<SupervisionUserComplaintMapper, SupervisionUserComplaint> implements SupervisionUserComplaintService {
-
-    @Override
-    public String addSupervisionUserComplaint(SupervisionUserComplaint supervisionUserComplaint) {
-        this.save(supervisionUserComplaint);
-        return supervisionUserComplaint.getMonitorNumber();
-    }
-
-    @Override
-    public Page<SupervisionUserComplaint> getSupervisionUserComplaint(SupervisionUserComplaint.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) {
-        QueryWrapper<SupervisionUserComplaint> supervisionUserComplaintQueryWrapper = new QueryWrapper<>();
-        return this.page(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper);
-    }
-
-
-}