From 0d6b54cc59c47733b4ceae438a328ae74bab7bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 11 Nov 2022 09:06:01 +0800 Subject: [PATCH 01/21] first commit --- README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..e69de29bb From 5f4b841e21bc962b2acbf9f9a72eb923cb750995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 11 Nov 2022 09:08:22 +0800 Subject: [PATCH 02/21] first commit --- pom.xml | 20 +++ process-api/pom.xml | 64 +++++++++ process-boot/pom.xml | 130 ++++++++++++++++++ .../com/njcn/process/ProcessApplication.java | 25 ++++ process-boot/src/main/resources/bootstrap.yml | 60 ++++++++ .../njcn/process/ProcessApplicationTest.java | 22 +++ 6 files changed, 321 insertions(+) create mode 100644 pom.xml create mode 100644 process-api/pom.xml create mode 100644 process-boot/pom.xml create mode 100644 process-boot/src/main/java/com/njcn/process/ProcessApplication.java create mode 100644 process-boot/src/main/resources/bootstrap.yml create mode 100644 process-boot/src/test/java/com/njcn/process/ProcessApplicationTest.java diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..1cfb38469 --- /dev/null +++ b/pom.xml @@ -0,0 +1,20 @@ + + + + pqs + com.njcn + 1.0.0 + + + 4.0.0 + pqs-process + 技术监督管理 + + + process-api + process-boot + + pom + + diff --git a/process-api/pom.xml b/process-api/pom.xml new file mode 100644 index 000000000..cef078f3b --- /dev/null +++ b/process-api/pom.xml @@ -0,0 +1,64 @@ + + + + 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.njcn + pms-device-api + ${project.version} + + + org.influxdb + influxdb-java + + + com.njcn + pq-device-api + 1.0.0 + compile + + + + com.github.jeffreyning + mybatisplus-plus + 1.5.1-RELEASE + compile + + + diff --git a/process-boot/pom.xml b/process-boot/pom.xml new file mode 100644 index 000000000..b83816598 --- /dev/null +++ b/process-boot/pom.xml @@ -0,0 +1,130 @@ + + + + pqs-process + com.njcn + 1.0.0 + + 4.0.0 + 技术监督管理模块 + process-boot + + + + 8 + 8 + + + + + + com.njcn + prepare-api + ${project.version} + + + com.njcn + common-web + ${project.version} + + + com.njcn + common-swagger + ${project.version} + + + com.njcn + common-influxDB + ${project.version} + compile + + + com.njcn + pq-device-api + ${project.version} + + + com.njcn + system-api + ${project.version} + + + com.njcn + user-api + ${project.version} + + + com.njcn + event-api + ${project.version} + + + com.njcn + common-minio + ${project.version} + + + + + processboot + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + -Xlint:unchecked + + + + org.springframework.boot + spring-boot-maven-plugin + + + package + + repackage + + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + + build-image + ${docker.operate} + + build + + + + + + http://${docker.repostory} + + ${docker.repostory}/${docker.registry.name}/${project.artifactId} + + latest + + ${docker.url} + ${basedir}/ + + + /ROOT + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + + + + diff --git a/process-boot/src/main/java/com/njcn/process/ProcessApplication.java b/process-boot/src/main/java/com/njcn/process/ProcessApplication.java new file mode 100644 index 000000000..494de5864 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/ProcessApplication.java @@ -0,0 +1,25 @@ +package com.njcn.process; + +import lombok.extern.slf4j.Slf4j; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * pqs + * + * @author cdf + * @date 2022/11/10 + */ +@Slf4j +@MapperScan("com.njcn.**.mapper") +@EnableFeignClients(basePackages = "com.njcn") +@SpringBootApplication(scanBasePackages = "com.njcn") +public class ProcessApplication { + + public static void main(String[] args) { + SpringApplication.run(ProcessApplication.class, args); + } + +} diff --git a/process-boot/src/main/resources/bootstrap.yml b/process-boot/src/main/resources/bootstrap.yml new file mode 100644 index 000000000..61a5f15e8 --- /dev/null +++ b/process-boot/src/main/resources/bootstrap.yml @@ -0,0 +1,60 @@ +#当前服务的基本信息 +microservice: + ename: @artifactId@ + name: '@name@' + version: @version@ + sentinel: + url: @sentinel.url@ + gateway: + url: @gateway.url@ +server: + port: 10222 +#feign接口开启服务熔断降级处理 +feign: + sentinel: + enabled: true +spring: + application: + name: @artifactId@ + #nacos注册中心以及配置中心的指定 + cloud: + nacos: + discovery: + ip: @service.server.url@ + server-addr: @nacos.url@ + namespace: @nacos.namespace@ + config: + server-addr: @nacos.url@ + namespace: @nacos.namespace@ + file-extension: yaml + shared-configs: + - data-id: share-config.yaml + refresh: true + - data-Id: share-config-datasource-db.yaml + refresh: true + main: + allow-bean-definition-overriding: true + servlet: + multipart: + max-file-size: 100MB + max-request-size: 100MB + + +#项目日志的配置 +logging: + config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + level: + root: info + + +#mybatis配置信息 +mybatis-plus: + type-aliases-package: com.njcn.process.pojo + + +mqtt: + client-id: @artifactId@${random.value} + + + + diff --git a/process-boot/src/test/java/com/njcn/process/ProcessApplicationTest.java b/process-boot/src/test/java/com/njcn/process/ProcessApplicationTest.java new file mode 100644 index 000000000..98de78d76 --- /dev/null +++ b/process-boot/src/test/java/com/njcn/process/ProcessApplicationTest.java @@ -0,0 +1,22 @@ +package com.njcn.process; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * pqs + * + * @author cdf + * @date 2022/11/10 + */ +@RunWith(SpringRunner.class) +@SpringBootTest +public class ProcessApplicationTest { + + @Test + public void test1(){ + + } +} From 4761ecc096986f3c6c8a1120da8330c044b2ed72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 11 Nov 2022 09:25:49 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process-boot/pom.xml | 6 +----- process-boot/src/main/resources/bootstrap.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/process-boot/pom.xml b/process-boot/pom.xml index b83816598..6becc0c91 100644 --- a/process-boot/pom.xml +++ b/process-boot/pom.xml @@ -60,11 +60,7 @@ event-api ${project.version} - - com.njcn - common-minio - ${project.version} - + diff --git a/process-boot/src/main/resources/bootstrap.yml b/process-boot/src/main/resources/bootstrap.yml index 61a5f15e8..acf2c844d 100644 --- a/process-boot/src/main/resources/bootstrap.yml +++ b/process-boot/src/main/resources/bootstrap.yml @@ -4,9 +4,9 @@ microservice: name: '@name@' version: @version@ sentinel: - url: @sentinel.url@ + url: 192.168.1.13:8080 gateway: - url: @gateway.url@ + url: 192.168.1.13:10215 server: port: 10222 #feign接口开启服务熔断降级处理 @@ -20,12 +20,12 @@ spring: cloud: nacos: discovery: - ip: @service.server.url@ - server-addr: @nacos.url@ - namespace: @nacos.namespace@ + ip: 192.168.1.29 + server-addr: 192.168.1.28:18848 + namespace: e5d5499b-e3f6-42f8-baf9-7b5d9a7e3145 config: - server-addr: @nacos.url@ - namespace: @nacos.namespace@ + server-addr: 192.168.1.28:18848 + namespace: e5d5499b-e3f6-42f8-baf9-7b5d9a7e3145 file-extension: yaml shared-configs: - data-id: share-config.yaml @@ -42,7 +42,7 @@ spring: #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + config: http://192.168.1.28:18848/nacos/v1/cs/configs?tenant=&group=DEFAULT_GROUP&dataId=logback.xml level: root: info From 5f32519c62a6c3d2cb33a87427ee6131d714ccd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 11 Nov 2022 09:49:49 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process-boot/src/main/resources/bootstrap.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/process-boot/src/main/resources/bootstrap.yml b/process-boot/src/main/resources/bootstrap.yml index acf2c844d..f8f08629e 100644 --- a/process-boot/src/main/resources/bootstrap.yml +++ b/process-boot/src/main/resources/bootstrap.yml @@ -21,16 +21,16 @@ spring: nacos: discovery: ip: 192.168.1.29 - server-addr: 192.168.1.28:18848 - namespace: e5d5499b-e3f6-42f8-baf9-7b5d9a7e3145 + server-addr: 192.168.1.13:18848 + namespace: ba3ba5d1-3480-4755-8b87-6b1fce16201c config: - server-addr: 192.168.1.28:18848 - namespace: e5d5499b-e3f6-42f8-baf9-7b5d9a7e3145 + server-addr: 192.168.1.13:18848 + namespace: ba3ba5d1-3480-4755-8b87-6b1fce16201c file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: share-config-datasource-db.yaml + - data-Id: process-config.yaml refresh: true main: allow-bean-definition-overriding: true @@ -42,7 +42,7 @@ spring: #项目日志的配置 logging: - config: http://192.168.1.28:18848/nacos/v1/cs/configs?tenant=&group=DEFAULT_GROUP&dataId=logback.xml + config: http://192.168.1.13:18848/nacos/v1/cs/configs?tenant=&group=DEFAULT_GROUP&dataId=logback.xml level: root: info From 6dc3c7612023db325e882d1718f7cc6d46bebf52 Mon Sep 17 00:00:00 2001 From: qijian <491437605@qq.com> Date: Fri, 11 Nov 2022 10:46:24 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + .../java/com/njcn/process/constant/Param.java | 13 ++ .../process/enums/ProcessResponseEnum.java | 30 +++++ .../com/njcn/process/pojo/dto/PublicDTO.java | 18 +++ .../njcn/process/pojo/param/PublicParam.java | 21 ++++ .../process/pojo/po/RLoadTypeUserManage.java | 116 ++++++++++++++++++ .../pojo/vo/RLoadTypeUserManageVO.java | 114 +++++++++++++++++ .../njcn/process/utils/PublicDataUtils.java | 30 +++++ process-boot/pom.xml | 33 ++++- .../LoadTypeUserManageController.java | 51 ++++++++ .../mapper/LoadTypeUserManageMapper.java | 24 ++++ .../mapping/LoadTypeUserManageMapper.xml | 12 ++ .../service/LoadTypeUserManageService.java | 17 +++ .../impl/LoadTypeUserManageServiceImpl.java | 30 +++++ 14 files changed, 509 insertions(+), 1 deletion(-) create mode 100644 process-api/src/main/java/com/njcn/process/constant/Param.java create mode 100644 process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/dto/PublicDTO.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/PublicParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java create mode 100644 process-api/src/main/java/com/njcn/process/utils/PublicDataUtils.java create mode 100644 process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml create mode 100644 process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java create mode 100644 process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java diff --git a/README.md b/README.md index e69de29bb..ff5f26224 100644 --- a/README.md +++ b/README.md @@ -0,0 +1 @@ +过程监督管理 \ No newline at end of file diff --git a/process-api/src/main/java/com/njcn/process/constant/Param.java b/process-api/src/main/java/com/njcn/process/constant/Param.java new file mode 100644 index 000000000..dbc097c99 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/constant/Param.java @@ -0,0 +1,13 @@ +package com.njcn.process.constant; + + +/** + * 常量类 + * @author qijian + * @version 1.0.0 + * @date 2022年11月11日 09:56 + */ +public interface Param { + + +} diff --git a/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java b/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java new file mode 100644 index 000000000..4b1c64474 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java @@ -0,0 +1,30 @@ +package com.njcn.process.enums; + +import lombok.Getter; + +/** + * 异常处理类 + * @author qijian + * @version 1.0.0 + * @date 2022年11月11日 09:56 + */ +@Getter +public enum ProcessResponseEnum { + + /** + * 过程监督异常响应码的范围： + * A00550 ~ A00649 + */ + PROCESS_COMMON_ERROR("A00550","监督管理模块异常"), + + ; + + private final String code; + + private final String message; + + ProcessResponseEnum(String code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/dto/PublicDTO.java b/process-api/src/main/java/com/njcn/process/pojo/dto/PublicDTO.java new file mode 100644 index 000000000..9136383c7 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/dto/PublicDTO.java @@ -0,0 +1,18 @@ +package com.njcn.process.pojo.dto; + +import lombok.Data; + +/** + * 公共DTO（初始化类） + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 10:34 + */ +@Data +public class PublicDTO { + + private String id; + + private String date; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/PublicParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/PublicParam.java new file mode 100644 index 000000000..2de7fa48c --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/PublicParam.java @@ -0,0 +1,21 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 公共Param（初始化类） + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 10:34 + */ +@Data +public class PublicParam { + + @ApiModelProperty(value = "id") + private String id; + + @ApiModelProperty(value = "date") + private String date; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java b/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java new file mode 100644 index 000000000..835772a35 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java @@ -0,0 +1,116 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 干扰源用户管理表(RLoadTypeUserManage)实体类 + * + * @author qijian + * @since 2022-11-11 10:11:41 + */ +@Data +@TableName(value = "r_load_type_user_manage") +public class RLoadTypeUserManage implements Serializable { + private static final long serialVersionUID = 390349030891669605L; + /** + * 主键 + */ + private String id; + /** + * 单位ID + */ + private String orgNo; + /** + * 干扰源类型ID + */ + private String loadType; + /** + * 干扰源用户名称 + */ + private String userName; + /** + * 关联干扰源用户编号ID + */ + private String relationUserId; + /** + * 建档时间 + */ + private Date recordTime; + /** + * 送电日期（并网日期） + */ + private Date powerTransmissionDate; + /** + * 合同容量（总装机容量） + */ + private Float userArgeementCapacity; + /** + * 用户类型，字典表 + */ + private String userLoadType; + /** + * 入网报告状态，字典ID + */ + private String iStatus; + /** + * 入网报告路径 + */ + private String iFilePath; + /** + * 入网报告上传时间 + */ + private Date iUploadTime; + /** + * 入网是否超标(0:否 1:是) + */ + private Integer iIsOverLimit; + /** + * 入网超标指标 + */ + private String iOverLimitTarget; + /** + * 入网计划采取措施，字典ID + */ + private String iPlanStep; + /** + * 入网详情 + */ + private String iDescription; + /** + * 实测报告是否上传(0:否 1:是) + */ + private Integer aIsFileUpload; + /** + * 实测报告状态，字典ID + */ + private String aStatus; + /** + * 实测报告路径 + */ + private String aFilePath; + /** + * 实测报告上传时间 + */ + private Date aUploadTime; + /** + * 实测是否超标(0:否 1:是) + */ + private Integer aIsOverLimit; + /** + * 实测超标指标 + */ + private String aOverLimitTarget; + /** + * 实测计划采取措施，字典ID + */ + private String aPlanStep; + /** + * 实测详情 + */ + private String aDescription; +} + diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java new file mode 100644 index 000000000..3aad32812 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java @@ -0,0 +1,114 @@ +package com.njcn.process.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 干扰源用户管理表 VO + * + * @author qijian + * @since 2022-11-11 10:11:41 + */ +@Data +public class RLoadTypeUserManageVO implements Serializable { + private static final long serialVersionUID = 390349030891669605L; + /** + * 主键 + */ + private String id; + /** + * 单位ID + */ + private String orgNo; + /** + * 干扰源类型ID + */ + private String loadType; + /** + * 干扰源用户名称 + */ + private String userName; + /** + * 关联干扰源用户编号ID + */ + private String relationUserId; + /** + * 建档时间 + */ + private Date recordTime; + /** + * 送电日期（并网日期） + */ + private Date powerTransmissionDate; + /** + * 合同容量（总装机容量） + */ + private Float userArgeementCapacity; + /** + * 用户类型，字典表 + */ + private String userLoadType; + /** + * 入网报告状态，字典ID + */ + private String iStatus; + /** + * 入网报告路径 + */ + private String iFilePath; + /** + * 入网报告上传时间 + */ + private Date iUploadTime; + /** + * 入网是否超标(0:否 1:是) + */ + private Integer iIsOverLimit; + /** + * 入网超标指标 + */ + private String iOverLimitTarget; + /** + * 入网计划采取措施，字典ID + */ + private String iPlanStep; + /** + * 入网详情 + */ + private String iDescription; + /** + * 实测报告是否上传(0:否 1:是) + */ + private Integer aIsFileUpload; + /** + * 实测报告状态，字典ID + */ + private String aStatus; + /** + * 实测报告路径 + */ + private String aFilePath; + /** + * 实测报告上传时间 + */ + private Date aUploadTime; + /** + * 实测是否超标(0:否 1:是) + */ + private Integer aIsOverLimit; + /** + * 实测超标指标 + */ + private String aOverLimitTarget; + /** + * 实测计划采取措施，字典ID + */ + private String aPlanStep; + /** + * 实测详情 + */ + private String aDescription; +} + diff --git a/process-api/src/main/java/com/njcn/process/utils/PublicDataUtils.java b/process-api/src/main/java/com/njcn/process/utils/PublicDataUtils.java new file mode 100644 index 000000000..b016bee37 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/utils/PublicDataUtils.java @@ -0,0 +1,30 @@ +package com.njcn.process.utils; + +/** + * 数据公共工具类 + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/10/14 - 10:07 + */ +public class PublicDataUtils { + /** + * 功能：下划线命名转驼峰命名 + * 将下划线替换为空格,将字符串根据空格分割成数组,再将每个单词首字母大写 + * @param s + * @return + */ + public static String underCamel(String s) + { + String separator = "_"; + String under=""; + s = s.toLowerCase().replace(separator, " "); + String sarr[]=s.split(" "); + for(int i=0;i com.njcn - prepare-api + process-api ${project.version} @@ -61,6 +61,37 @@ ${project.version} + + + com.njcn + common-minio + ${project.version} + + + + me.tongfei + progressbar + 0.5.3 + + + + com.squareup.okhttp3 + okhttp + 4.8.1 + + + + io.minio + minio + 8.2.1 + + + com.squareup.okhttp3 + okhttp + + + + diff --git a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java new file mode 100644 index 000000000..01efc09db --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java @@ -0,0 +1,51 @@ +package com.njcn.process.controller; + +import com.njcn.common.pojo.annotation.OperateInfo; +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.vo.RLoadTypeUserManageVO; +import com.njcn.process.service.LoadTypeUserManageService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 干扰源用户管理 + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 - 9:20 + */ +@Slf4j +@RestController +@RequestMapping("/loadTypeUserManage") +@Api(tags = "干扰源用户管理") +@AllArgsConstructor +public class LoadTypeUserManageController extends BaseController { + + private final LoadTypeUserManageService loadTypeUserManageService; + + /** + * 查询所有数据 + * @author qijian + * @date 2022/11/11 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getAll") + @ApiOperation("查询所有数据") + public HttpResult> getAll(){ + String methodDescribe = getMethodDescribe("getAll"); + List list = loadTypeUserManageService.getAll(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + +} diff --git a/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java new file mode 100644 index 000000000..516ef0fad --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java @@ -0,0 +1,24 @@ +package com.njcn.process.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.process.pojo.po.RLoadTypeUserManage; +import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; + +import java.util.List; + +/** + * 干扰源用户管理Mapper + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 - 9:24 + */ +public interface LoadTypeUserManageMapper extends BaseMapper { + + /** + * 查询所有数据 + * @return 结果 + */ + List getAll(); +} diff --git a/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml b/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml new file mode 100644 index 000000000..01feb1f51 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java b/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java new file mode 100644 index 000000000..be59ce10b --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java @@ -0,0 +1,17 @@ +package com.njcn.process.service; + +import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; + +import java.util.List; + +/** + * 干扰源用户管理 + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 - 9:20 + */ +public interface LoadTypeUserManageService { + + List getAll(); +} diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java new file mode 100644 index 000000000..f2e014205 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java @@ -0,0 +1,30 @@ +package com.njcn.process.service.impl; + +import com.njcn.process.mapper.LoadTypeUserManageMapper; +import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; +import com.njcn.process.service.LoadTypeUserManageService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 干扰源用户管理 + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 - 9:20 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService { + + private final LoadTypeUserManageMapper loadTypeUserManageMapper; + + @Override + public List getAll() { + return loadTypeUserManageMapper.getAll(); + } +} From a119908bc0e25b3cd9dda18f9181f14be8ccca57 Mon Sep 17 00:00:00 2001 From: qijian <491437605@qq.com> Date: Mon, 14 Nov 2022 15:52:39 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E5=B9=B2=E6=89=B0=E6=BA=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9A=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/enums/ProcessResponseEnum.java | 2 +- .../process/pojo/param/LoadTypeUserParam.java | 39 +++++++ .../pojo/param/LoadTypeUserSearchParam.java | 43 ++++++++ .../pojo/param/LoadTypeUserUploadParam.java | 45 ++++++++ .../njcn/process/utils/PublicDataUtils.java | 34 +++++- .../LoadTypeUserManageController.java | 77 +++++++++++-- .../mapper/LoadTypeUserManageMapper.java | 12 ++- .../mapping/LoadTypeUserManageMapper.xml | 17 ++- .../service/LoadTypeUserManageService.java | 35 +++++- .../impl/LoadTypeUserManageServiceImpl.java | 101 +++++++++++++++++- 10 files changed, 381 insertions(+), 24 deletions(-) create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java diff --git a/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java b/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java index 4b1c64474..996dba793 100644 --- a/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java +++ b/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java @@ -16,7 +16,7 @@ public enum ProcessResponseEnum { * A00550 ~ A00649 */ PROCESS_COMMON_ERROR("A00550","监督管理模块异常"), - + UPLOAD_FILE_ERROR("A00551","上传文件服务器错误，请检查数据"), ; private final String code; diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserParam.java new file mode 100644 index 000000000..7bf3cdde4 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserParam.java @@ -0,0 +1,39 @@ +package com.njcn.process.pojo.param; + +import com.njcn.common.pojo.constant.PatternRegex; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; + +/** + * 未建档干扰源用户编辑Param + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 10:34 + */ +@Data +@ApiModel +public class LoadTypeUserParam { + + @ApiModelProperty("所属单位") + @NotBlank(message = "所属单位不可为空") + private String orgNo; + + @ApiModelProperty("干扰源类型") + @NotBlank(message = "干扰源类型不可为空") + private String loadType; + + @ApiModelProperty("干扰源用户名称") + @NotBlank(message = "干扰源用户名称不可为空") + private String userName; + + @ApiModelProperty("建档时间") + @NotBlank(message = "时间不可为空") + @Pattern(regexp = PatternRegex.TIME_SECOND_FORMAT, message = "时间格式错误") + private String recordTime; + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java new file mode 100644 index 000000000..0861bd16a --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java @@ -0,0 +1,43 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Range; + +import javax.validation.constraints.NotNull; + +/** + * 未建档干扰源用户搜索Param + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 10:34 + */ +@Data +@ApiModel +public class LoadTypeUserSearchParam { + + @ApiModelProperty("所属单位") + private String orgNo; + + @ApiModelProperty("干扰源类型") + private String loadType; + + @ApiModelProperty("干扰源用户名称") + private String userName; + + @ApiModelProperty("是否上传报告(0:否 1:是)") + private Integer aIsFileUpload; + + @ApiModelProperty("页码") + @NotNull(message = "页码不可为空") + @Range(min = 1,message = "页码必须大于0") + private Integer pageNum; + + @ApiModelProperty("条数") + @NotNull(message = "条数不可为空") + @Range(min = 1,message = "条数必须大于0") + private Integer pageSize; + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java new file mode 100644 index 000000000..2061f5231 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java @@ -0,0 +1,45 @@ +package com.njcn.process.pojo.param; + +import com.njcn.web.constant.ValidMessage; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 未建档干扰源用户入网上传Param + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 10:34 + */ +@Data +public class LoadTypeUserUploadParam { + + @ApiModelProperty(name = "id",required = true) + @NotBlank(message = ValidMessage.ID_NOT_BLANK) + private String id; + + @ApiModelProperty(name = "file",value = "入网报告文件",required = true) + @NotNull(message = "入网报告文件不可为空") + private MultipartFile file; + + @ApiModelProperty(name = "iIsOverLimit",value = "入网是否超标(0:否 1:是)",required = true) + @NotNull(message = "入网是否超标不可为空") + private Integer iIsOverLimit; + + @ApiModelProperty(name = "iOverLimitTarget",value = "入网超标指标",required = true) + @NotBlank(message = "入网超标指标不可为空") + private String iOverLimitTarget; + + @ApiModelProperty(name = "iPlanStep",value = "入网计划采取措施",required = true) + @NotBlank(message = "入网计划采取措施不可为空") + private String iPlanStep; + + @ApiModelProperty(name = "iDescription",value = "入网详情") + private String iDescription; + + +} diff --git a/process-api/src/main/java/com/njcn/process/utils/PublicDataUtils.java b/process-api/src/main/java/com/njcn/process/utils/PublicDataUtils.java index b016bee37..cb9881f82 100644 --- a/process-api/src/main/java/com/njcn/process/utils/PublicDataUtils.java +++ b/process-api/src/main/java/com/njcn/process/utils/PublicDataUtils.java @@ -1,5 +1,12 @@ package com.njcn.process.utils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; + /** * 数据公共工具类 * @@ -9,7 +16,7 @@ package com.njcn.process.utils; */ public class PublicDataUtils { /** - * 功能：下划线命名转驼峰命名 + * 下划线命名转驼峰命名 * 将下划线替换为空格,将字符串根据空格分割成数组,再将每个单词首字母大写 * @param s * @return @@ -27,4 +34,29 @@ public class PublicDataUtils { } return under; } + + /** + * MultipartFile 转 String + * @param multipartFile 原字符串 + * @return 成功标记 + */ + private String MultipartFileToString(MultipartFile multipartFile) { + InputStreamReader isr; + BufferedReader br; + StringBuilder txtResult = new StringBuilder(); + try { + isr = new InputStreamReader(multipartFile.getInputStream(), StandardCharsets.UTF_8); + br = new BufferedReader(isr); + String lineTxt; + while ((lineTxt = br.readLine()) != null) { + txtResult.append(lineTxt); + } + isr.close(); + br.close(); + return txtResult.toString(); + } catch (IOException e) { + e.printStackTrace(); + return ""; + } + } } diff --git a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java index 01efc09db..7de7fba22 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java @@ -1,22 +1,26 @@ package com.njcn.process.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; 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.LoadTypeUserParam; +import com.njcn.process.pojo.param.LoadTypeUserSearchParam; +import com.njcn.process.pojo.param.LoadTypeUserUploadParam; +import com.njcn.process.pojo.po.RLoadTypeUserManage; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; import com.njcn.process.service.LoadTypeUserManageService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * 干扰源用户管理 @@ -35,17 +39,70 @@ public class LoadTypeUserManageController extends BaseController { private final LoadTypeUserManageService loadTypeUserManageService; /** - * 查询所有数据 + * 查询所有干扰源用户 * @author qijian * @date 2022/11/11 */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @GetMapping("/getAll") + @PostMapping("/getLoadTypeUserList") @ApiOperation("查询所有数据") - public HttpResult> getAll(){ - String methodDescribe = getMethodDescribe("getAll"); - List list = loadTypeUserManageService.getAll(); + @ApiImplicitParam(name = "loadTypeUserSearchParam", value = "干扰源用户入参", required = true) + public HttpResult> getLoadTypeUserList(@RequestBody @Validated LoadTypeUserSearchParam loadTypeUserSearchParam){ + String methodDescribe = getMethodDescribe("getLoadTypeUserList"); + Page list = loadTypeUserManageService.getLoadTypeUserList(loadTypeUserSearchParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + /** + * 根据id查询干扰源用户 + * @author qijian + * @date 2022/11/14 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getLoadTypeUserById") + @ApiOperation("根据id查询干扰源用户") + @ApiImplicitParam(name = "id", value = "id", required = true) + public HttpResult getLoadTypeUserById(@RequestParam("id") String id){ + String methodDescribe = getMethodDescribe("getLoadTypeUserById"); + RLoadTypeUserManage rLoadTypeUserManage = loadTypeUserManageService.getLoadTypeUserById(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rLoadTypeUserManage, methodDescribe); + } + + /** + * 新增干扰源用户 + * @author qijian + * @date 2022/11/14 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) + @PostMapping("/addLoadTypeUser") + @ApiOperation("新增干扰源用户") + @ApiImplicitParam(name = "loadTypeUserParam", value = "实体参数", required = true) + public HttpResult addLoadTypeUser(@RequestBody @Validated LoadTypeUserParam loadTypeUserParam){ + String methodDescribe = getMethodDescribe("addLoadTypeUser"); + boolean res = loadTypeUserManageService.addLoadTypeUser(loadTypeUserParam); + if(res){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + }else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + /** + * 上传干扰源用户入网报告 + * @author qijian + * @date 2022/11/14 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) + @PostMapping("/uploadLoadTypeUser") + @ApiOperation("上传干扰源用户入网报告") + @ApiImplicitParam(name = "loadTypeUserUploadParam", value = "实体参数", required = true) + public HttpResult uploadLoadTypeUser(@RequestBody @Validated LoadTypeUserUploadParam loadTypeUserUploadParam){ + String methodDescribe = getMethodDescribe("uploadLoadTypeUser"); + boolean res = loadTypeUserManageService.uploadLoadTypeUser(loadTypeUserUploadParam); + if(res){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + }else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } } diff --git a/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java index 516ef0fad..882c1e22c 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java +++ b/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java @@ -2,10 +2,12 @@ package com.njcn.process.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.process.pojo.param.LoadTypeUserSearchParam; import com.njcn.process.pojo.po.RLoadTypeUserManage; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; - -import java.util.List; +import org.apache.ibatis.annotations.Param; /** * 干扰源用户管理Mapper @@ -17,8 +19,10 @@ import java.util.List; public interface LoadTypeUserManageMapper extends BaseMapper { /** - * 查询所有数据 + * 干扰源用户分页查询 + * @param page 分页参数 + * @param loadTypeUserSearchParam 入参 * @return 结果 */ - List getAll(); + Page getLoadTypeUserPage(IPage page, @Param("loadTypeUserParam") LoadTypeUserSearchParam loadTypeUserSearchParam); } diff --git a/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml b/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml index 01feb1f51..7f09934c5 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml +++ b/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml @@ -2,11 +2,24 @@ - SELECT * FROM - r_load_type_user_manage + r_load_type_user_manage r + where 1=1 + + and r.org_no = #{loadTypeUserSearchParam.orgNo} + + + and r.load_type = #{loadTypeUserSearchParam.loadType} + + + and r.user_name like CONCAT(CONCAT('%', #{loadTypeUserSearchParam.userName}), '%') + + + and r.a_is_file_upload = #{loadTypeUserSearchParam.aIsFileUpload} + diff --git a/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java b/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java index be59ce10b..a5ff30a53 100644 --- a/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java +++ b/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java @@ -1,9 +1,12 @@ package com.njcn.process.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.process.pojo.param.LoadTypeUserParam; +import com.njcn.process.pojo.param.LoadTypeUserSearchParam; +import com.njcn.process.pojo.param.LoadTypeUserUploadParam; +import com.njcn.process.pojo.po.RLoadTypeUserManage; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; -import java.util.List; - /** * 干扰源用户管理 * @@ -13,5 +16,31 @@ import java.util.List; */ public interface LoadTypeUserManageService { - List getAll(); + /** + * 干扰源用户分页查询 + * @param loadTypeUserSearchParam + * @return + */ + Page getLoadTypeUserList(LoadTypeUserSearchParam loadTypeUserSearchParam); + + /** + * 根据id查询干扰源用户 + * @param id + * @return + */ + RLoadTypeUserManage getLoadTypeUserById(String id); + + /** + * 新增干扰源用户 + * @param loadTypeUserParam + * @return + */ + boolean addLoadTypeUser(LoadTypeUserParam loadTypeUserParam); + + /** + * 上传干扰源用户入网报告 + * @param loadTypeUserUploadParam + * @return + */ + boolean uploadLoadTypeUser(LoadTypeUserUploadParam loadTypeUserUploadParam); } diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java index f2e014205..d1fc1c08f 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java @@ -1,13 +1,27 @@ package com.njcn.process.service.impl; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.minio.bo.MinIoUploadResDTO; +import com.njcn.minio.config.MinIoProperties; +import com.njcn.minio.utils.MinIoUtils; +import com.njcn.process.enums.ProcessResponseEnum; import com.njcn.process.mapper.LoadTypeUserManageMapper; +import com.njcn.process.pojo.param.LoadTypeUserParam; +import com.njcn.process.pojo.param.LoadTypeUserSearchParam; +import com.njcn.process.pojo.param.LoadTypeUserUploadParam; +import com.njcn.process.pojo.po.RLoadTypeUserManage; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; import com.njcn.process.service.LoadTypeUserManageService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; -import java.util.List; +import javax.annotation.Resource; +import java.util.Date; /** * 干扰源用户管理 @@ -23,8 +37,89 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService private final LoadTypeUserManageMapper loadTypeUserManageMapper; + @Resource + private MinIoUtils minIoUtils; + + @Resource + private MinIoProperties minIoProperties; + + /** + * 干扰源用户分页查询 + * @param loadTypeUserSearchParam + * @return + */ @Override - public List getAll() { - return loadTypeUserManageMapper.getAll(); + public Page getLoadTypeUserList(LoadTypeUserSearchParam loadTypeUserSearchParam){ + Page page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize()); + return loadTypeUserManageMapper.getLoadTypeUserPage(page,loadTypeUserSearchParam); + } + + /** + * 根据id查询干扰源用户 + * @param id + * @return + */ + @Override + public RLoadTypeUserManage getLoadTypeUserById(String id) { + RLoadTypeUserManage rLoadTypeUserManage = loadTypeUserManageMapper.selectById(id); + return rLoadTypeUserManage; + } + + /** + * 新增干扰源用户 + * @param loadTypeUserParam + * @return + */ + @Override + public boolean addLoadTypeUser(LoadTypeUserParam loadTypeUserParam) { + //参数转换 + RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage(); + BeanUtils.copyProperties(loadTypeUserParam, rLoadTypeUserManage); + System.out.println(rLoadTypeUserManage); + + //塞入建档时间 + Date date = DateUtil.parse(loadTypeUserParam.getRecordTime(), "yyyy-MM-dd HH:mm:ss"); + rLoadTypeUserManage.setRecordTime(date); + loadTypeUserManageMapper.insert(rLoadTypeUserManage); + return true; + } + + /** + * 上传干扰源用户入网报告 + * @param loadTypeUserUploadParam + * @return + */ + @Override + public boolean uploadLoadTypeUser(LoadTypeUserUploadParam loadTypeUserUploadParam) { + + RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage(); + + //文件上传到Minio服务器，存入文件名 + MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserUploadParam.getFile()); + rLoadTypeUserManage.setIFilePath(minIoUploadResDTO.getMinFileName()); + rLoadTypeUserManage.setIUploadTime(new Date()); + + //填入数据修改 + BeanUtils.copyProperties(loadTypeUserUploadParam, rLoadTypeUserManage); + rLoadTypeUserManage.setIStatus("待审核");//需要修改字典 + loadTypeUserManageMapper.updateById(rLoadTypeUserManage); + + return true; + } + + /** + * 上传文件到Minio + * + * @param file 文件 + * @return 成功标记 + */ + private MinIoUploadResDTO fileToMinio(MultipartFile file) { + try { + //把名称存入数据 + MinIoUploadResDTO upload = minIoUtils.upload(file, minIoProperties.getBucket(), "loadTypeUser/"); + return upload; + } catch (Exception e) { + throw new BusinessException(ProcessResponseEnum.UPLOAD_FILE_ERROR); + } } } From 6155e3d0e8cc90746fba90d5659129108479bb7f Mon Sep 17 00:00:00 2001 From: qijian <491437605@qq.com> Date: Wed, 16 Nov 2022 10:48:56 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E5=B9=B2=E6=89=B0=E6=BA=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9A=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoadTypeUserManageController.java | 20 +++++++++++++++++++ .../service/LoadTypeUserManageService.java | 7 +++++++ .../impl/LoadTypeUserManageServiceImpl.java | 16 ++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java index 7de7fba22..091933bfb 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java @@ -105,4 +105,24 @@ public class LoadTypeUserManageController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } } + + /** + * 关联营销用户（待修改） + * @author qijian + * @date 2022/11/15 + * + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) + @PostMapping("/linkUser") + @ApiOperation("关联营销用户") +// @ApiImplicitParam(name = "loadTypeUserUploadParam", value = "实体参数", required = true) + public HttpResult linkUser(){ + String methodDescribe = getMethodDescribe("linkUser"); + boolean res = loadTypeUserManageService.linkUser(); + if(res){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + }else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } } diff --git a/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java b/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java index a5ff30a53..9483c7fe2 100644 --- a/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java +++ b/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java @@ -43,4 +43,11 @@ public interface LoadTypeUserManageService { * @return */ boolean uploadLoadTypeUser(LoadTypeUserUploadParam loadTypeUserUploadParam); + + /** + * 关联营销用户 + * @param + * @return + */ + boolean linkUser(); } diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java index d1fc1c08f..438108efc 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java @@ -14,6 +14,8 @@ import com.njcn.process.pojo.param.LoadTypeUserUploadParam; import com.njcn.process.pojo.po.RLoadTypeUserManage; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; import com.njcn.process.service.LoadTypeUserManageService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -37,6 +39,8 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService private final LoadTypeUserManageMapper loadTypeUserManageMapper; + private final DicDataFeignClient dicDataFeignClient; + @Resource private MinIoUtils minIoUtils; @@ -101,12 +105,22 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService //填入数据修改 BeanUtils.copyProperties(loadTypeUserUploadParam, rLoadTypeUserManage); - rLoadTypeUserManage.setIStatus("待审核");//需要修改字典 + rLoadTypeUserManage.setIStatus(DicDataEnum.NEWLY.getCode()); loadTypeUserManageMapper.updateById(rLoadTypeUserManage); return true; } + /** + * 关联营销用户 + * @param + * @return + */ + @Override + public boolean linkUser() { + return false; + } + /** * 上传文件到Minio * From 0f428ccc87ca41f851d8241d82289a767245d185 Mon Sep 17 00:00:00 2001 From: qijian <491437605@qq.com> Date: Fri, 18 Nov 2022 10:56:52 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E5=B9=B2=E6=89=B0=E6=BA=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9A=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/process/constant/Param.java | 7 +- .../pojo/param/LoadTypeUserAUploadParam.java | 49 ++++++++++++ .../param/LoadTypeUserAssociateParam.java | 34 +++++++++ ...ram.java => LoadTypeUserIUploadParam.java} | 6 +- .../pojo/param/LoadTypeUserSearchParam.java | 3 + .../process/pojo/po/RLoadTypeUserManage.java | 4 + .../pojo/vo/RLoadTypeUserManageVO.java | 5 ++ .../LoadTypeUserManageController.java | 64 ++++++++++++---- .../mapper/LoadTypeUserManageMapper.java | 10 ++- .../mapping/LoadTypeUserManageMapper.xml | 28 ++++++- .../service/LoadTypeUserManageService.java | 26 +++++-- .../impl/LoadTypeUserManageServiceImpl.java | 76 ++++++++++++++++--- 12 files changed, 273 insertions(+), 39 deletions(-) create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java rename process-api/src/main/java/com/njcn/process/pojo/param/{LoadTypeUserUploadParam.java => LoadTypeUserIUploadParam.java} (86%) diff --git a/process-api/src/main/java/com/njcn/process/constant/Param.java b/process-api/src/main/java/com/njcn/process/constant/Param.java index dbc097c99..42d3ad290 100644 --- a/process-api/src/main/java/com/njcn/process/constant/Param.java +++ b/process-api/src/main/java/com/njcn/process/constant/Param.java @@ -8,6 +8,9 @@ package com.njcn.process.constant; * @date 2022年11月11日 09:56 */ public interface Param { - - + /** + * 干扰源用户管理 数据状态 + */ + Integer LOAD_TYPE_USER_SUBMIT = 1; + Integer LOAD_TYPE_USER_SAVE = 2; } diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java new file mode 100644 index 000000000..cfecd31ee --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java @@ -0,0 +1,49 @@ +package com.njcn.process.pojo.param; + +import com.njcn.web.constant.ValidMessage; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 未建档干扰源用户实测上传Param + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/18 10:00 + */ +@Data +public class LoadTypeUserAUploadParam { + + @ApiModelProperty(name = "id",required = true) + @NotBlank(message = ValidMessage.ID_NOT_BLANK) + private String id; + + @ApiModelProperty(name = "file",value = "实测报告文件",required = true) + @NotNull(message = "实测报告文件不可为空") + private MultipartFile file; + + @ApiModelProperty(name = "status",value = "数据状态（1：提交 2：保存）",required = true) + @NotNull(message = "数据状态不可为空") + private Integer status; + + @ApiModelProperty(name = "aIsOverLimit",value = "实测是否超标(0:否 1:是)",required = true) + @NotNull(message = "实测是否超标不可为空") + private Integer aIsOverLimit; + + @ApiModelProperty(name = "aOverLimitTarget",value = "实测超标指标",required = true) + @NotBlank(message = "实测超标指标不可为空") + private String aOverLimitTarget; + + @ApiModelProperty(name = "aPlanStep",value = "实测计划采取措施",required = true) + @NotBlank(message = "实测计划采取措施不可为空") + private String aPlanStep; + + @ApiModelProperty(name = "aDescription",value = "实测详情") + private String aDescription; + + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java new file mode 100644 index 000000000..3a7c91a19 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java @@ -0,0 +1,34 @@ +package com.njcn.process.pojo.param; + +import com.njcn.web.constant.ValidMessage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 未建档干扰源用户关联营销Param + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/16 10:34 + */ +@Data +@ApiModel +public class LoadTypeUserAssociateParam { + + @ApiModelProperty("id") + @NotBlank(message = ValidMessage.ID_NOT_BLANK) + private String id; + + @ApiModelProperty("用户类型") + @NotBlank(message = "用户类型不可为空") + private String userLoadType; + + @ApiModelProperty("关联干扰源用户编号") + @NotNull(message = "关联干扰源用户编号不可为空") + private String relationUserId; + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java similarity index 86% rename from process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java rename to process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java index 2061f5231..d0b9a5c53 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserUploadParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; * @createTime 2022/11/11 10:34 */ @Data -public class LoadTypeUserUploadParam { +public class LoadTypeUserIUploadParam { @ApiModelProperty(name = "id",required = true) @NotBlank(message = ValidMessage.ID_NOT_BLANK) @@ -26,6 +26,10 @@ public class LoadTypeUserUploadParam { @NotNull(message = "入网报告文件不可为空") private MultipartFile file; + @ApiModelProperty(name = "status",value = "数据状态（1：提交 2：保存）",required = true) + @NotNull(message = "数据状态不可为空") + private Integer status; + @ApiModelProperty(name = "iIsOverLimit",value = "入网是否超标(0:否 1:是)",required = true) @NotNull(message = "入网是否超标不可为空") private Integer iIsOverLimit; diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java index 0861bd16a..1bb18fbc8 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java @@ -27,6 +27,9 @@ public class LoadTypeUserSearchParam { @ApiModelProperty("干扰源用户名称") private String userName; + @ApiModelProperty("关联干扰源用户名称") + private String relationUserName; + @ApiModelProperty("是否上传报告(0:否 1:是)") private Integer aIsFileUpload; diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java b/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java index 835772a35..1ca54efae 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java @@ -36,6 +36,10 @@ public class RLoadTypeUserManage implements Serializable { * 关联干扰源用户编号ID */ private String relationUserId; + /** + * 关联干扰源用户名称 + */ + private String relationUserName; /** * 建档时间 */ diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java index 3aad32812..5fcf88a62 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java @@ -34,6 +34,10 @@ public class RLoadTypeUserManageVO implements Serializable { * 关联干扰源用户编号ID */ private String relationUserId; + /** + * 关联干扰源用户名称 + */ + private String relationUserName; /** * 建档时间 */ @@ -110,5 +114,6 @@ public class RLoadTypeUserManageVO implements Serializable { * 实测详情 */ private String aDescription; + } diff --git a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java index 091933bfb..594292178 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java @@ -7,9 +7,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.process.pojo.param.LoadTypeUserParam; -import com.njcn.process.pojo.param.LoadTypeUserSearchParam; -import com.njcn.process.pojo.param.LoadTypeUserUploadParam; +import com.njcn.process.pojo.param.*; import com.njcn.process.pojo.po.RLoadTypeUserManage; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; import com.njcn.process.service.LoadTypeUserManageService; @@ -45,7 +43,7 @@ public class LoadTypeUserManageController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLoadTypeUserList") - @ApiOperation("查询所有数据") + @ApiOperation("查询所有干扰源用户") @ApiImplicitParam(name = "loadTypeUserSearchParam", value = "干扰源用户入参", required = true) public HttpResult> getLoadTypeUserList(@RequestBody @Validated LoadTypeUserSearchParam loadTypeUserSearchParam){ String methodDescribe = getMethodDescribe("getLoadTypeUserList"); @@ -92,13 +90,13 @@ public class LoadTypeUserManageController extends BaseController { * @author qijian * @date 2022/11/14 */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) - @PostMapping("/uploadLoadTypeUser") + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) + @PostMapping("/uploadLoadTypeUserI") @ApiOperation("上传干扰源用户入网报告") - @ApiImplicitParam(name = "loadTypeUserUploadParam", value = "实体参数", required = true) - public HttpResult uploadLoadTypeUser(@RequestBody @Validated LoadTypeUserUploadParam loadTypeUserUploadParam){ - String methodDescribe = getMethodDescribe("uploadLoadTypeUser"); - boolean res = loadTypeUserManageService.uploadLoadTypeUser(loadTypeUserUploadParam); +// @ApiImplicitParam(name = "loadTypeUserIUploadParam", value = "实体参数", required = true) + public HttpResult uploadLoadTypeUserI(@Validated LoadTypeUserIUploadParam loadTypeUserIUploadParam){ + String methodDescribe = getMethodDescribe("uploadLoadTypeUserI"); + boolean res = loadTypeUserManageService.uploadLoadTypeUserI(loadTypeUserIUploadParam); if(res){ return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); }else { @@ -107,18 +105,52 @@ public class LoadTypeUserManageController extends BaseController { } /** - * 关联营销用户（待修改） + * 关联营销用户 * @author qijian - * @date 2022/11/15 + * @date 2022/11/16 * */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) @PostMapping("/linkUser") @ApiOperation("关联营销用户") -// @ApiImplicitParam(name = "loadTypeUserUploadParam", value = "实体参数", required = true) - public HttpResult linkUser(){ + @ApiImplicitParam(name = "loadTypeUserAssociateParam", value = "实体参数", required = true) + public HttpResult linkUser(@RequestBody @Validated LoadTypeUserAssociateParam loadTypeUserAssociateParam){ String methodDescribe = getMethodDescribe("linkUser"); - boolean res = loadTypeUserManageService.linkUser(); + boolean res = loadTypeUserManageService.linkUser(loadTypeUserAssociateParam); + if(res){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + }else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + /** + * 查询所有干扰源用户（与营销系统关联） + * @author qijian + * @date 2022/11/17 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getLoadTypeRelationList") + @ApiOperation("查询所有干扰源用户（与营销系统关联）") + @ApiImplicitParam(name = "loadTypeUserSearchParam", value = "干扰源用户入参", required = true) + public HttpResult> getLoadTypeRelationList(@RequestBody @Validated LoadTypeUserSearchParam loadTypeUserSearchParam){ + String methodDescribe = getMethodDescribe("getLoadTypeRelationList"); + Page list = loadTypeUserManageService.getLoadTypeRelationList(loadTypeUserSearchParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + + /** + * 上传干扰源用户实测报告 + * @author qijian + * @date 2022/11/14 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) + @PostMapping("/uploadLoadTypeUserA") + @ApiOperation("上传干扰源用户实测报告") +// @ApiImplicitParam(name = "loadTypeUserAUploadParam", value = "实体参数", required = true) + public HttpResult uploadLoadTypeUserA(@Validated LoadTypeUserAUploadParam loadTypeUserAUploadParam){ + String methodDescribe = getMethodDescribe("uploadLoadTypeUserA"); + boolean res = loadTypeUserManageService.uploadLoadTypeUserA(loadTypeUserAUploadParam); if(res){ return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); }else { diff --git a/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java index 882c1e22c..dc1f53c25 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java +++ b/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java @@ -24,5 +24,13 @@ public interface LoadTypeUserManageMapper extends BaseMapper getLoadTypeUserPage(IPage page, @Param("loadTypeUserParam") LoadTypeUserSearchParam loadTypeUserSearchParam); + Page getLoadTypeUserPage(IPage page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam); + + /** + * 干扰源用户分页查询 + * @param page 分页参数 + * @param loadTypeUserSearchParam 入参 + * @return 结果 + */ + Page getLoadTypeRelationPage(IPage page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam); } diff --git a/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml b/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml index 7f09934c5..39aae0b45 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml +++ b/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml @@ -15,7 +15,33 @@ and r.load_type = #{loadTypeUserSearchParam.loadType} - and r.user_name like CONCAT(CONCAT('%', #{loadTypeUserSearchParam.userName}), '%') + and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%') + + + and r.a_is_file_upload = #{loadTypeUserSearchParam.aIsFileUpload} + + + + + SELECT + * + FROM + r_stat_electric_quality_problem_flow + WHERE + data_date between #{date.dateBegin} AND #{date.dateEnd} + + AND org_no = #{param.orgNo} + + + AND problem_sources = #{param.problemSources} + + + AND report_process = #{param.reportProcess} + + + AND report_process_status = #{param.reportProcessStatus} + + + AND problem_name like CONCAT(CONCAT('%', #{param.problemName}), '%') + + + diff --git a/process-boot/src/main/java/com/njcn/process/service/IssuesService.java b/process-boot/src/main/java/com/njcn/process/service/IssuesService.java new file mode 100644 index 000000000..6857a75f8 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/service/IssuesService.java @@ -0,0 +1,81 @@ +package com.njcn.process.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.minio.bo.MinIoUploadResDTO; +import com.njcn.process.pojo.param.*; +import com.njcn.process.pojo.vo.*; +import org.springframework.web.multipart.MultipartFile; + +/** + * 电能质量问题接口类 + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/14 10:59 + */ +public interface IssuesService { + + /** + * 填报在线监测超标问题 + */ + void addExcessiveIssues(ExcessiveParam excessiveParam); + + /** + * 填报普测超标问题 + */ + void addGeneralSurveyIssues(GeneralSurveyParam generalSurveyParam); + + /** + * 填报用户投诉问题 + */ + void addComplaintIssues(ComplaintParam complaintParam); + + /** + * 填报运维监控异常问题 + */ + void addAbnormalIssues(AbnormalParam abnormalParam); + + /** + * 查询问题列表 + */ + Page getIssues(QueryIssuesParam queryIssuesParam); + + /** + * 查询在线监测超标问题详情 + */ + ExcessiveDetailVO getExcessiveDetail(String powerQualityProblemNo); + + /** + * 查询普测超标问题详情 + */ + GeneralSurveyVO getGeneralSurveyDetail(String powerQualityProblemNo); + + /** + * 查询用户投诉问题详情 + */ + ComplaintVO getComplaintDetail(String powerQualityProblemNo); + + /** + * 查询运维异常问题详情 + */ + AbnormalVO getAbnormalDetail(String powerQualityProblemNo); + + /** + * 原因分析 + */ + void reasonAnalysis(ProcessParam processParam); + + /** + * 计划整改措施、实际采取措施、成效分析 + */ + void process(ProcessParam processParam, String code); + + /** + * 问题归档 + */ + void archive(String powerQualityProblemNo); + + /** + * 上传文件 + */ + MinIoUploadResDTO uploadFile(MultipartFile issuesFile); +} diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java new file mode 100644 index 000000000..606e0898b --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java @@ -0,0 +1,312 @@ +package com.njcn.process.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.constant.BizParamConstant; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.minio.bo.MinIoUploadResDTO; +import com.njcn.minio.config.MinIoProperties; +import com.njcn.minio.utils.MinIoUtils; +import com.njcn.process.enums.ProcessResponseEnum; +import com.njcn.process.mapper.*; +import com.njcn.process.pojo.param.*; +import com.njcn.process.pojo.po.*; +import com.njcn.process.pojo.vo.*; +import com.njcn.process.service.IssuesService; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.user.api.DeptFeignClient; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.Date; + +/** + * 电能质量问题实现类 + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/14 11:03 + */ +@Slf4j +@Service +@AllArgsConstructor +public class IssuesServiceImpl implements IssuesService { + + private final DeptFeignClient deptFeignClient; + + private final RStatElectricQualityProblemFlowMapper issuesMapper; + + private final RMpOnlineMonitorOverproofProblemMapper excessiveMapper; + + private final RMpGeneralSurveyOverproofProblemMapper generalSurveyMapper; + + private final RMpUserComplaintMapper complaintMapper; + + private final RMpOperationMonitorAbnormalMapper abnormalMapper; + + private final RMpElectricQualityProblemFlowDetailsMapper flowDetailsMapper; + + @Resource + private MinIoUtils minIoUtils; + + @Resource + private MinIoProperties minIoProperties; + + /** + * 新增电能质量问题流程表信息 + */ + private LocalDateTime addIssues(IssuesParam issuesParam){ + RStatElectricQualityProblemFlow issues = new RStatElectricQualityProblemFlow(); + LocalDateTime local = LocalDateTimeUtil.now(); + BeanUtil.copyProperties(issuesParam,issues); + issues.setDataDate(local); + issues.setReportProcess(DicDataEnum.NOT_REPORTED.getCode()); + issues.setReportProcessStatus(DicDataEnum.AUDITT.getCode()); + issuesMapper.insert(issues); + return local; + } + + /** + * 填报在线监测超标问题 + */ + @Override + public void addExcessiveIssues(ExcessiveParam excessiveParam) { + IssuesParam issuesParam = new IssuesParam(); + BeanUtil.copyProperties(excessiveParam,issuesParam); + LocalDateTime localDateTime = addIssues(issuesParam); + RMpOnlineMonitorOverproofProblem excessive = new RMpOnlineMonitorOverproofProblem(); + BeanUtil.copyProperties(excessiveParam,excessive); + excessive.setDataDate(localDateTime); + excessiveMapper.insert(excessive); + } + + /** + * 填报普测超标问题 + */ + @Override + public void addGeneralSurveyIssues(GeneralSurveyParam generalSurveyParam) { + IssuesParam issuesParam = new IssuesParam(); + BeanUtil.copyProperties(generalSurveyParam,issuesParam); + LocalDateTime localDateTime = addIssues(issuesParam); + RMpGeneralSurveyOverproofProblem generalSurvey = new RMpGeneralSurveyOverproofProblem(); + BeanUtil.copyProperties(generalSurveyParam,generalSurvey); + generalSurvey.setDataDate(localDateTime); + generalSurveyMapper.insert(generalSurvey); + } + + /** + * 填报用户投诉问题 + */ + @Override + public void addComplaintIssues(ComplaintParam complaintParam) { + IssuesParam issuesParam = new IssuesParam(); + BeanUtil.copyProperties(complaintParam,issuesParam); + LocalDateTime localDateTime = addIssues(issuesParam); + RMpUserComplaint complaint = new RMpUserComplaint(); + BeanUtil.copyProperties(complaintParam,complaint); + complaint.setDataDate(localDateTime); + complaintMapper.insert(complaint); + } + + /** + * 填报运维监控异常问题 + */ + @Override + public void addAbnormalIssues(AbnormalParam abnormalParam) { + IssuesParam issuesParam = new IssuesParam(); + BeanUtil.copyProperties(abnormalParam,issuesParam); + LocalDateTime localDateTime = addIssues(issuesParam); + RMpOperationMonitorAbnormal abnormal = new RMpOperationMonitorAbnormal(); + BeanUtil.copyProperties(abnormalParam,abnormal); + abnormal.setDataDate(localDateTime); + abnormalMapper.insert(abnormal); + } + + /** + * 查询问题列表 + */ + @Override + public Page getIssues(QueryIssuesParam param) { + IPage page = new Page<>(param.getPageNum(), param.getPageSize()); + Date dateOut = DateUtil.parse(param.getDataDate()); + Date dateBegin = new Date(); + Date dateEnd = new Date(); + if (Integer.valueOf(BizParamConstant.STAT_BIZ_YEAR).equals(param.getDataType())){ + dateBegin = DateUtil.beginOfYear(dateOut); + dateEnd = DateUtil.endOfYear(dateOut); + }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_QUARTER).equals(param.getDataType())){ + dateBegin = DateUtil.beginOfQuarter(dateOut); + dateEnd = DateUtil.endOfQuarter(dateOut); + }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH).equals(param.getDataType())){ + dateBegin = DateUtil.beginOfMonth(dateOut); + dateEnd = DateUtil.endOfMonth(dateOut); + } + Page out = issuesMapper.getIssues(page,param,DateUtil.formatDateTime(dateBegin), DateUtil.formatDateTime(dateEnd)); + out.getRecords().forEach(data -> data.setOrgName((deptFeignClient.getDeptById(data.getOrgNo()).getData().getName()))); + return out; + } + + /** + * 问题基本信息查询 + */ + private RStatElectricQualityProblemFlow issuesSelectOne(String powerQualityProblemNo){ + LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); + issuesQuery.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,powerQualityProblemNo); + return issuesMapper.selectOne(issuesQuery); + } + + /** + * 填报流程详情查询 + */ + private RMpElectricQualityProblemFlowDetails flowDetailSelectOne(String powerQualityProblemNo){ + LambdaQueryWrapper flowQuery = new LambdaQueryWrapper<>(); + flowQuery.eq(RMpElectricQualityProblemFlowDetails::getPowerQualityProblemNo,powerQualityProblemNo); + return flowDetailsMapper.selectOne(flowQuery); + } + /** + * 查询在线监测超标问题详情 + */ + @Override + public ExcessiveDetailVO getExcessiveDetail(String powerQualityProblemNo) { + ExcessiveDetailVO detail = new ExcessiveDetailVO(); + BeanUtil.copyProperties(issuesSelectOne(powerQualityProblemNo),detail); + detail.setOrgName(deptFeignClient.getDeptById(detail.getOrgNo()).getData().getName()); + LambdaQueryWrapper excessiveQuery = new LambdaQueryWrapper<>(); + excessiveQuery.eq(RMpOnlineMonitorOverproofProblem::getPowerQualityProblemNo,powerQualityProblemNo); + RMpOnlineMonitorOverproofProblem excessiveOut = excessiveMapper.selectOne(excessiveQuery); + BeanUtil.copyProperties(excessiveOut,detail); + BeanUtil.copyProperties(flowDetailSelectOne(powerQualityProblemNo),detail); + return detail; + } + + /** + * 查询用户投诉问题详情 + */ + @Override + public GeneralSurveyVO getGeneralSurveyDetail(String powerQualityProblemNo) { + GeneralSurveyVO detail = new GeneralSurveyVO(); + BeanUtil.copyProperties(issuesSelectOne(powerQualityProblemNo),detail); + detail.setOrgName(deptFeignClient.getDeptById(detail.getOrgNo()).getData().getName()); + LambdaQueryWrapper generalSurveyQuery = new LambdaQueryWrapper<>(); + generalSurveyQuery.eq(RMpGeneralSurveyOverproofProblem::getPowerQualityProblemNo,powerQualityProblemNo); + RMpGeneralSurveyOverproofProblem generalSurveyOut = generalSurveyMapper.selectOne(generalSurveyQuery); + BeanUtil.copyProperties(generalSurveyOut,detail); + BeanUtil.copyProperties(flowDetailSelectOne(powerQualityProblemNo),detail); + return detail; + } + + /** + * 查询用户投诉问题详情 + */ + @Override + public ComplaintVO getComplaintDetail(String powerQualityProblemNo) { + ComplaintVO detail = new ComplaintVO(); + BeanUtil.copyProperties(issuesSelectOne(powerQualityProblemNo),detail); + detail.setOrgName(deptFeignClient.getDeptById(detail.getOrgNo()).getData().getName()); + LambdaQueryWrapper complaintQuery = new LambdaQueryWrapper<>(); + complaintQuery.eq(RMpUserComplaint::getPowerQualityProblemNo,powerQualityProblemNo); + RMpUserComplaint complaintOut = complaintMapper.selectOne(complaintQuery); + BeanUtil.copyProperties(complaintOut,detail); + BeanUtil.copyProperties(flowDetailSelectOne(powerQualityProblemNo),detail); + return detail; + } + + /** + * 查询运维异常问题详情 + */ + @Override + public AbnormalVO getAbnormalDetail(String powerQualityProblemNo) { + AbnormalVO detail = new AbnormalVO(); + BeanUtil.copyProperties(issuesSelectOne(powerQualityProblemNo),detail); + detail.setOrgName(deptFeignClient.getDeptById(detail.getOrgNo()).getData().getName()); + LambdaQueryWrapper abnormalQuery = new LambdaQueryWrapper<>(); + abnormalQuery.eq(RMpOperationMonitorAbnormal::getPowerQualityProblemNo,powerQualityProblemNo); + RMpOperationMonitorAbnormal abnormalOut = abnormalMapper.selectOne(abnormalQuery); + BeanUtil.copyProperties(abnormalOut,detail); + BeanUtil.copyProperties(flowDetailSelectOne(powerQualityProblemNo),detail); + return detail; + } + + /** + * 原因分析 + */ + @Override + public void reasonAnalysis(ProcessParam processParam) { + LocalDateTime local = LocalDateTimeUtil.now(); + RMpElectricQualityProblemFlowDetails details = new RMpElectricQualityProblemFlowDetails(); + BeanUtil.copyProperties(processParam,details); + details.setDataDateYyfx(local); + flowDetailsMapper.insert(details); + LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); + issuesQuery.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo()); + RStatElectricQualityProblemFlow issuesOut = issuesMapper.selectOne(issuesQuery); + issuesOut.setReportProcess(DicDataEnum.CAUSE_ANALYSIS.getCode()); + issuesMapper.update(issuesOut,issuesQuery); + } + + /** + * 计划整改措施、实际采取措施、成效分析 + */ + @Override + public void process(ProcessParam processParam, String code) { + LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); + issuesQuery.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo()); + RStatElectricQualityProblemFlow issuesOut = issuesMapper.selectOne(issuesQuery); + if (DicDataEnum.SUCCESS.getCode().equals(issuesOut.getReportProcessStatus())){ + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(RMpElectricQualityProblemFlowDetails::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo()); + RMpElectricQualityProblemFlowDetails details = flowDetailsMapper.selectOne(query); + BeanUtil.copyProperties(processParam,details); + LocalDateTime local = LocalDateTimeUtil.now(); + if (DicDataEnum.PLAN_MEASURES.getCode().equals(code)){ + details.setDataDateJhzg(local); + }else if (DicDataEnum.ACTUAL_MEASURES.getCode().equals(code)){ + details.setDataDateSjcq(local); + }else if (DicDataEnum.INSIGHTS.getCode().equals(code)){ + details.setDataDateZlxg(local); + } + flowDetailsMapper.update(details, query); + issuesOut.setReportProcess(DicDataEnum.CAUSE_ANALYSIS.getCode()); + issuesMapper.update(issuesOut,issuesQuery); + }else { + throw new BusinessException(ProcessResponseEnum.PROCESS_ERROR); + } + } + + /** + * 问题归档 + */ + @Override + public void archive(String powerQualityProblemNo) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,powerQualityProblemNo); + RStatElectricQualityProblemFlow issuesOut = issuesMapper.selectOne(query); + if (DicDataEnum.INSIGHTS.getCode().equals(issuesOut.getReportProcess()) + && DicDataEnum.SUCCESS.getCode().equals(issuesOut.getReportProcessStatus())){ + issuesOut.setReportProcess(DicDataEnum.ARCHIVED.getCode()); + issuesMapper.update(issuesOut,query); + }else { + throw new BusinessException(ProcessResponseEnum.ARCHIVE_ERROR); + } + } + + /** + * 上传文件 + */ + @Override + public MinIoUploadResDTO uploadFile(MultipartFile issuesFile) { + try { + return minIoUtils.upload(issuesFile, minIoProperties.getBucket(), "electricityQuality/"); + } catch (Exception e) { + throw new BusinessException(ProcessResponseEnum.UPLOAD_FILE_ERROR); + } + } + +} From bb23fcf761f322de59a5e30c8c23ea43cf603ffa Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Fri, 18 Nov 2022 11:22:46 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E6=99=AE=E6=B5=8B=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/enums/ProcessResponseEnum.java | 2 + process-boot/pom.xml | 7 +- .../com/njcn/process/ProcessApplication.java | 2 + .../RGeneralSurveyPlanController.java | 124 ++++++++++ .../RGeneralSurveyPlanDetailMapper.java | 16 ++ .../mapper/RGeneralSurveyPlanPOMapper.java | 16 ++ .../RGeneralSurveyPlanDetailMapper.xml | 26 ++ .../mapping/RGeneralSurveyPlanPOMapper.xml | 27 ++ .../pojo/param/RGeneralSurveyPlanAddParm.java | 97 ++++++++ .../param/RGeneralSurveyPlanQueryParm.java | 47 ++++ .../RGeneralSurveyPlandetailQueryParm.java | 36 +++ .../pojo/param/SurveyResultUploadParam.java | 31 +++ .../pojo/po/RGeneralSurveyPlanDetail.java | 113 +++++++++ .../process/pojo/po/RGeneralSurveyPlanPO.java | 126 ++++++++++ .../process/pojo/vo/RGeneralSurveyPlanVO.java | 127 ++++++++++ .../RGeneralSurveyPlanDetailService.java | 29 +++ .../service/RGeneralSurveyPlanPOService.java | 56 +++++ .../RGeneralSurveyPlanDetailServiceImpl.java | 51 ++++ .../impl/RGeneralSurveyPlanPOServiceImpl.java | 232 ++++++++++++++++++ 19 files changed, 1164 insertions(+), 1 deletion(-) create mode 100644 process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanPOMapper.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanDetailMapper.xml create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanPOMapper.xml create mode 100644 process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java create mode 100644 process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java create mode 100644 process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java create mode 100644 process-boot/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java create mode 100644 process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java create mode 100644 process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java create mode 100644 process-boot/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java create mode 100644 process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanDetailService.java create mode 100644 process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java create mode 100644 process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanDetailServiceImpl.java create mode 100644 process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java diff --git a/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java b/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java index bba21f7bc..c9c6d818f 100644 --- a/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java +++ b/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java @@ -19,6 +19,8 @@ public enum ProcessResponseEnum { UPLOAD_FILE_ERROR("A00551","上传文件服务器错误，请检查数据"), ARCHIVE_ERROR("A00552","不满足归档调节，操作失败！"), PROCESS_ERROR("A00553","当前流程未审核通过，操作失败！"), + DOWNLOAD_FILE_ERROR("A00554","下载文件URL不存在，请检查数据"), + ; private final String code; diff --git a/process-boot/pom.xml b/process-boot/pom.xml index 7d74908d6..8e86b5678 100644 --- a/process-boot/pom.xml +++ b/process-boot/pom.xml @@ -91,7 +91,12 @@ - + + com.github.jeffreyning + mybatisplus-plus + 1.5.1-RELEASE + compile + diff --git a/process-boot/src/main/java/com/njcn/process/ProcessApplication.java b/process-boot/src/main/java/com/njcn/process/ProcessApplication.java index 494de5864..77b88204b 100644 --- a/process-boot/src/main/java/com/njcn/process/ProcessApplication.java +++ b/process-boot/src/main/java/com/njcn/process/ProcessApplication.java @@ -1,5 +1,6 @@ package com.njcn.process; +import com.github.jeffreyning.mybatisplus.conf.EnableMPP; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -16,6 +17,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @MapperScan("com.njcn.**.mapper") @EnableFeignClients(basePackages = "com.njcn") @SpringBootApplication(scanBasePackages = "com.njcn") +@EnableMPP public class ProcessApplication { public static void main(String[] args) { diff --git a/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java b/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java new file mode 100644 index 000000000..59b3ef577 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java @@ -0,0 +1,124 @@ +package com.njcn.process.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; +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.RGeneralSurveyPlanAddParm; +import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm; +import com.njcn.process.pojo.param.RGeneralSurveyPlandetailQueryParm; +import com.njcn.process.pojo.param.SurveyResultUploadParam; +import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; +import com.njcn.process.service.RGeneralSurveyPlanDetailService; +import com.njcn.process.service.RGeneralSurveyPlanPOService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 14:50【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +@Slf4j +@RestController +@RequestMapping("/rGeneralSurveyPlan") +@Api(tags = "普测计划管理") +@AllArgsConstructor +public class RGeneralSurveyPlanController extends BaseController { + + private final RGeneralSurveyPlanPOService rGeneralSurveyPlanPOService; + + private @Autowired + RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService; + /** + * 查询所有数据 + * @author qijian + * @date 2022/11/11 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/addPlan") + @ApiOperation("新增普测计划") + @ApiImplicitParam(name = "rGeneralSurveyPlanAddParm", value = "新增普测计划参数", required = true) + public HttpResult addPlan(@RequestBody RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm){ + String methodDescribe = getMethodDescribe("addPlan"); + + Boolean addFlag = rGeneralSurveyPlanPOService.addPlan(rGeneralSurveyPlanAddParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe); + } + +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @PostMapping("/updatePlan") +// @ApiOperation("新增普测计划") +// @ApiImplicitParam(name = "rGeneralSurveyPlanAddParm", value = "新增普测计划参数", required = true) +// public HttpResult updatePlan(@RequestBody RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm){ +// String methodDescribe = getMethodDescribe("addPlan"); +// +//// Boolean addFlag = rGeneralSurveyPlanPOService.updatePlan(rGeneralSurveyPlanAddParm); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe); +// } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryPlan") + @ApiOperation("查询普测计划") + @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true) + public HttpResult> queryPlan(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ + String methodDescribe = getMethodDescribe("queryPlan"); + + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryPlandetail") + @ApiOperation("根据planNO查询普测计划详情") + @ApiImplicitParam(name = "rGeneralSurveyPlandetailQueryParm", value = "普测计划详情查询参数", required = true) + public HttpResult> queryPlandetail(@Validated @RequestBody RGeneralSurveyPlandetailQueryParm rGeneralSurveyPlandetailQueryParm){ + String methodDescribe = getMethodDescribe("queryPlandetail"); + + IPage rGeneralSurveyPlanDetailVOIPage = rGeneralSurveyPlanDetailService.queryPlandetail (rGeneralSurveyPlandetailQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanDetailVOIPage, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPLOAD) + @PostMapping("/surveyResultUpload") + @ApiOperation("上传普测结果报告") +// @ApiImplicitParam(name = "surveyResultUploadParam", value = "实体参数", required = true) + public HttpResult surveyResultUpload( @Validated SurveyResultUploadParam surveyResultUploadParam){ + String methodDescribe = getMethodDescribe("surveyResultUpload"); + boolean res = rGeneralSurveyPlanPOService.surveyResultUpload(surveyResultUploadParam); + if(res){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + }else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.DOWNLOAD) + @PostMapping("/surveyResultDownload") + @ApiOperation("下载普测结果报告") + @ApiImplicitParam(name = "planNo", value = "计划号", required = true) + public HttpResult> surveyResultDownload(@RequestParam("planNo") String planNo ){ + String methodDescribe = getMethodDescribe("surveyResultDownload"); + List downloadUrls = rGeneralSurveyPlanPOService.surveyResultDownload(planNo); + + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, downloadUrls, methodDescribe); + + } + +} diff --git a/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java new file mode 100644 index 000000000..2e8137184 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java @@ -0,0 +1,16 @@ +package com.njcn.process.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 11:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RGeneralSurveyPlanDetailMapper extends MppBaseMapper { +} \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanPOMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanPOMapper.java new file mode 100644 index 000000000..d893f9a4f --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanPOMapper.java @@ -0,0 +1,16 @@ +package com.njcn.process.mapper; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.process.pojo.po.RGeneralSurveyPlanPO; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 11:24【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RGeneralSurveyPlanPOMapper extends MppBaseMapper { +} \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanDetailMapper.xml b/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanDetailMapper.xml new file mode 100644 index 000000000..ed402a7ab --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanDetailMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + plan_no, general_survey_start_time, general_survey_end_time, general_survey_time, + general_survey_leader, sub_id, sub_name, voltage_level, busbar_id, busbar_name, measurement_point_id, + is_problem + + \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanPOMapper.xml b/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanPOMapper.xml new file mode 100644 index 000000000..9b366b75f --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/mapper/mapping/RGeneralSurveyPlanPOMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + org_no, plan_no, plan_name, plan_create_time, plan_start_time, plan_end_time, plan_complate_time, + leader, `status`, description, is_file_upload, file_count, file_path, upload_time + + \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java b/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java new file mode 100644 index 000000000..96bba923c --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java @@ -0,0 +1,97 @@ +package com.njcn.process.pojo.param; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 15:20【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm") +@Data +public class RGeneralSurveyPlanAddParm { + + @ApiModelProperty(value="单位ID") + private String orgNo; + + @ApiModelProperty(value="普测计划编号") + private String planNo; + + @ApiModelProperty(value="普测计划名称") + private String planName; + + @ApiModelProperty(value="计划开始时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date planStartTime; + + @ApiModelProperty(value="计划结束时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date planEndTime; + + @ApiModelProperty(value="计划负责人") + private String leader; + @ApiModelProperty(value="详细情况") + private String description; + + @ApiModelProperty(value="计划详细情况母线相关") + private List rGeneralSurveyPlanDetailAddParm; + @Data + @ApiModel(value="计划详细情况母线相关") + public static class RGeneralSurveyPlanDetailAddParm{ + + @ApiModelProperty(value="变电站ID") + private String subId; + + @ApiModelProperty(value="变电站名称") + private String subName; + + @ApiModelProperty(value="变电站电压等级") + private String voltageLevel; + + @ApiModelProperty(value="母线ID") + private String busbarId; + + @ApiModelProperty(value="母线名称") + private String busbarName; + + @ApiModelProperty(value="离线监测点id") + private String measurementPointId; + /** + * 测试开始时间 + */ + @ApiModelProperty(value="测试开始时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date generalSurveyStartTime; + + /** + * 测试结束时间 + */ + @ApiModelProperty(value="测试结束时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date generalSurveyEndTime; + + /** + * 测试日期 + */ + @ApiModelProperty(value="测试日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date generalSurveyTime; + + /** + * 测试负责人 + */ + @ApiModelProperty(value="测试负责人") + private String generalSurveyLeader; + + } + +} diff --git a/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java b/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java new file mode 100644 index 000000000..629fe10bc --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java @@ -0,0 +1,47 @@ +package com.njcn.process.pojo.param; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 15:20【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm") +@Data +public class RGeneralSurveyPlanQueryParm { + + @NotNull(message="当前页不能为空！") + @Min(value = 1, message = "当前页不能为0") + @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) + private Integer currentPage; + /**显示条数*/ + @NotNull(message="显示条数不能为空！") + @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) + private Integer pageSize; + + @ApiModelProperty(value="单位ID") + private String orgNo; + + @ApiModelProperty(value="计划开始时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date planStartTime; + + @ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)") + private String status; + + @ApiModelProperty(value="文件是否上传(0:否 1:是)") + private String isFileUpload; + + +} diff --git a/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java b/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java new file mode 100644 index 000000000..ab1a29506 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java @@ -0,0 +1,36 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModel; +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 + */ +@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm") +@Data +public class RGeneralSurveyPlandetailQueryParm { + + @NotNull(message="当前页不能为空！") + @Min(value = 1, message = "当前页不能为0") + @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) + private Integer currentPage; + /**显示条数*/ + @NotNull(message="显示条数不能为空！") + @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) + private Integer pageSize; + + @ApiModelProperty(value="普测计划编号") + private String planNo; + + + +} diff --git a/process-boot/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java b/process-boot/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java new file mode 100644 index 000000000..9c2c545fb --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java @@ -0,0 +1,31 @@ +package com.njcn.process.pojo.param; + +import com.njcn.web.constant.ValidMessage; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 未建档干扰源用户入网上传Param + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 10:34 + */ +@Data +public class SurveyResultUploadParam { + + @ApiModelProperty(name = "planId",required = true) + @NotBlank(message = ValidMessage.ID_NOT_BLANK) + private String planId; + + @ApiModelProperty(name = "files",value = "普测结果报告",required = true) + @NotNull(message = "普测结果报告") + private MultipartFile[] files; + + + +} diff --git a/process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java b/process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java new file mode 100644 index 000000000..4f1004fb9 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java @@ -0,0 +1,113 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 11:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 普测计划详情表 + */ +@ApiModel(value="com-njcn-process-pojo-po-RGeneralSurveyPlanDetail") +@Data +@TableName(value = "r_general_survey_plan_detail") +public class RGeneralSurveyPlanDetail { + /** + * 普测计划编号 + */ + @MppMultiId(value = "plan_no") + @ApiModelProperty(value="普测计划编号") + private String planNo; + /** + * 母线ID + */ + + @MppMultiId(value = "busbar_id") + @ApiModelProperty(value="母线ID") + private String busbarId; + + /** + * 测试开始时间 + */ + @TableField(value = "general_survey_start_time") + @ApiModelProperty(value="测试开始时间") + private Date generalSurveyStartTime; + + /** + * 测试结束时间 + */ + @TableField(value = "general_survey_end_time") + @ApiModelProperty(value="测试结束时间") + private Date generalSurveyEndTime; + + /** + * 测试日期 + */ + @TableField(value = "general_survey_time") + @ApiModelProperty(value="测试日期") + private Date generalSurveyTime; + + /** + * 测试负责人 + */ + @TableField(value = "general_survey_leader") + @ApiModelProperty(value="测试负责人") + private String generalSurveyLeader; + + /** + * 变电站ID + */ + @TableField(value = "sub_id") + @ApiModelProperty(value="变电站ID") + private String subId; + + /** + * 变电站名称 + */ + @TableField(value = "sub_name") + @ApiModelProperty(value="变电站名称") + private String subName; + + /** + * 变电站电压等级 + */ + @TableField(value = "voltage_level") + @ApiModelProperty(value="变电站电压等级") + private String voltageLevel; + + + + /** + * 母线名称 + */ + @TableField(value = "busbar_name") + @ApiModelProperty(value="母线名称") + private String busbarName; + + /** + * 离线监测点id + */ + @TableField(value = "measurement_point_id") + @ApiModelProperty(value="离线监测点id") + private String measurementPointId; + + /** + * 是否生成问题(0:否 1:是) + */ + @TableField(value = "is_problem") + @ApiModelProperty(value="是否生成问题(0:否 1:是)") + private Byte isProblem; +} \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java b/process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java new file mode 100644 index 000000000..5f0da1f1c --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java @@ -0,0 +1,126 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 11:24【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 普测计划表 + */ +@ApiModel(value="com-njcn-process-pojo-po-RGeneralSurveyPlanPO") +@Data +@TableName(value = "r_general_survey_plan") +public class RGeneralSurveyPlanPO { + /** + * 单位ID + */ + @TableField(value = "org_no") + @ApiModelProperty(value="单位ID") + private String orgNo; + + /** + * 普测计划编号 + */ + @MppMultiId(value = "plan_no") + @ApiModelProperty(value="普测计划编号") + private String planNo; + + /** + * 普测计划名称 + */ + @TableId(value = "plan_name") + @ApiModelProperty(value="普测计划名称") + private String planName; + + /** + * 计划生成时间 + */ + @TableField(value = "plan_create_time") + @ApiModelProperty(value="计划生成时间") + private Date planCreateTime = new Date(); + + /** + * 计划开始时间 + */ + @TableField(value = "plan_start_time") + @ApiModelProperty(value="计划开始时间") + private Date planStartTime; + + /** + * 计划结束时间 + */ + @TableField(value = "plan_end_time") + @ApiModelProperty(value="计划结束时间") + private Date planEndTime; + + /** + * 实际完成时间 + */ + @TableField(value = "plan_complate_time") + @ApiModelProperty(value="实际完成时间") + private Date planComplateTime; + + /** + * 计划负责人 + */ + @TableField(value = "leader") + @ApiModelProperty(value="计划负责人") + private String leader; + + /** + * 计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成) + */ + @TableField(value = "status") + @ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)") + private int status; + + /** + * 详情 + */ + @TableField(value = "description") + @ApiModelProperty(value="详情") + private String description; + + /** + * 文件是否上传(0:否 1:是) + */ + @TableField(value = "is_file_upload") + @ApiModelProperty(value="文件是否上传(0:否 1:是)") + private Integer isFileUpload; + + /** + * 上传文件数量 + */ + @TableField(value = "file_count") + @ApiModelProperty(value="上传文件数量") + private Integer fileCount ; + + /** + * 文件路径 + */ + @TableField(value = "file_path") + @ApiModelProperty(value="文件路径") + private String filePath; + + /** + * 上传时间 + */ + @TableField(value = "upload_time") + @ApiModelProperty(value="上传时间") + private Date uploadTime; +} \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java b/process-boot/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java new file mode 100644 index 000000000..9378ee1f1 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java @@ -0,0 +1,127 @@ +package com.njcn.process.pojo.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 15:20【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm") +@Data +public class RGeneralSurveyPlanVO { + + @ApiModelProperty(value="单位ID") + private String orgNo; + + @ApiModelProperty(value="普测计划编号") + private String planNo; + + @ApiModelProperty(value="普测计划名称") + private String planName; + + @ApiModelProperty(value="计划开始时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date planStartTime; + + @ApiModelProperty(value="计划结束时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date planEndTime; + + @ApiModelProperty(value="变电站数量") + private Long subCount; + + @ApiModelProperty(value="母线数量") + private Long busCount; + + @ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)") + private int status; + + @TableField(value = "is_file_upload") + @ApiModelProperty(value="文件是否上传(0:否 1:是)") + private Byte isFileUpload; + + /** + * 上传文件数量 + */ + @TableField(value = "file_count") + @ApiModelProperty(value="上传文件数量") + private Integer fileCount; + + /** + * 文件路径 + */ + @TableField(value = "file_path") + @ApiModelProperty(value="文件路径") + private String filePath; + + /** + * 上传时间 + */ + @TableField(value = "upload_time") + @ApiModelProperty(value="上传时间") + private Date uploadTime; + + @ApiModelProperty(value="计划详细情况母线相关") + private List rGeneralSurveyPlanDetailVOList; + @Data + @ApiModel(value="计划详细情况母线相关") + public static class RGeneralSurveyPlanDetailVO{ + + @ApiModelProperty(value="变电站ID") + private String subId; + + @ApiModelProperty(value="变电站名称") + private String subName; + + @ApiModelProperty(value="变电站电压等级") + private String voltageLevel; + + @ApiModelProperty(value="母线ID") + private String busbarId; + + @ApiModelProperty(value="母线名称") + private String busbarName; + + @ApiModelProperty(value="离线监测点id") + private String measurementPointId; + /** + * 测试开始时间 + */ + @ApiModelProperty(value="测试开始时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date generalSurveyStartTime; + + /** + * 测试结束时间 + */ + @ApiModelProperty(value="测试结束时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date generalSurveyEndTime; + + /** + * 测试日期 + */ + @ApiModelProperty(value="测试日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date generalSurveyTime; + + /** + * 测试负责人 + */ + @ApiModelProperty(value="测试负责人") + private String generalSurveyLeader; + + } + +} diff --git a/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanDetailService.java b/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanDetailService.java new file mode 100644 index 000000000..aa8ee0018 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanDetailService.java @@ -0,0 +1,29 @@ +package com.njcn.process.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.process.pojo.param.RGeneralSurveyPlandetailQueryParm; +import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail; +import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 11:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +public interface RGeneralSurveyPlanDetailService extends IMppService { + + /** + * @Description: 根据planNO查询普测计划详情 + * @Param: [rGeneralSurveyPlandetailQueryParm] + * @return: com.baomidou.mybatisplus.core.metadata.IPage + * @Author: clam + * @Date: 2022/11/15 + */ + IPage queryPlandetail(RGeneralSurveyPlandetailQueryParm rGeneralSurveyPlandetailQueryParm); +} diff --git a/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java b/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java new file mode 100644 index 000000000..c3fedd05f --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java @@ -0,0 +1,56 @@ +package com.njcn.process.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.process.pojo.param.RGeneralSurveyPlanAddParm; +import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm; +import com.njcn.process.pojo.param.SurveyResultUploadParam; +import com.njcn.process.pojo.po.RGeneralSurveyPlanPO; +import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; + +import java.util.List; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 11:24【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RGeneralSurveyPlanPOService extends IMppService{ + + /** + * @Description: addPlan + * @Param: [rGeneralSurveyPlanAddParm] + * @return: java.lang.Boolean + * @Author: clam + * @Date: 2022/11/14 + */ + Boolean addPlan(RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm); + /** + * @Description: query + * @Param: [rGeneralSurveyPlanQueryParm] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/15 + */ + IPage query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm); + /** + * @Description: surveyResultUpload + * @Param: [surveyResultUploadParam] + * @return: boolean + * @Author: clam + * @Date: 2022/11/18 + */ + boolean surveyResultUpload(SurveyResultUploadParam surveyResultUploadParam); + /** + * @Description: surveyResultDownload + * @Param: [planNo] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/18 + */ + List surveyResultDownload(String planNo); +} diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanDetailServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanDetailServiceImpl.java new file mode 100644 index 000000000..2a5bee0c3 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanDetailServiceImpl.java @@ -0,0 +1,51 @@ +package com.njcn.process.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.process.mapper.RGeneralSurveyPlanDetailMapper; +import com.njcn.process.pojo.param.RGeneralSurveyPlandetailQueryParm; +import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail; +import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; +import com.njcn.process.service.RGeneralSurveyPlanDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 11:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class RGeneralSurveyPlanDetailServiceImpl extends MppServiceImpl implements RGeneralSurveyPlanDetailService{ + + + private @Autowired + RGeneralSurveyPlanDetailMapper rGeneralSurveyPlanDetailMapper; + /** + * @param rGeneralSurveyPlandetailQueryParm + * @Description: 根据planNO查询普测计划详情 + * @Param: [rGeneralSurveyPlandetailQueryParm] + * @return: com.baomidou.mybatisplus.core.metadata.IPage + * @Author: clam + * @Date: 2022/11/15 + */ + @Override + public IPage queryPlandetail(RGeneralSurveyPlandetailQueryParm rGeneralSurveyPlandetailQueryParm) { + + IPage page = new Page<> (rGeneralSurveyPlandetailQueryParm.getCurrentPage(), rGeneralSurveyPlandetailQueryParm.getPageSize()); + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<> (); + lambdaQueryWrapper.eq (RGeneralSurveyPlanDetail::getPlanNo, rGeneralSurveyPlandetailQueryParm.getPlanNo ()); + IPage rGeneralSurveyPlanDetailIPage = rGeneralSurveyPlanDetailMapper.selectPage (page, lambdaQueryWrapper); + + return rGeneralSurveyPlanDetailIPage.convert (temp-> BeanUtil.copyProperties (temp, RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO.class)); + + } +} diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java new file mode 100644 index 000000000..99b8e7cf5 --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java @@ -0,0 +1,232 @@ +package com.njcn.process.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.minio.bo.MinIoUploadResDTO; +import com.njcn.minio.config.MinIoProperties; +import com.njcn.minio.utils.MinIoUtils; +import com.njcn.process.enums.ProcessResponseEnum; +import com.njcn.process.mapper.RGeneralSurveyPlanDetailMapper; +import com.njcn.process.mapper.RGeneralSurveyPlanPOMapper; +import com.njcn.process.pojo.param.RGeneralSurveyPlanAddParm; +import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm; +import com.njcn.process.pojo.param.SurveyResultUploadParam; +import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail; +import com.njcn.process.pojo.po.RGeneralSurveyPlanPO; +import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; +import com.njcn.process.service.RGeneralSurveyPlanDetailService; +import com.njcn.process.service.RGeneralSurveyPlanPOService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 11:24【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl implements RGeneralSurveyPlanPOService{ + + + private @Autowired + RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService; + + private @Autowired + RGeneralSurveyPlanPOMapper rGeneralSurveyPlanPOMapper; + + private @Autowired + RGeneralSurveyPlanDetailMapper rGeneralSurveyPlanDetailMapper; + + @Resource + private MinIoUtils minIoUtils; + + @Resource + private MinIoProperties minIoProperties; + /** + * @param rGeneralSurveyPlanAddParm + * @Description: addPlan + * @Param: [rGeneralSurveyPlanAddParm] + * @return: java.lang.Boolean + * @Author: clam + * @Date: 2022/11/14 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean addPlan(RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm) { + + Boolean flag =true; + RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO (); + BeanUtils.copyProperties (rGeneralSurveyPlanAddParm,rGeneralSurveyPlanPO); + /*todo 后期与工作流绑定*/ + rGeneralSurveyPlanPO.setStatus (0); + flag = this.saveOrUpdate (rGeneralSurveyPlanPO); + + List rGeneralSurveyPlanDetailAddParm = rGeneralSurveyPlanAddParm.getRGeneralSurveyPlanDetailAddParm ( ); + + List rGeneralSurveyPlanDetailList = new ArrayList<> (); + rGeneralSurveyPlanDetailAddParm.forEach (temp->{ + RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail(); + BeanUtils.copyProperties (temp, rGeneralSurveyPlanDetail); + rGeneralSurveyPlanDetail.setPlanNo (rGeneralSurveyPlanAddParm.getPlanNo ()); + rGeneralSurveyPlanDetail.setGeneralSurveyLeader(rGeneralSurveyPlanAddParm.getLeader ()); + rGeneralSurveyPlanDetailList.add (rGeneralSurveyPlanDetail); + }); + flag = rGeneralSurveyPlanDetailService.saveOrUpdateBatchByMultiId (rGeneralSurveyPlanDetailList,5); + + return flag; + } + + /** + * @param rGeneralSurveyPlanQueryParm + * @Description: query + * @Param: [rGeneralSurveyPlanQueryParm] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/15 + */ + @Override + public IPage query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm) { + IPage page = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage(), rGeneralSurveyPlanQueryParm.getPageSize()); + IPage returnpage = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage(), rGeneralSurveyPlanQueryParm.getPageSize()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<> (); + if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm.getOrgNo ())) { + queryWrapper.eq (RGeneralSurveyPlanPO::getOrgNo, rGeneralSurveyPlanQueryParm.getOrgNo ()); + } + if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm. getStatus ())) { + queryWrapper.eq (RGeneralSurveyPlanPO::getStatus, rGeneralSurveyPlanQueryParm.getStatus ()); + } + if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm.getIsFileUpload ())) { + queryWrapper.eq (RGeneralSurveyPlanPO::getIsFileUpload, rGeneralSurveyPlanQueryParm.getIsFileUpload ()); + } + if (!Objects.isNull (rGeneralSurveyPlanQueryParm.getPlanStartTime ())) { + queryWrapper.eq (RGeneralSurveyPlanPO::getPlanStartTime, rGeneralSurveyPlanQueryParm.getPlanStartTime ()); + } + queryWrapper.orderByAsc (RGeneralSurveyPlanPO::getStatus).orderByDesc (RGeneralSurveyPlanPO::getPlanCreateTime); + + List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectPage (page,queryWrapper).getRecords (); + if(CollectionUtils.isEmpty (rGeneralSurveyPlanPOS)){ + return returnpage; + } + List collect = rGeneralSurveyPlanPOS.stream ( ).map (RGeneralSurveyPlanPO::getPlanNo).collect (Collectors.toList ( )); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<> (); + lambdaQueryWrapper.in (RGeneralSurveyPlanDetail::getPlanNo, collect); + List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (lambdaQueryWrapper); + List rGeneralSurveyPlanVOList = new ArrayList<> (); + rGeneralSurveyPlanPOS.forEach (temp ->{ + RGeneralSurveyPlanVO rGeneralSurveyPlanVO = new RGeneralSurveyPlanVO(); + BeanUtils.copyProperties (temp, rGeneralSurveyPlanVO); + Stream rGeneralSurveyPlanDetailStream = rGeneralSurveyPlanDetails.stream ( ). + filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))); + long Busbarcount = rGeneralSurveyPlanDetails.stream ( ). + filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). + map (RGeneralSurveyPlanDetail::getBusbarId).distinct ( ).count ( ); + + long Subcount = rGeneralSurveyPlanDetails.stream ( ). + filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). + map (RGeneralSurveyPlanDetail::getSubId).distinct ( ).count ( ); + rGeneralSurveyPlanVO.setBusCount (Busbarcount); + rGeneralSurveyPlanVO.setSubCount (Subcount); + List collect1 = rGeneralSurveyPlanDetails.stream ( ). + filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). + map (surveyPlanDetail -> { + RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO rGeneralSurveyPlanDetailVO = new RGeneralSurveyPlanVO.RGeneralSurveyPlanDetailVO ( ); + BeanUtils.copyProperties (surveyPlanDetail, rGeneralSurveyPlanDetailVO); + return rGeneralSurveyPlanDetailVO; + }).collect (Collectors.toList ( )); + + rGeneralSurveyPlanVO.setRGeneralSurveyPlanDetailVOList (collect1); + rGeneralSurveyPlanVOList.add (rGeneralSurveyPlanVO); + }); + returnpage.setRecords (rGeneralSurveyPlanVOList); + return returnpage; + } + + /** + * @param surveyResultUploadParam + * @Description: surveyResultUpload + * @Param: [surveyResultUploadParam] + * @return: boolean + * @Author: clam + * @Date: 2022/11/18 + */ + @Override + public boolean surveyResultUpload(SurveyResultUploadParam surveyResultUploadParam) { + boolean result = true; + RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO(); + rGeneralSurveyPlanPO.setPlanNo (surveyResultUploadParam.getPlanId ()); + rGeneralSurveyPlanPO = this.selectByMultiId (rGeneralSurveyPlanPO); + String filePath =rGeneralSurveyPlanPO.getFilePath (); + Integer fileCount = rGeneralSurveyPlanPO.getFileCount ( ); + Optional.ofNullable (fileCount).orElse (0); + for (int i = 0; i < surveyResultUploadParam.getFiles ( ).length; i++) { + MinIoUploadResDTO minIoUploadResDTO = fileToMinio(surveyResultUploadParam.getFiles ( )[i]); + filePath=filePath+minIoUploadResDTO.getMinFileName ()+";"; + fileCount++; + } + rGeneralSurveyPlanPO.setStatus (4); + rGeneralSurveyPlanPO.setFileCount (fileCount); + rGeneralSurveyPlanPO.setFilePath (filePath); + rGeneralSurveyPlanPO.setIsFileUpload (1); + rGeneralSurveyPlanPO.setUploadTime (new Date ()); + this.saveOrUpdateByMultiId (rGeneralSurveyPlanPO); + return result; + } + + /** + * @param planNo + * @Description: surveyResultDownload + * @Param: [surveyResultUploadParam] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/18 + */ + @Override + public List surveyResultDownload(String planNo) { + RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO(); + rGeneralSurveyPlanPO.setPlanNo (planNo); + rGeneralSurveyPlanPO = this.selectByMultiId (rGeneralSurveyPlanPO); + String filePath = rGeneralSurveyPlanPO.getFilePath ( ); + if(StringUtils.isEmpty (filePath)){ + throw new BusinessException(ProcessResponseEnum.DOWNLOAD_FILE_ERROR); + } + String[] split = filePath.substring (0, filePath.length ( ) - 1).split (";"); + List collect = Stream.of (split).map (temp -> { + return minIoUtils.getObjectUrl (minIoProperties.getBucket ( ), temp, 7 * 24 * 60 * 60); + }).collect (Collectors.toList ( )); + return collect; + } + + /** + * 上传文件到Minio + * + * @param file 文件 + * @return 成功标记 + */ + private MinIoUploadResDTO fileToMinio(MultipartFile file) { + try { + //把名称存入数据 + MinIoUploadResDTO upload = minIoUtils.upload(file, minIoProperties.getBucket(), "surveyresult/"); + return upload; + } catch (Exception e) { + throw new BusinessException (ProcessResponseEnum.UPLOAD_FILE_ERROR); + } + } +} From 29d9840bfd4a054f9041c4528f453aacaa652645 Mon Sep 17 00:00:00 2001 From: "1771838663@qq.com" <1771838663@qq.com> Date: Fri, 18 Nov 2022 14:59:13 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E7=94=B5=E8=83=BD=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ElectricityQualityIssuesController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java b/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java index f01b7679a..bb7e4eaee 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java @@ -131,7 +131,7 @@ public class ElectricityQualityIssuesController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @PostMapping("/reasonAnalysis") @ApiOperation("原因分析") - @ApiImplicitParam(name = "reasonAnalysisParam", value = "参数", required = true) + @ApiImplicitParam(name = "processParam", value = "参数", required = true) public HttpResult reasonAnalysis(@RequestBody @Validated ProcessParam processParam){ String methodDescribe = getMethodDescribe("reasonAnalysis"); issuesService.reasonAnalysis(processParam); @@ -182,7 +182,7 @@ public class ElectricityQualityIssuesController extends BaseController { @PostMapping("/uploadFile") @ApiOperation("上传文件") @ApiImplicitParam(name = "issuesFile", value = "填报进度文件", required = true) - public HttpResult uploadFile(@RequestPart("issuesFile") MultipartFile issuesFile){ + public HttpResult uploadFile(@RequestParam("issuesFile") MultipartFile issuesFile){ String methodDescribe = getMethodDescribe("uploadFile"); MinIoUploadResDTO out = issuesService.uploadFile(issuesFile); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); From 0b89050fdc17058e172b5bdfa8177f4ce51c6956 Mon Sep 17 00:00:00 2001 From: "1771838663@qq.com" <1771838663@qq.com> Date: Tue, 22 Nov 2022 14:53:44 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E7=94=B5=E8=83=BD=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/GeneralSurveyParam.java | 4 +- .../po/RMpOnlineMonitorOverproofProblem.java | 1 - .../ElectricityQualityIssuesController.java | 24 +++++++ .../RStatElectricQualityProblemFlowMapper.xml | 2 +- .../njcn/process/service/IssuesService.java | 10 +++ .../service/impl/IssuesServiceImpl.java | 68 ++++++++++++++++++- 6 files changed, 104 insertions(+), 5 deletions(-) diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java index aa7975224..906154184 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java @@ -20,9 +20,9 @@ public class GeneralSurveyParam extends IssuesParam { @NotNull(message = "变电站ID不可为空") private String substationId; - @ApiModelProperty(name = "busBarId",value = "母线ID") + @ApiModelProperty(name = "busbarId",value = "母线ID") @NotNull(message = "母线ID不可为空") - private String busBarId; + private String busbarId; @ApiModelProperty(name = "measurementPointId",value = "监测点ID") @NotNull(message = "监测点ID不可为空") diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java b/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java index ef7be9f20..d07257bea 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java @@ -22,7 +22,6 @@ public class RMpOnlineMonitorOverproofProblem implements Serializable { /** * 电能质量问题编号 */ - @TableId(value = "power_quality_problem_no", type = IdType.AUTO) private String powerQualityProblemNo; /** diff --git a/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java b/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java index bb7e4eaee..39d8130e4 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java @@ -16,6 +16,7 @@ import com.njcn.system.enums.DicDataEnum; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -187,4 +188,27 @@ public class ElectricityQualityIssuesController extends BaseController { MinIoUploadResDTO out = issuesService.uploadFile(issuesFile); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD) + @PostMapping("/downloadFile") + @ApiOperation("下载文件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "powerQualityProblemNo", value = "电能质量问题编号", required = true), + @ApiImplicitParam(name = "reportProcess", value = "填报进度", required = true) + }) + public HttpResult downloadFile(@RequestParam("powerQualityProblemNo") String powerQualityProblemNo,@RequestParam("reportProcess") String reportProcess){ + String methodDescribe = getMethodDescribe("downloadFile"); + String out = issuesService.downloadFile(powerQualityProblemNo, reportProcess); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE) + @PostMapping("/deleteIssues") + @ApiOperation("删除问题") + @ApiImplicitParam(name = "powerQualityProblemNo", value = "电能质量问题编号", required = true) + public HttpResult deleteIssues(@RequestParam("powerQualityProblemNo") String powerQualityProblemNo){ + String methodDescribe = getMethodDescribe("deleteIssues"); + issuesService.deleteIssues(powerQualityProblemNo); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemFlowMapper.xml b/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemFlowMapper.xml index 510311b6f..afdfbc2eb 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemFlowMapper.xml +++ b/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemFlowMapper.xml @@ -8,7 +8,7 @@ FROM r_stat_electric_quality_problem_flow WHERE - data_date between #{date.dateBegin} AND #{date.dateEnd} + data_date between #{dateBegin} AND #{dateEnd} AND org_no = #{param.orgNo} diff --git a/process-boot/src/main/java/com/njcn/process/service/IssuesService.java b/process-boot/src/main/java/com/njcn/process/service/IssuesService.java index 6857a75f8..8eb53d01f 100644 --- a/process-boot/src/main/java/com/njcn/process/service/IssuesService.java +++ b/process-boot/src/main/java/com/njcn/process/service/IssuesService.java @@ -78,4 +78,14 @@ public interface IssuesService { * 上传文件 */ MinIoUploadResDTO uploadFile(MultipartFile issuesFile); + + /** + * 下载文件 + */ + String downloadFile(String powerQualityProblemNo, String reportProcess); + + /** + * 删除问题 + */ + void deleteIssues(String powerQualityProblemNo); } diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java index 606e0898b..beae3b6c5 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java @@ -17,7 +17,10 @@ import com.njcn.process.pojo.param.*; import com.njcn.process.pojo.po.*; import com.njcn.process.pojo.vo.*; import com.njcn.process.service.IssuesService; +import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.Date; +import java.util.List; /** * 电能质量问题实现类 @@ -41,6 +45,8 @@ public class IssuesServiceImpl implements IssuesService { private final DeptFeignClient deptFeignClient; + private final DicDataFeignClient dicDataFeignClient; + private final RStatElectricQualityProblemFlowMapper issuesMapper; private final RMpOnlineMonitorOverproofProblemMapper excessiveMapper; @@ -67,6 +73,8 @@ public class IssuesServiceImpl implements IssuesService { LocalDateTime local = LocalDateTimeUtil.now(); BeanUtil.copyProperties(issuesParam,issues); issues.setDataDate(local); + issues.setStartTime(null); + issues.setUpdateTime(null); issues.setReportProcess(DicDataEnum.NOT_REPORTED.getCode()); issues.setReportProcessStatus(DicDataEnum.AUDITT.getCode()); issuesMapper.insert(issues); @@ -150,6 +158,15 @@ public class IssuesServiceImpl implements IssuesService { } Page out = issuesMapper.getIssues(page,param,DateUtil.formatDateTime(dateBegin), DateUtil.formatDateTime(dateEnd)); out.getRecords().forEach(data -> data.setOrgName((deptFeignClient.getDeptById(data.getOrgNo()).getData().getName()))); + /*问题来源*/ + List problemSourcesDictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PROBLEM_SOURCES.getCode()).getData(); + problemSourcesDictData.forEach(dict -> out.getRecords().stream().filter(data -> dict.getCode().equals(data.getProblemSources())).forEach(data -> data.setProblemSources(dict.getName()))); + /*填报进度*/ + List fillProgressDictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.FILL_PROGRESS.getCode()).getData(); + fillProgressDictData.forEach(dict -> out.getRecords().stream().filter(data -> dict.getCode().equals(data.getReportProcess())).forEach(data -> data.setReportProcess(dict.getName()))); + /*审核状态*/ + List auditStatusDictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.AUDIT_STATUS.getCode()).getData(); + auditStatusDictData.forEach(dict -> out.getRecords().stream().filter(data -> dict.getCode().equals(data.getReportProcessStatus())).forEach(data -> data.setReportProcessStatus(dict.getName()))); return out; } @@ -273,7 +290,7 @@ public class IssuesServiceImpl implements IssuesService { details.setDataDateZlxg(local); } flowDetailsMapper.update(details, query); - issuesOut.setReportProcess(DicDataEnum.CAUSE_ANALYSIS.getCode()); + issuesOut.setReportProcess(code); issuesMapper.update(issuesOut,issuesQuery); }else { throw new BusinessException(ProcessResponseEnum.PROCESS_ERROR); @@ -309,4 +326,53 @@ public class IssuesServiceImpl implements IssuesService { } } + @Override + public String downloadFile(String powerQualityProblemNo,String reportProcess) { + LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); + issuesQuery.eq(RMpElectricQualityProblemFlowDetails::getPowerQualityProblemNo,powerQualityProblemNo); + RMpElectricQualityProblemFlowDetails details = flowDetailsMapper.selectOne(issuesQuery); + String filePath = null; + if (DicDataEnum.CAUSE_ANALYSIS.getName().equals(reportProcess)){ + filePath = details.getFilePathYyfx(); + }else if (DicDataEnum.PLAN_MEASURES.getName().equals(reportProcess)){ + filePath = details.getFilePathJhzg(); + }else if (DicDataEnum.ACTUAL_MEASURES.getName().equals(reportProcess)){ + filePath = details.getFilePathSjcq(); + }else if (DicDataEnum.INSIGHTS.getName().equals(reportProcess)){ + filePath = details.getFilePathZlxg(); + } + return minIoUtils.getObjectUrl (minIoProperties.getBucket ( ), filePath, 7 * 24 * 60 * 60); + } + + /** + * 删除问题 + */ + @Override + public void deleteIssues(String powerQualityProblemNo) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,powerQualityProblemNo); + RStatElectricQualityProblemFlow issuesOut = issuesMapper.selectOne(query); + if (DicDataEnum.ONLINE.getCode().equals(issuesOut.getProblemSources())){ + LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); + issuesQuery.eq(RMpOnlineMonitorOverproofProblem::getPowerQualityProblemNo,powerQualityProblemNo); + excessiveMapper.delete(issuesQuery); + }else if (DicDataEnum.GENERAL.getCode().equals(issuesOut.getProblemSources())){ + LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); + issuesQuery.eq(RMpGeneralSurveyOverproofProblem::getPowerQualityProblemNo,powerQualityProblemNo); + generalSurveyMapper.delete(issuesQuery); + }else if (DicDataEnum.USER_COMPLAINTS.getCode().equals(issuesOut.getProblemSources())){ + LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); + issuesQuery.eq(RMpUserComplaint::getPowerQualityProblemNo,powerQualityProblemNo); + complaintMapper.delete(issuesQuery); + }else if (DicDataEnum.DEV_EXCEPTION.getCode().equals(issuesOut.getProblemSources())){ + LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); + issuesQuery.eq(RMpOperationMonitorAbnormal::getPowerQualityProblemNo,powerQualityProblemNo); + abnormalMapper.delete(issuesQuery); + } + LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); + issuesQuery.eq(RMpElectricQualityProblemFlowDetails::getPowerQualityProblemNo,powerQualityProblemNo); + flowDetailsMapper.delete(issuesQuery); + issuesMapper.delete(query); + } + } From 28f6f2a320ccfd888293cc92817cae34ace5075c Mon Sep 17 00:00:00 2001 From: "1771838663@qq.com" <1771838663@qq.com> Date: Wed, 23 Nov 2022 09:32:12 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E7=94=B5=E8=83=BD=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/service/impl/IssuesServiceImpl.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java index beae3b6c5..572079412 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java @@ -280,17 +280,28 @@ public class IssuesServiceImpl implements IssuesService { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(RMpElectricQualityProblemFlowDetails::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo()); RMpElectricQualityProblemFlowDetails details = flowDetailsMapper.selectOne(query); - BeanUtil.copyProperties(processParam,details); LocalDateTime local = LocalDateTimeUtil.now(); if (DicDataEnum.PLAN_MEASURES.getCode().equals(code)){ details.setDataDateJhzg(local); + details.setReportProcessContentJhzg(processParam.getReportProcessContentJhzg()); + details.setUserReportProcessContentJhzg(processParam.getUserReportProcessContentJhzg()); + details.setFileNameJhzg(processParam.getFileNameJhzg()); + details.setFilePathJhzg(processParam.getFilePathJhzg()); }else if (DicDataEnum.ACTUAL_MEASURES.getCode().equals(code)){ details.setDataDateSjcq(local); + details.setReportProcessContentSjcq(processParam.getReportProcessContentSjcq()); + details.setUserReportProcessContentSjcq(processParam.getUserReportProcessContentSjcq()); + details.setFileNameSjcq(processParam.getFileNameSjcq()); + details.setFilePathSjcq(processParam.getFilePathSjcq()); }else if (DicDataEnum.INSIGHTS.getCode().equals(code)){ details.setDataDateZlxg(local); + details.setDescriptionZlxg(processParam.getDescriptionZlxg()); + details.setFileNameZlxg(processParam.getFileNameZlxg()); + details.setFilePathZlxg(processParam.getFilePathZlxg()); } flowDetailsMapper.update(details, query); issuesOut.setReportProcess(code); + issuesOut.setReportProcessStatus(DicDataEnum.AUDITT.getCode()); issuesMapper.update(issuesOut,issuesQuery); }else { throw new BusinessException(ProcessResponseEnum.PROCESS_ERROR); @@ -326,6 +337,9 @@ public class IssuesServiceImpl implements IssuesService { } } + /** + * 下载文件 + */ @Override public String downloadFile(String powerQualityProblemNo,String reportProcess) { LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); From cee90270e92d359d6f39f7528c26ec41e94d7dfc Mon Sep 17 00:00:00 2001 From: "1771838663@qq.com" <1771838663@qq.com> Date: Thu, 24 Nov 2022 16:01:28 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E7=94=B5=E8=83=BD=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/pojo/param/AbnormalParam.java | 10 +- .../process/pojo/param/ComplaintParam.java | 10 +- .../process/pojo/param/ExcessiveParam.java | 4 - .../pojo/param/GeneralSurveyParam.java | 10 +- .../njcn/process/pojo/param/IssuesParam.java | 6 +- .../njcn/process/pojo/param/ProcessParam.java | 16 +- .../po/RMpOnlineMonitorOverproofProblem.java | 66 +------ .../com/njcn/process/pojo/vo/AbnormalVO.java | 4 +- .../com/njcn/process/pojo/vo/ComplaintVO.java | 4 +- .../njcn/process/pojo/vo/GeneralSurveyVO.java | 4 +- .../com/njcn/process/pojo/vo/ProcessVO.java | 16 +- process-boot/pom.xml | 5 + ...RStatElectricQualityProblemFlowMapper.java | 4 +- .../service/impl/IssuesServiceImpl.java | 180 +++++++++++++++--- 14 files changed, 210 insertions(+), 129 deletions(-) diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/AbnormalParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/AbnormalParam.java index d675899e0..57cae98f9 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/AbnormalParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/AbnormalParam.java @@ -24,9 +24,13 @@ public class AbnormalParam extends IssuesParam { @NotNull(message = "发现异常时间不可为空") private String abnormalDevTime; - @ApiModelProperty(name = "abnormalTarget",value = "异常指标") - @NotNull(message = "异常指标不可为空") - private String abnormalTarget; + @ApiModelProperty(name = "steadyState",value = "稳态指标") + @NotNull(message = "稳态指标不可为空") + private String[] steadyState; + + @ApiModelProperty(name = "transientIndicators",value = "暂态指标") + @NotNull(message = "暂态指标不可为空") + private String[] transientIndicators; @ApiModelProperty(name = "eventDescription",value = "事件描述") @NotNull(message = "事件描述不可为空") diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/ComplaintParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/ComplaintParam.java index 204fabad9..d446bb0ec 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/ComplaintParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/ComplaintParam.java @@ -36,9 +36,13 @@ public class ComplaintParam extends IssuesParam { @NotNull(message = "投诉时间不可为空") private String complaintTime; - @ApiModelProperty(name = "abnormalTarget",value = "异常指标") - @NotNull(message = "异常指标不可为空") - private String abnormalTarget; + @ApiModelProperty(name = "steadyState",value = "稳态指标") + @NotNull(message = "稳态指标不可为空") + private String[] steadyState; + + @ApiModelProperty(name = "transientIndicators",value = "暂态指标") + @NotNull(message = "暂态指标不可为空") + private String[] transientIndicators; @ApiModelProperty(name = "electricityType",value = "用电类别") @NotNull(message = "用电类别不可为空") diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java index 1f3613fd0..15bc8ad88 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java @@ -24,10 +24,6 @@ public class ExcessiveParam extends IssuesParam { @NotNull(message = "告警原因不可为空") private String warnReason; - @ApiModelProperty(name = "substationId",value = "变电站ID") - @NotNull(message = "变电站ID不可为空") - private String substationId; - @ApiModelProperty(name = "measurementPointId",value = "监测点ID") @NotNull(message = "监测点ID不可为空") private String measurementPointId; diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java index 906154184..5d0433819 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java @@ -28,9 +28,13 @@ public class GeneralSurveyParam extends IssuesParam { @NotNull(message = "监测点ID不可为空") private String measurementPointId; - @ApiModelProperty(name = "overLimitTarget",value = "超标指标") - @NotNull(message = "超标指标不可为空") - private String overLimitTarget; + @ApiModelProperty(name = "steadyState",value = "稳态指标") + @NotNull(message = "稳态指标不可为空") + private String[] steadyState; + + @ApiModelProperty(name = "transientIndicators",value = "暂态指标") + @NotNull(message = "暂态指标不可为空") + private String[] transientIndicators; @ApiModelProperty(name = "planName",value = "普测计划名称") @NotNull(message = "普测计划名称不可为空") diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/IssuesParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/IssuesParam.java index eeca60840..a698dcab9 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/IssuesParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/IssuesParam.java @@ -18,9 +18,9 @@ public class IssuesParam { @NotNull(message = "单位不可为空") private String orgNo; - @ApiModelProperty(name = "powerQualityProblemNo",value = "电能质量问题编号") - @NotNull(message = "电能质量问题编号不可为空") - private String powerQualityProblemNo; + @ApiModelProperty(name = "orgName",value = "单位名称") + @NotNull(message = "单位名称不可为空") + private String orgName; @ApiModelProperty(name = "problemName",value = "问题名称") @NotNull(message = "问题名称不可为空") diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/ProcessParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/ProcessParam.java index 6988804a8..47c41ca7a 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/ProcessParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/ProcessParam.java @@ -18,16 +18,16 @@ public class ProcessParam { private String powerQualityProblemNo; @ApiModelProperty(name = "reportProcessContentYyfx",value = "电网侧原因") - private String reportProcessContentYyfx; + private String[] reportProcessContentYyfx; @ApiModelProperty(name = "userReportProcessContentYyfx",value = "用户侧原因") - private String userReportProcessContentYyfx; + private String[] userReportProcessContentYyfx; @ApiModelProperty(name = "powerGridAffectDev",value = "电网侧受影响设备") - private String powerGridAffectDev; + private String[] powerGridAffectDev; @ApiModelProperty(name = "userAffectDev",value = "用户侧受影响设备") - private String userAffectDev; + private String[] userAffectDev; @ApiModelProperty(name = "eventDescriptionYyfx",value = "事件描述") private String eventDescriptionYyfx; @@ -39,10 +39,10 @@ public class ProcessParam { private String filePathYyfx; @ApiModelProperty(name = "reportProcessContentYyfx",value = "电网侧整改治理措施") - private String reportProcessContentJhzg; + private String[] reportProcessContentJhzg; @ApiModelProperty(name = "userReportProcessContentJhzg",value = "用户侧整改治理措施") - private String userReportProcessContentJhzg; + private String[] userReportProcessContentJhzg; @ApiModelProperty(name = "fileNameJhzg",value = "计划整改文件名称") private String fileNameJhzg; @@ -51,10 +51,10 @@ public class ProcessParam { private String filePathJhzg; @ApiModelProperty(name = "reportProcessContentSjcq",value = "电网侧实际采取措施") - private String reportProcessContentSjcq; + private String[] reportProcessContentSjcq; @ApiModelProperty(name = "userReportProcessContentSjcq",value = "用户侧实际采取措施") - private String userReportProcessContentSjcq; + private String[] userReportProcessContentSjcq; @ApiModelProperty(name = "fileNameSjcq",value = "实际采取措施报告文件名称") private String fileNameSjcq; diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java b/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java index d07257bea..1d5d22b09 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java @@ -4,6 +4,8 @@ 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; /** @@ -14,6 +16,7 @@ import java.io.Serializable; * @author xiaoyao * @since 2022-11-14 */ +@Data @TableName("r_mp_online_monitor_overproof_problem") public class RMpOnlineMonitorOverproofProblem implements Serializable { @@ -53,67 +56,4 @@ public class RMpOnlineMonitorOverproofProblem implements Serializable { * 告警持续时间 */ private String warnLastTime; - - public String getPowerQualityProblemNo() { - return powerQualityProblemNo; - } - - public void setPowerQualityProblemNo(String powerQualityProblemNo) { - this.powerQualityProblemNo = powerQualityProblemNo; - } - public String getWarnTarget() { - return warnTarget; - } - - public void setWarnTarget(String warnTarget) { - this.warnTarget = warnTarget; - } - public String getWarnReason() { - return warnReason; - } - - public void setWarnReason(String warnReason) { - this.warnReason = warnReason; - } - public String getSubstationId() { - return substationId; - } - - public void setSubstationId(String substationId) { - this.substationId = substationId; - } - public String getMeasurementPointId() { - return measurementPointId; - } - - public void setMeasurementPointId(String measurementPointId) { - this.measurementPointId = measurementPointId; - } - public LocalDateTime getDataDate() { - return dataDate; - } - - public void setDataDate(LocalDateTime dataDate) { - this.dataDate = dataDate; - } - public String getWarnLastTime() { - return warnLastTime; - } - - public void setWarnLastTime(String warnLastTime) { - this.warnLastTime = warnLastTime; - } - - @Override - public String toString() { - return "RMpOnlineMonitorOverproofProblem{" + - "powerQualityProblemNo=" + powerQualityProblemNo + - ", warnTarget=" + warnTarget + - ", warnReason=" + warnReason + - ", substationId=" + substationId + - ", measurementPointId=" + measurementPointId + - ", dataDate=" + dataDate + - ", warnLastTime=" + warnLastTime + - "}"; - } } diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/AbnormalVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/AbnormalVO.java index bb9beb9ef..a25a3f95b 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/vo/AbnormalVO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/AbnormalVO.java @@ -34,10 +34,10 @@ public class AbnormalVO extends ProcessVO implements Serializable { /** * 稳态指标 */ - private String steadyIndicator; + private String[] steadyIndicator; /** * 暂态指标 */ - private String transientIndicators; + private String[] transientIndicators; } diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/ComplaintVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/ComplaintVO.java index 25ce71db6..c0cc56635 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/vo/ComplaintVO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/ComplaintVO.java @@ -39,11 +39,11 @@ public class ComplaintVO extends ProcessVO implements Serializable { /** * 稳态指标 */ - private String steadyIndicator; + private String[] steadyIndicator; /** * 暂态指标 */ - private String transientIndicators; + private String[] transientIndicators; } diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/GeneralSurveyVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/GeneralSurveyVO.java index 281322465..363ac8e4c 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/vo/GeneralSurveyVO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/GeneralSurveyVO.java @@ -44,10 +44,10 @@ public class GeneralSurveyVO extends ProcessVO implements Serializable { /** * 稳态指标 */ - private String steadyIndicator; + private String[] steadyIndicator; /** * 暂态指标 */ - private String transientIndicators; + private String[] transientIndicators; } diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/ProcessVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/ProcessVO.java index 6e64e9c15..aefc3ef75 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/vo/ProcessVO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/ProcessVO.java @@ -47,22 +47,22 @@ public class ProcessVO implements Serializable { /** * 电网侧原因 */ - private String reportProcessContentYyfx; + private String[] reportProcessContentYyfx; /** * 用户侧原因 */ - private String userReportProcessContentYyfx; + private String[] userReportProcessContentYyfx; /** * 电网侧受影响设备 */ - private String powerGridAffectDev; + private String[] powerGridAffectDev; /** * 用户侧受影响设备 */ - private String userAffectDev; + private String[] userAffectDev; /** * 事件描述 @@ -82,12 +82,12 @@ public class ProcessVO implements Serializable { /** * 电网侧整改治理措施 */ - private String reportProcessContentJhzg; + private String[] reportProcessContentJhzg; /** * 用户侧整改治理措施 */ - private String userReportProcessContentJhzg; + private String[] userReportProcessContentJhzg; /** * 计划整改文件名称 @@ -102,12 +102,12 @@ public class ProcessVO implements Serializable { /** * 电网侧实际采取措施 */ - private String reportProcessContentSjcq; + private String[] reportProcessContentSjcq; /** * 用户侧实际采取措施 */ - private String userReportProcessContentSjcq; + private String[] userReportProcessContentSjcq; /** * 实际采取措施报告文件名称 diff --git a/process-boot/pom.xml b/process-boot/pom.xml index 8e86b5678..3a8227bf2 100644 --- a/process-boot/pom.xml +++ b/process-boot/pom.xml @@ -97,6 +97,11 @@ 1.5.1-RELEASE compile + + com.belerweb + pinyin4j + 2.5.1 + diff --git a/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java index 7f94c7891..413daba31 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java +++ b/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java @@ -8,6 +8,8 @@ import com.njcn.process.pojo.po.RStatElectricQualityProblemFlow; import com.njcn.process.pojo.vo.IssuesVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 电能质量问题流程表 Mapper 接口 @@ -18,5 +20,5 @@ import org.apache.ibatis.annotations.Param; */ public interface RStatElectricQualityProblemFlowMapper extends BaseMapper { - Page getIssues(IPage page, @Param("param") QueryIssuesParam param, @Param("dateBegin") String dateBegin, @Param("dateEnd") String dateEnd); + List getIssues(@Param("param") QueryIssuesParam param, @Param("dateBegin") String dateBegin, @Param("dateEnd") String dateEnd); } diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java index 572079412..341da8564 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java @@ -3,8 +3,11 @@ package com.njcn.process.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.pinyin.PinyinUtil; +import com.alibaba.nacos.shaded.com.google.common.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.constant.BizParamConstant; import com.njcn.common.pojo.exception.BusinessException; @@ -25,6 +28,7 @@ import com.njcn.user.api.DeptFeignClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -68,10 +72,11 @@ public class IssuesServiceImpl implements IssuesService { /** * 新增电能质量问题流程表信息 */ - private LocalDateTime addIssues(IssuesParam issuesParam){ + private LocalDateTime addIssues(IssuesParam issuesParam,String powerQualityProblemNo){ RStatElectricQualityProblemFlow issues = new RStatElectricQualityProblemFlow(); LocalDateTime local = LocalDateTimeUtil.now(); BeanUtil.copyProperties(issuesParam,issues); + issues.setPowerQualityProblemNo(powerQualityProblemNo); issues.setDataDate(local); issues.setStartTime(null); issues.setUpdateTime(null); @@ -81,6 +86,33 @@ public class IssuesServiceImpl implements IssuesService { return local; } + /** + * 生成问题编号 + */ + private String getPowerQualityProblemNo(IssuesParam issuesParam){ + StringBuilder powerQualityProblemNo = new StringBuilder(); + powerQualityProblemNo.append(PinyinUtil.getFirstLetter(issuesParam.getOrgName(),"").toUpperCase()).append("-"); + if (DicDataEnum.ONLINE.getCode().equals(issuesParam.getProblemSources())){ + powerQualityProblemNo.append("ZXJC"); + }else if (DicDataEnum.GENERAL.getCode().equals(issuesParam.getProblemSources())){ + powerQualityProblemNo.append("PCCB"); + }else if (DicDataEnum.USER_COMPLAINTS.getCode().equals(issuesParam.getProblemSources())){ + powerQualityProblemNo.append("YHTS"); + }else if (DicDataEnum.DEV_EXCEPTION.getCode().equals(issuesParam.getProblemSources())){ + powerQualityProblemNo.append("YWYC"); + } + String nowDate = DateUtil.format(new Date(), "yyyyMMdd"); + String processDate = DateUtil.format(new Date(), "yyyy-MM-dd"); + powerQualityProblemNo.append(nowDate); + LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); + LocalDateTime local = LocalDateTimeUtil.parse(processDate + "T00:00:00"); + LocalDateTime localEnd = LocalDateTimeUtil.parse(processDate + "T23:59:59"); + issuesQuery.ge(RStatElectricQualityProblemFlow::getDataDate, local).le(RStatElectricQualityProblemFlow::getDataDate,localEnd); + Integer count = issuesMapper.selectCount(issuesQuery); + powerQualityProblemNo.append(StrUtil.padPre(String.valueOf(count + 1),5, '0')); + return powerQualityProblemNo.toString(); + } + /** * 填报在线监测超标问题 */ @@ -88,9 +120,11 @@ public class IssuesServiceImpl implements IssuesService { public void addExcessiveIssues(ExcessiveParam excessiveParam) { IssuesParam issuesParam = new IssuesParam(); BeanUtil.copyProperties(excessiveParam,issuesParam); - LocalDateTime localDateTime = addIssues(issuesParam); + String powerQualityProblemNo = getPowerQualityProblemNo(issuesParam); + LocalDateTime localDateTime = addIssues(issuesParam,powerQualityProblemNo); RMpOnlineMonitorOverproofProblem excessive = new RMpOnlineMonitorOverproofProblem(); BeanUtil.copyProperties(excessiveParam,excessive); + excessive.setPowerQualityProblemNo(powerQualityProblemNo); excessive.setDataDate(localDateTime); excessiveMapper.insert(excessive); } @@ -102,9 +136,12 @@ public class IssuesServiceImpl implements IssuesService { public void addGeneralSurveyIssues(GeneralSurveyParam generalSurveyParam) { IssuesParam issuesParam = new IssuesParam(); BeanUtil.copyProperties(generalSurveyParam,issuesParam); - LocalDateTime localDateTime = addIssues(issuesParam); + String powerQualityProblemNo = getPowerQualityProblemNo(issuesParam); + LocalDateTime localDateTime = addIssues(issuesParam,powerQualityProblemNo); RMpGeneralSurveyOverproofProblem generalSurvey = new RMpGeneralSurveyOverproofProblem(); BeanUtil.copyProperties(generalSurveyParam,generalSurvey); + generalSurvey.setOverLimitTarget(ArrayUtil.toString(generalSurveyParam.getSteadyState())+ArrayUtil.toString(generalSurveyParam.getTransientIndicators())); + generalSurvey.setPowerQualityProblemNo(powerQualityProblemNo); generalSurvey.setDataDate(localDateTime); generalSurveyMapper.insert(generalSurvey); } @@ -116,9 +153,12 @@ public class IssuesServiceImpl implements IssuesService { public void addComplaintIssues(ComplaintParam complaintParam) { IssuesParam issuesParam = new IssuesParam(); BeanUtil.copyProperties(complaintParam,issuesParam); - LocalDateTime localDateTime = addIssues(issuesParam); + String powerQualityProblemNo = getPowerQualityProblemNo(issuesParam); + LocalDateTime localDateTime = addIssues(issuesParam,powerQualityProblemNo); RMpUserComplaint complaint = new RMpUserComplaint(); BeanUtil.copyProperties(complaintParam,complaint); + complaint.setAbnormalTarget(ArrayUtil.toString(complaintParam.getSteadyState())+ArrayUtil.toString(complaintParam.getTransientIndicators())); + complaint.setPowerQualityProblemNo(powerQualityProblemNo); complaint.setDataDate(localDateTime); complaintMapper.insert(complaint); } @@ -130,9 +170,12 @@ public class IssuesServiceImpl implements IssuesService { public void addAbnormalIssues(AbnormalParam abnormalParam) { IssuesParam issuesParam = new IssuesParam(); BeanUtil.copyProperties(abnormalParam,issuesParam); - LocalDateTime localDateTime = addIssues(issuesParam); + String powerQualityProblemNo = getPowerQualityProblemNo(issuesParam); + LocalDateTime localDateTime = addIssues(issuesParam,powerQualityProblemNo); RMpOperationMonitorAbnormal abnormal = new RMpOperationMonitorAbnormal(); BeanUtil.copyProperties(abnormalParam,abnormal); + abnormal.setAbnormalTarget(ArrayUtil.toString(abnormalParam.getSteadyState())+ArrayUtil.toString(abnormalParam.getTransientIndicators())); + abnormal.setPowerQualityProblemNo(powerQualityProblemNo); abnormal.setDataDate(localDateTime); abnormalMapper.insert(abnormal); } @@ -142,7 +185,7 @@ public class IssuesServiceImpl implements IssuesService { */ @Override public Page getIssues(QueryIssuesParam param) { - IPage page = new Page<>(param.getPageNum(), param.getPageSize()); + Page page = new Page<>(param.getPageNum(), param.getPageSize()); Date dateOut = DateUtil.parse(param.getDataDate()); Date dateBegin = new Date(); Date dateEnd = new Date(); @@ -156,18 +199,20 @@ public class IssuesServiceImpl implements IssuesService { dateBegin = DateUtil.beginOfMonth(dateOut); dateEnd = DateUtil.endOfMonth(dateOut); } - Page out = issuesMapper.getIssues(page,param,DateUtil.formatDateTime(dateBegin), DateUtil.formatDateTime(dateEnd)); - out.getRecords().forEach(data -> data.setOrgName((deptFeignClient.getDeptById(data.getOrgNo()).getData().getName()))); - /*问题来源*/ - List problemSourcesDictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PROBLEM_SOURCES.getCode()).getData(); - problemSourcesDictData.forEach(dict -> out.getRecords().stream().filter(data -> dict.getCode().equals(data.getProblemSources())).forEach(data -> data.setProblemSources(dict.getName()))); - /*填报进度*/ - List fillProgressDictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.FILL_PROGRESS.getCode()).getData(); - fillProgressDictData.forEach(dict -> out.getRecords().stream().filter(data -> dict.getCode().equals(data.getReportProcess())).forEach(data -> data.setReportProcess(dict.getName()))); - /*审核状态*/ - List auditStatusDictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.AUDIT_STATUS.getCode()).getData(); - auditStatusDictData.forEach(dict -> out.getRecords().stream().filter(data -> dict.getCode().equals(data.getReportProcessStatus())).forEach(data -> data.setReportProcessStatus(dict.getName()))); - return out; + List out = issuesMapper.getIssues(param,DateUtil.formatDateTime(dateBegin), DateUtil.formatDateTime(dateEnd)); + if (!CollectionUtils.isEmpty(out)) { + out.forEach(data -> data.setOrgName((deptFeignClient.getDeptById(data.getOrgNo()).getData().getName()))); + /*问题来源*/ + List problemSourcesDictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PROBLEM_SOURCES.getCode()).getData(); + problemSourcesDictData.forEach(dict -> out.stream().filter(data -> dict.getCode().equals(data.getProblemSources())).forEach(data -> data.setProblemSources(dict.getName()))); + page.setTotal(out.size()); + int pages = (int)Math.ceil(out.size()*1.0/param.getPageSize()); + page.setPages(pages); + List> partition = Lists.partition(out, param.getPageSize()); + List issuesVOS = partition.get(param.getPageNum() - 1); + page.setRecords(issuesVOS); + } + return page; } /** @@ -187,6 +232,34 @@ public class IssuesServiceImpl implements IssuesService { flowQuery.eq(RMpElectricQualityProblemFlowDetails::getPowerQualityProblemNo,powerQualityProblemNo); return flowDetailsMapper.selectOne(flowQuery); } + + /** + * 处理填报信息 + */ + private ProcessVO processFlowDetail(RMpElectricQualityProblemFlowDetails details){ + ProcessVO process = new ProcessVO(); + BeanUtil.copyProperties(details,process); + if (!StrUtil.isEmpty(details.getReportProcessContentYyfx())){ + process.setReportProcessContentYyfx(StrUtil.removeSuffix(StrUtil.removePrefix(details.getReportProcessContentYyfx(),"["),"\\]").split(",")); + } + if (!StrUtil.isEmpty(details.getUserReportProcessContentYyfx())){ + process.setUserReportProcessContentYyfx(StrUtil.removeSuffix(StrUtil.removePrefix(details.getUserReportProcessContentYyfx(),"["),"\\]").split(",")); + } + if (!StrUtil.isEmpty(details.getReportProcessContentJhzg())){ + process.setReportProcessContentJhzg(StrUtil.removeSuffix(StrUtil.removePrefix(details.getReportProcessContentJhzg(),"["),"\\]").split(",")); + } + if (!StrUtil.isEmpty(details.getUserReportProcessContentJhzg())){ + process.setUserReportProcessContentJhzg(StrUtil.removeSuffix(StrUtil.removePrefix(details.getUserReportProcessContentJhzg(),"["),"\\]").split(",")); + } + if (!StrUtil.isEmpty(details.getReportProcessContentSjcq())){ + process.setReportProcessContentSjcq(StrUtil.removeSuffix(StrUtil.removePrefix(details.getReportProcessContentSjcq(),"["),"\\]").split(",")); + } + if (!StrUtil.isEmpty(details.getUserReportProcessContentSjcq())){ + process.setUserReportProcessContentSjcq(StrUtil.removeSuffix(StrUtil.removePrefix(details.getUserReportProcessContentSjcq(),"["),"\\]").split(",")); + } + return process; + } + /** * 查询在线监测超标问题详情 */ @@ -199,7 +272,8 @@ public class IssuesServiceImpl implements IssuesService { excessiveQuery.eq(RMpOnlineMonitorOverproofProblem::getPowerQualityProblemNo,powerQualityProblemNo); RMpOnlineMonitorOverproofProblem excessiveOut = excessiveMapper.selectOne(excessiveQuery); BeanUtil.copyProperties(excessiveOut,detail); - BeanUtil.copyProperties(flowDetailSelectOne(powerQualityProblemNo),detail); + RMpElectricQualityProblemFlowDetails flowDetails = flowDetailSelectOne(powerQualityProblemNo); + BeanUtil.copyProperties(processFlowDetail(flowDetails),detail); return detail; } @@ -215,7 +289,10 @@ public class IssuesServiceImpl implements IssuesService { generalSurveyQuery.eq(RMpGeneralSurveyOverproofProblem::getPowerQualityProblemNo,powerQualityProblemNo); RMpGeneralSurveyOverproofProblem generalSurveyOut = generalSurveyMapper.selectOne(generalSurveyQuery); BeanUtil.copyProperties(generalSurveyOut,detail); - BeanUtil.copyProperties(flowDetailSelectOne(powerQualityProblemNo),detail); + detail.setSteadyIndicator(steadyIndicator(generalSurveyOut.getOverLimitTarget())); + detail.setTransientIndicators(transientIndicators(generalSurveyOut.getOverLimitTarget())); + RMpElectricQualityProblemFlowDetails flowDetails = flowDetailSelectOne(powerQualityProblemNo); + BeanUtil.copyProperties(processFlowDetail(flowDetails),detail); return detail; } @@ -231,7 +308,16 @@ public class IssuesServiceImpl implements IssuesService { complaintQuery.eq(RMpUserComplaint::getPowerQualityProblemNo,powerQualityProblemNo); RMpUserComplaint complaintOut = complaintMapper.selectOne(complaintQuery); BeanUtil.copyProperties(complaintOut,detail); - BeanUtil.copyProperties(flowDetailSelectOne(powerQualityProblemNo),detail); + detail.setSteadyIndicator(steadyIndicator(complaintOut.getAbnormalTarget())); + detail.setTransientIndicators(transientIndicators(complaintOut.getAbnormalTarget())); + RMpElectricQualityProblemFlowDetails flowDetails = flowDetailSelectOne(powerQualityProblemNo); + BeanUtil.copyProperties(processFlowDetail(flowDetails),detail); + if (!StrUtil.isEmpty(complaintOut.getPowerGridAffectDev())){ + detail.setPowerGridAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(complaintOut.getPowerGridAffectDev(),"["),"\\]").split(",")); + } + if (!StrUtil.isEmpty(complaintOut.getUserAffectDev())){ + detail.setUserAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(complaintOut.getUserAffectDev(),"["),"\\]").split(",")); + } return detail; } @@ -247,10 +333,33 @@ public class IssuesServiceImpl implements IssuesService { abnormalQuery.eq(RMpOperationMonitorAbnormal::getPowerQualityProblemNo,powerQualityProblemNo); RMpOperationMonitorAbnormal abnormalOut = abnormalMapper.selectOne(abnormalQuery); BeanUtil.copyProperties(abnormalOut,detail); - BeanUtil.copyProperties(flowDetailSelectOne(powerQualityProblemNo),detail); + detail.setSteadyIndicator(steadyIndicator(abnormalOut.getAbnormalTarget())); + detail.setTransientIndicators(transientIndicators(abnormalOut.getAbnormalTarget())); + RMpElectricQualityProblemFlowDetails flowDetails = flowDetailSelectOne(powerQualityProblemNo); + BeanUtil.copyProperties(processFlowDetail(flowDetails),detail); + if (!StrUtil.isEmpty(abnormalOut.getPowerGridAffectDev())){ + detail.setPowerGridAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(abnormalOut.getPowerGridAffectDev(),"["),"\\]").split(",")); + } + if (!StrUtil.isEmpty(abnormalOut.getUserAffectDev())){ + detail.setUserAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(abnormalOut.getUserAffectDev(),"["),"\\]").split(",")); + } return detail; } + /** + * 稳态指标处理 + */ + private String[] steadyIndicator(String target){ + return StrUtil.removePrefix(target.split("]\\[")[0],"\\[").split(","); + } + + /** + * 暂态指标处理 + */ + private String[] transientIndicators(String target){ + return StrUtil.removeSuffix(target.split("]\\[")[1],"]").split(","); + } + /** * 原因分析 */ @@ -260,12 +369,29 @@ public class IssuesServiceImpl implements IssuesService { RMpElectricQualityProblemFlowDetails details = new RMpElectricQualityProblemFlowDetails(); BeanUtil.copyProperties(processParam,details); details.setDataDateYyfx(local); + details.setReportProcessContentYyfx(ArrayUtil.toString(processParam.getReportProcessContentYyfx())); + details.setUserReportProcessContentYyfx(ArrayUtil.toString(processParam.getUserReportProcessContentYyfx())); flowDetailsMapper.insert(details); LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); issuesQuery.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo()); RStatElectricQualityProblemFlow issuesOut = issuesMapper.selectOne(issuesQuery); issuesOut.setReportProcess(DicDataEnum.CAUSE_ANALYSIS.getCode()); issuesMapper.update(issuesOut,issuesQuery); + if (DicDataEnum.USER_COMPLAINTS.getCode().equals(issuesOut.getProblemSources())){ + LambdaQueryWrapper complaintQuery = new LambdaQueryWrapper<>(); + complaintQuery.eq(RMpUserComplaint::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo()); + RMpUserComplaint complaintOut = complaintMapper.selectOne(complaintQuery); + complaintOut.setPowerGridAffectDev(ArrayUtil.toString(processParam.getPowerGridAffectDev())); + complaintOut.setUserAffectDev(ArrayUtil.toString(processParam.getUserAffectDev())); + complaintMapper.update(complaintOut,complaintQuery); + }else if (DicDataEnum.DEV_EXCEPTION.getCode().equals(issuesOut.getProblemSources())){ + LambdaQueryWrapper abnormalQuery = new LambdaQueryWrapper<>(); + abnormalQuery.eq(RMpOperationMonitorAbnormal::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo()); + RMpOperationMonitorAbnormal abnormalOut = abnormalMapper.selectOne(abnormalQuery); + abnormalOut.setPowerGridAffectDev(ArrayUtil.toString(processParam.getPowerGridAffectDev())); + abnormalOut.setUserAffectDev(ArrayUtil.toString(processParam.getUserAffectDev())); + abnormalMapper.update(abnormalOut,abnormalQuery); + } } /** @@ -283,14 +409,14 @@ public class IssuesServiceImpl implements IssuesService { LocalDateTime local = LocalDateTimeUtil.now(); if (DicDataEnum.PLAN_MEASURES.getCode().equals(code)){ details.setDataDateJhzg(local); - details.setReportProcessContentJhzg(processParam.getReportProcessContentJhzg()); - details.setUserReportProcessContentJhzg(processParam.getUserReportProcessContentJhzg()); + details.setReportProcessContentJhzg(ArrayUtil.toString(processParam.getReportProcessContentJhzg())); + details.setUserReportProcessContentJhzg(ArrayUtil.toString(processParam.getUserReportProcessContentJhzg())); details.setFileNameJhzg(processParam.getFileNameJhzg()); details.setFilePathJhzg(processParam.getFilePathJhzg()); }else if (DicDataEnum.ACTUAL_MEASURES.getCode().equals(code)){ details.setDataDateSjcq(local); - details.setReportProcessContentSjcq(processParam.getReportProcessContentSjcq()); - details.setUserReportProcessContentSjcq(processParam.getUserReportProcessContentSjcq()); + details.setReportProcessContentSjcq(ArrayUtil.toString(processParam.getReportProcessContentSjcq())); + details.setUserReportProcessContentSjcq(ArrayUtil.toString(processParam.getUserReportProcessContentSjcq())); details.setFileNameSjcq(processParam.getFileNameSjcq()); details.setFilePathSjcq(processParam.getFilePathSjcq()); }else if (DicDataEnum.INSIGHTS.getCode().equals(code)){ From 4ce81ced3d9448bb5233ac2692bfa6fe07e820cf Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Wed, 30 Nov 2022 19:13:53 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E6=99=AE=E6=B5=8B=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/RGeneralSurveyPlanAddParm.java | 0 .../param/RGeneralSurveyPlanQueryParm.java | 0 .../RGeneralSurveyPlandetailQueryParm.java | 0 .../param/SurveyPlanQuestionQueryParm.java | 36 ++++++++ .../pojo/param/SurveyResultUploadParam.java | 0 .../pojo/po/RGeneralSurveyPlanDetail.java | 0 .../process/pojo/po/RGeneralSurveyPlanPO.java | 6 ++ .../njcn/process/pojo/po/SurveyPlanExcel.java | 48 ++++++++++ .../RGeneralSurveyPlanDetailOnQuestionVO.java | 64 ++++++++++++++ .../process/pojo/vo/RGeneralSurveyPlanVO.java | 0 .../RGeneralSurveyPlanController.java | 87 ++++++++++++++++--- .../RGeneralSurveyPlanDetailMapper.java | 20 +++++ .../mapper/RGeneralSurveyPlanPOMapper.java | 1 + .../service/RGeneralSurveyPlanPOService.java | 19 ++++ .../impl/RGeneralSurveyPlanPOServiceImpl.java | 54 ++++++++++++ 15 files changed, 324 insertions(+), 11 deletions(-) rename {process-boot => process-api}/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java (100%) rename {process-boot => process-api}/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java (100%) rename {process-boot => process-api}/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java (100%) create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java rename {process-boot => process-api}/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java (100%) rename {process-boot => process-api}/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java (100%) rename {process-boot => process-api}/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java (91%) create mode 100644 process-api/src/main/java/com/njcn/process/pojo/po/SurveyPlanExcel.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanDetailOnQuestionVO.java rename {process-boot => process-api}/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java (100%) diff --git a/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java similarity index 100% rename from process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java rename to process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java diff --git a/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java similarity index 100% rename from process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java rename to process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java diff --git a/process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java similarity index 100% rename from process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java rename to process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java b/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java new file mode 100644 index 000000000..d6ae73b19 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java @@ -0,0 +1,36 @@ +package com.njcn.process.pojo.param; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 15:20【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class SurveyPlanQuestionQueryParm { + + + + @ApiModelProperty(value="单位ID") + @NotNull(message="单位ID不能为空！") + private String orgNo; + + @ApiModelProperty(value="计划开始时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date planStartTime; + + @ApiModelProperty(value="计划名称") + private String planName; + + + +} diff --git a/process-boot/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java similarity index 100% rename from process-boot/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java rename to process-api/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java diff --git a/process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java similarity index 100% rename from process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java rename to process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java diff --git a/process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java similarity index 91% rename from process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java rename to process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java index 5f0da1f1c..32b72c376 100644 --- a/process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java @@ -3,6 +3,7 @@ package com.njcn.process.pojo.po; 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 com.github.jeffreyning.mybatisplus.anno.MppMultiId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -51,6 +52,7 @@ public class RGeneralSurveyPlanPO { * 计划生成时间 */ @TableField(value = "plan_create_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value="计划生成时间") private Date planCreateTime = new Date(); @@ -58,6 +60,7 @@ public class RGeneralSurveyPlanPO { * 计划开始时间 */ @TableField(value = "plan_start_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value="计划开始时间") private Date planStartTime; @@ -65,6 +68,7 @@ public class RGeneralSurveyPlanPO { * 计划结束时间 */ @TableField(value = "plan_end_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value="计划结束时间") private Date planEndTime; @@ -72,6 +76,7 @@ public class RGeneralSurveyPlanPO { * 实际完成时间 */ @TableField(value = "plan_complate_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value="实际完成时间") private Date planComplateTime; @@ -121,6 +126,7 @@ public class RGeneralSurveyPlanPO { * 上传时间 */ @TableField(value = "upload_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value="上传时间") private Date uploadTime; } \ No newline at end of file diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/SurveyPlanExcel.java b/process-api/src/main/java/com/njcn/process/pojo/po/SurveyPlanExcel.java new file mode 100644 index 000000000..9fde41b4e --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/po/SurveyPlanExcel.java @@ -0,0 +1,48 @@ +package com.njcn.process.pojo.po; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/21 9:35【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class SurveyPlanExcel implements Serializable { + + @Excel(name = "单位", width = 15) + private String orgNo; + + @Excel(name = "普测计划编号", width = 15) + private String planNo; + + @Excel(name = "普测计划名称", width = 15) + private String planName; + + @Excel(name = "计划开始时间", format = "yyyy-MM-dd HH:mm:ss", width = 15) + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date planStartTime; + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @Excel(name = "计划结束时间",format = "yyyy-MM-dd HH:mm:ss", width = 15) + private Date planEndTime; + + @Excel(name = "变电站数量", width = 15) + private Long subCount; + + @Excel(name = "母线数量", width = 15) + private Long busCount; + + @Excel(name = "计划状态", width = 15) + private String status; + + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanDetailOnQuestionVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanDetailOnQuestionVO.java new file mode 100644 index 000000000..fe5ac18bf --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanDetailOnQuestionVO.java @@ -0,0 +1,64 @@ +package com.njcn.process.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 11:28【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +/** + * 普测计划详情表(问题件页面) + */ +@Data +public class RGeneralSurveyPlanDetailOnQuestionVO { + /** + * 普测计划编号 + */ + @ApiModelProperty(value="普测名称") + private String planName; + + /** + * 变电站电压等级 + */ + @ApiModelProperty(value="变电站电压等级") + private String voltageLevel; + /** + * 变电站ID + */ + @ApiModelProperty(value="变电站ID") + private String subId; + + /** + * 变电站名称 + */ + @ApiModelProperty(value="变电站名称") + private String subName; + /** + * 母线ID + */ + + @ApiModelProperty(value="母线ID") + private String busbarId; + + + /** + * 母线名称 + */ + @ApiModelProperty(value="母线名称") + private String busbarName; + + /** + * 离线监测点id + */ + @ApiModelProperty(value="离线监测点id") + private String measurementPointId; + + +} \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java similarity index 100% rename from process-boot/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java rename to process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java diff --git a/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java b/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java index 59b3ef577..5c999e450 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java @@ -1,5 +1,7 @@ package com.njcn.process.controller; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.metadata.IPage; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; @@ -7,10 +9,10 @@ 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.RGeneralSurveyPlanAddParm; -import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm; -import com.njcn.process.pojo.param.RGeneralSurveyPlandetailQueryParm; -import com.njcn.process.pojo.param.SurveyResultUploadParam; +import com.njcn.poi.util.PoiUtil; +import com.njcn.process.pojo.param.*; +import com.njcn.process.pojo.po.SurveyPlanExcel; +import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO; import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; import com.njcn.process.service.RGeneralSurveyPlanDetailService; import com.njcn.process.service.RGeneralSurveyPlanPOService; @@ -20,10 +22,12 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -46,14 +50,16 @@ public class RGeneralSurveyPlanController extends BaseController { private @Autowired RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService; - /** - * 查询所有数据 - * @author qijian - * @date 2022/11/11 - */ + /** + * @Description: 新增/修改普测计划 + * @Param: [rGeneralSurveyPlanAddParm] + * @return: com.njcn.common.pojo.response.HttpResult + * @Author: clam + * @Date: 2022/11/22 + */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/addPlan") - @ApiOperation("新增普测计划") + @ApiOperation("新增/修改普测计划") @ApiImplicitParam(name = "rGeneralSurveyPlanAddParm", value = "新增普测计划参数", required = true) public HttpResult addPlan(@RequestBody RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm){ String methodDescribe = getMethodDescribe("addPlan"); @@ -75,7 +81,7 @@ public class RGeneralSurveyPlanController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryPlan") - @ApiOperation("查询普测计划") + @ApiOperation("查询普测计划-新建页面") @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true) public HttpResult> queryPlan(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ String methodDescribe = getMethodDescribe("queryPlan"); @@ -84,6 +90,28 @@ public class RGeneralSurveyPlanController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryPlanAudit") + @ApiOperation("查询普测计划-审核页面") + @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true) + public HttpResult> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ + String methodDescribe = getMethodDescribe("queryPlanAudit"); + + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryPlanResult") + @ApiOperation("查询普测计划-结果页面") + @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true) + public HttpResult> queryPlanResult(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ + String methodDescribe = getMethodDescribe("queryPlanResult"); + + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryPlandetail") @ApiOperation("根据planNO查询普测计划详情") @@ -95,6 +123,8 @@ public class RGeneralSurveyPlanController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanDetailVOIPage, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPLOAD) @PostMapping("/surveyResultUpload") @ApiOperation("上传普测结果报告") @@ -121,4 +151,39 @@ public class RGeneralSurveyPlanController extends BaseController { } + @ResponseBody + @ApiOperation("导出普测计划信息") + @PostMapping(value = "exportSurveyPlan") + @ApiImplicitParam(name = "planIdList", value = "普测计划详情查询参数", required = true) + public HttpResult exportSurveyPlan(HttpServletResponse response,@RequestBody List planIdList) { + String methodDescribe = getMethodDescribe("exportSurveyPlan"); + String fileName = "普测计划信息.xls"; + List baseExcelList = null; + try { + baseExcelList = rGeneralSurveyPlanPOService.exportSurveyPlan(planIdList); + } catch (Exception e) { + e.printStackTrace(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + ExportParams exportExcel = new ExportParams("普测计划信息", "普测计划信息"); + Workbook workbook = ExcelExportUtil.exportExcel(exportExcel, SurveyPlanExcel.class, baseExcelList); + PoiUtil.exportFileByWorkbook(workbook, fileName, response); + return null; + } + + @ResponseBody + @ApiOperation("普测计划信息问题件新增查询") + @PostMapping(value = "querySurveyPlanOnQuestion") + @ApiImplicitParam(name = "questionQueryParm", value = "普测计划信息问题件查询参数", required = true) + public HttpResult> querySurveyPlanOnQuestion(@Validated @RequestBody SurveyPlanQuestionQueryParm questionQueryParm) { + String methodDescribe = getMethodDescribe("querySurveyPlanOnQuestion"); + + List list= rGeneralSurveyPlanPOService.querySurveyPlanOnQuestion(questionQueryParm); + + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + + } + + + } diff --git a/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java index 2e8137184..b53db752c 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java +++ b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java @@ -1,7 +1,13 @@ package com.njcn.process.mapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm; import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail; +import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @@ -13,4 +19,18 @@ import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail; * @version V1.0.0 */ public interface RGeneralSurveyPlanDetailMapper extends MppBaseMapper { + @Select ("SELECT\n" + + "\ta.plan_name as planName,\n" + + "\tb.voltage_level as voltageLevel,\n" + + "\tb.sub_id as subId,\n" + + "\tb.sub_name as subName,\n" + + "\tb.busbar_id as busbarId,\n" + + "\tb.busbar_name as busbarName\n" + + "FROM\n" + + "\tr_general_survey_plan a\n" + + "INNER JOIN r_general_survey_plan_detail b ON a.plan_no = b.plan_no\n" + + "WHERE\n" + + "\ta.org_no = #{questionQueryParm.orgNo} and a.plan_name LIKE CONCAT('%', #{questionQueryParm.planName}, '%')\n" + + "AND DATE_FORMAT(a.upload_time, '%Y%m') = DATE_FORMAT(#{questionQueryParm.planStartTime}, '%Y%m')") + List querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm); } \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanPOMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanPOMapper.java index d893f9a4f..f9dfbc9ed 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanPOMapper.java +++ b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanPOMapper.java @@ -13,4 +13,5 @@ import com.njcn.process.pojo.po.RGeneralSurveyPlanPO; * @version V1.0.0 */ public interface RGeneralSurveyPlanPOMapper extends MppBaseMapper { + } \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java b/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java index c3fedd05f..d655e0d09 100644 --- a/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java +++ b/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.process.pojo.param.RGeneralSurveyPlanAddParm; import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm; +import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm; import com.njcn.process.pojo.param.SurveyResultUploadParam; import com.njcn.process.pojo.po.RGeneralSurveyPlanPO; +import com.njcn.process.pojo.po.SurveyPlanExcel; +import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO; import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; import java.util.List; @@ -53,4 +56,20 @@ public interface RGeneralSurveyPlanPOService extends IMppService surveyResultDownload(String planNo); + /** + * @Description: exportSurveyPlan + * @Param: [] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/21 + */ + List exportSurveyPlan(List planIdList); + /** + * @Description: querySurveyPlanOnQuestion + * @Param: [questionQueryParm] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/30 + */ + List querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm); } diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java index 99b8e7cf5..856595e8d 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java @@ -13,9 +13,12 @@ import com.njcn.process.mapper.RGeneralSurveyPlanDetailMapper; import com.njcn.process.mapper.RGeneralSurveyPlanPOMapper; import com.njcn.process.pojo.param.RGeneralSurveyPlanAddParm; import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm; +import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm; import com.njcn.process.pojo.param.SurveyResultUploadParam; import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail; import com.njcn.process.pojo.po.RGeneralSurveyPlanPO; +import com.njcn.process.pojo.po.SurveyPlanExcel; +import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO; import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; import com.njcn.process.service.RGeneralSurveyPlanDetailService; import com.njcn.process.service.RGeneralSurveyPlanPOService; @@ -214,6 +217,57 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl + * @Author: clam + * @Date: 2022/11/21 + */ + @Override + public List exportSurveyPlan(List planIdList) { + List surveyPlanExcels = new ArrayList<> (); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<> (); + queryWrapper.in (RGeneralSurveyPlanPO::getPlanNo,planIdList); + List rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList (queryWrapper); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<> (); + lambdaQueryWrapper.in (RGeneralSurveyPlanDetail::getPlanNo, planIdList); + List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (lambdaQueryWrapper); + rGeneralSurveyPlanPOS.forEach (temp->{ + SurveyPlanExcel surveyPlanExcel = new SurveyPlanExcel(); + BeanUtils.copyProperties (temp, surveyPlanExcel); + + long Busbarcount = rGeneralSurveyPlanDetails.stream ( ). + filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). + map (RGeneralSurveyPlanDetail::getBusbarId).distinct ( ).count ( ); + + long Subcount = rGeneralSurveyPlanDetails.stream ( ). + filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). + map (RGeneralSurveyPlanDetail::getSubId).distinct ( ).count ( ); + surveyPlanExcel.setBusCount (Busbarcount); + surveyPlanExcel.setSubCount (Subcount); + surveyPlanExcels.add (surveyPlanExcel); + }); + + return surveyPlanExcels; + } + + /** + * @param questionQueryParm + * @Description: querySurveyPlanOnQuestion + * @Param: [questionQueryParm] + * @return: java.util.List + * @Author: clam + * @Date: 2022/11/30 + */ + @Override + public List querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm) { + List rGeneralSurveyPlanDetailOnQuestionVOS = new ArrayList<> (); + rGeneralSurveyPlanDetailOnQuestionVOS =rGeneralSurveyPlanDetailMapper.querySurveyPlanOnQuestion(questionQueryParm); + + return rGeneralSurveyPlanDetailOnQuestionVOS; + } + /** * 上传文件到Minio * From 428703b7cbdb66ea7b447d6cf09848627bc9869e Mon Sep 17 00:00:00 2001 From: "1771838663@qq.com" <1771838663@qq.com> Date: Thu, 1 Dec 2022 09:00:43 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E7=94=B5=E8=83=BD=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/process/pojo/vo/FlowDetailVO.java | 116 ++++++++++++++++++ .../ElectricityQualityIssuesController.java | 5 +- .../service/impl/IssuesServiceImpl.java | 44 ++++--- 3 files changed, 148 insertions(+), 17 deletions(-) create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/FlowDetailVO.java diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/FlowDetailVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/FlowDetailVO.java new file mode 100644 index 000000000..3c7de4018 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/FlowDetailVO.java @@ -0,0 +1,116 @@ +package com.njcn.process.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/29 9:23 + */ +@Data +public class FlowDetailVO implements Serializable { + + private static final long serialVersionUID = 6025928276036950946L; + + /** + * 电能质量问题编号 + */ + private String powerQualityProblemNo; + + /** + * 填报进度，字典表（未填报、原因分析结果、计划整改措施、实际采取措施、治理效果评价、已归档） + */ + private String reportProcess; + + /** + * 电网侧原因 + */ + private String[] reportProcessContentYyfx; + + /** + * 用户侧原因 + */ + private String[] userReportProcessContentYyfx; + + /** + * 电网侧受影响设备 + */ + private String[] powerGridAffectDev; + + /** + * 用户侧受影响设备 + */ + private String[] userAffectDev; + + /** + * 事件描述 + */ + private String eventDescriptionYyfx; + + /** + * 原因分析报告文件名称 + */ + private String fileNameYyfx; + + /** + * 原因分析报告文件路径 + */ + private String filePathYyfx; + + /** + * 电网侧整改治理措施 + */ + private String[] reportProcessContentJhzg; + + /** + * 用户侧整改治理措施 + */ + private String[] userReportProcessContentJhzg; + + /** + * 计划整改文件名称 + */ + private String fileNameJhzg; + + /** + * 计划整改文件路径 + */ + private String filePathJhzg; + + /** + * 电网侧实际采取措施 + */ + private String[] reportProcessContentSjcq; + + /** + * 用户侧实际采取措施 + */ + private String[] userReportProcessContentSjcq; + + /** + * 实际采取措施报告文件名称 + */ + private String fileNameSjcq; + + /** + * 实际采取措施报告文件路径 + */ + private String filePathSjcq; + + /** + * 成效分析概述 + */ + private String descriptionZlxg; + + /** + * 成效分析报告文件名称 + */ + private String fileNameZlxg; + + /** + * 成效分析报告文件路径 + */ + private String filePathZlxg; +} diff --git a/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java b/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java index 39d8130e4..027e5b3a1 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java @@ -182,10 +182,11 @@ public class ElectricityQualityIssuesController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD) @PostMapping("/uploadFile") @ApiOperation("上传文件") - @ApiImplicitParam(name = "issuesFile", value = "填报进度文件", required = true) - public HttpResult uploadFile(@RequestParam("issuesFile") MultipartFile issuesFile){ + @ApiImplicitParam(name = "file", value = "填报进度文件", required = true) + public HttpResult uploadFile(@RequestParam("file") MultipartFile issuesFile){ String methodDescribe = getMethodDescribe("uploadFile"); MinIoUploadResDTO out = issuesService.uploadFile(issuesFile); + out.setMinFileName(issuesFile.getOriginalFilename()); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java index 341da8564..3a468ced1 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java @@ -236,26 +236,32 @@ public class IssuesServiceImpl implements IssuesService { /** * 处理填报信息 */ - private ProcessVO processFlowDetail(RMpElectricQualityProblemFlowDetails details){ - ProcessVO process = new ProcessVO(); + private FlowDetailVO processFlowDetail(RMpElectricQualityProblemFlowDetails details){ + FlowDetailVO process = new FlowDetailVO(); BeanUtil.copyProperties(details,process); if (!StrUtil.isEmpty(details.getReportProcessContentYyfx())){ - process.setReportProcessContentYyfx(StrUtil.removeSuffix(StrUtil.removePrefix(details.getReportProcessContentYyfx(),"["),"\\]").split(",")); + process.setReportProcessContentYyfx(StrUtil.removeSuffix(StrUtil.removePrefix(details.getReportProcessContentYyfx(),"["),"]").split(",")); + StrUtil.trim(process.getReportProcessContentYyfx()); } if (!StrUtil.isEmpty(details.getUserReportProcessContentYyfx())){ - process.setUserReportProcessContentYyfx(StrUtil.removeSuffix(StrUtil.removePrefix(details.getUserReportProcessContentYyfx(),"["),"\\]").split(",")); + process.setUserReportProcessContentYyfx(StrUtil.removeSuffix(StrUtil.removePrefix(details.getUserReportProcessContentYyfx(),"["),"]").split(",")); + StrUtil.trim(process.getUserReportProcessContentYyfx()); } if (!StrUtil.isEmpty(details.getReportProcessContentJhzg())){ - process.setReportProcessContentJhzg(StrUtil.removeSuffix(StrUtil.removePrefix(details.getReportProcessContentJhzg(),"["),"\\]").split(",")); + process.setReportProcessContentJhzg(StrUtil.removeSuffix(StrUtil.removePrefix(details.getReportProcessContentJhzg(),"["),"]").split(",")); + StrUtil.trim(process.getReportProcessContentJhzg()); } if (!StrUtil.isEmpty(details.getUserReportProcessContentJhzg())){ - process.setUserReportProcessContentJhzg(StrUtil.removeSuffix(StrUtil.removePrefix(details.getUserReportProcessContentJhzg(),"["),"\\]").split(",")); + process.setUserReportProcessContentJhzg(StrUtil.removeSuffix(StrUtil.removePrefix(details.getUserReportProcessContentJhzg(),"["),"]").split(",")); + StrUtil.trim(process.getUserReportProcessContentJhzg()); } if (!StrUtil.isEmpty(details.getReportProcessContentSjcq())){ - process.setReportProcessContentSjcq(StrUtil.removeSuffix(StrUtil.removePrefix(details.getReportProcessContentSjcq(),"["),"\\]").split(",")); + process.setReportProcessContentSjcq(StrUtil.removeSuffix(StrUtil.removePrefix(details.getReportProcessContentSjcq(),"["),"]").split(",")); + StrUtil.trim(process.getReportProcessContentSjcq()); } if (!StrUtil.isEmpty(details.getUserReportProcessContentSjcq())){ - process.setUserReportProcessContentSjcq(StrUtil.removeSuffix(StrUtil.removePrefix(details.getUserReportProcessContentSjcq(),"["),"\\]").split(",")); + process.setUserReportProcessContentSjcq(StrUtil.removeSuffix(StrUtil.removePrefix(details.getUserReportProcessContentSjcq(),"["),"]").split(",")); + StrUtil.trim(process.getUserReportProcessContentSjcq()); } return process; } @@ -313,10 +319,12 @@ public class IssuesServiceImpl implements IssuesService { RMpElectricQualityProblemFlowDetails flowDetails = flowDetailSelectOne(powerQualityProblemNo); BeanUtil.copyProperties(processFlowDetail(flowDetails),detail); if (!StrUtil.isEmpty(complaintOut.getPowerGridAffectDev())){ - detail.setPowerGridAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(complaintOut.getPowerGridAffectDev(),"["),"\\]").split(",")); + detail.setPowerGridAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(complaintOut.getPowerGridAffectDev(),"["),"]").split(",")); + StrUtil.trim(detail.getPowerGridAffectDev()); } if (!StrUtil.isEmpty(complaintOut.getUserAffectDev())){ - detail.setUserAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(complaintOut.getUserAffectDev(),"["),"\\]").split(",")); + detail.setUserAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(complaintOut.getUserAffectDev(),"["),"]").split(",")); + StrUtil.trim(detail.getUserAffectDev()); } return detail; } @@ -338,10 +346,12 @@ public class IssuesServiceImpl implements IssuesService { RMpElectricQualityProblemFlowDetails flowDetails = flowDetailSelectOne(powerQualityProblemNo); BeanUtil.copyProperties(processFlowDetail(flowDetails),detail); if (!StrUtil.isEmpty(abnormalOut.getPowerGridAffectDev())){ - detail.setPowerGridAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(abnormalOut.getPowerGridAffectDev(),"["),"\\]").split(",")); + detail.setPowerGridAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(abnormalOut.getPowerGridAffectDev(),"["),"]").split(",")); + StrUtil.trim(detail.getPowerGridAffectDev()); } if (!StrUtil.isEmpty(abnormalOut.getUserAffectDev())){ - detail.setUserAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(abnormalOut.getUserAffectDev(),"["),"\\]").split(",")); + detail.setUserAffectDev(StrUtil.removeSuffix(StrUtil.removePrefix(abnormalOut.getUserAffectDev(),"["),"]").split(",")); + StrUtil.trim(detail.getUserAffectDev()); } return detail; } @@ -350,14 +360,18 @@ public class IssuesServiceImpl implements IssuesService { * 稳态指标处理 */ private String[] steadyIndicator(String target){ - return StrUtil.removePrefix(target.split("]\\[")[0],"\\[").split(","); + String[] process = StrUtil.removePrefix(target.split("]\\[")[0],"\\[").split(","); + StrUtil.trim(process); + return process; } /** * 暂态指标处理 */ private String[] transientIndicators(String target){ - return StrUtil.removeSuffix(target.split("]\\[")[1],"]").split(","); + String[] process = StrUtil.removeSuffix(target.split("]\\[")[1],"]").split(","); + StrUtil.trim(process); + return process; } /** @@ -481,7 +495,7 @@ public class IssuesServiceImpl implements IssuesService { }else if (DicDataEnum.INSIGHTS.getName().equals(reportProcess)){ filePath = details.getFilePathZlxg(); } - return minIoUtils.getObjectUrl (minIoProperties.getBucket ( ), filePath, 7 * 24 * 60 * 60); + return filePath; } /** From f9733d0fe14483223f2ffd722e9230688e504495 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Tue, 6 Dec 2022 15:36:15 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E6=99=AE=E6=B5=8B=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=81=94=E8=B0=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/RGeneralSurveyPlanAddParm.java | 1 - .../param/RGeneralSurveyPlanQueryParm.java | 6 +- .../RGeneralSurveyPlandetailQueryParm.java | 2 - .../param/SurveyPlanQuestionQueryParm.java | 1 + .../pojo/param/SurveyResultUploadParam.java | 4 +- .../pojo/po/RGeneralSurveyPlanDetail.java | 9 +- .../process/pojo/vo/RGeneralSurveyPlanVO.java | 15 +++- .../pojo/{po => vo}/SurveyPlanExcel.java | 2 +- .../RGeneralSurveyPlanController.java | 40 +++++---- .../RGeneralSurveyPlanDetailMapper.java | 13 ++- .../service/RGeneralSurveyPlanPOService.java | 17 +++- .../impl/RGeneralSurveyPlanPOServiceImpl.java | 89 +++++++++++++++---- 12 files changed, 146 insertions(+), 53 deletions(-) rename process-api/src/main/java/com/njcn/process/pojo/{po => vo}/SurveyPlanExcel.java (97%) diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java index 96bba923c..dbecf23ec 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java @@ -16,7 +16,6 @@ import java.util.List; * @author clam * @version V1.0.0 */ -@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm") @Data public class RGeneralSurveyPlanAddParm { diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java index 629fe10bc..910f26724 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java @@ -1,7 +1,6 @@ package com.njcn.process.pojo.param; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,6 @@ import java.util.Date; * @author clam * @version V1.0.0 */ -@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm") @Data public class RGeneralSurveyPlanQueryParm { @@ -37,6 +35,10 @@ public class RGeneralSurveyPlanQueryParm { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date planStartTime; + @ApiModelProperty(value="计划结束时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date planEndTime; + @ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)") private String status; diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java index ab1a29506..d32bb6154 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java @@ -1,6 +1,5 @@ package com.njcn.process.pojo.param; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,6 @@ import javax.validation.constraints.NotNull; * @author clam * @version V1.0.0 */ -@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm") @Data public class RGeneralSurveyPlandetailQueryParm { diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java b/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java index d6ae73b19..760e7432b 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java @@ -26,6 +26,7 @@ public class SurveyPlanQuestionQueryParm { @ApiModelProperty(value="计划开始时间") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @NotNull(message="计划开始时间不能为空！") private Date planStartTime; @ApiModelProperty(value="计划名称") diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java index 9c2c545fb..e9b7d4439 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java @@ -22,9 +22,9 @@ public class SurveyResultUploadParam { @NotBlank(message = ValidMessage.ID_NOT_BLANK) private String planId; - @ApiModelProperty(name = "files",value = "普测结果报告",required = true) + @ApiModelProperty(name = "file",value = "普测结果报告",required = true) @NotNull(message = "普测结果报告") - private MultipartFile[] files; + private MultipartFile[] file; diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java index 4f1004fb9..a6f7bdc91 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java @@ -104,10 +104,17 @@ public class RGeneralSurveyPlanDetail { @ApiModelProperty(value="离线监测点id") private String measurementPointId; + /** + * 是否实现监测(0:否 1:是) + */ + @TableField(value = "is_survey") + @ApiModelProperty(value="是否生成问题(0:否 1:是)") + private Integer isSurvey; + /** * 是否生成问题(0:否 1:是) */ @TableField(value = "is_problem") @ApiModelProperty(value="是否生成问题(0:否 1:是)") - private Byte isProblem; + private Integer isProblem; } \ No newline at end of file diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java index 9378ee1f1..407fabdb1 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java @@ -17,12 +17,14 @@ import java.util.List; * @author clam * @version V1.0.0 */ -@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm") @Data public class RGeneralSurveyPlanVO { @ApiModelProperty(value="单位ID") private String orgNo; + @ApiModelProperty(value="单位名称") + private String orgName; + @ApiModelProperty(value="普测计划编号") private String planNo; @@ -45,11 +47,11 @@ public class RGeneralSurveyPlanVO { private Long busCount; @ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)") - private int status; + private Integer status; @TableField(value = "is_file_upload") @ApiModelProperty(value="文件是否上传(0:否 1:是)") - private Byte isFileUpload; + private Integer isFileUpload; /** * 上传文件数量 @@ -116,6 +118,13 @@ public class RGeneralSurveyPlanVO { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date generalSurveyTime; + /** + * 是否实现监测(0:否 1:是) + */ + @TableField(value = "is_survey") + @ApiModelProperty(value="是否生成问题(0:否 1:是)") + private Integer isSurvey; + /** * 测试负责人 */ diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/SurveyPlanExcel.java b/process-api/src/main/java/com/njcn/process/pojo/vo/SurveyPlanExcel.java similarity index 97% rename from process-api/src/main/java/com/njcn/process/pojo/po/SurveyPlanExcel.java rename to process-api/src/main/java/com/njcn/process/pojo/vo/SurveyPlanExcel.java index 9fde41b4e..15e4a2a3c 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/SurveyPlanExcel.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/SurveyPlanExcel.java @@ -1,4 +1,4 @@ -package com.njcn.process.pojo.po; +package com.njcn.process.pojo.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java b/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java index 5c999e450..db147ae3f 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java @@ -9,9 +9,11 @@ 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.minio.bo.MinIoUploadResDTO; import com.njcn.poi.util.PoiUtil; import com.njcn.process.pojo.param.*; -import com.njcn.process.pojo.po.SurveyPlanExcel; +import com.njcn.process.pojo.po.RGeneralSurveyPlanPO; +import com.njcn.process.pojo.vo.SurveyPlanExcel; import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO; import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; import com.njcn.process.service.RGeneralSurveyPlanDetailService; @@ -29,6 +31,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Description: @@ -68,16 +72,7 @@ public class RGeneralSurveyPlanController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe); } -// @OperateInfo(info = LogEnum.BUSINESS_COMMON) -// @PostMapping("/updatePlan") -// @ApiOperation("新增普测计划") -// @ApiImplicitParam(name = "rGeneralSurveyPlanAddParm", value = "新增普测计划参数", required = true) -// public HttpResult updatePlan(@RequestBody RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm){ -// String methodDescribe = getMethodDescribe("addPlan"); -// -//// Boolean addFlag = rGeneralSurveyPlanPOService.updatePlan(rGeneralSurveyPlanAddParm); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe); -// } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryPlan") @@ -86,7 +81,7 @@ public class RGeneralSurveyPlanController extends BaseController { public HttpResult> queryPlan(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ String methodDescribe = getMethodDescribe("queryPlan"); - IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm); + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("0","1","2","3").collect (Collectors.toList ())); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); } @@ -97,7 +92,7 @@ public class RGeneralSurveyPlanController extends BaseController { public HttpResult> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ String methodDescribe = getMethodDescribe("queryPlanAudit"); - IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm); + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1").collect (Collectors.toList ())); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); } @@ -108,7 +103,7 @@ public class RGeneralSurveyPlanController extends BaseController { public HttpResult> queryPlanResult(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ String methodDescribe = getMethodDescribe("queryPlanResult"); - IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm); + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("3","4").collect (Collectors.toList ())); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); } @@ -143,9 +138,9 @@ public class RGeneralSurveyPlanController extends BaseController { @PostMapping("/surveyResultDownload") @ApiOperation("下载普测结果报告") @ApiImplicitParam(name = "planNo", value = "计划号", required = true) - public HttpResult> surveyResultDownload(@RequestParam("planNo") String planNo ){ + public HttpResult> surveyResultDownload(@RequestParam("planNo") String planNo ){ String methodDescribe = getMethodDescribe("surveyResultDownload"); - List downloadUrls = rGeneralSurveyPlanPOService.surveyResultDownload(planNo); + List downloadUrls = rGeneralSurveyPlanPOService.surveyResultDownload(planNo); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, downloadUrls, methodDescribe); @@ -184,6 +179,19 @@ public class RGeneralSurveyPlanController extends BaseController { } + @ResponseBody + @ApiOperation("普测计划名称查询") + @PostMapping(value = "querySurveyPlanName") + @ApiImplicitParam(name = "questionQueryParm", value = "普测计划名称查询参数", required = true) + public HttpResult> querySurveyPlanName(@Validated @RequestBody SurveyPlanQuestionQueryParm questionQueryParm) { + String methodDescribe = getMethodDescribe("querySurveyPlanName"); + + List list= rGeneralSurveyPlanPOService.querySurveyPlanName(questionQueryParm); + + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + + } + } diff --git a/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java index b53db752c..816ad606b 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java +++ b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java @@ -19,18 +19,23 @@ import java.util.List; * @version V1.0.0 */ public interface RGeneralSurveyPlanDetailMapper extends MppBaseMapper { - @Select ("SELECT\n" + + @Select ({""}) List querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm); } \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java b/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java index d655e0d09..c345a1a5a 100644 --- a/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java +++ b/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java @@ -2,12 +2,13 @@ package com.njcn.process.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.minio.bo.MinIoUploadResDTO; import com.njcn.process.pojo.param.RGeneralSurveyPlanAddParm; import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm; import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm; import com.njcn.process.pojo.param.SurveyResultUploadParam; import com.njcn.process.pojo.po.RGeneralSurveyPlanPO; -import com.njcn.process.pojo.po.SurveyPlanExcel; +import com.njcn.process.pojo.vo.SurveyPlanExcel; import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO; import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; @@ -39,7 +40,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm); + IPage query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm,List statusList); /** * @Description: surveyResultUpload * @Param: [surveyResultUploadParam] @@ -55,11 +56,11 @@ public interface RGeneralSurveyPlanPOService extends IMppService surveyResultDownload(String planNo); + List surveyResultDownload(String planNo); /** * @Description: exportSurveyPlan * @Param: [] - * @return: java.util.List + * @return: java.util.List * @Author: clam * @Date: 2022/11/21 */ @@ -72,4 +73,12 @@ public interface RGeneralSurveyPlanPOService extends IMppService querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm); + /** + * @Description: 更具questionQueryParm查计划名称 + * @Param: [questionQueryParm] + * @return: java.util.List + * @Author: clam + * @Date: 2022/12/1 + */ + List querySurveyPlanName(SurveyPlanQuestionQueryParm questionQueryParm); } diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java index 856595e8d..1427686ba 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.process.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.github.jeffreyning.mybatisplus.service.MppServiceImpl; @@ -17,11 +18,13 @@ import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm; import com.njcn.process.pojo.param.SurveyResultUploadParam; import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail; import com.njcn.process.pojo.po.RGeneralSurveyPlanPO; -import com.njcn.process.pojo.po.SurveyPlanExcel; +import com.njcn.process.pojo.vo.SurveyPlanExcel; import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO; import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; import com.njcn.process.service.RGeneralSurveyPlanDetailService; import com.njcn.process.service.RGeneralSurveyPlanPOService; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.vo.PvTerminalTreeVO; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,6 +34,7 @@ import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -60,6 +64,10 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl rGeneralSurveyPlanDetailAddParm = rGeneralSurveyPlanAddParm.getRGeneralSurveyPlanDetailAddParm ( ); - + QueryWrapper queryWrapper = new QueryWrapper (); + queryWrapper.lambda ().eq (RGeneralSurveyPlanDetail::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo ()); + boolean remove = rGeneralSurveyPlanDetailService.remove (queryWrapper); List rGeneralSurveyPlanDetailList = new ArrayList<> (); rGeneralSurveyPlanDetailAddParm.forEach (temp->{ RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail(); @@ -91,9 +100,9 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm) { + public IPage query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm,List statusList ) { IPage page = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage(), rGeneralSurveyPlanQueryParm.getPageSize()); IPage returnpage = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage(), rGeneralSurveyPlanQueryParm.getPageSize()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<> (); if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm.getOrgNo ())) { - queryWrapper.eq (RGeneralSurveyPlanPO::getOrgNo, rGeneralSurveyPlanQueryParm.getOrgNo ()); + List data = deptFeignClient.getDepSonIdtByDeptId (rGeneralSurveyPlanQueryParm.getOrgNo ()).getData ( ); + + queryWrapper.in (RGeneralSurveyPlanPO::getOrgNo, data); } if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm. getStatus ())) { queryWrapper.eq (RGeneralSurveyPlanPO::getStatus, rGeneralSurveyPlanQueryParm.getStatus ()); @@ -120,14 +131,27 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectPage (page,queryWrapper).getRecords (); if(CollectionUtils.isEmpty (rGeneralSurveyPlanPOS)){ return returnpage; } + + //部门处理：根据部门code取名称 + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream(). + collect(Collectors. + toMap(PvTerminalTreeVO::getId, + PvTerminalTreeVO::getName)); + + List collect = rGeneralSurveyPlanPOS.stream ( ).map (RGeneralSurveyPlanPO::getPlanNo).collect (Collectors.toList ( )); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<> (); lambdaQueryWrapper.in (RGeneralSurveyPlanDetail::getPlanNo, collect); @@ -136,8 +160,6 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl{ RGeneralSurveyPlanVO rGeneralSurveyPlanVO = new RGeneralSurveyPlanVO(); BeanUtils.copyProperties (temp, rGeneralSurveyPlanVO); - Stream rGeneralSurveyPlanDetailStream = rGeneralSurveyPlanDetails.stream ( ). - filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))); long Busbarcount = rGeneralSurveyPlanDetails.stream ( ). filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). map (RGeneralSurveyPlanDetail::getBusbarId).distinct ( ).count ( ); @@ -154,6 +176,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl surveyResultDownload(String planNo) { + public List surveyResultDownload(String planNo) { RGeneralSurveyPlanPO rGeneralSurveyPlanPO = new RGeneralSurveyPlanPO(); rGeneralSurveyPlanPO.setPlanNo (planNo); rGeneralSurveyPlanPO = this.selectByMultiId (rGeneralSurveyPlanPO); @@ -211,8 +234,9 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl collect = Stream.of (split).map (temp -> { - return minIoUtils.getObjectUrl (minIoProperties.getBucket ( ), temp, 7 * 24 * 60 * 60); + List collect = Stream.of (split).map (temp -> { + MinIoUploadResDTO dto = new MinIoUploadResDTO("",minIoUtils.getObjectUrl (minIoProperties.getBucket ( ), temp, 7 * 24 * 60 * 60)); + return dto ; }).collect (Collectors.toList ( )); return collect; } @@ -220,7 +244,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl + * @return: java.util.List * @Author: clam * @Date: 2022/11/21 */ @@ -233,6 +257,13 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<> (); lambdaQueryWrapper.in (RGeneralSurveyPlanDetail::getPlanNo, planIdList); List rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (lambdaQueryWrapper); + + //部门处理：根据部门code取名称 + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream(). + collect(Collectors. + toMap(PvTerminalTreeVO::getId, + PvTerminalTreeVO::getName)); rGeneralSurveyPlanPOS.forEach (temp->{ SurveyPlanExcel surveyPlanExcel = new SurveyPlanExcel(); BeanUtils.copyProperties (temp, surveyPlanExcel); @@ -246,6 +277,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl + * @Author: clam + * @Date: 2022/12/1 + */ + @Override + public List querySurveyPlanName(SurveyPlanQuestionQueryParm questionQueryParm) { + + List data = deptFeignClient.getDepSonIdtByDeptId (questionQueryParm.getOrgNo ()).getData ( ); + + QueryWrapper queryWrapper = new QueryWrapper<> (); + queryWrapper.select ("plan_name"). + in ("org_no", data). + eq ("DATE_FORMAT(upload_time, '%Y-%m')", new SimpleDateFormat ("yyyy-MM"). + format (questionQueryParm.getPlanStartTime ())); + List list = this.list (queryWrapper); + + return list; + } + /** * 上传文件到Minio * From a1861c7599a10d3cb0171cefff64f71060df097f Mon Sep 17 00:00:00 2001 From: qijian <491437605@qq.com> Date: Thu, 8 Dec 2022 18:28:22 +0800 Subject: [PATCH 18/21] =?UTF-8?q?=E5=B9=B2=E6=89=B0=E6=BA=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/LoadTypeUserAUploadParam.java | 1 - .../param/LoadTypeUserAssociateParam.java | 7 +- .../pojo/param/LoadTypeUserIUploadParam.java | 1 - .../pojo/param/LoadTypeUserSearchParam.java | 5 +- .../process/pojo/po/RLoadTypeUserManage.java | 4 + .../pojo/vo/LoadTypeRelationExcel.java | 32 +++ .../process/pojo/vo/LoadTypeUserExcel.java | 38 ++++ .../pojo/vo/RLoadTypeUserManageVO.java | 40 ++++ .../LoadTypeUserManageController.java | 82 ++++++- .../mapping/LoadTypeUserManageMapper.xml | 4 +- .../service/LoadTypeUserManageService.java | 21 +- .../impl/LoadTypeUserManageServiceImpl.java | 210 +++++++++++++++--- 12 files changed, 396 insertions(+), 49 deletions(-) create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/LoadTypeRelationExcel.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/LoadTypeUserExcel.java diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java index cfecd31ee..a0446a2d4 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAUploadParam.java @@ -23,7 +23,6 @@ public class LoadTypeUserAUploadParam { private String id; @ApiModelProperty(name = "file",value = "实测报告文件",required = true) - @NotNull(message = "实测报告文件不可为空") private MultipartFile file; @ApiModelProperty(name = "status",value = "数据状态（1：提交 2：保存）",required = true) diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java index 3a7c91a19..5f68720b8 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserAssociateParam.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** * 未建档干扰源用户关联营销Param @@ -28,7 +27,11 @@ public class LoadTypeUserAssociateParam { private String userLoadType; @ApiModelProperty("关联干扰源用户编号") - @NotNull(message = "关联干扰源用户编号不可为空") + @NotBlank(message = "关联干扰源用户编号不可为空") private String relationUserId; + @ApiModelProperty("关联干扰源用户名称") + @NotBlank(message = "关联干扰源用户名称不可为空") + private String relationUserName; + } diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java index d0b9a5c53..b930bbf5b 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserIUploadParam.java @@ -23,7 +23,6 @@ public class LoadTypeUserIUploadParam { private String id; @ApiModelProperty(name = "file",value = "入网报告文件",required = true) - @NotNull(message = "入网报告文件不可为空") private MultipartFile file; @ApiModelProperty(name = "status",value = "数据状态（1：提交 2：保存）",required = true) diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java index 1bb18fbc8..882c514b6 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/LoadTypeUserSearchParam.java @@ -30,7 +30,10 @@ public class LoadTypeUserSearchParam { @ApiModelProperty("关联干扰源用户名称") private String relationUserName; - @ApiModelProperty("是否上传报告(0:否 1:是)") + @ApiModelProperty("是否上传入网报告(0:否 1:是)") + private Integer iIsFileUpload; + + @ApiModelProperty("是否上传实测报告(0:否 1:是)") private Integer aIsFileUpload; @ApiModelProperty("页码") diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java b/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java index 1ca54efae..5c62670a2 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RLoadTypeUserManage.java @@ -56,6 +56,10 @@ public class RLoadTypeUserManage implements Serializable { * 用户类型，字典表 */ private String userLoadType; + /** + * 入网报告是否上传(0:否 1:是) + */ + private Integer iIsFileUpload; /** * 入网报告状态，字典ID */ diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/LoadTypeRelationExcel.java b/process-api/src/main/java/com/njcn/process/pojo/vo/LoadTypeRelationExcel.java new file mode 100644 index 000000000..9ebb6a012 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/LoadTypeRelationExcel.java @@ -0,0 +1,32 @@ +package com.njcn.process.pojo.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author qijian + * @version 1.0.0 + * @createTime 2022/12/07 9:21 + */ +@Data +public class LoadTypeRelationExcel implements Serializable { + + @Excel(name = "单位名称", width = 15) + private String orgName; + + @Excel(name = "干扰源类型", width = 15) + private String loadTypeName; + + @Excel(name = "干扰源用户名称", width = 15) + private String userName; + + @Excel(name = "关联干扰源用户名称", width = 15) + private String relationUserName; + + @Excel(name = "实测报告状态", width = 15) + private String aStatusName; + + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/LoadTypeUserExcel.java b/process-api/src/main/java/com/njcn/process/pojo/vo/LoadTypeUserExcel.java new file mode 100644 index 000000000..5174a201d --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/LoadTypeUserExcel.java @@ -0,0 +1,38 @@ +package com.njcn.process.pojo.vo; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @author qijian + * @version 1.0.0 + * @createTime 2022/12/06 9:21 + */ +@Data +public class LoadTypeUserExcel implements Serializable { + + @Excel(name = "单位名称", width = 15) + private String orgName; + + @Excel(name = "干扰源类型", width = 15) + private String loadTypeName; + + @Excel(name = "干扰源用户名称", width = 15) + private String userName; + + @Excel(name = "建档时间", format = "yyyy-MM-dd HH:mm:ss", width = 15) + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date recordTime; + + @Excel(name = "报告是否上传", width = 15) + private String iIsFileUpload; + + @Excel(name = "入网报告状态", width = 15) + private String iStatusName; + + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java index 5fcf88a62..bdbf6b784 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java @@ -1,5 +1,6 @@ package com.njcn.process.pojo.vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -17,103 +18,142 @@ public class RLoadTypeUserManageVO implements Serializable { /** * 主键 */ + @ApiModelProperty("主键") private String id; /** * 单位ID */ + @ApiModelProperty("单位ID") private String orgNo; /** * 干扰源类型ID */ + @ApiModelProperty("干扰源类型ID") private String loadType; /** * 干扰源用户名称 */ + @ApiModelProperty("干扰源用户名称") private String userName; /** * 关联干扰源用户编号ID */ + @ApiModelProperty("关联干扰源用户编号ID") private String relationUserId; /** * 关联干扰源用户名称 */ + @ApiModelProperty("关联干扰源用户名称") private String relationUserName; /** * 建档时间 */ + @ApiModelProperty("建档时间") private Date recordTime; /** * 送电日期（并网日期） */ + @ApiModelProperty("送电日期（并网日期）") private Date powerTransmissionDate; /** * 合同容量（总装机容量） */ + @ApiModelProperty("合同容量（总装机容量）") private Float userArgeementCapacity; /** * 用户类型，字典表 */ + @ApiModelProperty("用户类型，字典表") private String userLoadType; + /** + * 入网报告是否上传(0:否 1:是) + */ + @ApiModelProperty("入网报告是否上传(0:否 1:是)") + private Integer iIsFileUpload; /** * 入网报告状态，字典ID */ + @ApiModelProperty("入网报告状态，字典ID") private String iStatus; /** * 入网报告路径 */ + @ApiModelProperty("入网报告路径") private String iFilePath; /** * 入网报告上传时间 */ + @ApiModelProperty("入网报告上传时间") private Date iUploadTime; /** * 入网是否超标(0:否 1:是) */ + @ApiModelProperty("入网是否超标(0:否 1:是)") private Integer iIsOverLimit; /** * 入网超标指标 */ + @ApiModelProperty("入网超标指标") private String iOverLimitTarget; /** * 入网计划采取措施，字典ID */ + @ApiModelProperty("入网计划采取措施，字典ID") private String iPlanStep; /** * 入网详情 */ + @ApiModelProperty("入网详情") private String iDescription; /** * 实测报告是否上传(0:否 1:是) */ + @ApiModelProperty("实测报告是否上传(0:否 1:是)") private Integer aIsFileUpload; /** * 实测报告状态，字典ID */ + @ApiModelProperty("实测报告状态，字典ID") private String aStatus; /** * 实测报告路径 */ + @ApiModelProperty("实测报告路径") private String aFilePath; /** * 实测报告上传时间 */ + @ApiModelProperty("实测报告上传时间") private Date aUploadTime; /** * 实测是否超标(0:否 1:是) */ + @ApiModelProperty("实测是否超标(0:否 1:是)") private Integer aIsOverLimit; /** * 实测超标指标 */ + @ApiModelProperty("实测超标指标") private String aOverLimitTarget; /** * 实测计划采取措施，字典ID */ + @ApiModelProperty("实测计划采取措施，字典ID") private String aPlanStep; /** * 实测详情 */ + @ApiModelProperty("实测详情") private String aDescription; + @ApiModelProperty("单位名称") + private String orgName; + + @ApiModelProperty("入网报告文件地址") + private String iFile; + + @ApiModelProperty("实测报告文件地址") + private String aFile; + } diff --git a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java index 594292178..e208c591a 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/LoadTypeUserManageController.java @@ -1,5 +1,7 @@ package com.njcn.process.controller; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; @@ -7,8 +9,10 @@ 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.poi.util.PoiUtil; import com.njcn.process.pojo.param.*; -import com.njcn.process.pojo.po.RLoadTypeUserManage; +import com.njcn.process.pojo.vo.LoadTypeRelationExcel; +import com.njcn.process.pojo.vo.LoadTypeUserExcel; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; import com.njcn.process.service.LoadTypeUserManageService; import com.njcn.web.controller.BaseController; @@ -17,9 +21,13 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** * 干扰源用户管理 * @@ -43,7 +51,7 @@ public class LoadTypeUserManageController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLoadTypeUserList") - @ApiOperation("查询所有干扰源用户") + @ApiOperation("查询所有干扰源用户（未建档干扰源用户管理）") @ApiImplicitParam(name = "loadTypeUserSearchParam", value = "干扰源用户入参", required = true) public HttpResult> getLoadTypeUserList(@RequestBody @Validated LoadTypeUserSearchParam loadTypeUserSearchParam){ String methodDescribe = getMethodDescribe("getLoadTypeUserList"); @@ -58,12 +66,12 @@ public class LoadTypeUserManageController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @GetMapping("/getLoadTypeUserById") - @ApiOperation("根据id查询干扰源用户") + @ApiOperation("根据id查询干扰源用户（通用）") @ApiImplicitParam(name = "id", value = "id", required = true) - public HttpResult getLoadTypeUserById(@RequestParam("id") String id){ + public HttpResult getLoadTypeUserById(@RequestParam("id") String id){ String methodDescribe = getMethodDescribe("getLoadTypeUserById"); - RLoadTypeUserManage rLoadTypeUserManage = loadTypeUserManageService.getLoadTypeUserById(id); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rLoadTypeUserManage, methodDescribe); + RLoadTypeUserManageVO rLoadTypeUserManageVO = loadTypeUserManageService.getLoadTypeUserById(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rLoadTypeUserManageVO, methodDescribe); } /** @@ -73,7 +81,7 @@ public class LoadTypeUserManageController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) @PostMapping("/addLoadTypeUser") - @ApiOperation("新增干扰源用户") + @ApiOperation("新增干扰源用户（未建档干扰源用户管理）") @ApiImplicitParam(name = "loadTypeUserParam", value = "实体参数", required = true) public HttpResult addLoadTypeUser(@RequestBody @Validated LoadTypeUserParam loadTypeUserParam){ String methodDescribe = getMethodDescribe("addLoadTypeUser"); @@ -92,7 +100,7 @@ public class LoadTypeUserManageController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) @PostMapping("/uploadLoadTypeUserI") - @ApiOperation("上传干扰源用户入网报告") + @ApiOperation("上传干扰源用户入网报告（未建档干扰源用户管理）") // @ApiImplicitParam(name = "loadTypeUserIUploadParam", value = "实体参数", required = true) public HttpResult uploadLoadTypeUserI(@Validated LoadTypeUserIUploadParam loadTypeUserIUploadParam){ String methodDescribe = getMethodDescribe("uploadLoadTypeUserI"); @@ -112,7 +120,7 @@ public class LoadTypeUserManageController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) @PostMapping("/linkUser") - @ApiOperation("关联营销用户") + @ApiOperation("关联营销用户（未建档干扰源用户管理）") @ApiImplicitParam(name = "loadTypeUserAssociateParam", value = "实体参数", required = true) public HttpResult linkUser(@RequestBody @Validated LoadTypeUserAssociateParam loadTypeUserAssociateParam){ String methodDescribe = getMethodDescribe("linkUser"); @@ -124,6 +132,32 @@ public class LoadTypeUserManageController extends BaseController { } } + /** + * 导出未建档干扰源用户管理信息 + * @author qijian + * @date 2022/12/06 + */ + @ResponseBody + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.DOWNLOAD) + @ApiOperation("导出未建档干扰源用户管理信息") + @PostMapping(value = "exportLoadTypeUserList") + @ApiImplicitParam(name = "list", value = "导出勾选主键参数", required = true) + public HttpResult exportLoadTypeUserList(HttpServletResponse response, @RequestBody List list) { + String methodDescribe = getMethodDescribe("exportLoadTypeUserList"); + String fileName = "未建档干扰源用户管理信息.xls"; + List excelList = null; + try { + excelList = loadTypeUserManageService.exportLoadTypeUserList(list); + } catch (Exception e) { + e.printStackTrace(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + ExportParams exportExcel = new ExportParams("未建档干扰源用户管理信息", "未建档干扰源用户"); + Workbook workbook = ExcelExportUtil.exportExcel(exportExcel, LoadTypeUserExcel.class, excelList); + PoiUtil.exportFileByWorkbook(workbook, fileName, response); + return null; + } + /** * 查询所有干扰源用户（与营销系统关联） * @author qijian @@ -131,7 +165,7 @@ public class LoadTypeUserManageController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLoadTypeRelationList") - @ApiOperation("查询所有干扰源用户（与营销系统关联）") + @ApiOperation("查询所有干扰源用户（干扰源用户常态化管理）") @ApiImplicitParam(name = "loadTypeUserSearchParam", value = "干扰源用户入参", required = true) public HttpResult> getLoadTypeRelationList(@RequestBody @Validated LoadTypeUserSearchParam loadTypeUserSearchParam){ String methodDescribe = getMethodDescribe("getLoadTypeRelationList"); @@ -146,7 +180,7 @@ public class LoadTypeUserManageController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) @PostMapping("/uploadLoadTypeUserA") - @ApiOperation("上传干扰源用户实测报告") + @ApiOperation("上传干扰源用户实测报告（干扰源用户常态化管理）") // @ApiImplicitParam(name = "loadTypeUserAUploadParam", value = "实体参数", required = true) public HttpResult uploadLoadTypeUserA(@Validated LoadTypeUserAUploadParam loadTypeUserAUploadParam){ String methodDescribe = getMethodDescribe("uploadLoadTypeUserA"); @@ -157,4 +191,30 @@ public class LoadTypeUserManageController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } } + + /** + * 导出干扰源用户常态化管理信息 + * @author qijian + * @date 2022/12/07 + */ + @ResponseBody + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.DOWNLOAD) + @ApiOperation("导出干扰源用户常态化管理信息") + @PostMapping(value = "exportLoadTypeRelationList") + @ApiImplicitParam(name = "list", value = "导出勾选主键参数", required = true) + public HttpResult exportLoadTypeRelationList(HttpServletResponse response, @RequestBody List list) { + String methodDescribe = getMethodDescribe("exportLoadTypeRelationList"); + String fileName = "导出干扰源用户常态化管理信息.xls"; + List excelList = null; + try { + excelList = loadTypeUserManageService.exportLoadTypeRelationList(list); + } catch (Exception e) { + e.printStackTrace(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + ExportParams exportExcel = new ExportParams("干扰源用户常态化管理信息", "干扰源用户常态化管理"); + Workbook workbook = ExcelExportUtil.exportExcel(exportExcel, LoadTypeRelationExcel.class, excelList); + PoiUtil.exportFileByWorkbook(workbook, fileName, response); + return null; + } } diff --git a/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml b/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml index 39aae0b45..2677ffd5d 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml +++ b/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml @@ -18,7 +18,7 @@ and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%') - and r.a_is_file_upload = #{loadTypeUserSearchParam.aIsFileUpload} + and r.i_is_file_upload = #{loadTypeUserSearchParam.iIsFileUpload} @@ -38,7 +38,7 @@ and r.load_type = #{loadTypeUserSearchParam.loadType} - and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.relationUserName}, '%') + and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%') and r.relation_user_name like CONCAT('%', #{loadTypeUserSearchParam.relationUserName}, '%') diff --git a/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java b/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java index 1da156998..d9c398024 100644 --- a/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java +++ b/process-boot/src/main/java/com/njcn/process/service/LoadTypeUserManageService.java @@ -2,9 +2,12 @@ package com.njcn.process.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.process.pojo.param.*; -import com.njcn.process.pojo.po.RLoadTypeUserManage; +import com.njcn.process.pojo.vo.LoadTypeRelationExcel; +import com.njcn.process.pojo.vo.LoadTypeUserExcel; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; +import java.util.List; + /** * 干扰源用户管理 * @@ -26,7 +29,7 @@ public interface LoadTypeUserManageService { * @param id * @return */ - RLoadTypeUserManage getLoadTypeUserById(String id); + RLoadTypeUserManageVO getLoadTypeUserById(String id); /** * 新增干扰源用户 @@ -62,4 +65,18 @@ public interface LoadTypeUserManageService { * @return */ boolean uploadLoadTypeUserA(LoadTypeUserAUploadParam loadTypeUserAUploadParam); + + /** + * 导出未建档干扰源用户管理信息 + * @param list + * @return + */ + List exportLoadTypeUserList(List list); + + /** + * 导出干扰源用户常态化管理信息 + * @param list + * @return + */ + List exportLoadTypeRelationList(List list); } diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java index 954e23921..70b1d97b0 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.process.service.impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.api.DistributionMonitorClient; @@ -12,10 +13,16 @@ import com.njcn.process.enums.ProcessResponseEnum; import com.njcn.process.mapper.LoadTypeUserManageMapper; import com.njcn.process.pojo.param.*; import com.njcn.process.pojo.po.RLoadTypeUserManage; +import com.njcn.process.pojo.vo.LoadTypeRelationExcel; +import com.njcn.process.pojo.vo.LoadTypeUserExcel; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; import com.njcn.process.service.LoadTypeUserManageService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.vo.PvTerminalTreeVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -24,7 +31,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; /** * 干扰源用户管理 @@ -44,6 +54,8 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService private final DistributionMonitorClient distributionMonitorClient; + private final DeptFeignClient deptFeignClient; + @Resource private MinIoUtils minIoUtils; @@ -58,7 +70,21 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService @Override public Page getLoadTypeUserList(LoadTypeUserSearchParam loadTypeUserSearchParam){ Page page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize()); - return loadTypeUserManageMapper.getLoadTypeUserPage(page,loadTypeUserSearchParam); + Page loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeUserPage(page, loadTypeUserSearchParam); + + //部门处理：根据部门code取名称 + List list = loadTypeUserPage.getRecords(); + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, pvTerminalTreeVO -> pvTerminalTreeVO)); + List resultList = list.stream().map(item -> { + RLoadTypeUserManageVO rLoadTypeUserManageVO = new RLoadTypeUserManageVO(); + BeanUtils.copyProperties(item, rLoadTypeUserManageVO); + rLoadTypeUserManageVO.setOrgName(pvTerminalTreeVOMap.get(item.getOrgNo()).getName()); //单位名称 + return rLoadTypeUserManageVO; + }).collect(Collectors.toList()); + + //返回新的数据组 + return loadTypeUserPage.setRecords(resultList); } /** @@ -67,9 +93,20 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService * @return */ @Override - public RLoadTypeUserManage getLoadTypeUserById(String id) { + public RLoadTypeUserManageVO getLoadTypeUserById(String id) { RLoadTypeUserManage rLoadTypeUserManage = loadTypeUserManageMapper.selectById(id); - return rLoadTypeUserManage; + RLoadTypeUserManageVO rLoadTypeUserManageVO = new RLoadTypeUserManageVO(); + BeanUtils.copyProperties(rLoadTypeUserManage, rLoadTypeUserManageVO); + //文件 + if (rLoadTypeUserManageVO.getIFilePath() != null){ + String iFile = minIoUtils.getObjectUrl(minIoProperties.getBucket(), rLoadTypeUserManageVO.getIFilePath(), 7 * 24 * 60 * 60); + rLoadTypeUserManageVO.setIFile(iFile); + } + if (rLoadTypeUserManageVO.getAFilePath() != null){ + String aFile = minIoUtils.getObjectUrl(minIoProperties.getBucket(), rLoadTypeUserManageVO.getAFilePath(), 7 * 24 * 60 * 60); + rLoadTypeUserManageVO.setIFile(aFile); + } + return rLoadTypeUserManageVO; } /** @@ -82,7 +119,6 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService //参数转换 RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage(); BeanUtils.copyProperties(loadTypeUserParam, rLoadTypeUserManage); - System.out.println(rLoadTypeUserManage); //塞入建档时间 Date date = DateUtil.parse(loadTypeUserParam.getRecordTime(), "yyyy-MM-dd HH:mm:ss"); @@ -100,21 +136,24 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService public boolean uploadLoadTypeUserI(LoadTypeUserIUploadParam loadTypeUserIUploadParam) { RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage(); - - //文件上传到Minio服务器，存入文件名 - MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserIUploadParam.getFile()); - rLoadTypeUserManage.setIFilePath(minIoUploadResDTO.getMinFileName()); - rLoadTypeUserManage.setIUploadTime(new Date()); - - //填入数据 BeanUtils.copyProperties(loadTypeUserIUploadParam, rLoadTypeUserManage); - //提交：待审核/保存：新建 - if(Objects.equals(Param.LOAD_TYPE_USER_SUBMIT,loadTypeUserIUploadParam.getStatus())){ - rLoadTypeUserManage.setIStatus(DicDataEnum.AUDIT.getCode()); - }else{ - rLoadTypeUserManage.setIStatus(DicDataEnum.NEWLY.getCode()); + //文件上传到Minio服务器，存入文件名 + if(loadTypeUserIUploadParam.getFile() != null){ + MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserIUploadParam.getFile()); + rLoadTypeUserManage.setIFilePath(minIoUploadResDTO.getMinFileName()); + rLoadTypeUserManage.setIUploadTime(new Date()); } + + //提交：待审核/保存：新建 + DictData dictData; + if(Objects.equals(Param.LOAD_TYPE_USER_SUBMIT,loadTypeUserIUploadParam.getStatus())){ + dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.AUDIT.getCode()).getData(); + }else{ + dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.NEWLY.getCode()).getData(); + } + rLoadTypeUserManage.setIStatus(dictData.getId()); + rLoadTypeUserManage.setIIsFileUpload(1); loadTypeUserManageMapper.updateById(rLoadTypeUserManage); return true; @@ -142,7 +181,21 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService @Override public Page getLoadTypeRelationList(LoadTypeUserSearchParam loadTypeUserSearchParam) { Page page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize()); - return loadTypeUserManageMapper.getLoadTypeRelationPage(page,loadTypeUserSearchParam); + Page loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeRelationPage(page,loadTypeUserSearchParam); + + //部门处理：根据部门code取名称 + List list = loadTypeUserPage.getRecords(); + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, pvTerminalTreeVO -> pvTerminalTreeVO)); + List resultList = list.stream().map(item -> { + RLoadTypeUserManageVO rLoadTypeUserManageVO = new RLoadTypeUserManageVO(); + BeanUtils.copyProperties(item, rLoadTypeUserManageVO); + rLoadTypeUserManageVO.setOrgName(pvTerminalTreeVOMap.get(item.getOrgNo()).getName()); //单位名称 + return rLoadTypeUserManageVO; + }).collect(Collectors.toList()); + + //返回新的数据组 + return loadTypeUserPage.setRecords(resultList); } /** @@ -170,24 +223,123 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService public boolean uploadLoadTypeUserA(LoadTypeUserAUploadParam loadTypeUserAUploadParam) { RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage(); - - //文件上传到Minio服务器，存入文件名 - MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserAUploadParam.getFile()); - rLoadTypeUserManage.setAFilePath(minIoUploadResDTO.getMinFileName()); - rLoadTypeUserManage.setAUploadTime(new Date()); - - //填入数据 BeanUtils.copyProperties(loadTypeUserAUploadParam, rLoadTypeUserManage); - //提交：待审核/保存：新建 - if(Objects.equals(Param.LOAD_TYPE_USER_SUBMIT,loadTypeUserAUploadParam.getStatus())){ - rLoadTypeUserManage.setAStatus(DicDataEnum.AUDIT.getCode()); - }else{ - rLoadTypeUserManage.setAStatus(DicDataEnum.NEWLY.getCode()); + //文件上传到Minio服务器，存入文件名 + if(loadTypeUserAUploadParam.getFile() != null){ + MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserAUploadParam.getFile()); + rLoadTypeUserManage.setAFilePath(minIoUploadResDTO.getMinFileName()); + rLoadTypeUserManage.setAUploadTime(new Date()); } + //提交：待审核/保存：新建 + DictData dictData; + if(Objects.equals(Param.LOAD_TYPE_USER_SUBMIT,loadTypeUserAUploadParam.getStatus())){ + dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.AUDIT.getCode()).getData(); + }else{ + dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.NEWLY.getCode()).getData(); + } + rLoadTypeUserManage.setAStatus(dictData.getId()); loadTypeUserManageMapper.updateById(rLoadTypeUserManage); return true; } + + /** + * 导出未建档干扰源用户管理信息 + * @param list + * @return + */ + @Override + public List exportLoadTypeUserList(List list) { + //数据处理 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<> (); + queryWrapper.in(RLoadTypeUserManage::getId, list); + List rLoadTypeUserManages = loadTypeUserManageMapper.selectList(queryWrapper); + //1、部门数据 + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, pvTerminalTreeVO -> pvTerminalTreeVO)); + + //2、取干扰源类型 + List loadTypeList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INTERFERENCE_SOURCE.getCode()).getData(); + Map loadTypeMap = loadTypeList.stream().collect(Collectors.toMap(DictData::getId, dictData -> dictData)); + + //3、取入网报告状态 + List iStatusList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.ON_NETWORK_STATUS.getCode()).getData(); + Map iStatusMap = iStatusList.stream().collect(Collectors.toMap(DictData::getId, dictData -> dictData)); + + List resultList = rLoadTypeUserManages.stream().map(item -> { + LoadTypeUserExcel loadTypeUserExcel = new LoadTypeUserExcel(); + if (item.getUserName() != null){ + loadTypeUserExcel.setUserName(item.getUserName()); + } + if (item.getRecordTime() != null){ + loadTypeUserExcel.setRecordTime(item.getRecordTime()); + } + if (item.getAIsFileUpload() != null){ + loadTypeUserExcel.setIIsFileUpload(item.getIIsFileUpload() == 0 ? "否" : "是"); //实测报告是否上传 + } + if (item.getOrgNo() != null){ + loadTypeUserExcel.setOrgName(pvTerminalTreeVOMap.get(item.getOrgNo()).getName()); //单位 + } + if (item.getLoadType() != null){ + loadTypeUserExcel.setLoadTypeName(loadTypeMap.get(item.getLoadType()).getName()); //入网报告状态 + } + if (item.getIStatus() != null){ + loadTypeUserExcel.setIStatusName(iStatusMap.get(item.getIStatus()).getName()); //入网报告状态 + } + if (item.getAIsFileUpload() != null){ + loadTypeUserExcel.setIIsFileUpload(item.getIIsFileUpload() == 0 ? "否" : "是"); //实测报告是否上传 + } + return loadTypeUserExcel; + }).collect(Collectors.toList()); + + return resultList; + } + + /** + * 导出干扰源用户常态化管理信息 + * @param list + * @return + */ + @Override + public List exportLoadTypeRelationList(List list) { + //数据处理 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<> (); + queryWrapper.in(RLoadTypeUserManage::getId, list); + List rLoadTypeUserManages = loadTypeUserManageMapper.selectList(queryWrapper); + //1、部门数据 + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, pvTerminalTreeVO -> pvTerminalTreeVO)); + + //2、取干扰源类型 + List loadTypeList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INTERFERENCE_SOURCE.getCode()).getData(); + Map loadTypeMap = loadTypeList.stream().collect(Collectors.toMap(DictData::getId, dictData -> dictData)); + + //3、取实测报告状态 + List aStatusList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.ON_NETWORK_STATUS.getCode()).getData(); + Map aStatusMap = aStatusList.stream().collect(Collectors.toMap(DictData::getId, dictData -> dictData)); + + List resultList = rLoadTypeUserManages.stream().map(item -> { + LoadTypeRelationExcel loadTypeRelationExcel = new LoadTypeRelationExcel(); + if (item.getOrgNo() != null){ + loadTypeRelationExcel.setOrgName(pvTerminalTreeVOMap.get(item.getOrgNo()).getName()); + } + if (item.getLoadType() != null){ + loadTypeRelationExcel.setLoadTypeName(loadTypeMap.get(item.getLoadType()).getName()); + } + if (item.getUserName() != null){ + loadTypeRelationExcel.setUserName(item.getUserName()); + } + if (item.getRelationUserName() != null){ + loadTypeRelationExcel.setRelationUserName(item.getRelationUserName()); + } + if (item.getAStatus() != null){ + loadTypeRelationExcel.setAStatusName(aStatusMap.get(item.getIStatus()).getName()); + } + return loadTypeRelationExcel; + }).collect(Collectors.toList()); + + return resultList; + } } From 1e11335a5ccfadb59489e1528d8d2bba10fbdb10 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Mon, 12 Dec 2022 08:56:05 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E6=99=AE=E6=B5=8B=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=81=94=E8=B0=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/RGeneralSurveyPlanAddParm.java | 5 +++++ .../pojo/po/RGeneralSurveyPlanDetail.java | 21 +++++-------------- .../process/pojo/po/RGeneralSurveyPlanPO.java | 20 +----------------- .../process/pojo/vo/RGeneralSurveyPlanVO.java | 5 +++++ .../impl/RGeneralSurveyPlanPOServiceImpl.java | 12 +++++++---- 5 files changed, 24 insertions(+), 39 deletions(-) diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java index dbecf23ec..187c936b7 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java @@ -47,6 +47,11 @@ public class RGeneralSurveyPlanAddParm { @ApiModel(value="计划详细情况母线相关") public static class RGeneralSurveyPlanDetailAddParm{ + @ApiModelProperty(value = "组织id") + private String orgNo; + @ApiModelProperty(value = "组织名") + private String orgName; + @ApiModelProperty(value="变电站ID") private String subId; diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java index a6f7bdc91..2e503281f 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java @@ -3,8 +3,6 @@ package com.njcn.process.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -21,7 +19,6 @@ import java.util.Date; /** * 普测计划详情表 */ -@ApiModel(value="com-njcn-process-pojo-po-RGeneralSurveyPlanDetail") @Data @TableName(value = "r_general_survey_plan_detail") public class RGeneralSurveyPlanDetail { @@ -29,63 +26,59 @@ public class RGeneralSurveyPlanDetail { * 普测计划编号 */ @MppMultiId(value = "plan_no") - @ApiModelProperty(value="普测计划编号") private String planNo; + + @TableField(value = "org_no") + private String orgNo; + @TableField(value = "org_name") + private String orgName; /** * 母线ID */ @MppMultiId(value = "busbar_id") - @ApiModelProperty(value="母线ID") private String busbarId; /** * 测试开始时间 */ @TableField(value = "general_survey_start_time") - @ApiModelProperty(value="测试开始时间") private Date generalSurveyStartTime; /** * 测试结束时间 */ @TableField(value = "general_survey_end_time") - @ApiModelProperty(value="测试结束时间") private Date generalSurveyEndTime; /** * 测试日期 */ @TableField(value = "general_survey_time") - @ApiModelProperty(value="测试日期") private Date generalSurveyTime; /** * 测试负责人 */ @TableField(value = "general_survey_leader") - @ApiModelProperty(value="测试负责人") private String generalSurveyLeader; /** * 变电站ID */ @TableField(value = "sub_id") - @ApiModelProperty(value="变电站ID") private String subId; /** * 变电站名称 */ @TableField(value = "sub_name") - @ApiModelProperty(value="变电站名称") private String subName; /** * 变电站电压等级 */ @TableField(value = "voltage_level") - @ApiModelProperty(value="变电站电压等级") private String voltageLevel; @@ -94,27 +87,23 @@ public class RGeneralSurveyPlanDetail { * 母线名称 */ @TableField(value = "busbar_name") - @ApiModelProperty(value="母线名称") private String busbarName; /** * 离线监测点id */ @TableField(value = "measurement_point_id") - @ApiModelProperty(value="离线监测点id") private String measurementPointId; /** * 是否实现监测(0:否 1:是) */ @TableField(value = "is_survey") - @ApiModelProperty(value="是否生成问题(0:否 1:是)") private Integer isSurvey; /** * 是否生成问题(0:否 1:是) */ @TableField(value = "is_problem") - @ApiModelProperty(value="是否生成问题(0:否 1:是)") private Integer isProblem; } \ No newline at end of file diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java index 32b72c376..1c8ea8f29 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java @@ -1,12 +1,9 @@ package com.njcn.process.pojo.po; 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 com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -23,7 +20,6 @@ import java.util.Date; /** * 普测计划表 */ -@ApiModel(value="com-njcn-process-pojo-po-RGeneralSurveyPlanPO") @Data @TableName(value = "r_general_survey_plan") public class RGeneralSurveyPlanPO { @@ -31,21 +27,18 @@ public class RGeneralSurveyPlanPO { * 单位ID */ @TableField(value = "org_no") - @ApiModelProperty(value="单位ID") private String orgNo; /** * 普测计划编号 */ @MppMultiId(value = "plan_no") - @ApiModelProperty(value="普测计划编号") private String planNo; /** * 普测计划名称 */ - @TableId(value = "plan_name") - @ApiModelProperty(value="普测计划名称") + @TableField(value = "plan_name") private String planName; /** @@ -53,7 +46,6 @@ public class RGeneralSurveyPlanPO { */ @TableField(value = "plan_create_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="计划生成时间") private Date planCreateTime = new Date(); /** @@ -61,7 +53,6 @@ public class RGeneralSurveyPlanPO { */ @TableField(value = "plan_start_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="计划开始时间") private Date planStartTime; /** @@ -69,7 +60,6 @@ public class RGeneralSurveyPlanPO { */ @TableField(value = "plan_end_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="计划结束时间") private Date planEndTime; /** @@ -77,49 +67,42 @@ public class RGeneralSurveyPlanPO { */ @TableField(value = "plan_complate_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="实际完成时间") private Date planComplateTime; /** * 计划负责人 */ @TableField(value = "leader") - @ApiModelProperty(value="计划负责人") private String leader; /** * 计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成) */ @TableField(value = "status") - @ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)") private int status; /** * 详情 */ @TableField(value = "description") - @ApiModelProperty(value="详情") private String description; /** * 文件是否上传(0:否 1:是) */ @TableField(value = "is_file_upload") - @ApiModelProperty(value="文件是否上传(0:否 1:是)") private Integer isFileUpload; /** * 上传文件数量 */ @TableField(value = "file_count") - @ApiModelProperty(value="上传文件数量") private Integer fileCount ; /** * 文件路径 */ @TableField(value = "file_path") - @ApiModelProperty(value="文件路径") private String filePath; /** @@ -127,6 +110,5 @@ public class RGeneralSurveyPlanPO { */ @TableField(value = "upload_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="上传时间") private Date uploadTime; } \ No newline at end of file diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java index 407fabdb1..401cf8feb 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java @@ -80,6 +80,11 @@ public class RGeneralSurveyPlanVO { @ApiModel(value="计划详细情况母线相关") public static class RGeneralSurveyPlanDetailVO{ + @ApiModelProperty(value = "组织id") + private String orgNo; + @ApiModelProperty(value = "组织名") + private String orgName; + @ApiModelProperty(value="变电站ID") private String subId; diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java index 1427686ba..65a458745 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java @@ -86,23 +86,27 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl rGeneralSurveyPlanDetailAddParm = rGeneralSurveyPlanAddParm.getRGeneralSurveyPlanDetailAddParm ( ); QueryWrapper queryWrapper = new QueryWrapper (); queryWrapper.lambda ().eq (RGeneralSurveyPlanDetail::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo ()); - boolean remove = rGeneralSurveyPlanDetailService.remove (queryWrapper); + rGeneralSurveyPlanDetailService.remove (queryWrapper); List rGeneralSurveyPlanDetailList = new ArrayList<> (); rGeneralSurveyPlanDetailAddParm.forEach (temp->{ RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail(); BeanUtils.copyProperties (temp, rGeneralSurveyPlanDetail); + /*目前时间与计划开始时间，结束时间一致*/ + rGeneralSurveyPlanDetail.setGeneralSurveyStartTime (rGeneralSurveyPlanAddParm.getPlanStartTime ()); + rGeneralSurveyPlanDetail.setGeneralSurveyTime (rGeneralSurveyPlanAddParm.getPlanStartTime ()); + rGeneralSurveyPlanDetail.setGeneralSurveyEndTime (rGeneralSurveyPlanAddParm.getPlanEndTime ()); rGeneralSurveyPlanDetail.setPlanNo (rGeneralSurveyPlanAddParm.getPlanNo ()); rGeneralSurveyPlanDetail.setGeneralSurveyLeader(rGeneralSurveyPlanAddParm.getLeader ()); rGeneralSurveyPlanDetailList.add (rGeneralSurveyPlanDetail); }); boolean b1 = rGeneralSurveyPlanDetailService.saveOrUpdateBatchByMultiId (rGeneralSurveyPlanDetailList, 5); - return b&&remove&&b1; + return b&&b1; } /** @@ -201,7 +205,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl Date: Fri, 6 Jan 2023 15:51:54 +0800 Subject: [PATCH 20/21] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=97=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/pojo/vo/IssueesAndOrderVO.java | 29 ++ process-boot/process-boot.iml | 320 ++++++++++++++++++ .../ElectricityQualityIssuesController.java | 11 + .../RGeneralSurveyPlanDetailMapper.java | 12 +- ...RStatElectricQualityProblemFlowMapper.java | 4 +- .../RStatElectricQualityProblemFlowMapper.xml | 8 +- .../njcn/process/service/IssuesService.java | 8 + .../service/impl/IssuesServiceImpl.java | 36 +- .../impl/RGeneralSurveyPlanPOServiceImpl.java | 15 +- 9 files changed, 425 insertions(+), 18 deletions(-) create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/IssueesAndOrderVO.java create mode 100644 process-boot/process-boot.iml diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/IssueesAndOrderVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/IssueesAndOrderVO.java new file mode 100644 index 000000000..0936e57d9 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/IssueesAndOrderVO.java @@ -0,0 +1,29 @@ +package com.njcn.process.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** +* @Description: 问题及工单类 +* @Param: +* @return: +* @Author: clam +* @Date: 2023/1/5 +*/ +@Data +public class IssueesAndOrderVO implements Serializable { + + private static final long serialVersionUID = -8022287041427540079L; + + @ApiModelProperty("单位id") + private String id; + + @ApiModelProperty("问题个数") + private Integer issueesCount; + + @ApiModelProperty("已关联工单数量") + private Integer relatedOrderCount; + +} diff --git a/process-boot/process-boot.iml b/process-boot/process-boot.iml new file mode 100644 index 000000000..691a6e399 --- /dev/null +++ b/process-boot/process-boot.iml @@ -0,0 +1,320 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java b/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java index 027e5b3a1..f15b6fe4a 100644 --- a/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java +++ b/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java @@ -212,4 +212,15 @@ public class ElectricityQualityIssuesController extends BaseController { issuesService.deleteIssues(powerQualityProblemNo); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE) + @PostMapping("/queryIssuesAndOrder") + @ApiOperation("查询问题及工单（当前部门下）") + @ApiImplicitParam(name = "orgNo", value = "部门id", required = true) + public HttpResult queryIssuesAndOrder(@RequestParam("orgNo") String orgNo){ + String methodDescribe = getMethodDescribe("queryIssuesAndOrder"); + IssueesAndOrderVO issueesAndOrderVO =issuesService.queryIssuesAndOrder(orgNo); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, issueesAndOrderVO, methodDescribe); + } + } diff --git a/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java index 816ad606b..c64d03593 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java +++ b/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java @@ -33,9 +33,9 @@ public interface RGeneralSurveyPlanDetailMapper extends MppBaseMapper", - "and a.plan_name = #{questionQueryParm.planName}\n" + - "", - "AND DATE_FORMAT(a.upload_time, '%Y%m') = DATE_FORMAT(#{questionQueryParm.planStartTime}, '%Y%m')", - ""}) - List querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm); -} \ No newline at end of file + "and a.plan_name = #{questionQueryParm.planName}\n" + + "", + "AND DATE_FORMAT(a.upload_time, '%Y%m') = DATE_FORMAT(#{questionQueryParm.planStartTime}, '%Y%m')", + ""}) + List querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm); + } \ No newline at end of file diff --git a/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java b/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java index 413daba31..58e794067 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java +++ b/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java @@ -1,8 +1,6 @@ package com.njcn.process.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.process.pojo.param.QueryIssuesParam; import com.njcn.process.pojo.po.RStatElectricQualityProblemFlow; import com.njcn.process.pojo.vo.IssuesVO; @@ -20,5 +18,5 @@ import java.util.List; */ public interface RStatElectricQualityProblemFlowMapper extends BaseMapper { - List getIssues(@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); } diff --git a/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemFlowMapper.xml b/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemFlowMapper.xml index afdfbc2eb..6ae830695 100644 --- a/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemFlowMapper.xml +++ b/process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemFlowMapper.xml @@ -9,8 +9,12 @@ r_stat_electric_quality_problem_flow WHERE data_date between #{dateBegin} AND #{dateEnd} - - AND org_no = #{param.orgNo} + + AND org_no in + + #{item} + + AND problem_sources = #{param.problemSources} diff --git a/process-boot/src/main/java/com/njcn/process/service/IssuesService.java b/process-boot/src/main/java/com/njcn/process/service/IssuesService.java index 8eb53d01f..d2ab9867f 100644 --- a/process-boot/src/main/java/com/njcn/process/service/IssuesService.java +++ b/process-boot/src/main/java/com/njcn/process/service/IssuesService.java @@ -88,4 +88,12 @@ public interface IssuesService { * 删除问题 */ void deleteIssues(String powerQualityProblemNo); + /** + * @Description: 查询问题及工单（当前部门下） + * @Param: [orgNo] + * @return: com.njcn.process.pojo.vo.IssueesAndOrderVO + * @Author: clam + * @Date: 2023/1/5 + */ + IssueesAndOrderVO queryIssuesAndOrder(String orgNo); } diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java index 3a468ced1..dffabfd12 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.pinyin.PinyinUtil; import com.alibaba.nacos.shaded.com.google.common.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.constant.BizParamConstant; import com.njcn.common.pojo.exception.BusinessException; @@ -81,7 +82,7 @@ public class IssuesServiceImpl implements IssuesService { issues.setStartTime(null); issues.setUpdateTime(null); issues.setReportProcess(DicDataEnum.NOT_REPORTED.getCode()); - issues.setReportProcessStatus(DicDataEnum.AUDITT.getCode()); + issues.setReportProcessStatus(DicDataEnum.INIT.getCode()); issuesMapper.insert(issues); return local; } @@ -199,7 +200,9 @@ public class IssuesServiceImpl implements IssuesService { dateBegin = DateUtil.beginOfMonth(dateOut); dateEnd = DateUtil.endOfMonth(dateOut); } - List out = issuesMapper.getIssues(param,DateUtil.formatDateTime(dateBegin), DateUtil.formatDateTime(dateEnd)); + List deptIds = deptFeignClient.getDepSonIdtByDeptId(param.getOrgNo ()).getData(); + + List out = issuesMapper.getIssues(deptIds,param,DateUtil.formatDateTime(dateBegin), DateUtil.formatDateTime(dateEnd)); if (!CollectionUtils.isEmpty(out)) { out.forEach(data -> data.setOrgName((deptFeignClient.getDeptById(data.getOrgNo()).getData().getName()))); /*问题来源*/ @@ -390,6 +393,7 @@ public class IssuesServiceImpl implements IssuesService { issuesQuery.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo()); RStatElectricQualityProblemFlow issuesOut = issuesMapper.selectOne(issuesQuery); issuesOut.setReportProcess(DicDataEnum.CAUSE_ANALYSIS.getCode()); + issuesOut.setReportProcessStatus (DicDataEnum.AUDITT.getCode()); issuesMapper.update(issuesOut,issuesQuery); if (DicDataEnum.USER_COMPLAINTS.getCode().equals(issuesOut.getProblemSources())){ LambdaQueryWrapper complaintQuery = new LambdaQueryWrapper<>(); @@ -529,4 +533,32 @@ public class IssuesServiceImpl implements IssuesService { issuesMapper.delete(query); } + /** + * @param orgNo + * @Description: 查询问题及工单（当前部门下） + * @Param: [orgNo] + * @return: com.njcn.process.pojo.vo.IssueesAndOrderVO + * @Author: clam + * @Date: 2023/1/5 + */ + @Override + public IssueesAndOrderVO queryIssuesAndOrder(String orgNo) { + IssueesAndOrderVO issueesAndOrderVO = new IssueesAndOrderVO(); + + List deptIds = deptFeignClient.getDepSonIdtByDeptId(orgNo).getData(); + /*问题个数*/ + QueryWrapper qualityProblemFlowQueryWrapper = new QueryWrapper<> (); + qualityProblemFlowQueryWrapper.select ("1"). + in ("orgNo",deptIds); + Integer integer = issuesMapper.selectCount (qualityProblemFlowQueryWrapper); + issueesAndOrderVO.setId (orgNo); + issueesAndOrderVO.setIssueesCount (integer); + /*已关联工单数量*/ + + + + + return issueesAndOrderVO; + } + } diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java index 65a458745..d8bf9dca5 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java @@ -18,9 +18,9 @@ import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm; import com.njcn.process.pojo.param.SurveyResultUploadParam; import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail; import com.njcn.process.pojo.po.RGeneralSurveyPlanPO; -import com.njcn.process.pojo.vo.SurveyPlanExcel; import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO; import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO; +import com.njcn.process.pojo.vo.SurveyPlanExcel; import com.njcn.process.service.RGeneralSurveyPlanDetailService; import com.njcn.process.service.RGeneralSurveyPlanPOService; import com.njcn.user.api.DeptFeignClient; @@ -203,12 +203,15 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl collect = Stream.of (split).map (temp -> { - MinIoUploadResDTO dto = new MinIoUploadResDTO("",minIoUtils.getObjectUrl (minIoProperties.getBucket ( ), temp, 7 * 24 * 60 * 60)); + String[] split1 = temp.split ("##"); + String OriginalFilename = split1[1]; + String minoFileName = split1[0]; + MinIoUploadResDTO dto = new MinIoUploadResDTO(OriginalFilename,minIoUtils.getObjectUrl (minIoProperties.getBucket ( ), minoFileName, 7 * 24 * 60 * 60)); return dto ; }).collect (Collectors.toList ( )); return collect; @@ -335,7 +341,6 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl Date: Fri, 6 Jan 2023 15:54:32 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=89=A9=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huangzj <826100833@qq.com> --- process-boot/process-boot.iml | 320 ---------------------------------- 1 file changed, 320 deletions(-) delete mode 100644 process-boot/process-boot.iml diff --git a/process-boot/process-boot.iml b/process-boot/process-boot.iml deleted file mode 100644 index 691a6e399..000000000 --- a/process-boot/process-boot.iml +++ /dev/null @@ -1,320 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file