lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[add] 新增进度类别模块 [refactor] 将 req 包修改为 dto 包 [update] 修改光伏板创建逻辑

Browse Source
This commit is contained in:
lcj
2025-05-22 19:54:24 +08:00
parent dc1de34116
commit 0529b0e00a
296 changed files with 1402 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinnengyuan/pom.xml
View File

@ -16,7 +16,7 @@
<spring-boot.version>3.4.2</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
<java.version>21</java.version>
<mybatis.version>3.5.16</mybatis.version>
<springdoc.version>2.8.4</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>

8
xinnengyuan/ruoyi-admin/Dockerfile
View File

@ -1,9 +1,9 @@
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
#FROM bellsoft/liberica-openjdk-debian:21.0.5-cds
#FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
FROM bellsoft/liberica-openjdk-debian:21.0.5-cds
#FROM findepi/graalvm:java17-native
LABEL maintainer="Lion Li"
LABEL maintainer="lilemy"
RUN mkdir -p /ruoyi/server/logs \
/ruoyi/server/temp \
@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/server/logs \
WORKDIR /ruoyi/server
ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
ENV SERVER_PORT=8899 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT}

4
xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -49,7 +49,7 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://localhost:3306/xinnengyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.110.126:3306/xinnengyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# # 从库数据源
@ -98,7 +98,7 @@ spring:
spring.data:
redis:
# 地址
host: localhost
host: 192.168.110.126
# 端口，默认为6379
port: 6379
# 数据库索引

14
xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -4,7 +4,7 @@ spring.servlet.multipart.location: /ruoyi/server/temp
--- # 监控中心配置
spring.boot.admin.client:
# 增加客户端开关
enabled: true
enabled: false
url: http://localhost:9090/admin
instance:
service-host-type: IP
@ -16,7 +16,7 @@ spring.boot.admin.client:
--- # snail-job 配置
snail-job:
enabled: true
enabled: false
# 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
group: "ruoyi_group"
# SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表
@ -52,9 +52,9 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
url: jdbc:mysql://mysql:3306/xinnengyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root
password: root
password: 123456
# # 从库数据源
# slave:
# lazy: true
@ -101,13 +101,13 @@ spring:
spring.data:
redis:
# 地址
host: localhost
host: redis
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
database: 3
# redis 密码必须配置
password: ruoyi123
password: 123456
# 连接超时时间
timeout: 10s
# 是否开启ssl

6
xinnengyuan/ruoyi-admin/src/main/resources/application.yml
View File

@ -226,9 +226,11 @@ springdoc:
packages-to-scan: org.dromara.quality
- group: 8.设施模块
packages-to-scan: org.dromara.facility
- group: 9.代码生成模块
- group: 9.进度模块
packages-to-scan: org.dromara.progress
- group: 10.代码生成模块
packages-to-scan: org.dromara.generator
- group: 10.工作流模块
- group: 11.工作流模块
packages-to-scan: org.dromara.workflow
# 防止XSS攻击

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacBoxTransformerController.java
View File

@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerCreateReq;
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerQueryReq;
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerUpdateReq;
import org.dromara.facility.domain.dto.boxtransformer.FacBoxTransformerCreateReq;
import org.dromara.facility.domain.dto.boxtransformer.FacBoxTransformerQueryReq;
import org.dromara.facility.domain.dto.boxtransformer.FacBoxTransformerUpdateReq;
import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
import org.dromara.facility.service.IFacBoxTransformerService;
import org.springframework.validation.annotation.Validated;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacInverterController.java
View File

@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.facility.domain.req.inverter.FacInverterCreateReq;
import org.dromara.facility.domain.req.inverter.FacInverterQueryReq;
import org.dromara.facility.domain.req.inverter.FacInverterUpdateReq;
import org.dromara.facility.domain.dto.inverter.FacInverterCreateReq;
import org.dromara.facility.domain.dto.inverter.FacInverterQueryReq;
import org.dromara.facility.domain.dto.inverter.FacInverterUpdateReq;
import org.dromara.facility.domain.vo.inverter.FacInverterVo;
import org.dromara.facility.service.IFacInverterService;
import org.springframework.validation.annotation.Validated;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java
View File

@ -15,7 +15,7 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.facility.domain.req.matrix.*;
import org.dromara.facility.domain.dto.matrix.*;
import org.dromara.facility.domain.vo.matrix.FacMatrixVo;
import org.dromara.facility.domain.vo.matrix.FacMatrixDetailGisVo;
import org.dromara.facility.service.IFacMatrixService;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelColumnController.java
View File

@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
import org.dromara.facility.service.IFacPhotovoltaicPanelColumnService;
import org.springframework.validation.annotation.Validated;

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelController.java
View File

@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
import org.dromara.facility.service.IFacPhotovoltaicPanelService;
import org.springframework.validation.annotation.Validated;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPartsController.java
View File

@ -6,8 +6,8 @@ import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.web.core.BaseController;
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
import org.dromara.facility.domain.dto.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
import org.dromara.facility.service.IFacPhotovoltaicPanelPartsService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPointController.java
View File

@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
import org.dromara.facility.service.IFacPhotovoltaicPanelPointService;
import org.springframework.validation.annotation.Validated;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelSupportController.java
View File

@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
import org.dromara.facility.service.IFacPhotovoltaicPanelSupportService;
import org.springframework.validation.annotation.Validated;

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacBoxTransformer.java
View File

@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
import java.time.LocalDate;
import java.util.Date;
/**
@ -51,7 +52,7 @@ public class FacBoxTransformer extends BaseEntity {
private String positions;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;
@ -60,6 +61,16 @@ public class FacBoxTransformer extends BaseEntity {
*/
private String finishType;
/**
* 完成时间
*/
private LocalDate finishDate;
/**
* 进度类别id
*/
private Long progressCategoryId;
/**
* 备注
*/

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacInverter.java
View File

@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
import java.time.LocalDate;
import java.util.Date;
/**
@ -51,7 +52,7 @@ public class FacInverter extends BaseEntity {
private String positions;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;
@ -60,6 +61,16 @@ public class FacInverter extends BaseEntity {
*/
private String finishType;
/**
* 完成时间
*/
private LocalDate finishDate;
/**
* 进度类别id
*/
private Long progressCategoryId;
/**
* 备注
*/

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanel.java
View File

@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
import java.time.LocalDate;
/**
* 设施-光伏板对象 fac_photovoltaic_panel
@ -49,7 +50,7 @@ public class FacPhotovoltaicPanel extends BaseEntity {
private String positions;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;
@ -58,6 +59,16 @@ public class FacPhotovoltaicPanel extends BaseEntity {
*/
private String finishType;
/**
* 完成时间
*/
private LocalDate finishDate;
/**
* 进度类别id
*/
private Long progressCategoryId;
/**
* 备注
*/

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelColumn.java
View File

@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
import java.time.LocalDate;
/**
* 设施-光伏板立柱对象 fac_photovoltaic_panel_column
@ -49,7 +50,7 @@ public class FacPhotovoltaicPanelColumn extends BaseEntity {
private String positions;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;
@ -58,6 +59,16 @@ public class FacPhotovoltaicPanelColumn extends BaseEntity {
*/
private String finishType;
/**
* 完成时间
*/
private LocalDate finishDate;
/**
* 进度类别id
*/
private Long progressCategoryId;
/**
* 备注
*/

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelPoint.java
View File

@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
import java.time.LocalDate;
/**
* 设施-光伏板桩点对象 fac_photovoltaic_panel_point
@ -49,7 +50,7 @@ public class FacPhotovoltaicPanelPoint extends BaseEntity {
private String positions;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;
@ -58,6 +59,16 @@ public class FacPhotovoltaicPanelPoint extends BaseEntity {
*/
private String finishType;
/**
* 完成时间
*/
private LocalDate finishDate;
/**
* 进度类别id
*/
private Long progressCategoryId;
/**
* 备注
*/

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelSupport.java
View File

@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
import java.time.LocalDate;
/**
* 设施-光伏板支架对象 fac_photovoltaic_panel_support
@ -49,7 +50,7 @@ public class FacPhotovoltaicPanelSupport extends BaseEntity {
private String positions;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;
@ -58,6 +59,16 @@ public class FacPhotovoltaicPanelSupport extends BaseEntity {
*/
private String finishType;
/**
* 完成时间
*/
private LocalDate finishDate;
/**
* 进度类别id
*/
private Long progressCategoryId;
/**
* 备注
*/

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.boxtransformer;
package org.dromara.facility.domain.dto.boxtransformer;
import lombok.Data;
@ -37,7 +37,7 @@ public class FacBoxTransformerCreateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerQueryReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerQueryReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.boxtransformer;
package org.dromara.facility.domain.dto.boxtransformer;
import lombok.Data;
@ -31,7 +31,7 @@ public class FacBoxTransformerQueryReq implements Serializable {
private String name;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerUpdateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerUpdateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.boxtransformer;
package org.dromara.facility.domain.dto.boxtransformer;
import lombok.Data;
@ -42,7 +42,7 @@ public class FacBoxTransformerUpdateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeature.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeature.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.AllArgsConstructor;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByLine.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByLine.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.AllArgsConstructor;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPlane.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByPlane.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.AllArgsConstructor;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPoint.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByPoint.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.AllArgsConstructor;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJson.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJson.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.AllArgsConstructor;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByLine.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByLine.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPlane.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByPlane.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPoint.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByPoint.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometry.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometry.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.AllArgsConstructor;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByLine.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByLine.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.AllArgsConstructor;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPlane.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByPlane.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.AllArgsConstructor;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPoint.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByPoint.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.AllArgsConstructor;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacProperties.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacProperties.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.geojson;
package org.dromara.facility.domain.dto.geojson;
import lombok.AllArgsConstructor;
import lombok.Data;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.inverter;
package org.dromara.facility.domain.dto.inverter;
import lombok.Data;
@ -37,7 +37,7 @@ public class FacInverterCreateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterQueryReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterQueryReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.inverter;
package org.dromara.facility.domain.dto.inverter;
import lombok.Data;
@ -31,7 +31,7 @@ public class FacInverterQueryReq implements Serializable {
private String name;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterUpdateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterUpdateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.inverter;
package org.dromara.facility.domain.dto.inverter;
import lombok.Data;
@ -42,7 +42,7 @@ public class FacInverterUpdateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateByGeoJsonReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixCreateByGeoJsonReq.java
View File

@ -1,8 +1,8 @@
package org.dromara.facility.domain.req.matrix;
package org.dromara.facility.domain.dto.matrix;
import lombok.Data;
import org.dromara.facility.domain.req.geojson.FacGeoJson;
import org.dromara.facility.domain.req.geojson.FacGeoJsonByPoint;
import org.dromara.facility.domain.dto.geojson.FacGeoJson;
import org.dromara.facility.domain.dto.geojson.FacGeoJsonByPoint;
import java.io.Serial;
import java.io.Serializable;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.matrix;
package org.dromara.facility.domain.dto.matrix;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixDetailGisReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixDetailGisReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.matrix;
package org.dromara.facility.domain.dto.matrix;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixQueryReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixQueryReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.matrix;
package org.dromara.facility.domain.dto.matrix;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixUpdateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixUpdateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.matrix;
package org.dromara.facility.domain.dto.matrix;
import lombok.Data;

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java
View File

@ -1,11 +1,12 @@
package org.dromara.facility.domain.req.photovoltaicpanel;
package org.dromara.facility.domain.dto.photovoltaicpanel;
import lombok.Data;
import org.dromara.facility.domain.req.geojson.FacGeoJsonByPlane;
import org.dromara.facility.domain.req.geojson.FacGeoJsonByPoint;
import org.dromara.facility.domain.dto.geojson.FacGeoJsonByPlane;
import org.dromara.facility.domain.dto.geojson.FacGeoJsonByPoint;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* @author lcj
@ -32,4 +33,9 @@ public class FacPhotovoltaicPanelCreateByGeoJsonReq implements Serializable {
*/
private FacGeoJsonByPoint nameGeoJson;
/**
* 进度类别id列表
*/
private List<Long> progressCategoryIdList;
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanel;
package org.dromara.facility.domain.dto.photovoltaicpanel;
import lombok.Data;
@ -37,7 +37,7 @@ public class FacPhotovoltaicPanelCreateReq implements Serializable {
private List<List<String>> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanel;
package org.dromara.facility.domain.dto.photovoltaicpanel;
import lombok.Data;
@ -31,7 +31,7 @@ public class FacPhotovoltaicPanelQueryReq implements Serializable {
private String name;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanel;
package org.dromara.facility.domain.dto.photovoltaicpanel;
import lombok.Data;
@ -42,7 +42,7 @@ public class FacPhotovoltaicPanelUpdateReq implements Serializable {
private List<List<String>> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanelcolumn;
package org.dromara.facility.domain.dto.photovoltaicpanelcolumn;
import lombok.Data;
@ -37,7 +37,7 @@ public class FacPhotovoltaicPanelColumnCreateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanelcolumn;
package org.dromara.facility.domain.dto.photovoltaicpanelcolumn;
import lombok.Data;
@ -31,7 +31,7 @@ public class FacPhotovoltaicPanelColumnQueryReq implements Serializable {
private String name;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanelcolumn;
package org.dromara.facility.domain.dto.photovoltaicpanelcolumn;
import lombok.Data;
@ -42,7 +42,7 @@ public class FacPhotovoltaicPanelColumnUpdateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java
View File

@ -1,7 +1,7 @@
package org.dromara.facility.domain.req.photovoltaicpanelparts;
package org.dromara.facility.domain.dto.photovoltaicpanelparts;
import lombok.Data;
import org.dromara.facility.domain.req.geojson.FacGeoJsonByPoint;
import org.dromara.facility.domain.dto.geojson.FacGeoJsonByPoint;
import java.io.Serial;
import java.io.Serializable;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanelparts;
package org.dromara.facility.domain.dto.photovoltaicpanelparts;
import lombok.Data;
@ -37,7 +37,7 @@ public class FacPhotovoltaicPanelPartsCreateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanelpoint;
package org.dromara.facility.domain.dto.photovoltaicpanelpoint;
import lombok.Data;
@ -37,7 +37,7 @@ public class FacPhotovoltaicPanelPointCreateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanelpoint;
package org.dromara.facility.domain.dto.photovoltaicpanelpoint;
import lombok.Data;
@ -31,7 +31,7 @@ public class FacPhotovoltaicPanelPointQueryReq implements Serializable {
private String name;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanelpoint;
package org.dromara.facility.domain.dto.photovoltaicpanelpoint;
import lombok.Data;
@ -42,7 +42,7 @@ public class FacPhotovoltaicPanelPointUpdateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanelsupport;
package org.dromara.facility.domain.dto.photovoltaicpanelsupport;
import lombok.Data;
@ -37,7 +37,7 @@ public class FacPhotovoltaicPanelSupportCreateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanelsupport;
package org.dromara.facility.domain.dto.photovoltaicpanelsupport;
import lombok.Data;
@ -31,7 +31,7 @@ public class FacPhotovoltaicPanelSupportQueryReq implements Serializable {
private String name;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.facility.domain.req.photovoltaicpanelsupport;
package org.dromara.facility.domain.dto.photovoltaicpanelsupport;
import lombok.Data;
@ -42,7 +42,7 @@ public class FacPhotovoltaicPanelSupportUpdateReq implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
private String status;

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FacFinishStatusEnum.java
View File

@ -9,8 +9,9 @@ import lombok.Getter;
@Getter
public enum FacFinishStatusEnum {
UNFINISH("未完成", "0"),
FINISH("已完成", "1");
UNFINISH("未开始", "0"),
INPROGRESS("进行中", "1"),
FINISH("已完成", "2");
private final String text;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/boxtransformer/FacBoxTransformerVo.java
View File

@ -63,10 +63,10 @@ public class FacBoxTransformerVo implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
@ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=未完成,1=完成")
@ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成")
private String status;
/**

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/inverter/FacInverterVo.java
View File

@ -63,10 +63,10 @@ public class FacInverterVo implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
@ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=未完成,1=完成")
@ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成")
private String status;
/**

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanel/FacPhotovoltaicPanelVo.java
View File

@ -63,10 +63,10 @@ public class FacPhotovoltaicPanelVo implements Serializable {
private List<List<String>> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
@ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=未完成,1=完成")
@ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成")
private String status;
/**

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnVo.java
View File

@ -63,10 +63,10 @@ public class FacPhotovoltaicPanelColumnVo implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
@ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=未完成,1=完成")
@ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成")
private String status;
/**

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelpoint/FacPhotovoltaicPanelPointVo.java
View File

@ -63,10 +63,10 @@ public class FacPhotovoltaicPanelPointVo implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
@ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=未完成,1=完成")
@ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成")
private String status;
/**

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportVo.java
View File

@ -63,10 +63,10 @@ public class FacPhotovoltaicPanelSupportVo implements Serializable {
private List<String> positionList;
/**
* 完成状态（0未完成 1完成）
* 完成状态（0未开始 1进行中 2完成）
*/
@ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=未完成,1=完成")
@ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成")
private String status;
/**

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacBoxTransformerService.java
View File

@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.facility.domain.FacBoxTransformer;
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerCreateReq;
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerQueryReq;
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerUpdateReq;
import org.dromara.facility.domain.dto.boxtransformer.FacBoxTransformerCreateReq;
import org.dromara.facility.domain.dto.boxtransformer.FacBoxTransformerQueryReq;
import org.dromara.facility.domain.dto.boxtransformer.FacBoxTransformerUpdateReq;
import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
import java.util.Collection;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacInverterService.java
View File

@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.facility.domain.FacInverter;
import org.dromara.facility.domain.req.inverter.FacInverterCreateReq;
import org.dromara.facility.domain.req.inverter.FacInverterQueryReq;
import org.dromara.facility.domain.req.inverter.FacInverterUpdateReq;
import org.dromara.facility.domain.dto.inverter.FacInverterCreateReq;
import org.dromara.facility.domain.dto.inverter.FacInverterQueryReq;
import org.dromara.facility.domain.dto.inverter.FacInverterUpdateReq;
import org.dromara.facility.domain.vo.inverter.FacInverterVo;
import java.util.Collection;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacMatrixService.java
View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.facility.domain.FacMatrix;
import org.dromara.facility.domain.req.matrix.*;
import org.dromara.facility.domain.dto.matrix.*;
import org.dromara.facility.domain.vo.matrix.FacMatrixVo;
import org.dromara.facility.domain.vo.matrix.FacMatrixDetailGisVo;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelColumnService.java
View File

@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
import java.util.Collection;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPartsService.java
View File

@ -3,8 +3,8 @@ package org.dromara.facility.service;
import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
import org.dromara.facility.domain.dto.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
import java.util.Collection;
import java.util.List;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPointService.java
View File

@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
import java.util.Collection;

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelService.java
View File

@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.facility.domain.FacPhotovoltaicPanel;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
import java.util.Collection;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelSupportService.java
View File

@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
import java.util.Collection;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java
View File

@ -14,9 +14,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.facility.domain.FacBoxTransformer;
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerCreateReq;
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerQueryReq;
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerUpdateReq;
import org.dromara.facility.domain.dto.boxtransformer.FacBoxTransformerCreateReq;
import org.dromara.facility.domain.dto.boxtransformer.FacBoxTransformerQueryReq;
import org.dromara.facility.domain.dto.boxtransformer.FacBoxTransformerUpdateReq;
import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
import org.dromara.facility.mapper.FacBoxTransformerMapper;
import org.dromara.facility.service.IFacBoxTransformerService;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java
View File

@ -14,9 +14,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.facility.domain.FacInverter;
import org.dromara.facility.domain.req.inverter.FacInverterCreateReq;
import org.dromara.facility.domain.req.inverter.FacInverterQueryReq;
import org.dromara.facility.domain.req.inverter.FacInverterUpdateReq;
import org.dromara.facility.domain.dto.inverter.FacInverterCreateReq;
import org.dromara.facility.domain.dto.inverter.FacInverterQueryReq;
import org.dromara.facility.domain.dto.inverter.FacInverterUpdateReq;
import org.dromara.facility.domain.vo.inverter.FacInverterVo;
import org.dromara.facility.mapper.FacInverterMapper;
import org.dromara.facility.service.IFacInverterService;

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java
View File

@ -15,10 +15,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.facility.domain.*;
import org.dromara.facility.domain.enums.FacFinishStatusEnum;
import org.dromara.facility.domain.req.geojson.FacFeature;
import org.dromara.facility.domain.req.geojson.FacFeatureByPoint;
import org.dromara.facility.domain.req.geojson.FacGeometry;
import org.dromara.facility.domain.req.matrix.*;
import org.dromara.facility.domain.dto.geojson.FacFeature;
import org.dromara.facility.domain.dto.geojson.FacFeatureByPoint;
import org.dromara.facility.domain.dto.geojson.FacGeometry;
import org.dromara.facility.domain.dto.matrix.*;
import org.dromara.facility.domain.vo.matrix.FacMatrixVo;
import org.dromara.facility.domain.vo.matrix.FacMatrixDetailGisVo;
import org.dromara.facility.mapper.FacMatrixMapper;
@ -283,10 +283,10 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
matrix.setMatrixName(name);
matrixList.add(matrix);
}
if (CollUtil.isEmpty(oldMatrixList)) {
if (CollUtil.isNotEmpty(oldMatrixList)) {
boolean result = this.removeBatchByIds(oldMatrixList);
if (!result) {
throw new ServiceException("数据库操作失败", HttpStatus.ERROR);
throw new ServiceException("删除老方阵失败，数据库异常", HttpStatus.ERROR);
}
}
if (CollUtil.isNotEmpty(matrixList)) {
@ -374,7 +374,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
if (CollUtil.isNotEmpty(projectIds) && projectIds.size() > 1) {
throw new ServiceException("仅能删除单个项目下的方阵", HttpStatus.BAD_REQUEST);
}
Long projectId = projectIds.get(0);
Long projectId = projectIds.getFirst();
projectService.validAuth(projectId, userId);
// 判断方阵下是否存在光伏板信息
Long photovoltaicPanelCount = photovoltaicPanelService.lambdaQuery()

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java
View File

@ -14,9 +14,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
import org.dromara.facility.mapper.FacPhotovoltaicPanelColumnMapper;
import org.dromara.facility.service.IFacMatrixService;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java
View File

@ -13,9 +13,9 @@ import org.dromara.facility.domain.FacPhotovoltaicPanel;
import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
import org.dromara.facility.domain.req.geojson.FacFeatureByPoint;
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
import org.dromara.facility.domain.dto.geojson.FacFeatureByPoint;
import org.dromara.facility.domain.dto.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
import org.dromara.facility.domain.dto.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
import org.dromara.facility.service.*;
import org.dromara.project.service.IBusProjectService;
import org.dromara.utils.GeoJsonUtils;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java
View File

@ -14,9 +14,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
import org.dromara.facility.mapper.FacPhotovoltaicPanelPointMapper;
import org.dromara.facility.service.IFacMatrixService;

64
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
View File

@ -13,14 +13,15 @@ import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.facility.domain.FacMatrix;
import org.dromara.facility.domain.FacPhotovoltaicPanel;
import org.dromara.facility.domain.req.geojson.FacFeatureByPlane;
import org.dromara.facility.domain.req.geojson.FacFeatureByPoint;
import org.dromara.facility.domain.req.geojson.FacGeometryByPlane;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
import org.dromara.facility.domain.dto.geojson.FacFeatureByPlane;
import org.dromara.facility.domain.dto.geojson.FacFeatureByPoint;
import org.dromara.facility.domain.dto.geojson.FacGeometryByPlane;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
import org.dromara.facility.mapper.FacPhotovoltaicPanelMapper;
import org.dromara.facility.service.IFacMatrixService;
@ -148,18 +149,18 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
if (projectService.getById(projectId) == null) {
throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
}
// todo 获取项目下方阵信息
/* List<FacMatrix> matrixList = matrixService.lambdaQuery()
// 获取项目下方阵信息
List<FacMatrix> matrixList = matrixService.lambdaQuery()
.eq(FacMatrix::getProjectId, projectId).list();
if (CollUtil.isEmpty(matrixList)) {
throw new ServiceException("项目下无方阵数据，请先创建方阵消息后再添加光伏板信息", HttpStatus.NOT_FOUND);
}*/
}
// 获取当下项目下光伏板的信息
List<FacPhotovoltaicPanel> oldPhotovoltaicPanelList = this.lambdaQuery()
.eq(FacPhotovoltaicPanel::getProjectId, projectId).list();
Map<String, FacPhotovoltaicPanel> photovoltaicPanelMap = oldPhotovoltaicPanelList.stream()
.collect(Collectors.toMap(
FacPhotovoltaicPanel::getName,
panel -> panel.getName() + "_" + panel.getProgressCategoryId(),
Function.identity(),
(existing, replacement) -> existing // 如果有重复，保留第一个
));
@ -168,11 +169,10 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
List<FacFeatureByPlane> locationFeatures = geoJson.getLocationGeoJson().getFeatures();
List<FacFeatureByPoint> nameFeatures = geoJson.getNameGeoJson().getFeatures();
for (FacFeatureByPlane locationFeature : locationFeatures) {
FacPhotovoltaicPanel photovoltaicPanel = new FacPhotovoltaicPanel();
FacGeometryByPlane geometry = locationFeature.getGeometry();
List<List<Double>> coordinates = geometry.getCoordinates().get(0);
// todo 判断光伏板在哪个方阵里
/* Long matrixId = null;
List<List<Double>> coordinates = geometry.getCoordinates().getFirst();
// 判断光伏板在哪个方阵里
Long matrixId = null;
for (FacMatrix matrix : matrixList) {
String positions = matrix.getPositions();
List<List<Double>> positionList = new ArrayList<>();
@ -189,8 +189,6 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
if (matrixId == null) {
continue;
}
photovoltaicPanel.setMatrixId(matrixId);*/
photovoltaicPanel.setMatrixId(1L);
// 获取光伏板名称
String name = null;
for (FacFeatureByPoint nameFeature : nameFeatures) {
@ -204,23 +202,33 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
if (name == null) {
continue;
}
photovoltaicPanel.setName(name);
photovoltaicPanel.setProjectId(projectId);
photovoltaicPanel.setPositions(JSONUtil.toJsonStr(coordinates));
// 如果有同名光伏板，则获取该光伏板的完成状态
if (CollUtil.isNotEmpty(photovoltaicPanelMap) && photovoltaicPanelMap.containsKey(name)) {
FacPhotovoltaicPanel oldPhotovoltaicPanel = photovoltaicPanelMap.get(name);
photovoltaicPanel.setFinishType(oldPhotovoltaicPanel.getFinishType());
photovoltaicPanel.setStatus(oldPhotovoltaicPanel.getStatus());
// 根据进度类别创建
for (Long progressCategoryId : geoJson.getProgressCategoryIdList()) {
FacPhotovoltaicPanel photovoltaicPanel = new FacPhotovoltaicPanel();
photovoltaicPanel.setMatrixId(matrixId);
photovoltaicPanel.setName(name);
photovoltaicPanel.setProjectId(projectId);
photovoltaicPanel.setPositions(JSONUtil.toJsonStr(coordinates));
String mapKey = name + "_" + progressCategoryId;
// 如果有同名同类别光伏板，则获取该光伏板的完成状态
if (CollUtil.isNotEmpty(photovoltaicPanelMap) && photovoltaicPanelMap.containsKey(mapKey)) {
FacPhotovoltaicPanel oldPhotovoltaicPanel = photovoltaicPanelMap.get(name);
photovoltaicPanel.setFinishType(oldPhotovoltaicPanel.getFinishType());
photovoltaicPanel.setFinishDate(oldPhotovoltaicPanel.getFinishDate());
photovoltaicPanel.setProgressCategoryId(oldPhotovoltaicPanel.getProgressCategoryId());
photovoltaicPanel.setStatus(oldPhotovoltaicPanel.getStatus());
} else {
photovoltaicPanel.setProgressCategoryId(progressCategoryId);
}
photovoltaicPanelList.add(photovoltaicPanel);
}
photovoltaicPanelList.add(photovoltaicPanel);
}
// 操作数据库
// 删除旧数据
if (CollUtil.isNotEmpty(oldPhotovoltaicPanelList)) {
boolean result = this.removeBatchByIds(oldPhotovoltaicPanelList);
if (!result) {
throw new ServiceException("数据库操作失败", HttpStatus.ERROR);
throw new ServiceException("删除光伏板失败，数据库异常", HttpStatus.ERROR);
}
}
// 批量保存
@ -316,7 +324,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
if (CollUtil.isNotEmpty(projectIds) && projectIds.size() > 1) {
throw new ServiceException("仅能删除单个项目下的光伏板", HttpStatus.BAD_REQUEST);
}
Long projectId = projectIds.get(0);
Long projectId = projectIds.getFirst();
projectService.validAuth(projectId, userId);
// 判断是否存在光伏板点信息
List<String> matrixNames = photovoltaicPanelList.stream().map(FacPhotovoltaicPanel::getName).toList();

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java
View File

@ -14,9 +14,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
import org.dromara.facility.domain.dto.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
import org.dromara.facility.domain.dto.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
import org.dromara.facility.mapper.FacPhotovoltaicPanelSupportMapper;
import org.dromara.facility.service.IFacMatrixService;

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryController.java
View File

@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.machinery.domain.req.machinery.EqpMachineryCreateReq;
import org.dromara.machinery.domain.req.machinery.EqpMachineryGisReq;
import org.dromara.machinery.domain.req.machinery.EqpMachineryQueryReq;
import org.dromara.machinery.domain.req.machinery.EqpMachineryUpdateReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryCreateReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryGisReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryQueryReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryUpdateReq;
import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
import org.dromara.machinery.domain.vo.machinery.EqpMachineryGisVo;
import org.dromara.machinery.service.IEqpMachineryService;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryDetailController.java
View File

@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailCreateReq;
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailQueryReq;
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailUpdateReq;
import org.dromara.machinery.domain.dto.machinerydetail.EqpMachineryDetailCreateReq;
import org.dromara.machinery.domain.dto.machinerydetail.EqpMachineryDetailQueryReq;
import org.dromara.machinery.domain.dto.machinerydetail.EqpMachineryDetailUpdateReq;
import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
import org.dromara.machinery.service.IEqpMachineryDetailService;
import org.springframework.validation.annotation.Validated;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.machinery.domain.req.machinery;
package org.dromara.machinery.domain.dto.machinery;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryGisReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryGisReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.machinery.domain.req.machinery;
package org.dromara.machinery.domain.dto.machinery;
import jakarta.validation.constraints.NotNull;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryQueryReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryQueryReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.machinery.domain.req.machinery;
package org.dromara.machinery.domain.dto.machinery;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryUpdateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryUpdateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.machinery.domain.req.machinery;
package org.dromara.machinery.domain.dto.machinery;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.machinery.domain.req.machinerydetail;
package org.dromara.machinery.domain.dto.machinerydetail;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailQueryReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailQueryReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.machinery.domain.req.machinerydetail;
package org.dromara.machinery.domain.dto.machinerydetail;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailUpdateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailUpdateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.machinery.domain.req.machinerydetail;
package org.dromara.machinery.domain.dto.machinerydetail;
import lombok.Data;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryDetailService.java
View File

@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.machinery.domain.EqpMachineryDetail;
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailCreateReq;
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailQueryReq;
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailUpdateReq;
import org.dromara.machinery.domain.dto.machinerydetail.EqpMachineryDetailCreateReq;
import org.dromara.machinery.domain.dto.machinerydetail.EqpMachineryDetailQueryReq;
import org.dromara.machinery.domain.dto.machinerydetail.EqpMachineryDetailUpdateReq;
import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
import java.util.Collection;

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryService.java
View File

@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.machinery.domain.EqpMachinery;
import org.dromara.machinery.domain.req.machinery.EqpMachineryCreateReq;
import org.dromara.machinery.domain.req.machinery.EqpMachineryGisReq;
import org.dromara.machinery.domain.req.machinery.EqpMachineryQueryReq;
import org.dromara.machinery.domain.req.machinery.EqpMachineryUpdateReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryCreateReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryGisReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryQueryReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryUpdateReq;
import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
import org.dromara.machinery.domain.vo.machinery.EqpMachineryGisVo;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java
View File

@ -16,9 +16,9 @@ import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.machinery.domain.EqpMachinery;
import org.dromara.machinery.domain.EqpMachineryDetail;
import org.dromara.machinery.domain.enums.EqpMachineryDetailTypeEnum;
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailCreateReq;
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailQueryReq;
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailUpdateReq;
import org.dromara.machinery.domain.dto.machinerydetail.EqpMachineryDetailCreateReq;
import org.dromara.machinery.domain.dto.machinerydetail.EqpMachineryDetailQueryReq;
import org.dromara.machinery.domain.dto.machinerydetail.EqpMachineryDetailUpdateReq;
import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
import org.dromara.machinery.mapper.EqpMachineryDetailMapper;
import org.dromara.machinery.service.IEqpMachineryDetailService;

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryServiceImpl.java
View File

@ -17,10 +17,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.machinery.domain.EqpMachinery;
import org.dromara.machinery.domain.EqpMachineryDetail;
import org.dromara.machinery.domain.req.machinery.EqpMachineryCreateReq;
import org.dromara.machinery.domain.req.machinery.EqpMachineryGisReq;
import org.dromara.machinery.domain.req.machinery.EqpMachineryQueryReq;
import org.dromara.machinery.domain.req.machinery.EqpMachineryUpdateReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryCreateReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryGisReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryQueryReq;
import org.dromara.machinery.domain.dto.machinery.EqpMachineryUpdateReq;
import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
import org.dromara.machinery.domain.vo.machinery.EqpMachineryGisVo;
import org.dromara.machinery.mapper.EqpMachineryMapper;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatCompanyController.java
View File

@ -17,9 +17,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.materials.domain.req.company.MatCompanyCreateReq;
import org.dromara.materials.domain.req.company.MatCompanyQueryReq;
import org.dromara.materials.domain.req.company.MatCompanyUpdateReq;
import org.dromara.materials.domain.dto.company.MatCompanyCreateReq;
import org.dromara.materials.domain.dto.company.MatCompanyQueryReq;
import org.dromara.materials.domain.dto.company.MatCompanyUpdateReq;
import org.dromara.materials.domain.vo.company.MatCompanyVo;
import org.dromara.materials.service.IMatCompanyService;
import org.springframework.validation.annotation.Validated;

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java
View File

@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.materials.domain.req.materials.MatMaterialsCreateReq;
import org.dromara.materials.domain.req.materials.MatMaterialsGisReq;
import org.dromara.materials.domain.req.materials.MatMaterialsQueryReq;
import org.dromara.materials.domain.req.materials.MatMaterialsUpdateReq;
import org.dromara.materials.domain.dto.materials.MatMaterialsCreateReq;
import org.dromara.materials.domain.dto.materials.MatMaterialsGisReq;
import org.dromara.materials.domain.dto.materials.MatMaterialsQueryReq;
import org.dromara.materials.domain.dto.materials.MatMaterialsUpdateReq;
import org.dromara.materials.domain.vo.materials.MatMaterialsVo;
import org.dromara.materials.domain.vo.materials.MatMaterialsGisVo;
import org.dromara.materials.service.IMatMaterialsService;

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsInventoryController.java
View File

@ -15,9 +15,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryCreateReq;
import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryQueryReq;
import org.dromara.materials.domain.req.materialsinventory.MatMaterialsInventoryUpdateReq;
import org.dromara.materials.domain.dto.materialsinventory.MatMaterialsInventoryCreateReq;
import org.dromara.materials.domain.dto.materialsinventory.MatMaterialsInventoryQueryReq;
import org.dromara.materials.domain.dto.materialsinventory.MatMaterialsInventoryUpdateReq;
import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryVo;
import org.dromara.materials.service.IMatMaterialsInventoryService;
import org.springframework.validation.annotation.Validated;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyCreateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyCreateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.materials.domain.req.company;
package org.dromara.materials.domain.dto.company;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyQueryReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyQueryReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.materials.domain.req.company;
package org.dromara.materials.domain.dto.company;
import lombok.Data;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyUpdateReq.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyUpdateReq.java
View File

@ -1,4 +1,4 @@
package org.dromara.materials.domain.req.company;
package org.dromara.materials.domain.dto.company;
import lombok.Data;

Some files were not shown because too many files have changed in this diff Show More