From 7d946b646cabec5f85f834f1da7717e888eb251e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 13 Jan 2023 13:29:54 +0800 Subject: [PATCH] =?UTF-8?q?pms=E8=BF=87=E7=A8=8B=E7=9B=91=E7=9D=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/po/RGeneralSurveyPlanDetail.java | 5 +- .../process/pojo/po/RGeneralSurveyPlanPO.java | 5 +- .../RMpElectricQualityProblemFlowDetails.java | 4 +- .../po/RMpGeneralSurveyOverproofProblem.java | 4 +- .../po/RMpOnlineMonitorOverproofProblem.java | 4 +- .../pojo/po/RMpOperationMonitorAbnormal.java | 4 +- .../process/pojo/po/RMpUserComplaint.java | 4 +- .../po/RStatElectricQualityProblemFlow.java | 4 +- .../src/main/java/com/njcn/process/pom.xml | 48 +++++++++++++++++++ pqs-process/process-boot/pom.xml | 6 +++ ...RStatElectricQualityProblemFlowMapper.java | 2 +- 11 files changed, 67 insertions(+), 23 deletions(-) create mode 100644 pqs-process/process-api/src/main/java/com/njcn/process/pom.xml diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java index 2e503281f..aa59b43ea 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java @@ -8,7 +8,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/11 11:28【需求编号】 @@ -16,6 +16,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 普测计划详情表 */ @@ -106,4 +107,4 @@ public class RGeneralSurveyPlanDetail { */ @TableField(value = "is_problem") private Integer isProblem; -} \ No newline at end of file +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java index 1c8ea8f29..5dc908edb 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java @@ -9,7 +9,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/11 11:24【需求编号】 @@ -17,6 +17,7 @@ import java.util.Date; * @author clam * @version V1.0.0 */ + /** * 普测计划表 */ @@ -111,4 +112,4 @@ public class RGeneralSurveyPlanPO { @TableField(value = "upload_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date uploadTime; -} \ No newline at end of file +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpElectricQualityProblemFlowDetails.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpElectricQualityProblemFlowDetails.java index 02914eedf..65fade966 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpElectricQualityProblemFlowDetails.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpElectricQualityProblemFlowDetails.java @@ -1,12 +1,10 @@ package com.njcn.process.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.io.Serializable; +import java.time.LocalDateTime; /** *

diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpGeneralSurveyOverproofProblem.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpGeneralSurveyOverproofProblem.java index 2ccd33bfd..d563f7c62 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpGeneralSurveyOverproofProblem.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpGeneralSurveyOverproofProblem.java @@ -1,12 +1,10 @@ package com.njcn.process.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.io.Serializable; +import java.time.LocalDateTime; /** *

diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java index 1d5d22b09..d8d93d3af 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java @@ -1,12 +1,10 @@ package com.njcn.process.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.io.Serializable; +import java.time.LocalDateTime; /** *

diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOperationMonitorAbnormal.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOperationMonitorAbnormal.java index 4149a32b0..ac9ac2d8b 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOperationMonitorAbnormal.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOperationMonitorAbnormal.java @@ -1,12 +1,10 @@ package com.njcn.process.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.io.Serializable; +import java.time.LocalDateTime; /** *

diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpUserComplaint.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpUserComplaint.java index 7cec190a8..7372230e7 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpUserComplaint.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpUserComplaint.java @@ -1,12 +1,10 @@ package com.njcn.process.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.io.Serializable; +import java.time.LocalDateTime; /** *

diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RStatElectricQualityProblemFlow.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RStatElectricQualityProblemFlow.java index 079fd3ada..8a1df1a72 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RStatElectricQualityProblemFlow.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RStatElectricQualityProblemFlow.java @@ -1,12 +1,10 @@ package com.njcn.process.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.io.Serializable; +import java.time.LocalDateTime; /** *

diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pom.xml b/pqs-process/process-api/src/main/java/com/njcn/process/pom.xml new file mode 100644 index 000000000..d843af640 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pom.xml @@ -0,0 +1,48 @@ + + + + pqs-process + com.njcn + 1.0.0 + + + 4.0.0 + 技术监督管理 + process-api + + + 8 + 8 + + + + + com.njcn + common-core + ${project.version} + + + com.njcn + common-db + ${project.version} + + + com.njcn + common-microservice + ${project.version} + + + com.njcn + common-poi + ${project.version} + + + com.github.jeffreyning + mybatisplus-plus + 1.5.1-RELEASE + compile + + + diff --git a/pqs-process/process-boot/pom.xml b/pqs-process/process-boot/pom.xml index 3a8227bf2..83823600b 100644 --- a/pqs-process/process-boot/pom.xml +++ b/pqs-process/process-boot/pom.xml @@ -45,6 +45,12 @@ pq-device-api ${project.version} + + com.njcn + pms-device-api + ${project.version} + + com.njcn system-api diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java index ccefa40a7..58e794067 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java @@ -18,5 +18,5 @@ import java.util.List; */ public interface RStatElectricQualityProblemFlowMapper extends BaseMapper { - List getIssues(@Param("deptIds") List deptIds, @Param("param") QueryIssuesParam param, @Param("dateBegin") String dateBegin, @Param("dateEnd") String dateEnd); + List getIssues(@Param("deptIds") ListdeptIds,@Param("param") QueryIssuesParam param, @Param("dateBegin") String dateBegin, @Param("dateEnd") String dateEnd); }