diff --git a/xinnengyuan/pom.xml b/xinnengyuan/pom.xml index 3a73510d..cc87970d 100644 --- a/xinnengyuan/pom.xml +++ b/xinnengyuan/pom.xml @@ -16,7 +16,7 @@ 3.4.2 UTF-8 UTF-8 - 17 + 21 3.5.16 2.8.4 0.15.0 diff --git a/xinnengyuan/ruoyi-admin/Dockerfile b/xinnengyuan/ruoyi-admin/Dockerfile index b489ab57..c934bcee 100644 --- a/xinnengyuan/ruoyi-admin/Dockerfile +++ b/xinnengyuan/ruoyi-admin/Dockerfile @@ -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} diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml index 066c2c84..4a869122 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml @@ -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 # 数据库索引 diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml index 80c1f969..d5b79928 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml @@ -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 diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index 23a925df..aa1d9408 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -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攻击 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacBoxTransformerController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacBoxTransformerController.java index f127445c..a8169484 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacBoxTransformerController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacBoxTransformerController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacInverterController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacInverterController.java index 4800520b..7e71ef96 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacInverterController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacInverterController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java index 0a77625f..19b2c9bd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelColumnController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelColumnController.java index 5556f9b3..fb8db8f8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelColumnController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelColumnController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelController.java index c96878f0..17b95b42 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPartsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPartsController.java index 4017f0b0..676d8836 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPartsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPartsController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPointController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPointController.java index ce780e45..dd617cdb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPointController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelPointController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelSupportController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelSupportController.java index c07b600a..57ee789f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelSupportController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelSupportController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacBoxTransformer.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacBoxTransformer.java index 4a2c5410..7a4e41e1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacBoxTransformer.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacBoxTransformer.java @@ -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; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacInverter.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacInverter.java index 6091ad43..17f73edd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacInverter.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacInverter.java @@ -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; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanel.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanel.java index bfaa8cc0..057a9fbb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanel.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanel.java @@ -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; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelColumn.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelColumn.java index 11f2062b..45636963 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelColumn.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelColumn.java @@ -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; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelPoint.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelPoint.java index b5f59f01..015d6964 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelPoint.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelPoint.java @@ -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; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelSupport.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelSupport.java index 65f81417..bffdf19b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelSupport.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacPhotovoltaicPanelSupport.java @@ -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; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerCreateReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerCreateReq.java index 8b3141a2..e0db6cda 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerCreateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerQueryReq.java similarity index 84% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerQueryReq.java index c6f992c5..1bc93296 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerQueryReq.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerUpdateReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerUpdateReq.java index 321096dc..3d60e553 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/boxtransformer/FacBoxTransformerUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/boxtransformer/FacBoxTransformerUpdateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeature.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeature.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeature.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeature.java index c2dc9df1..0c8467e7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeature.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeature.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByLine.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByLine.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByLine.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByLine.java index 3b8960b4..e4fe443c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByLine.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByLine.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPlane.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByPlane.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPlane.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByPlane.java index 306401ce..2854a382 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPlane.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByPlane.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPoint.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByPoint.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPoint.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByPoint.java index c4721b94..2c22b13e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacFeatureByPoint.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacFeatureByPoint.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJson.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJson.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJson.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJson.java index 3a6aa81a..54f2a575 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJson.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJson.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByLine.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByLine.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByLine.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByLine.java index 61bb7382..abc79345 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByLine.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByLine.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPlane.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByPlane.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPlane.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByPlane.java index 950436e2..84f9363b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPlane.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByPlane.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPoint.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByPoint.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPoint.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByPoint.java index 6ebadd26..e29f591a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeoJsonByPoint.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeoJsonByPoint.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometry.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometry.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometry.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometry.java index 94da8896..3ad07e9e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometry.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometry.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByLine.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByLine.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByLine.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByLine.java index d3235db3..43b7f33a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByLine.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByLine.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPlane.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByPlane.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPlane.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByPlane.java index 640369f2..966f9c54 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPlane.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByPlane.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPoint.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByPoint.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPoint.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByPoint.java index e4256095..ff62021b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacGeometryByPoint.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacGeometryByPoint.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacProperties.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacProperties.java similarity index 84% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacProperties.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacProperties.java index d2700561..8ab0e8d6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/geojson/FacProperties.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/geojson/FacProperties.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.geojson; +package org.dromara.facility.domain.dto.geojson; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterCreateReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterCreateReq.java index 942a25e4..a73f6946 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterCreateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterQueryReq.java similarity index 85% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterQueryReq.java index d4f3692b..c3fb6d80 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterQueryReq.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterUpdateReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterUpdateReq.java index 6c7b20c8..f2b2df3b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/inverter/FacInverterUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/inverter/FacInverterUpdateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateByGeoJsonReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixCreateByGeoJsonReq.java similarity index 74% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateByGeoJsonReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixCreateByGeoJsonReq.java index 014164b7..4d5b593d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateByGeoJsonReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixCreateByGeoJsonReq.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixCreateReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixCreateReq.java index 2315a1e8..ce773e2e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.matrix; +package org.dromara.facility.domain.dto.matrix; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixDetailGisReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixDetailGisReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixDetailGisReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixDetailGisReq.java index 81416192..37e9dcbe 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixDetailGisReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixDetailGisReq.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.matrix; +package org.dromara.facility.domain.dto.matrix; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixQueryReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixQueryReq.java index 75c52f78..4b5e17be 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.matrix; +package org.dromara.facility.domain.dto.matrix; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixUpdateReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixUpdateReq.java index 26facae0..e841eafc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/matrix/FacMatrixUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacMatrixUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.facility.domain.req.matrix; +package org.dromara.facility.domain.dto.matrix; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java similarity index 63% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java index 472c241e..e52e919b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelCreateByGeoJsonReq.java @@ -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 progressCategoryIdList; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java index 11dccac2..3e83e437 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelCreateReq.java @@ -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> positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java similarity index 84% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java index f5e829cd..97525803 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelQueryReq.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java index 37fa7962..3a64e00a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanel/FacPhotovoltaicPanelUpdateReq.java @@ -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> positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java index f07175a7..522d7255 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnCreateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java similarity index 83% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java index 9420cb34..628e4452 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnQueryReq.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java index fff4c4a1..51498bd2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnUpdateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java similarity index 78% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java index 8c7f3b2c..22ac1e31 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateByGeoJsonReq.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java index beaf48ec..fa6ae2b9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelparts/FacPhotovoltaicPanelPartsCreateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java index 7a288860..3a225975 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointCreateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java similarity index 83% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java index e3442d9b..38cd8ff4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointQueryReq.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java index 2d2844f1..2fbd1704 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelpoint/FacPhotovoltaicPanelPointUpdateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java index e06493ee..fa24b7a9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportCreateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java similarity index 84% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java index f832ed55..20096ff5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportQueryReq.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java index eed66117..d40be9b8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/req/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportUpdateReq.java @@ -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 positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ private String status; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FacFinishStatusEnum.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FacFinishStatusEnum.java index 90af9c07..22bca975 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FacFinishStatusEnum.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/enums/FacFinishStatusEnum.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/boxtransformer/FacBoxTransformerVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/boxtransformer/FacBoxTransformerVo.java index 831ef3fa..bf839d22 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/boxtransformer/FacBoxTransformerVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/boxtransformer/FacBoxTransformerVo.java @@ -63,10 +63,10 @@ public class FacBoxTransformerVo implements Serializable { private List positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ @ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=未完成,1=完成") + @ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成") private String status; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/inverter/FacInverterVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/inverter/FacInverterVo.java index 7669ef63..5f891e41 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/inverter/FacInverterVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/inverter/FacInverterVo.java @@ -63,10 +63,10 @@ public class FacInverterVo implements Serializable { private List positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ @ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=未完成,1=完成") + @ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成") private String status; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanel/FacPhotovoltaicPanelVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanel/FacPhotovoltaicPanelVo.java index 07727013..64b1b73b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanel/FacPhotovoltaicPanelVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanel/FacPhotovoltaicPanelVo.java @@ -63,10 +63,10 @@ public class FacPhotovoltaicPanelVo implements Serializable { private List> positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ @ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=未完成,1=完成") + @ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成") private String status; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnVo.java index 1384b1cd..b46f8c70 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelcolumn/FacPhotovoltaicPanelColumnVo.java @@ -63,10 +63,10 @@ public class FacPhotovoltaicPanelColumnVo implements Serializable { private List positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ @ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=未完成,1=完成") + @ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成") private String status; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelpoint/FacPhotovoltaicPanelPointVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelpoint/FacPhotovoltaicPanelPointVo.java index af55e2d0..6ae5231b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelpoint/FacPhotovoltaicPanelPointVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelpoint/FacPhotovoltaicPanelPointVo.java @@ -63,10 +63,10 @@ public class FacPhotovoltaicPanelPointVo implements Serializable { private List positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ @ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=未完成,1=完成") + @ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成") private String status; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportVo.java index af892bcc..40b4b24f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/vo/photovoltaicpanelsupport/FacPhotovoltaicPanelSupportVo.java @@ -63,10 +63,10 @@ public class FacPhotovoltaicPanelSupportVo implements Serializable { private List positionList; /** - * 完成状态（0未完成 1完成） + * 完成状态（0未开始 1进行中 2完成） */ @ExcelProperty(value = "完成状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=未完成,1=完成") + @ExcelDictFormat(readConverterExp = "0=未开始,1=进行中,2=完成") private String status; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacBoxTransformerService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacBoxTransformerService.java index b9341913..3c684845 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacBoxTransformerService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacBoxTransformerService.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacInverterService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacInverterService.java index 8bba4637..660ecfcf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacInverterService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacInverterService.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacMatrixService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacMatrixService.java index 6c91c020..292663f0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacMatrixService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacMatrixService.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelColumnService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelColumnService.java index 3b37c503..8e56a53c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelColumnService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelColumnService.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPartsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPartsService.java index d8af4446..5a532a43 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPartsService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPartsService.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPointService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPointService.java index 99b6e482..d84957ae 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPointService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelPointService.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelService.java index 2c6a5399..b33b7acc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelService.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelSupportService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelSupportService.java index ca8bc238..815ae61f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelSupportService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/IFacPhotovoltaicPanelSupportService.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java index b63d9b8a..133dde5b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java index 30fb498f..b148c5ca 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java index 3cbacfd4..844486aa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java @@ -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 1) { throw new ServiceException("仅能删除单个项目下的方阵", HttpStatus.BAD_REQUEST); } - Long projectId = projectIds.get(0); + Long projectId = projectIds.getFirst(); projectService.validAuth(projectId, userId); // 判断方阵下是否存在光伏板信息 Long photovoltaicPanelCount = photovoltaicPanelService.lambdaQuery() diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java index df53ffeb..d459aa5c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java index 55c0abe1..e435ba22 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java index 600c1d6b..ea7d11d6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java index d4678af6..ea2c6f58 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java @@ -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 matrixList = matrixService.lambdaQuery() + // 获取项目下方阵信息 + List matrixList = matrixService.lambdaQuery() .eq(FacMatrix::getProjectId, projectId).list(); if (CollUtil.isEmpty(matrixList)) { throw new ServiceException("项目下无方阵数据，请先创建方阵消息后再添加光伏板信息", HttpStatus.NOT_FOUND); - }*/ + } // 获取当下项目下光伏板的信息 List oldPhotovoltaicPanelList = this.lambdaQuery() .eq(FacPhotovoltaicPanel::getProjectId, projectId).list(); Map 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 locationFeatures = geoJson.getLocationGeoJson().getFeatures(); List nameFeatures = geoJson.getNameGeoJson().getFeatures(); for (FacFeatureByPlane locationFeature : locationFeatures) { - FacPhotovoltaicPanel photovoltaicPanel = new FacPhotovoltaicPanel(); FacGeometryByPlane geometry = locationFeature.getGeometry(); - List> coordinates = geometry.getCoordinates().get(0); - // todo 判断光伏板在哪个方阵里 -/* Long matrixId = null; + List> coordinates = geometry.getCoordinates().getFirst(); + // 判断光伏板在哪个方阵里 + Long matrixId = null; for (FacMatrix matrix : matrixList) { String positions = matrix.getPositions(); List> positionList = new ArrayList<>(); @@ -189,8 +189,6 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl 1) { throw new ServiceException("仅能删除单个项目下的光伏板", HttpStatus.BAD_REQUEST); } - Long projectId = projectIds.get(0); + Long projectId = projectIds.getFirst(); projectService.validAuth(projectId, userId); // 判断是否存在光伏板点信息 List matrixNames = photovoltaicPanelList.stream().map(FacPhotovoltaicPanel::getName).toList(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java index 878113c6..fbe85b43 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryController.java index 959cee38..910818b2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryDetailController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryDetailController.java index ebd9d8d0..26f2f69f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryDetailController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryDetailController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryCreateReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryCreateReq.java index acc20613..189c4289 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.machinery.domain.req.machinery; +package org.dromara.machinery.domain.dto.machinery; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryGisReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryGisReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryGisReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryGisReq.java index f44a4946..8af71076 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryGisReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryGisReq.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryQueryReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryQueryReq.java index 033f2ec3..db663ad7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.machinery.domain.req.machinery; +package org.dromara.machinery.domain.dto.machinery; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryUpdateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryUpdateReq.java index c0ca5735..e6f547fa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/EqpMachineryUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinery/EqpMachineryUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.machinery.domain.req.machinery; +package org.dromara.machinery.domain.dto.machinery; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailCreateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailCreateReq.java index ce7f2b92..8f463545 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.machinery.domain.req.machinerydetail; +package org.dromara.machinery.domain.dto.machinerydetail; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailQueryReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailQueryReq.java index e4082a26..3cc751c3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.machinery.domain.req.machinerydetail; +package org.dromara.machinery.domain.dto.machinerydetail; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailUpdateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailUpdateReq.java index 2c086678..9f390443 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/EqpMachineryDetailUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/dto/machinerydetail/EqpMachineryDetailUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.machinery.domain.req.machinerydetail; +package org.dromara.machinery.domain.dto.machinerydetail; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryDetailService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryDetailService.java index 91ea9be7..ba741e46 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryDetailService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryDetailService.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryService.java index 0a167e17..dff47170 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IEqpMachineryService.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java index 53835f7d..9b7debbf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryDetailServiceImpl.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryServiceImpl.java index fb9b559f..721b3715 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/EqpMachineryServiceImpl.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatCompanyController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatCompanyController.java index 8e1b104c..a8d5e807 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatCompanyController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatCompanyController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java index 186a6dfb..fc28248c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsInventoryController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsInventoryController.java index 55436e53..b033239b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsInventoryController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsInventoryController.java @@ -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyCreateReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyCreateReq.java index aae25d3f..4c751e1a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.materials.domain.req.company; +package org.dromara.materials.domain.dto.company; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyQueryReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyQueryReq.java index bfdbdc9d..190357b2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.materials.domain.req.company; +package org.dromara.materials.domain.dto.company; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyUpdateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyUpdateReq.java index 6a39ffbe..75e81917 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/MatCompanyUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/company/MatCompanyUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.materials.domain.req.company; +package org.dromara.materials.domain.dto.company; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsCreateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsCreateReq.java index 0f99f86b..1f35281e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.materials.domain.req.materials; +package org.dromara.materials.domain.dto.materials; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsGisReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsGisReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsGisReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsGisReq.java index e2af5a9f..e003be90 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsGisReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsGisReq.java @@ -1,4 +1,4 @@ -package org.dromara.materials.domain.req.materials; +package org.dromara.materials.domain.dto.materials; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsQueryReq.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsQueryReq.java index a9ace79b..849b75dd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.materials.domain.req.materials; +package org.dromara.materials.domain.dto.materials; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsUpdateReq.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsUpdateReq.java index 0bddc03f..6530c01f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MatMaterialsUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materials/MatMaterialsUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.materials.domain.req.materials; +package org.dromara.materials.domain.dto.materials; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialsinventory/MatMaterialsInventoryCreateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialsinventory/MatMaterialsInventoryCreateReq.java index 76a71512..f5090ae8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialsinventory/MatMaterialsInventoryCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.materials.domain.req.materialsinventory; +package org.dromara.materials.domain.dto.materialsinventory; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialsinventory/MatMaterialsInventoryQueryReq.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialsinventory/MatMaterialsInventoryQueryReq.java index c7fa4188..acac0b6a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialsinventory/MatMaterialsInventoryQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.materials.domain.req.materialsinventory; +package org.dromara.materials.domain.dto.materialsinventory; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialsinventory/MatMaterialsInventoryUpdateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialsinventory/MatMaterialsInventoryUpdateReq.java index 61c8aef0..e238f224 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MatMaterialsInventoryUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialsinventory/MatMaterialsInventoryUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.materials.domain.req.materialsinventory; +package org.dromara.materials.domain.dto.materialsinventory; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatCompanyService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatCompanyService.java index 9cd7bbd9..ff112589 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatCompanyService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatCompanyService.java @@ -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.materials.domain.MatCompany; -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 java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsInventoryService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsInventoryService.java index fd85c8eb..31f4c3e3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsInventoryService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsInventoryService.java @@ -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.materials.domain.MatMaterialsInventory; -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 java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsService.java index d555e7d3..a1558543 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialsService.java @@ -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.materials.domain.MatMaterials; -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; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatCompanyServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatCompanyServiceImpl.java index e011073d..11f2b165 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatCompanyServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatCompanyServiceImpl.java @@ -16,9 +16,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.materials.domain.MatCompany; import org.dromara.materials.domain.MatMaterials; -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.mapper.MatCompanyMapper; import org.dromara.materials.service.IMatCompanyService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java index 47a668b1..34bc26e8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java @@ -16,9 +16,9 @@ import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.materials.domain.MatMaterials; import org.dromara.materials.domain.MatMaterialsInventory; import org.dromara.materials.domain.enums.MatMaterialsInventoryOutPutEnum; -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.mapper.MatMaterialsInventoryMapper; import org.dromara.materials.service.IMatMaterialsInventoryService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java index 646128cd..d71f3ab5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsServiceImpl.java @@ -19,10 +19,10 @@ import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.materials.domain.MatMaterials; import org.dromara.materials.domain.MatMaterialsInventory; import org.dromara.materials.domain.enums.MatMaterialsInventoryOutPutEnum; -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.MatMaterialsGisVo; import org.dromara.materials.domain.vo.materials.MatMaterialsVo; import org.dromara.materials.mapper.MatMaterialsMapper; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/controller/PgsProgressCategoryController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/controller/PgsProgressCategoryController.java new file mode 100644 index 00000000..db76b374 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/controller/PgsProgressCategoryController.java @@ -0,0 +1,118 @@ +package org.dromara.progress.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +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.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.progress.domain.dto.progresscategory.PgsProgressCategoryCreateReq; +import org.dromara.progress.domain.dto.progresscategory.PgsProgressCategoryQueryReq; +import org.dromara.progress.domain.dto.progresscategory.PgsProgressCategoryUpdateReq; +import org.dromara.progress.domain.vo.progresscategory.PgsProgressCategoryVo; +import org.dromara.progress.service.IPgsProgressCategoryService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 进度类别 + * + * @author lcj + * @date 2025-05-22 + */ +@Validated +@RestController +@RequestMapping("/progress/progressCategory") +public class PgsProgressCategoryController extends BaseController { + + @Resource + private IPgsProgressCategoryService pgsProgressCategoryService; + + /** + * 分页查询进度类别列表 + */ + @SaCheckPermission("progress:progressCategory:page") + @GetMapping("/page") + public TableDataInfo page(PgsProgressCategoryQueryReq req, PageQuery pageQuery) { + return pgsProgressCategoryService.queryPageList(req, pageQuery); + } + + /** + * 查询进度类别列表 + */ + @SaCheckPermission("progress:progressCategory:list") + @GetMapping("/list") + public R> list(PgsProgressCategoryQueryReq req) { + List list = pgsProgressCategoryService.queryList(req); + return R.ok(list); + } + + /** + * 导出进度类别列表 + */ + @SaCheckPermission("progress:progressCategory:export") + @Log(title = "进度类别", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(PgsProgressCategoryQueryReq req, HttpServletResponse response) { + List list = pgsProgressCategoryService.queryList(req); + ExcelUtil.exportExcel(list, "进度类别", PgsProgressCategoryVo.class, response); + } + + /** + * 获取进度类别详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("progress:progressCategory:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(pgsProgressCategoryService.queryById(id)); + } + + /** + * 新增进度类别 + */ + @SaCheckPermission("progress:progressCategory:add") + @Log(title = "进度类别", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody PgsProgressCategoryCreateReq req) { + return R.ok(pgsProgressCategoryService.insertByBo(req)); + } + + /** + * 修改进度类别 + */ + @SaCheckPermission("progress:progressCategory:edit") + @Log(title = "进度类别", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody PgsProgressCategoryUpdateReq req) { + return toAjax(pgsProgressCategoryService.updateByBo(req)); + } + + /** + * 删除进度类别 + * + * @param ids 主键串 + */ + @SaCheckPermission("progress:progressCategory:remove") + @Log(title = "进度类别", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(pgsProgressCategoryService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressCategory.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressCategory.java new file mode 100644 index 00000000..88cd558c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressCategory.java @@ -0,0 +1,60 @@ +package org.dromara.progress.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 进度类别对象 pgs_progress_category + * + * @author lcj + * @date 2025-05-22 + */ +@Data +@TableName("pgs_progress_category") +public class PgsProgressCategory implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 父类别id + */ + private Long pid; + + /** + * 类别名称 + */ + private String name; + + /** + * 计量方式（0无 1数量 2百分比） + */ + private String unitType; + + /** + * 项目id（0表示共用） + */ + private Long projectId; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryCreateReq.java new file mode 100644 index 00000000..13cf9816 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryCreateReq.java @@ -0,0 +1,38 @@ +package org.dromara.progress.domain.dto.progresscategory; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lcj + * @date 2025/5/22 16:07 + */ +@Data +public class PgsProgressCategoryCreateReq implements Serializable { + + @Serial + private static final long serialVersionUID = 6264724604334298318L; + + /** + * 父类别id + */ + private Long pid; + + /** + * 类别名称 + */ + private String name; + + /** + * 计量方式（0无 1数量 2百分比） + */ + private String unitType; + + /** + * 项目id（0表示共用） + */ + private Long projectId; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryQueryReq.java new file mode 100644 index 00000000..8e6e12dc --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryQueryReq.java @@ -0,0 +1,37 @@ +package org.dromara.progress.domain.dto.progresscategory; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lcj + * @date 2025/5/22 16:07 + */ +@Data +public class PgsProgressCategoryQueryReq implements Serializable { + @Serial + private static final long serialVersionUID = 2607953543340685175L; + + /** + * 父类别id + */ + private Long pid; + + /** + * 类别名称 + */ + private String name; + + /** + * 计量方式（0无 1数量 2百分比） + */ + private String unitType; + + /** + * 项目id（0表示共用） + */ + private Long projectId; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryUpdateReq.java new file mode 100644 index 00000000..e4a7ebd6 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryUpdateReq.java @@ -0,0 +1,38 @@ +package org.dromara.progress.domain.dto.progresscategory; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lcj + * @date 2025/5/22 16:07 + */ +@Data +public class PgsProgressCategoryUpdateReq implements Serializable { + + @Serial + private static final long serialVersionUID = 8324950385975719302L; + + /** + * 主键id + */ + private Long id; + + /** + * 父类别id + */ + private Long pid; + + /** + * 类别名称 + */ + private String name; + + /** + * 计量方式（0无 1数量 2百分比） + */ + private String unitType; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/vo/progresscategory/PgsProgressCategoryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/vo/progresscategory/PgsProgressCategoryVo.java new file mode 100644 index 00000000..c1125f21 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/vo/progresscategory/PgsProgressCategoryVo.java @@ -0,0 +1,61 @@ +package org.dromara.progress.domain.vo.progresscategory; + +import org.dromara.progress.domain.PgsProgressCategory; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 进度类别视图对象 pgs_progress_category + * + * @author lcj + * @date 2025-05-22 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = PgsProgressCategory.class) +public class PgsProgressCategoryVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 父类别id + */ + @ExcelProperty(value = "父类别id") + private Long pid; + + /** + * 类别名称 + */ + @ExcelProperty(value = "类别名称") + private String name; + + /** + * 计量方式（0无 1数量 2百分比） + */ + @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=数量,2=百分比") + private String unitType; + + /** + * 项目id（0表示共用） + */ + @ExcelProperty(value = "项目id") + private Long projectId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/mapper/PgsProgressCategoryMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/mapper/PgsProgressCategoryMapper.java new file mode 100644 index 00000000..f8cf6378 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/mapper/PgsProgressCategoryMapper.java @@ -0,0 +1,15 @@ +package org.dromara.progress.mapper; + +import org.dromara.progress.domain.PgsProgressCategory; +import org.dromara.progress.domain.vo.progresscategory.PgsProgressCategoryVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 进度类别Mapper接口 + * + * @author lcj + * @date 2025-05-22 + */ +public interface PgsProgressCategoryMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/IPgsProgressCategoryService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/IPgsProgressCategoryService.java new file mode 100644 index 00000000..fe8784ba --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/IPgsProgressCategoryService.java @@ -0,0 +1,99 @@ +package org.dromara.progress.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.progress.domain.PgsProgressCategory; +import org.dromara.progress.domain.dto.progresscategory.PgsProgressCategoryCreateReq; +import org.dromara.progress.domain.dto.progresscategory.PgsProgressCategoryQueryReq; +import org.dromara.progress.domain.dto.progresscategory.PgsProgressCategoryUpdateReq; +import org.dromara.progress.domain.vo.progresscategory.PgsProgressCategoryVo; + +import java.util.Collection; +import java.util.List; + +/** + * 进度类别Service接口 + * + * @author lcj + * @date 2025-05-22 + */ +public interface IPgsProgressCategoryService extends IService { + + /** + * 查询进度类别 + * + * @param id 主键 + * @return 进度类别 + */ + PgsProgressCategoryVo queryById(Long id); + + /** + * 分页查询进度类别 + * + * @param req 查询条件 + * @param pageQuery 分页参数 + * @return 进度类别分页列表 + */ + TableDataInfo queryPageList(PgsProgressCategoryQueryReq req, PageQuery pageQuery); + + /** + * 查询符合条件的进度类别列表 + * + * @param req 查询条件 + * @return 进度类别列表 + */ + List queryList(PgsProgressCategoryQueryReq req); + + /** + * 新增进度类别 + * + * @param req 进度类别 + * @return 新增进度类别id + */ + Long insertByBo(PgsProgressCategoryCreateReq req); + + /** + * 修改进度类别 + * + * @param req 进度类别 + * @return 是否修改成功 + */ + Boolean updateByBo(PgsProgressCategoryUpdateReq req); + + /** + * 校验并批量删除进度类别信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 获取进度类别视图对象 + * + * @param progressCategory 进度类别对象 + * @return 进度类别视图对象 + */ + PgsProgressCategoryVo getVo(PgsProgressCategory progressCategory); + + /** + * 获取进度类别查询条件封装 + * + * @param req 查询条件 + * @return 查询条件封装 + */ + LambdaQueryWrapper buildQueryWrapper(PgsProgressCategoryQueryReq req); + + /** + * 获取进度类别分页对象视图 + * + * @param progressCategoryPage 进度类别分页对象 + * @return 进度类别分页对象视图 + */ + Page getVoPage(Page progressCategoryPage); + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java new file mode 100644 index 00000000..dbbea684 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java @@ -0,0 +1,237 @@ +package org.dromara.progress.service.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.constant.HttpStatus; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.ObjectUtils; +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.progress.domain.PgsProgressCategory; +import org.dromara.progress.domain.dto.progresscategory.PgsProgressCategoryCreateReq; +import org.dromara.progress.domain.dto.progresscategory.PgsProgressCategoryQueryReq; +import org.dromara.progress.domain.dto.progresscategory.PgsProgressCategoryUpdateReq; +import org.dromara.progress.domain.vo.progresscategory.PgsProgressCategoryVo; +import org.dromara.progress.mapper.PgsProgressCategoryMapper; +import org.dromara.progress.service.IPgsProgressCategoryService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +/** + * 进度类别Service业务层处理 + * + * @author lcj + * @date 2025-05-22 + */ +@Service +public class PgsProgressCategoryServiceImpl extends ServiceImpl + implements IPgsProgressCategoryService { + + /** + * 查询进度类别 + * + * @param id 主键 + * @return 进度类别 + */ + @Override + public PgsProgressCategoryVo queryById(Long id) { + PgsProgressCategory progressCategory = this.getById(id); + if (progressCategory == null) { + throw new ServiceException("进度类别信息不存在", HttpStatus.NOT_FOUND); + } + return this.getVo(progressCategory); + } + + /** + * 分页查询进度类别 + * + * @param req 查询条件 + * @param pageQuery 分页参数 + * @return 进度类别分页列表 + */ + @Override + public TableDataInfo queryPageList(PgsProgressCategoryQueryReq req, PageQuery pageQuery) { + Page progressCategoryPage = this.page(pageQuery.build(), this.buildQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(progressCategoryPage)); + } + + /** + * 查询符合条件的进度类别列表 + * + * @param req 查询条件 + * @return 进度类别列表 + */ + @Override + public List queryList(PgsProgressCategoryQueryReq req) { + List list = this.list(this.buildQueryWrapper(req)); + return list.stream().map(this::getVo).toList(); + } + + /** + * 新增进度类别 + * + * @param req 进度类别 + * @return 新增进度类别id + */ + @Override + public Long insertByBo(PgsProgressCategoryCreateReq req) { + // 将实体类和 DTO 进行转换 + PgsProgressCategory progressCategory = new PgsProgressCategory(); + BeanUtils.copyProperties(req, progressCategory); + // 数据校验 + validEntityBeforeSave(progressCategory); + // 写入数据库 + boolean result = this.save(progressCategory); + if (!result) { + throw new ServiceException("新增进度类别失败，数据库异常", HttpStatus.ERROR); + } + return progressCategory.getId(); + } + + /** + * 修改进度类别 + * + * @param req 进度类别 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(PgsProgressCategoryUpdateReq req) { + // 将实体类和 DTO 进行转换 + PgsProgressCategory progressCategory = new PgsProgressCategory(); + BeanUtils.copyProperties(req, progressCategory); + PgsProgressCategory oldProgressCategory = this.getById(req.getId()); + if (oldProgressCategory == null) { + throw new ServiceException("修改进度类别失败，数据不存在", HttpStatus.NOT_FOUND); + } + // 数据校验 + validEntityBeforeSave(progressCategory); + // 写入数据库 + boolean result = this.updateById(progressCategory); + if (!result) { + throw new ServiceException("更新进度类别失败，数据库异常", HttpStatus.ERROR); + } + return true; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(PgsProgressCategory entity) { + // TODO 做一些数据校验,如唯一约束 + Long projectId = entity.getProjectId(); + Long pid = entity.getPid(); + if (projectId != null && projectId != 0) { + if (this.getById(projectId) == null) { + throw new ServiceException("对应项目不存在", HttpStatus.NOT_FOUND); + } + } + if (pid != null && pid != 0) { + if (this.getById(pid) == null) { + throw new ServiceException("对应进度类别不存在", HttpStatus.NOT_FOUND); + } + } + // 名称唯一性校验 + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(PgsProgressCategory::getName, entity.getName()); + if (projectId != null && projectId != 0) { + lqw.eq(PgsProgressCategory::getProjectId, entity.getProjectId()); + } + if (pid != null && pid != 0) { + lqw.eq(PgsProgressCategory::getPid, entity.getPid()); + } + if (entity.getId() != null) { + // 排除自身 + lqw.ne(PgsProgressCategory::getId, entity.getId()); + } + if (this.count(lqw) > 0) { + throw new ServiceException("已有同名进度类别", HttpStatus.CONFLICT); + } + } + + /** + * 校验并批量删除进度类别信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return this.removeBatchByIds(ids); + } + + /** + * 获取进度类别视图对象 + * + * @param progressCategory 进度类别对象 + * @return 进度类别视图对象 + */ + @Override + public PgsProgressCategoryVo getVo(PgsProgressCategory progressCategory) { + if (progressCategory == null) { + return null; + } + // 对象转封装类 + PgsProgressCategoryVo progressCategoryVo = new PgsProgressCategoryVo(); + BeanUtils.copyProperties(progressCategory, progressCategoryVo); + return progressCategoryVo; + } + + /** + * 获取进度类别查询条件封装 + * + * @param req 查询条件 + * @return 查询条件封装 + */ + @Override + public LambdaQueryWrapper buildQueryWrapper(PgsProgressCategoryQueryReq req) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + if (req == null) { + return lqw; + } + Long pid = req.getPid(); + String name = req.getName(); + String unitType = req.getUnitType(); + Long progressCategoryId = req.getProjectId(); + // 模糊查询 + lqw.like(StringUtils.isNotBlank(name), PgsProgressCategory::getName, name); + // 精确查询 + lqw.eq(ObjectUtils.isNotEmpty(progressCategoryId), PgsProgressCategory::getProjectId, progressCategoryId); + lqw.eq(StringUtils.isNotBlank(unitType), PgsProgressCategory::getUnitType, unitType); + lqw.eq(ObjectUtils.isNotEmpty(pid), PgsProgressCategory::getPid, pid); + return lqw; + } + + /** + * 获取进度类别分页对象视图 + * + * @param progressCategoryPage 进度类别分页对象 + * @return 进度类别分页对象视图 + */ + @Override + public Page getVoPage(Page progressCategoryPage) { + List progressCategoryList = progressCategoryPage.getRecords(); + Page progressCategoryVoPage = new Page<>(progressCategoryPage.getCurrent(), progressCategoryPage.getSize(), progressCategoryPage.getTotal()); + if (CollUtil.isEmpty(progressCategoryList)) { + return progressCategoryVoPage; + } + // 对象列表 => 封装对象列表 + List progressCategoryVoList = progressCategoryList.stream().map(progressCategory -> { + // 对象转封装类 + PgsProgressCategoryVo progressCategoryVo = new PgsProgressCategoryVo(); + BeanUtils.copyProperties(progressCategory, progressCategoryVo); + return progressCategoryVo; + }).toList(); + progressCategoryVoPage.setRecords(progressCategoryVoList); + return progressCategoryVoPage; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java index 6542b79c..620794fe 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceController.java @@ -11,9 +11,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.project.domain.req.attendance.BusAttendanceMonthByUserIdReq; -import org.dromara.project.domain.req.attendance.BusAttendanceQueryReq; -import org.dromara.project.domain.req.attendance.BusAttendanceQueryTwoWeekReq; +import org.dromara.project.domain.dto.attendance.BusAttendanceMonthByUserIdReq; +import org.dromara.project.domain.dto.attendance.BusAttendanceQueryReq; +import org.dromara.project.domain.dto.attendance.BusAttendanceQueryTwoWeekReq; import org.dromara.project.domain.vo.attendance.BusAttendanceClockDateForTwoWeekVo; import org.dromara.project.domain.vo.attendance.BusAttendanceMonthByUserIdVo; import org.dromara.project.domain.vo.attendance.BusAttendanceVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionBlacklistController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionBlacklistController.java index efa90df9..4333e80c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionBlacklistController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionBlacklistController.java @@ -14,8 +14,8 @@ 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.project.domain.req.constructionblacklist.BusConstructionBlacklistCreateReq; -import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistQueryReq; +import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistCreateReq; +import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistQueryReq; import org.dromara.project.domain.vo.constructionblacklist.BusConstructionBlacklistVo; import org.dromara.project.service.IBusConstructionBlacklistService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java index 3057a25d..d2c7a875 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java @@ -16,7 +16,7 @@ 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.project.domain.exportvo.BusConstructionUserExportVo; -import org.dromara.project.domain.req.constructionuser.*; +import org.dromara.project.domain.dto.constructionuser.*; import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceMonthVo; import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceTotalVo; import org.dromara.project.domain.vo.constructionuser.BusConstructionUserGisVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserExitController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserExitController.java index c104f0e2..62fa6243 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserExitController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserExitController.java @@ -11,7 +11,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.project.domain.req.constructionuserexit.BusConstructionUserExitQueryReq; +import org.dromara.project.domain.dto.constructionuserexit.BusConstructionUserExitQueryReq; import org.dromara.project.domain.vo.constructionuserexit.BusConstructionUserExitVo; import org.dromara.project.service.IBusConstructionUserExitService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java index 1d2d8402..aca249c3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserFileController.java @@ -10,9 +10,9 @@ 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.project.domain.req.constructionuserfile.BusConstructionUserFileQueryReq; -import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileSaveReq; -import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileTemplateReq; +import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileQueryReq; +import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileSaveReq; +import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileTemplateReq; import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo; import org.dromara.project.service.IBusConstructionUserFileService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java index 9c3cf5eb..07c7c93d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java @@ -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.project.domain.req.contractor.BusContractorCreateReq; -import org.dromara.project.domain.req.contractor.BusContractorQueryReq; -import org.dromara.project.domain.req.contractor.BusContractorUpdateReq; +import org.dromara.project.domain.dto.contractor.BusContractorCreateReq; +import org.dromara.project.domain.dto.contractor.BusContractorQueryReq; +import org.dromara.project.domain.dto.contractor.BusContractorUpdateReq; import org.dromara.project.domain.vo.contractor.BusContractorVo; import org.dromara.project.service.IBusContractorService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusLeaveController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusLeaveController.java index 669e616e..a14aa785 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusLeaveController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusLeaveController.java @@ -13,8 +13,8 @@ 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.project.domain.req.leave.BusLeaveManagerReviewReq; -import org.dromara.project.domain.req.leave.BusLeaveQueryReq; +import org.dromara.project.domain.dto.leave.BusLeaveManagerReviewReq; +import org.dromara.project.domain.dto.leave.BusLeaveQueryReq; import org.dromara.project.domain.vo.leave.BusLeaveVo; import org.dromara.project.service.IBusLeaveService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java index 21bf22c2..38e0700c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java @@ -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.project.domain.req.project.BusProjectCreateReq; -import org.dromara.project.domain.req.project.BusProjectQueryReq; -import org.dromara.project.domain.req.project.BusProjectUpdateReq; +import org.dromara.project.domain.dto.project.BusProjectCreateReq; +import org.dromara.project.domain.dto.project.BusProjectQueryReq; +import org.dromara.project.domain.dto.project.BusProjectUpdateReq; import org.dromara.project.domain.vo.project.BusProjectContractorListVo; import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo; import org.dromara.project.domain.vo.project.BusProjectVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectFileController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectFileController.java index f7b8ca97..483f5932 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectFileController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectFileController.java @@ -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.project.domain.req.projectfile.BusProjectFileQueryReq; -import org.dromara.project.domain.req.projectfile.BusProjectFileUpdateReq; -import org.dromara.project.domain.req.projectfile.BusProjectFileUploadDxfReq; +import org.dromara.project.domain.dto.projectfile.BusProjectFileQueryReq; +import org.dromara.project.domain.dto.projectfile.BusProjectFileUpdateReq; +import org.dromara.project.domain.dto.projectfile.BusProjectFileUploadDxfReq; import org.dromara.project.domain.vo.projectfile.BusProjectFileVo; import org.dromara.project.service.IBusProjectFileService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectNewsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectNewsController.java index 4bde7baf..ae2c4846 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectNewsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectNewsController.java @@ -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.project.domain.req.projectnews.BusProjectNewsCreateReq; -import org.dromara.project.domain.req.projectnews.BusProjectNewsGisReq; -import org.dromara.project.domain.req.projectnews.BusProjectNewsQueryReq; -import org.dromara.project.domain.req.projectnews.BusProjectNewsUpdateReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsCreateReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsGisReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsQueryReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsUpdateReq; import org.dromara.project.domain.vo.projectnews.BusProjectNewsGisVo; import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo; import org.dromara.project.service.IBusProjectNewsService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java index 16ad097d..5418c0da 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java @@ -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.project.domain.req.projectteam.BusProjectTeamCreateReq; -import org.dromara.project.domain.req.projectteam.BusProjectTeamQueryReq; -import org.dromara.project.domain.req.projectteam.BusProjectTeamUpdateReq; +import org.dromara.project.domain.dto.projectteam.BusProjectTeamCreateReq; +import org.dromara.project.domain.dto.projectteam.BusProjectTeamQueryReq; +import org.dromara.project.domain.dto.projectteam.BusProjectTeamUpdateReq; import org.dromara.project.domain.vo.projectteam.BusProjectTeamForemanVo; import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo; import org.dromara.project.service.IBusProjectTeamService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java index 53fb23f6..4b5b48aa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java @@ -14,10 +14,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.project.domain.req.projectteammember.BusProjectTeamMemberCreateReq; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberExitReq; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberQueryReq; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberUpdateReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberCreateReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberExitReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberQueryReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberUpdateReq; import org.dromara.project.domain.vo.projectteammember.BusProjectTeamMemberVo; import org.dromara.project.service.IBusProjectTeamMemberService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusReissueCardController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusReissueCardController.java index d225e639..47360e51 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusReissueCardController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusReissueCardController.java @@ -13,8 +13,8 @@ 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.project.domain.req.reissuecard.BusReissueCardManagerReviewReq; -import org.dromara.project.domain.req.reissuecard.BusReissueCardQueryReq; +import org.dromara.project.domain.dto.reissuecard.BusReissueCardManagerReviewReq; +import org.dromara.project.domain.dto.reissuecard.BusReissueCardQueryReq; import org.dromara.project.domain.vo.reissuecard.BusReissueCardVo; import org.dromara.project.service.IBusReissueCardService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java index f34cc09b..0e934de4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java @@ -18,10 +18,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.project.domain.BusUserProjectRelevancy; -import org.dromara.project.domain.req.project.BusProjectBatchByProjectListReq; -import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyCreateReq; -import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyQueryReq; -import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyUpdateReq; +import org.dromara.project.domain.dto.project.BusProjectBatchByProjectListReq; +import org.dromara.project.domain.dto.userprojectrelevancy.BusUserProjectRelevancyCreateReq; +import org.dromara.project.domain.dto.userprojectrelevancy.BusUserProjectRelevancyQueryReq; +import org.dromara.project.domain.dto.userprojectrelevancy.BusUserProjectRelevancyUpdateReq; import org.dromara.project.domain.vo.userprojectrelevancy.BusLoginUserProjectRelevancyVo; import org.dromara.project.domain.vo.userprojectrelevancy.BusUserProjectRelevancyVo; import org.dromara.project.service.IBusUserProjectRelevancyService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkWageController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkWageController.java index 4edb0478..9b0e21be 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkWageController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkWageController.java @@ -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.project.domain.req.workwage.BusWorkWageCreateReq; -import org.dromara.project.domain.req.workwage.BusWorkWageQueryReq; -import org.dromara.project.domain.req.workwage.BusWorkWageUpdateReq; +import org.dromara.project.domain.dto.workwage.BusWorkWageCreateReq; +import org.dromara.project.domain.dto.workwage.BusWorkWageQueryReq; +import org.dromara.project.domain.dto.workwage.BusWorkWageUpdateReq; import org.dromara.project.domain.vo.workwage.BusWorkWageVo; import org.dromara.project.service.IBusWorkWageService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkerDailyReportController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkerDailyReportController.java index 6e976363..b1afeb33 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkerDailyReportController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusWorkerDailyReportController.java @@ -12,7 +12,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.project.domain.req.workerdailyreport.BusWorkerDailyReportQueryReq; +import org.dromara.project.domain.dto.workerdailyreport.BusWorkerDailyReportQueryReq; import org.dromara.project.domain.vo.workerdailyreport.BusWorkerDailyReportVo; import org.dromara.project.service.IBusWorkerDailyReportService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceMonthByUserIdReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendanceMonthByUserIdReq.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceMonthByUserIdReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendanceMonthByUserIdReq.java index 2ae20fd8..b3abd93a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceMonthByUserIdReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendanceMonthByUserIdReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.attendance; +package org.dromara.project.domain.dto.attendance; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendanceQueryReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendanceQueryReq.java index 437bd1b8..3ce43ba9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendanceQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.attendance; +package org.dromara.project.domain.dto.attendance; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryTwoWeekReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendanceQueryTwoWeekReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryTwoWeekReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendanceQueryTwoWeekReq.java index 9476f9bc..a6400b4b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/attendance/BusAttendanceQueryTwoWeekReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendance/BusAttendanceQueryTwoWeekReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.attendance; +package org.dromara.project.domain.dto.attendance; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionblacklist/BusConstructionBlacklistCreateReq.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionblacklist/BusConstructionBlacklistCreateReq.java index 86b25093..75628acc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionblacklist/BusConstructionBlacklistCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionblacklist; +package org.dromara.project.domain.dto.constructionblacklist; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionblacklist/BusConstructionBlacklistQueryReq.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionblacklist/BusConstructionBlacklistQueryReq.java index 0ce2e2c6..e6574e41 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionblacklist/BusConstructionBlacklistQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionblacklist/BusConstructionBlacklistQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionblacklist; +package org.dromara.project.domain.dto.constructionblacklist; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceMonthReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceMonthReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceMonthReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceMonthReq.java index 910641cd..66ab106f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceMonthReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceMonthReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceQueryReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceQueryReq.java index b3472807..4e0928e4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserAttendanceQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserAttendanceQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateClockReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateClockReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateClockReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateClockReq.java index ef4d4ae3..be35018f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateClockReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateClockReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateStatusReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateStatusReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateStatusReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateStatusReq.java index 10fb1a6c..10a0ec6e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserBatchUpdateStatusReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserBatchUpdateStatusReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserChangeProjectReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserChangeProjectReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserChangeProjectReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserChangeProjectReq.java index 9c488620..bdf0cd88 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserChangeProjectReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserChangeProjectReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserCreateReq.java similarity index 97% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserCreateReq.java index 56df44ae..adf5298a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserGisReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserGisReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserGisReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserGisReq.java index 824cb22d..11de37a1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserGisReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserGisReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserQueryReq.java similarity index 96% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserQueryReq.java index 7aeef1d4..1a785d31 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateClockReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateClockReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateClockReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateClockReq.java index 223442f7..9d839aad 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateClockReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateClockReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateReq.java similarity index 97% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateReq.java index 6d23efcc..9e0e6be1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateSalaryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateSalaryReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateSalaryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateSalaryReq.java index e676f794..80ab2892 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/BusConstructionUserUpdateSalaryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuser/BusConstructionUserUpdateSalaryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuser; +package org.dromara.project.domain.dto.constructionuser; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserexit/BusConstructionUserExitQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserexit/BusConstructionUserExitQueryReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserexit/BusConstructionUserExitQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserexit/BusConstructionUserExitQueryReq.java index 0ff3d5cd..7293b695 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserexit/BusConstructionUserExitQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserexit/BusConstructionUserExitQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuserexit; +package org.dromara.project.domain.dto.constructionuserexit; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileQueryReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileQueryReq.java index 435b5c39..60fd30fc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuserfile; +package org.dromara.project.domain.dto.constructionuserfile; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileReq.java similarity index 85% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileReq.java index dbb52d59..c6b7d80b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuserfile; +package org.dromara.project.domain.dto.constructionuserfile; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileSaveReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileSaveReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileSaveReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileSaveReq.java index 5f2673d7..3a4614ed 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileSaveReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileSaveReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuserfile; +package org.dromara.project.domain.dto.constructionuserfile; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileTemplateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileTemplateReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileTemplateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileTemplateReq.java index 7778e676..dd78ac84 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuserfile/BusConstructionUserFileTemplateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/constructionuserfile/BusConstructionUserFileTemplateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.constructionuserfile; +package org.dromara.project.domain.dto.constructionuserfile; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorCreateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorCreateReq.java index 6b0dba95..3f1d731e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.contractor; +package org.dromara.project.domain.dto.contractor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorQueryReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorQueryReq.java index 681869db..6c67b8b7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.contractor; +package org.dromara.project.domain.dto.contractor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorUpdateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorUpdateReq.java index fa393c57..8b1a563f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/BusContractorUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/contractor/BusContractorUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.contractor; +package org.dromara.project.domain.dto.contractor; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveManagerReviewReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveManagerReviewReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveManagerReviewReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveManagerReviewReq.java index d685f311..10c90da9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveManagerReviewReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveManagerReviewReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.leave; +package org.dromara.project.domain.dto.leave; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveQueryReq.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveQueryReq.java index 4f5e468d..599df67e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/leave/BusLeaveQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/leave/BusLeaveQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.leave; +package org.dromara.project.domain.dto.leave; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectBatchByProjectListReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectBatchByProjectListReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectBatchByProjectListReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectBatchByProjectListReq.java index 51cf7bc8..45d0c618 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectBatchByProjectListReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectBatchByProjectListReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.project; +package org.dromara.project.domain.dto.project; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectCreateReq.java similarity index 97% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectCreateReq.java index a8699bdd..a3a91597 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.project; +package org.dromara.project.domain.dto.project; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectQueryReq.java similarity index 97% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectQueryReq.java index 3a416c3b..7654bb93 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.project; +package org.dromara.project.domain.dto.project; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectUpdateReq.java similarity index 97% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectUpdateReq.java index f0047710..84f705c6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/BusProjectUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.project; +package org.dromara.project.domain.dto.project; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectfile/BusProjectFileQueryReq.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectfile/BusProjectFileQueryReq.java index b6bbfaec..829c2421 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectfile/BusProjectFileQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectfile; +package org.dromara.project.domain.dto.projectfile; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectfile/BusProjectFileUpdateReq.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectfile/BusProjectFileUpdateReq.java index fe371daf..0b9c2431 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectfile/BusProjectFileUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectfile; +package org.dromara.project.domain.dto.projectfile; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUploadDxfReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectfile/BusProjectFileUploadDxfReq.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUploadDxfReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectfile/BusProjectFileUploadDxfReq.java index 5e40a5b7..2fa8f7d8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectfile/BusProjectFileUploadDxfReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectfile/BusProjectFileUploadDxfReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectfile; +package org.dromara.project.domain.dto.projectfile; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsCreateReq.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsCreateReq.java index 21108c42..84ca4c35 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectnews; +package org.dromara.project.domain.dto.projectnews; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsGisReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsGisReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsGisReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsGisReq.java index 72e1d23a..75829594 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsGisReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsGisReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectnews; +package org.dromara.project.domain.dto.projectnews; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsQueryReq.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsQueryReq.java index a5ce0be6..bfb18551 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectnews; +package org.dromara.project.domain.dto.projectnews; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsUpdateReq.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsUpdateReq.java index 7cb98923..4651198b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectnews/BusProjectNewsUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectnews/BusProjectNewsUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectnews; +package org.dromara.project.domain.dto.projectnews; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamCreateReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamCreateReq.java index 4b2044b3..a4a92f80 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectteam; +package org.dromara.project.domain.dto.projectteam; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamQueryReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamQueryReq.java index 5f73783e..cd78bd28 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectteam; +package org.dromara.project.domain.dto.projectteam; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamUpdateReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamUpdateReq.java index d8977d89..36e296a0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/BusProjectTeamUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteam/BusProjectTeamUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectteam; +package org.dromara.project.domain.dto.projectteam; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberCreateReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberCreateReq.java index b62e1852..6248803c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectteammember; +package org.dromara.project.domain.dto.projectteammember; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberExitReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberExitReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberExitReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberExitReq.java index 7c5c9a43..7b1f84bb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberExitReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberExitReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectteammember; +package org.dromara.project.domain.dto.projectteammember; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberQueryReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberQueryReq.java index 8513f1e3..297c35a5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectteammember; +package org.dromara.project.domain.dto.projectteammember; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberUpdateReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberUpdateReq.java index 004acbba..21fccb32 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/BusProjectTeamMemberUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/projectteammember/BusProjectTeamMemberUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.projectteammember; +package org.dromara.project.domain.dto.projectteammember; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardManagerReviewReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardManagerReviewReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardManagerReviewReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardManagerReviewReq.java index c2c3f213..8dbe26ad 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardManagerReviewReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardManagerReviewReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.reissuecard; +package org.dromara.project.domain.dto.reissuecard; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardQueryReq.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardQueryReq.java index 9aae37f1..54602f94 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/reissuecard/BusReissueCardQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/reissuecard/BusReissueCardQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.reissuecard; +package org.dromara.project.domain.dto.reissuecard; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/userprojectrelevancy/BusUserProjectRelevancyCreateReq.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/userprojectrelevancy/BusUserProjectRelevancyCreateReq.java index f55a2a15..30c0dd28 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/userprojectrelevancy/BusUserProjectRelevancyCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.userprojectrelevancy; +package org.dromara.project.domain.dto.userprojectrelevancy; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/userprojectrelevancy/BusUserProjectRelevancyQueryReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/userprojectrelevancy/BusUserProjectRelevancyQueryReq.java index a7ba6943..d11486df 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/userprojectrelevancy/BusUserProjectRelevancyQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.userprojectrelevancy; +package org.dromara.project.domain.dto.userprojectrelevancy; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/userprojectrelevancy/BusUserProjectRelevancyUpdateReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/userprojectrelevancy/BusUserProjectRelevancyUpdateReq.java index 53f45031..e6d842e9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/BusUserProjectRelevancyUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/userprojectrelevancy/BusUserProjectRelevancyUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.userprojectrelevancy; +package org.dromara.project.domain.dto.userprojectrelevancy; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workerdailyreport/BusWorkerDailyReportQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workerdailyreport/BusWorkerDailyReportQueryReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workerdailyreport/BusWorkerDailyReportQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workerdailyreport/BusWorkerDailyReportQueryReq.java index 033d18ec..2a075c24 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workerdailyreport/BusWorkerDailyReportQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workerdailyreport/BusWorkerDailyReportQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.workerdailyreport; +package org.dromara.project.domain.dto.workerdailyreport; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workwage/BusWorkWageCreateReq.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workwage/BusWorkWageCreateReq.java index 7972c059..52144604 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workwage/BusWorkWageCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.workwage; +package org.dromara.project.domain.dto.workwage; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workwage/BusWorkWageQueryReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workwage/BusWorkWageQueryReq.java index b003d62c..60d0c346 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workwage/BusWorkWageQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.workwage; +package org.dromara.project.domain.dto.workwage; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workwage/BusWorkWageUpdateReq.java similarity index 92% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workwage/BusWorkWageUpdateReq.java index 2700724c..a54a8410 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/workwage/BusWorkWageUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/workwage/BusWorkWageUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.project.domain.req.workwage; +package org.dromara.project.domain.dto.workwage; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceService.java index 3dd5e756..5081138b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceService.java @@ -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.project.domain.BusAttendance; -import org.dromara.project.domain.req.attendance.BusAttendanceMonthByUserIdReq; -import org.dromara.project.domain.req.attendance.BusAttendanceQueryReq; -import org.dromara.project.domain.req.attendance.BusAttendanceQueryTwoWeekReq; +import org.dromara.project.domain.dto.attendance.BusAttendanceMonthByUserIdReq; +import org.dromara.project.domain.dto.attendance.BusAttendanceQueryReq; +import org.dromara.project.domain.dto.attendance.BusAttendanceQueryTwoWeekReq; import org.dromara.project.domain.vo.attendance.BusAttendanceClockDateForTwoWeekVo; import org.dromara.project.domain.vo.attendance.BusAttendanceMonthByUserIdVo; import org.dromara.project.domain.vo.attendance.BusAttendanceVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionBlacklistService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionBlacklistService.java index a73a4701..25e31e1a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionBlacklistService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionBlacklistService.java @@ -5,8 +5,8 @@ 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.project.domain.BusConstructionBlacklist; -import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistCreateReq; -import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistQueryReq; +import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistCreateReq; +import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistQueryReq; import org.dromara.project.domain.vo.constructionblacklist.BusConstructionBlacklistVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserExitService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserExitService.java index 95f9dc1b..66ab6e80 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserExitService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserExitService.java @@ -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.project.domain.BusConstructionUserExit; -import org.dromara.project.domain.req.constructionuserexit.BusConstructionUserExitQueryReq; +import org.dromara.project.domain.dto.constructionuserexit.BusConstructionUserExitQueryReq; import org.dromara.project.domain.vo.constructionuserexit.BusConstructionUserExitVo; import java.util.List; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java index 67dfdc95..490675e3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserFileService.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import jakarta.servlet.http.HttpServletResponse; import org.dromara.project.domain.BusConstructionUser; import org.dromara.project.domain.BusConstructionUserFile; -import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileQueryReq; -import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileSaveReq; -import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileTemplateReq; +import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileQueryReq; +import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileSaveReq; +import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileTemplateReq; import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo; import org.springframework.web.multipart.MultipartFile; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java index f0b14597..eaf8535e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java @@ -7,7 +7,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.project.domain.BusConstructionUser; import org.dromara.project.domain.exportvo.BusConstructionUserExportVo; -import org.dromara.project.domain.req.constructionuser.*; +import org.dromara.project.domain.dto.constructionuser.*; import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceMonthVo; import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceTotalVo; import org.dromara.project.domain.vo.constructionuser.BusConstructionUserGisVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java index 428ddc2f..768a798c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java @@ -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.project.domain.BusContractor; -import org.dromara.project.domain.req.contractor.BusContractorCreateReq; -import org.dromara.project.domain.req.contractor.BusContractorQueryReq; -import org.dromara.project.domain.req.contractor.BusContractorUpdateReq; +import org.dromara.project.domain.dto.contractor.BusContractorCreateReq; +import org.dromara.project.domain.dto.contractor.BusContractorQueryReq; +import org.dromara.project.domain.dto.contractor.BusContractorUpdateReq; import org.dromara.project.domain.vo.contractor.BusContractorVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java index d83e149c..1c8a5399 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusLeaveService.java @@ -6,8 +6,8 @@ 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.project.domain.BusLeave; -import org.dromara.project.domain.req.leave.BusLeaveManagerReviewReq; -import org.dromara.project.domain.req.leave.BusLeaveQueryReq; +import org.dromara.project.domain.dto.leave.BusLeaveManagerReviewReq; +import org.dromara.project.domain.dto.leave.BusLeaveQueryReq; import org.dromara.project.domain.vo.leave.BusLeaveVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectFileService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectFileService.java index 3bd2cee8..0eafc00c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectFileService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectFileService.java @@ -7,9 +7,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.project.domain.BusProjectFile; -import org.dromara.project.domain.req.projectfile.BusProjectFileQueryReq; -import org.dromara.project.domain.req.projectfile.BusProjectFileUpdateReq; -import org.dromara.project.domain.req.projectfile.BusProjectFileUploadDxfReq; +import org.dromara.project.domain.dto.projectfile.BusProjectFileQueryReq; +import org.dromara.project.domain.dto.projectfile.BusProjectFileUpdateReq; +import org.dromara.project.domain.dto.projectfile.BusProjectFileUploadDxfReq; import org.dromara.project.domain.vo.projectfile.BusProjectFileVo; import org.springframework.web.multipart.MultipartFile; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectNewsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectNewsService.java index e06e66df..d6a24978 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectNewsService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectNewsService.java @@ -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.project.domain.BusProjectNews; -import org.dromara.project.domain.req.projectnews.BusProjectNewsCreateReq; -import org.dromara.project.domain.req.projectnews.BusProjectNewsGisReq; -import org.dromara.project.domain.req.projectnews.BusProjectNewsQueryReq; -import org.dromara.project.domain.req.projectnews.BusProjectNewsUpdateReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsCreateReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsGisReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsQueryReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsUpdateReq; import org.dromara.project.domain.vo.projectnews.BusProjectNewsGisVo; import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java index 081f04f1..a1b18441 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java @@ -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.project.domain.BusProject; -import org.dromara.project.domain.req.project.BusProjectCreateReq; -import org.dromara.project.domain.req.project.BusProjectQueryReq; -import org.dromara.project.domain.req.project.BusProjectUpdateReq; +import org.dromara.project.domain.dto.project.BusProjectCreateReq; +import org.dromara.project.domain.dto.project.BusProjectQueryReq; +import org.dromara.project.domain.dto.project.BusProjectUpdateReq; import org.dromara.project.domain.vo.project.BusProjectContractorListVo; import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo; import org.dromara.project.domain.vo.project.BusProjectVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java index 61109e55..d9c86188 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java @@ -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.project.domain.BusProjectTeamMember; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberCreateReq; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberExitReq; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberQueryReq; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberUpdateReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberCreateReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberExitReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberQueryReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberUpdateReq; import org.dromara.project.domain.vo.projectteammember.BusProjectTeamMemberVo; import java.util.List; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java index 9c3c0531..4771d31b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java @@ -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.project.domain.BusProjectTeam; -import org.dromara.project.domain.req.projectteam.BusProjectTeamCreateReq; -import org.dromara.project.domain.req.projectteam.BusProjectTeamQueryReq; -import org.dromara.project.domain.req.projectteam.BusProjectTeamUpdateReq; +import org.dromara.project.domain.dto.projectteam.BusProjectTeamCreateReq; +import org.dromara.project.domain.dto.projectteam.BusProjectTeamQueryReq; +import org.dromara.project.domain.dto.projectteam.BusProjectTeamUpdateReq; import org.dromara.project.domain.vo.projectteam.BusProjectTeamForemanVo; import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java index 70848432..84dd10e4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusReissueCardService.java @@ -6,8 +6,8 @@ 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.project.domain.BusReissueCard; -import org.dromara.project.domain.req.reissuecard.BusReissueCardManagerReviewReq; -import org.dromara.project.domain.req.reissuecard.BusReissueCardQueryReq; +import org.dromara.project.domain.dto.reissuecard.BusReissueCardManagerReviewReq; +import org.dromara.project.domain.dto.reissuecard.BusReissueCardQueryReq; import org.dromara.project.domain.vo.reissuecard.BusReissueCardVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java index 88bd623f..5a23bed9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java @@ -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.project.domain.BusUserProjectRelevancy; -import org.dromara.project.domain.req.project.BusProjectBatchByProjectListReq; -import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyCreateReq; -import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyQueryReq; -import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyUpdateReq; +import org.dromara.project.domain.dto.project.BusProjectBatchByProjectListReq; +import org.dromara.project.domain.dto.userprojectrelevancy.BusUserProjectRelevancyCreateReq; +import org.dromara.project.domain.dto.userprojectrelevancy.BusUserProjectRelevancyQueryReq; +import org.dromara.project.domain.dto.userprojectrelevancy.BusUserProjectRelevancyUpdateReq; import org.dromara.project.domain.vo.userprojectrelevancy.BusLoginUserProjectRelevancyVo; import org.dromara.project.domain.vo.userprojectrelevancy.BusUserProjectRelevancyVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkWageService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkWageService.java index 68e8fe10..b307995b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkWageService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkWageService.java @@ -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.project.domain.BusWorkWage; -import org.dromara.project.domain.req.workwage.BusWorkWageCreateReq; -import org.dromara.project.domain.req.workwage.BusWorkWageQueryReq; -import org.dromara.project.domain.req.workwage.BusWorkWageUpdateReq; +import org.dromara.project.domain.dto.workwage.BusWorkWageCreateReq; +import org.dromara.project.domain.dto.workwage.BusWorkWageQueryReq; +import org.dromara.project.domain.dto.workwage.BusWorkWageUpdateReq; import org.dromara.project.domain.vo.workwage.BusWorkWageVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkerDailyReportService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkerDailyReportService.java index b5a67ec0..50dd5098 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkerDailyReportService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusWorkerDailyReportService.java @@ -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.project.domain.BusWorkerDailyReport; -import org.dromara.project.domain.req.workerdailyreport.BusWorkerDailyReportQueryReq; +import org.dromara.project.domain.dto.workerdailyreport.BusWorkerDailyReportQueryReq; import org.dromara.project.domain.vo.workerdailyreport.BusWorkerDailyReportVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java index 3d251aac..e72b8d19 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java @@ -21,9 +21,9 @@ import org.dromara.project.domain.BusProjectTeamMember; import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum; import org.dromara.project.domain.enums.BusAttendanceCommuterEnum; import org.dromara.project.domain.enums.BusAttendanceStatusEnum; -import org.dromara.project.domain.req.attendance.BusAttendanceMonthByUserIdReq; -import org.dromara.project.domain.req.attendance.BusAttendanceQueryReq; -import org.dromara.project.domain.req.attendance.BusAttendanceQueryTwoWeekReq; +import org.dromara.project.domain.dto.attendance.BusAttendanceMonthByUserIdReq; +import org.dromara.project.domain.dto.attendance.BusAttendanceQueryReq; +import org.dromara.project.domain.dto.attendance.BusAttendanceQueryTwoWeekReq; import org.dromara.project.domain.vo.attendance.BusAttendanceClockDateForTwoWeekVo; import org.dromara.project.domain.vo.attendance.BusAttendanceListByDay; import org.dromara.project.domain.vo.attendance.BusAttendanceMonthByUserIdVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java index 51d92fdc..cf712b21 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionBlacklistServiceImpl.java @@ -15,8 +15,8 @@ import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.domain.BusConstructionBlacklist; import org.dromara.project.domain.BusConstructionUser; import org.dromara.project.domain.BusProjectTeamMember; -import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistCreateReq; -import org.dromara.project.domain.req.constructionblacklist.BusConstructionBlacklistQueryReq; +import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistCreateReq; +import org.dromara.project.domain.dto.constructionblacklist.BusConstructionBlacklistQueryReq; import org.dromara.project.domain.vo.constructionblacklist.BusConstructionBlacklistVo; import org.dromara.project.mapper.BusConstructionBlacklistMapper; import org.dromara.project.service.IBusConstructionBlacklistService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserExitServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserExitServiceImpl.java index 5d57638b..89166eae 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserExitServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserExitServiceImpl.java @@ -11,7 +11,7 @@ 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.project.domain.BusConstructionUserExit; -import org.dromara.project.domain.req.constructionuserexit.BusConstructionUserExitQueryReq; +import org.dromara.project.domain.dto.constructionuserexit.BusConstructionUserExitQueryReq; import org.dromara.project.domain.vo.constructionuserexit.BusConstructionUserExitVo; import org.dromara.project.mapper.BusConstructionUserExitMapper; import org.dromara.project.service.IBusConstructionUserExitService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java index 3daeb537..59511779 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserFileServiceImpl.java @@ -23,10 +23,10 @@ import org.dromara.project.domain.BusConstructionBlacklist; import org.dromara.project.domain.BusConstructionUser; import org.dromara.project.domain.BusConstructionUserFile; import org.dromara.project.domain.BusProject; -import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileQueryReq; -import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileReq; -import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileSaveReq; -import org.dromara.project.domain.req.constructionuserfile.BusConstructionUserFileTemplateReq; +import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileQueryReq; +import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileReq; +import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileSaveReq; +import org.dromara.project.domain.dto.constructionuserfile.BusConstructionUserFileTemplateReq; import org.dromara.project.domain.vo.constructionuserfile.BusConstructionUserFileVo; import org.dromara.project.mapper.BusConstructionUserFileMapper; import org.dromara.project.service.IBusConstructionBlacklistService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java index 07db2bf1..b6296036 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java @@ -25,7 +25,7 @@ import org.dromara.project.domain.enums.BusAttendanceCommuterEnum; import org.dromara.project.domain.enums.BusConstructionUserAttendanceStatusEnum; import org.dromara.project.domain.enums.BusConstructionUserFileStatusEnum; import org.dromara.project.domain.exportvo.BusConstructionUserExportVo; -import org.dromara.project.domain.req.constructionuser.*; +import org.dromara.project.domain.dto.constructionuser.*; import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceByDay; import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceMonthVo; import org.dromara.project.domain.vo.constructionuser.BusConstructionUserAttendanceTotalVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java index 716b5e8a..1cb80a14 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java @@ -18,9 +18,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.domain.BusConstructionUser; import org.dromara.project.domain.BusContractor; -import org.dromara.project.domain.req.contractor.BusContractorCreateReq; -import org.dromara.project.domain.req.contractor.BusContractorQueryReq; -import org.dromara.project.domain.req.contractor.BusContractorUpdateReq; +import org.dromara.project.domain.dto.contractor.BusContractorCreateReq; +import org.dromara.project.domain.dto.contractor.BusContractorQueryReq; +import org.dromara.project.domain.dto.contractor.BusContractorUpdateReq; import org.dromara.project.domain.vo.contractor.BusContractorVo; import org.dromara.project.mapper.BusContractorMapper; import org.dromara.project.service.IBusConstructionUserService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java index 44830b91..bc2fa8d4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusLeaveServiceImpl.java @@ -19,8 +19,8 @@ import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum; import org.dromara.project.domain.enums.BusAttendanceCommuterEnum; import org.dromara.project.domain.enums.BusOpinionStatusEnum; import org.dromara.project.domain.enums.BusReviewStatusEnum; -import org.dromara.project.domain.req.leave.BusLeaveManagerReviewReq; -import org.dromara.project.domain.req.leave.BusLeaveQueryReq; +import org.dromara.project.domain.dto.leave.BusLeaveManagerReviewReq; +import org.dromara.project.domain.dto.leave.BusLeaveQueryReq; import org.dromara.project.domain.vo.leave.BusLeaveVo; import org.dromara.project.mapper.BusLeaveMapper; import org.dromara.project.service.IBusAttendanceService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectFileServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectFileServiceImpl.java index c859da82..a477a06c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectFileServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectFileServiceImpl.java @@ -23,9 +23,9 @@ import org.dromara.common.sse.utils.SseMessageUtils; import org.dromara.constant.DesignMapFileConstant; import org.dromara.project.domain.BusProject; import org.dromara.project.domain.BusProjectFile; -import org.dromara.project.domain.req.projectfile.BusProjectFileQueryReq; -import org.dromara.project.domain.req.projectfile.BusProjectFileUpdateReq; -import org.dromara.project.domain.req.projectfile.BusProjectFileUploadDxfReq; +import org.dromara.project.domain.dto.projectfile.BusProjectFileQueryReq; +import org.dromara.project.domain.dto.projectfile.BusProjectFileUpdateReq; +import org.dromara.project.domain.dto.projectfile.BusProjectFileUploadDxfReq; import org.dromara.project.domain.vo.projectfile.BusProjectFileVo; import org.dromara.project.mapper.BusProjectFileMapper; import org.dromara.project.service.IBusProjectFileService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java index 43f7a486..eac433b3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectNewsServiceImpl.java @@ -12,10 +12,10 @@ 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.project.domain.BusProjectNews; -import org.dromara.project.domain.req.projectnews.BusProjectNewsCreateReq; -import org.dromara.project.domain.req.projectnews.BusProjectNewsGisReq; -import org.dromara.project.domain.req.projectnews.BusProjectNewsQueryReq; -import org.dromara.project.domain.req.projectnews.BusProjectNewsUpdateReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsCreateReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsGisReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsQueryReq; +import org.dromara.project.domain.dto.projectnews.BusProjectNewsUpdateReq; import org.dromara.project.domain.vo.projectnews.BusProjectNewsGisVo; import org.dromara.project.domain.vo.projectnews.BusProjectNewsVo; import org.dromara.project.mapper.BusProjectNewsMapper; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java index 419b2469..5aa739ec 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java @@ -33,9 +33,9 @@ import org.dromara.project.domain.BusContractor; import org.dromara.project.domain.BusProject; import org.dromara.project.domain.BusProjectFile; import org.dromara.project.domain.BusUserProjectRelevancy; -import org.dromara.project.domain.req.project.BusProjectCreateReq; -import org.dromara.project.domain.req.project.BusProjectQueryReq; -import org.dromara.project.domain.req.project.BusProjectUpdateReq; +import org.dromara.project.domain.dto.project.BusProjectCreateReq; +import org.dromara.project.domain.dto.project.BusProjectQueryReq; +import org.dromara.project.domain.dto.project.BusProjectUpdateReq; import org.dromara.project.domain.vo.project.BusProjectContractorListVo; import org.dromara.project.domain.vo.project.BusProjectSafetyDayVo; import org.dromara.project.domain.vo.project.BusProjectVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java index 44702b1d..42bd59bd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java @@ -20,10 +20,10 @@ import org.dromara.project.domain.BusConstructionUserExit; import org.dromara.project.domain.BusProjectTeam; import org.dromara.project.domain.BusProjectTeamMember; import org.dromara.project.domain.enums.BusProjectTeamMemberPostEnum; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberCreateReq; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberExitReq; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberQueryReq; -import org.dromara.project.domain.req.projectteammember.BusProjectTeamMemberUpdateReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberCreateReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberExitReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberQueryReq; +import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberUpdateReq; import org.dromara.project.domain.vo.projectteammember.BusProjectTeamMemberVo; import org.dromara.project.mapper.BusProjectTeamMemberMapper; import org.dromara.project.service.*; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java index 06dd9f08..2bde18d1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java @@ -18,9 +18,9 @@ import org.dromara.project.domain.BusConstructionUser; import org.dromara.project.domain.BusProjectTeam; import org.dromara.project.domain.BusProjectTeamMember; import org.dromara.project.domain.enums.BusProjectTeamMemberPostEnum; -import org.dromara.project.domain.req.projectteam.BusProjectTeamCreateReq; -import org.dromara.project.domain.req.projectteam.BusProjectTeamQueryReq; -import org.dromara.project.domain.req.projectteam.BusProjectTeamUpdateReq; +import org.dromara.project.domain.dto.projectteam.BusProjectTeamCreateReq; +import org.dromara.project.domain.dto.projectteam.BusProjectTeamQueryReq; +import org.dromara.project.domain.dto.projectteam.BusProjectTeamUpdateReq; import org.dromara.project.domain.vo.projectteam.BusForemanVo; import org.dromara.project.domain.vo.projectteam.BusProjectTeamForemanVo; import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java index fa6402c9..00502b12 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java @@ -20,8 +20,8 @@ import org.dromara.project.domain.enums.BusAttendanceClockStatusEnum; import org.dromara.project.domain.enums.BusAttendanceCommuterEnum; import org.dromara.project.domain.enums.BusOpinionStatusEnum; import org.dromara.project.domain.enums.BusReviewStatusEnum; -import org.dromara.project.domain.req.reissuecard.BusReissueCardManagerReviewReq; -import org.dromara.project.domain.req.reissuecard.BusReissueCardQueryReq; +import org.dromara.project.domain.dto.reissuecard.BusReissueCardManagerReviewReq; +import org.dromara.project.domain.dto.reissuecard.BusReissueCardQueryReq; import org.dromara.project.domain.vo.reissuecard.BusReissueCardVo; import org.dromara.project.mapper.BusReissueCardMapper; import org.dromara.project.service.IBusAttendanceService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java index 437329ba..58ad4dba 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java @@ -15,10 +15,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.domain.BusProject; import org.dromara.project.domain.BusUserProjectRelevancy; -import org.dromara.project.domain.req.project.BusProjectBatchByProjectListReq; -import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyCreateReq; -import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyQueryReq; -import org.dromara.project.domain.req.userprojectrelevancy.BusUserProjectRelevancyUpdateReq; +import org.dromara.project.domain.dto.project.BusProjectBatchByProjectListReq; +import org.dromara.project.domain.dto.userprojectrelevancy.BusUserProjectRelevancyCreateReq; +import org.dromara.project.domain.dto.userprojectrelevancy.BusUserProjectRelevancyQueryReq; +import org.dromara.project.domain.dto.userprojectrelevancy.BusUserProjectRelevancyUpdateReq; import org.dromara.project.domain.vo.userprojectrelevancy.BusLoginUserProjectRelevancyVo; import org.dromara.project.domain.vo.userprojectrelevancy.BusUserProjectRelevancyVo; import org.dromara.project.mapper.BusUserProjectRelevancyMapper; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkWageServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkWageServiceImpl.java index 9a0cc31b..bea71b35 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkWageServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkWageServiceImpl.java @@ -14,9 +14,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.domain.BusWorkWage; import org.dromara.project.domain.enums.BusWageMeasureUnitEnum; -import org.dromara.project.domain.req.workwage.BusWorkWageCreateReq; -import org.dromara.project.domain.req.workwage.BusWorkWageQueryReq; -import org.dromara.project.domain.req.workwage.BusWorkWageUpdateReq; +import org.dromara.project.domain.dto.workwage.BusWorkWageCreateReq; +import org.dromara.project.domain.dto.workwage.BusWorkWageQueryReq; +import org.dromara.project.domain.dto.workwage.BusWorkWageUpdateReq; import org.dromara.project.domain.vo.workwage.BusWorkWageVo; import org.dromara.project.mapper.BusWorkWageMapper; import org.dromara.project.service.IBusProjectService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkerDailyReportServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkerDailyReportServiceImpl.java index f30859ff..686c2e8f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkerDailyReportServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusWorkerDailyReportServiceImpl.java @@ -14,7 +14,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.project.domain.BusDailyPieceItem; import org.dromara.project.domain.BusProjectTeam; import org.dromara.project.domain.BusWorkerDailyReport; -import org.dromara.project.domain.req.workerdailyreport.BusWorkerDailyReportQueryReq; +import org.dromara.project.domain.dto.workerdailyreport.BusWorkerDailyReportQueryReq; import org.dromara.project.domain.vo.dailypieceitem.BusDailyPieceItemVo; import org.dromara.project.domain.vo.workerdailyreport.BusWorkerDailyReportVo; import org.dromara.project.mapper.BusWorkerDailyReportMapper; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityConstructionLogController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityConstructionLogController.java index 75fd97ec..52349770 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityConstructionLogController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityConstructionLogController.java @@ -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.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogCreateReq; -import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogQueryReq; -import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogUpdateReq; +import org.dromara.quality.domain.dto.qualityconstructionlog.QltQualityConstructionLogCreateReq; +import org.dromara.quality.domain.dto.qualityconstructionlog.QltQualityConstructionLogQueryReq; +import org.dromara.quality.domain.dto.qualityconstructionlog.QltQualityConstructionLogUpdateReq; import org.dromara.quality.domain.vo.qualityconstructionlog.QltQualityConstructionLogVo; import org.dromara.quality.service.IQltQualityConstructionLogService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java index 33523504..673ea18f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java @@ -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.quality.domain.req.qualityinspection.QltQualityInspectionCreateReq; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionGisReq; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionQueryReq; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionUpdateReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionCreateReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionGisReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionQueryReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionUpdateReq; import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo; import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionListGisVo; import org.dromara.quality.service.IQltQualityInspectionService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityconstructionlog/QltQualityConstructionLogCreateReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityconstructionlog/QltQualityConstructionLogCreateReq.java index 57adc5fe..2f197c41 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityconstructionlog/QltQualityConstructionLogCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.quality.domain.req.qualityconstructionlog; +package org.dromara.quality.domain.dto.qualityconstructionlog; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityconstructionlog/QltQualityConstructionLogQueryReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityconstructionlog/QltQualityConstructionLogQueryReq.java index a0c4590b..c4de56e7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityconstructionlog/QltQualityConstructionLogQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.quality.domain.req.qualityconstructionlog; +package org.dromara.quality.domain.dto.qualityconstructionlog; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityconstructionlog/QltQualityConstructionLogUpdateReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityconstructionlog/QltQualityConstructionLogUpdateReq.java index 3f6b8685..47fa0a52 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityconstructionlog/QltQualityConstructionLogUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityconstructionlog/QltQualityConstructionLogUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.quality.domain.req.qualityconstructionlog; +package org.dromara.quality.domain.dto.qualityconstructionlog; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionCreateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionCreateReq.java index 62c17386..4ca0476c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.quality.domain.req.qualityinspection; +package org.dromara.quality.domain.dto.qualityinspection; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionGisReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionGisReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionGisReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionGisReq.java index b3ca1abf..d881e445 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionGisReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionGisReq.java @@ -1,4 +1,4 @@ -package org.dromara.quality.domain.req.qualityinspection; +package org.dromara.quality.domain.dto.qualityinspection; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionQueryReq.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionQueryReq.java index 54244701..96100511 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.quality.domain.req.qualityinspection; +package org.dromara.quality.domain.dto.qualityinspection; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionUpdateReq.java similarity index 96% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionUpdateReq.java index e99604ac..5f21342c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/req/qualityinspection/QltQualityInspectionUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.quality.domain.req.qualityinspection; +package org.dromara.quality.domain.dto.qualityinspection; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityConstructionLogService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityConstructionLogService.java index 4c4b09c3..bda018ec 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityConstructionLogService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityConstructionLogService.java @@ -7,9 +7,9 @@ import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.quality.domain.QltQualityConstructionLog; -import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogCreateReq; -import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogQueryReq; -import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogUpdateReq; +import org.dromara.quality.domain.dto.qualityconstructionlog.QltQualityConstructionLogCreateReq; +import org.dromara.quality.domain.dto.qualityconstructionlog.QltQualityConstructionLogQueryReq; +import org.dromara.quality.domain.dto.qualityconstructionlog.QltQualityConstructionLogUpdateReq; import org.dromara.quality.domain.vo.qualityconstructionlog.QltQualityConstructionLogVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityInspectionService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityInspectionService.java index 9dee821d..553b10ed 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityInspectionService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/IQltQualityInspectionService.java @@ -7,10 +7,10 @@ import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.quality.domain.QltQualityInspection; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionCreateReq; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionGisReq; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionQueryReq; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionUpdateReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionCreateReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionGisReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionQueryReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionUpdateReq; import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo; import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionListGisVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityConstructionLogServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityConstructionLogServiceImpl.java index 75d748ca..7abeac97 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityConstructionLogServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityConstructionLogServiceImpl.java @@ -25,9 +25,9 @@ import org.dromara.project.domain.BusProject; import org.dromara.project.service.IBusProjectService; import org.dromara.quality.constant.QltQualityConstant; import org.dromara.quality.domain.QltQualityConstructionLog; -import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogCreateReq; -import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogQueryReq; -import org.dromara.quality.domain.req.qualityconstructionlog.QltQualityConstructionLogUpdateReq; +import org.dromara.quality.domain.dto.qualityconstructionlog.QltQualityConstructionLogCreateReq; +import org.dromara.quality.domain.dto.qualityconstructionlog.QltQualityConstructionLogQueryReq; +import org.dromara.quality.domain.dto.qualityconstructionlog.QltQualityConstructionLogUpdateReq; import org.dromara.quality.domain.vo.qualityconstructionlog.QltQualityConstructionLogVo; import org.dromara.quality.mapper.QltQualityConstructionLogMapper; import org.dromara.quality.service.IQltQualityConstructionLogService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java index 38ae7280..7721885e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java @@ -29,10 +29,10 @@ import org.dromara.quality.constant.QltQualityConstant; import org.dromara.quality.domain.QltQualityInspection; import org.dromara.quality.domain.enums.QltQualityInspectionStatusEnum; import org.dromara.quality.domain.enums.QltQualityInspectionVerificationTypeEnum; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionCreateReq; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionGisReq; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionQueryReq; -import org.dromara.quality.domain.req.qualityinspection.QltQualityInspectionUpdateReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionCreateReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionGisReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionQueryReq; +import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionUpdateReq; import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionGis; import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionListGisVo; import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDocumentSafetyMeetingController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDocumentSafetyMeetingController.java index 5cbbfecb..e217439a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDocumentSafetyMeetingController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDocumentSafetyMeetingController.java @@ -11,9 +11,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.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFileReq; -import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFolderReq; -import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingQueryReq; +import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingCreateFileReq; +import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingCreateFolderReq; +import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingQueryReq; import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingVo; import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingRecycleBinVo; import org.dromara.safety.service.IHseDocumentSafetyMeetingService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionBankController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionBankController.java index bf828e47..0b73df7e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionBankController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionBankController.java @@ -16,9 +16,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.safety.domain.req.questionbank.HseQuestionBankCreateReq; -import org.dromara.safety.domain.req.questionbank.HseQuestionBankQueryReq; -import org.dromara.safety.domain.req.questionbank.HseQuestionBankUpdateReq; +import org.dromara.safety.domain.dto.questionbank.HseQuestionBankCreateReq; +import org.dromara.safety.domain.dto.questionbank.HseQuestionBankQueryReq; +import org.dromara.safety.domain.dto.questionbank.HseQuestionBankUpdateReq; import org.dromara.safety.domain.vo.questionbank.HseQuestionBankVo; import org.dromara.safety.service.IHseQuestionBankService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionUserAnswerController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionUserAnswerController.java index c7fc31b1..8d4c02ed 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionUserAnswerController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionUserAnswerController.java @@ -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.safety.domain.req.questionuseranswer.HseQuestionUserAnswerBatchDownloadFileReq; -import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerCreateReq; -import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerQueryReq; -import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerUpdateReq; +import org.dromara.safety.domain.dto.questionuseranswer.HseQuestionUserAnswerBatchDownloadFileReq; +import org.dromara.safety.domain.dto.questionuseranswer.HseQuestionUserAnswerCreateReq; +import org.dromara.safety.domain.dto.questionuseranswer.HseQuestionUserAnswerQueryReq; +import org.dromara.safety.domain.dto.questionuseranswer.HseQuestionUserAnswerUpdateReq; import org.dromara.safety.domain.vo.questionuseranswer.HseQuestionUserAnswerVo; import org.dromara.safety.service.IHseQuestionUserAnswerService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsCategoryController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsCategoryController.java index b921d542..d7876c64 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsCategoryController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsCategoryController.java @@ -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.safety.domain.req.questionscategory.HseQuestionsCategoryCreateReq; -import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryQueryReq; -import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryUpdateReq; +import org.dromara.safety.domain.dto.questionscategory.HseQuestionsCategoryCreateReq; +import org.dromara.safety.domain.dto.questionscategory.HseQuestionsCategoryQueryReq; +import org.dromara.safety.domain.dto.questionscategory.HseQuestionsCategoryUpdateReq; import org.dromara.safety.domain.vo.questionscategory.HseQuestionsCategoryVo; import org.dromara.safety.service.IHseQuestionsCategoryService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsConfigController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsConfigController.java index 48f79df5..224b53c0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsConfigController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseQuestionsConfigController.java @@ -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.safety.domain.req.questionsconfig.HseQuestionsConfigCreateReq; -import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigQueryReq; -import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigUpdateReq; +import org.dromara.safety.domain.dto.questionsconfig.HseQuestionsConfigCreateReq; +import org.dromara.safety.domain.dto.questionsconfig.HseQuestionsConfigQueryReq; +import org.dromara.safety.domain.dto.questionsconfig.HseQuestionsConfigUpdateReq; import org.dromara.safety.domain.vo.questionsconfig.HseQuestionsConfigVo; import org.dromara.safety.service.IHseQuestionsConfigService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java index 2b5180b6..6f644d28 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java @@ -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.safety.domain.req.safetyinspection.HseSafetyInspectionCreateReq; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionGisReq; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionQueryReq; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionUpdateReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionCreateReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionGisReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionQueryReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionUpdateReq; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo; import org.dromara.safety.service.IHseSafetyInspectionService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyLogController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyLogController.java index 33df40ad..9bc76892 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyLogController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyLogController.java @@ -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.safety.domain.req.safetylog.HseSafetyLogCreateReq; -import org.dromara.safety.domain.req.safetylog.HseSafetyLogQueryReq; -import org.dromara.safety.domain.req.safetylog.HseSafetyLogUpdateReq; +import org.dromara.safety.domain.dto.safetylog.HseSafetyLogCreateReq; +import org.dromara.safety.domain.dto.safetylog.HseSafetyLogQueryReq; +import org.dromara.safety.domain.dto.safetylog.HseSafetyLogUpdateReq; import org.dromara.safety.domain.vo.safetylog.HseSafetyLogVo; import org.dromara.safety.service.IHseSafetyLogService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyWeeklyReportController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyWeeklyReportController.java index d49f5af0..4dece816 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyWeeklyReportController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyWeeklyReportController.java @@ -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.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportCreateReq; -import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportQueryReq; -import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportUpdateReq; +import org.dromara.safety.domain.dto.safetyweeklyreport.HseSafetyWeeklyReportCreateReq; +import org.dromara.safety.domain.dto.safetyweeklyreport.HseSafetyWeeklyReportQueryReq; +import org.dromara.safety.domain.dto.safetyweeklyreport.HseSafetyWeeklyReportUpdateReq; import org.dromara.safety.domain.vo.safetyweeklyreport.HseSafetyWeeklyReportVo; import org.dromara.safety.service.IHseSafetyWeeklyReportService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseTeamMeetingController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseTeamMeetingController.java index cf07e703..af0a57d5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseTeamMeetingController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseTeamMeetingController.java @@ -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.safety.domain.req.teammeeting.HseTeamMeetingCreateReq; -import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingQueryReq; -import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingUpdateReq; +import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingCreateReq; +import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingQueryReq; +import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingUpdateReq; import org.dromara.safety.domain.vo.teammeeting.HseTeamMeetingVo; import org.dromara.safety.service.IHseTeamMeetingService; import org.springframework.validation.annotation.Validated; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFileReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/documentsafetymeeting/HseDocumentSafetyMeetingCreateFileReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFileReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/documentsafetymeeting/HseDocumentSafetyMeetingCreateFileReq.java index beb7aa74..980e62af 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFileReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/documentsafetymeeting/HseDocumentSafetyMeetingCreateFileReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.documentsafetymeeting; +package org.dromara.safety.domain.dto.documentsafetymeeting; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFolderReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/documentsafetymeeting/HseDocumentSafetyMeetingCreateFolderReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFolderReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/documentsafetymeeting/HseDocumentSafetyMeetingCreateFolderReq.java index f35dd5df..7715c38d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingCreateFolderReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/documentsafetymeeting/HseDocumentSafetyMeetingCreateFolderReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.documentsafetymeeting; +package org.dromara.safety.domain.dto.documentsafetymeeting; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/documentsafetymeeting/HseDocumentSafetyMeetingQueryReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/documentsafetymeeting/HseDocumentSafetyMeetingQueryReq.java index 5942f75c..df879c3f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/documentsafetymeeting/HseDocumentSafetyMeetingQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/documentsafetymeeting/HseDocumentSafetyMeetingQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.documentsafetymeeting; +package org.dromara.safety.domain.dto.documentsafetymeeting; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionbank/HseQuestionBankCreateReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionbank/HseQuestionBankCreateReq.java index b3d29585..8c6dc204 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionbank/HseQuestionBankCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionbank; +package org.dromara.safety.domain.dto.questionbank; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionbank/HseQuestionBankQueryReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionbank/HseQuestionBankQueryReq.java index bbe51818..7bbc34c3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionbank/HseQuestionBankQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionbank; +package org.dromara.safety.domain.dto.questionbank; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionbank/HseQuestionBankUpdateReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionbank/HseQuestionBankUpdateReq.java index 758cf112..97c753dc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionbank/HseQuestionBankUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionbank/HseQuestionBankUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionbank; +package org.dromara.safety.domain.dto.questionbank; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionscategory/HseQuestionsCategoryCreateReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionscategory/HseQuestionsCategoryCreateReq.java index 6a34c16a..ce11725f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionscategory/HseQuestionsCategoryCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionscategory; +package org.dromara.safety.domain.dto.questionscategory; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionscategory/HseQuestionsCategoryQueryReq.java similarity index 87% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionscategory/HseQuestionsCategoryQueryReq.java index af023ce8..688769c6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionscategory/HseQuestionsCategoryQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionscategory; +package org.dromara.safety.domain.dto.questionscategory; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionscategory/HseQuestionsCategoryUpdateReq.java similarity index 89% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionscategory/HseQuestionsCategoryUpdateReq.java index 1585c421..a459abfb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionscategory/HseQuestionsCategoryUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionscategory/HseQuestionsCategoryUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionscategory; +package org.dromara.safety.domain.dto.questionscategory; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionsconfig/HseQuestionsConfigCreateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionsconfig/HseQuestionsConfigCreateReq.java index d0f9e800..6623b73d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionsconfig/HseQuestionsConfigCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionsconfig; +package org.dromara.safety.domain.dto.questionsconfig; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionsconfig/HseQuestionsConfigQueryReq.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionsconfig/HseQuestionsConfigQueryReq.java index fd2dca58..d9dea40c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionsconfig/HseQuestionsConfigQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionsconfig; +package org.dromara.safety.domain.dto.questionsconfig; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionsconfig/HseQuestionsConfigUpdateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionsconfig/HseQuestionsConfigUpdateReq.java index 65ee19b5..6054866b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionsconfig/HseQuestionsConfigUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionsconfig/HseQuestionsConfigUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionsconfig; +package org.dromara.safety.domain.dto.questionsconfig; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerBatchDownloadFileReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerBatchDownloadFileReq.java similarity index 86% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerBatchDownloadFileReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerBatchDownloadFileReq.java index df2899bd..96167bcf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerBatchDownloadFileReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerBatchDownloadFileReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionuseranswer; +package org.dromara.safety.domain.dto.questionuseranswer; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerCreateReq.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerCreateReq.java index afbb1d6e..792bfcc0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionuseranswer; +package org.dromara.safety.domain.dto.questionuseranswer; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerQueryReq.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerQueryReq.java index 9e5a0344..5a2bfad6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionuseranswer; +package org.dromara.safety.domain.dto.questionuseranswer; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerUpdateReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerUpdateReq.java index a5e73f08..db755125 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionuseranswer; +package org.dromara.safety.domain.dto.questionuseranswer; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUploadTemp.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerUploadTemp.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUploadTemp.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerUploadTemp.java index 0f415e01..c6c9024e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/questionuseranswer/HseQuestionUserAnswerUploadTemp.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/questionuseranswer/HseQuestionUserAnswerUploadTemp.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.questionuseranswer; +package org.dromara.safety.domain.dto.questionuseranswer; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionCreateReq.java similarity index 97% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionCreateReq.java index deaebf9f..a3dcc8fb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.safetyinspection; +package org.dromara.safety.domain.dto.safetyinspection; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionGisReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionGisReq.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionGisReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionGisReq.java index 6ad79288..1bf3905f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionGisReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionGisReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.safetyinspection; +package org.dromara.safety.domain.dto.safetyinspection; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionQueryReq.java similarity index 94% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionQueryReq.java index dc32b2c6..f3a50fe8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.safetyinspection; +package org.dromara.safety.domain.dto.safetyinspection; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateReq.java similarity index 97% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateReq.java index f5549215..43291a84 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyinspection/HseSafetyInspectionUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.safetyinspection; +package org.dromara.safety.domain.dto.safetyinspection; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetylog/HseSafetyLogCreateReq.java similarity index 96% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetylog/HseSafetyLogCreateReq.java index 3dc89854..4f013004 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetylog/HseSafetyLogCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.safetylog; +package org.dromara.safety.domain.dto.safetylog; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetylog/HseSafetyLogQueryReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetylog/HseSafetyLogQueryReq.java index 84666dea..c1c9cb7a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetylog/HseSafetyLogQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.safetylog; +package org.dromara.safety.domain.dto.safetylog; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetylog/HseSafetyLogUpdateReq.java similarity index 96% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetylog/HseSafetyLogUpdateReq.java index 0dacf33f..3596bf95 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetylog/HseSafetyLogUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetylog/HseSafetyLogUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.safetylog; +package org.dromara.safety.domain.dto.safetylog; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java index f6a63dec..e8398640 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.safetyweeklyreport; +package org.dromara.safety.domain.dto.safetyweeklyreport; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java index 24987de7..ea609622 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.safetyweeklyreport; +package org.dromara.safety.domain.dto.safetyweeklyreport; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java similarity index 91% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java index 0b92f78d..c46550f2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.safetyweeklyreport; +package org.dromara.safety.domain.dto.safetyweeklyreport; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingCreateReq.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingCreateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingCreateReq.java index 36164c52..0fd3f93e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingCreateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.teammeeting; +package org.dromara.safety.domain.dto.teammeeting; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingQueryReq.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingQueryReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingQueryReq.java index 5ef0684e..4183f237 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingQueryReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.teammeeting; +package org.dromara.safety.domain.dto.teammeeting; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingUpdateReq.java similarity index 95% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingUpdateReq.java index d34091a9..2b5ca501 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/req/teammeeting/HseTeamMeetingUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingUpdateReq.java @@ -1,4 +1,4 @@ -package org.dromara.safety.domain.req.teammeeting; +package org.dromara.safety.domain.dto.teammeeting; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDocumentSafetyMeetingService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDocumentSafetyMeetingService.java index 92590bcc..3ebb7bf6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDocumentSafetyMeetingService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseDocumentSafetyMeetingService.java @@ -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.safety.domain.HseDocumentSafetyMeeting; -import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFileReq; -import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFolderReq; -import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingQueryReq; +import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingCreateFileReq; +import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingCreateFolderReq; +import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingQueryReq; import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingRecycleBinVo; import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingVo; import org.springframework.web.multipart.MultipartFile; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionBankService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionBankService.java index 5b4592f7..a6164bed 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionBankService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionBankService.java @@ -7,9 +7,9 @@ import jakarta.servlet.http.HttpServletRequest; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.safety.domain.HseQuestionBank; -import org.dromara.safety.domain.req.questionbank.HseQuestionBankCreateReq; -import org.dromara.safety.domain.req.questionbank.HseQuestionBankQueryReq; -import org.dromara.safety.domain.req.questionbank.HseQuestionBankUpdateReq; +import org.dromara.safety.domain.dto.questionbank.HseQuestionBankCreateReq; +import org.dromara.safety.domain.dto.questionbank.HseQuestionBankQueryReq; +import org.dromara.safety.domain.dto.questionbank.HseQuestionBankUpdateReq; import org.dromara.safety.domain.vo.questionbank.HseQuestionBankVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionUserAnswerService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionUserAnswerService.java index 1c71f9b6..64f016b8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionUserAnswerService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionUserAnswerService.java @@ -7,10 +7,10 @@ import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.safety.domain.HseQuestionUserAnswer; -import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerBatchDownloadFileReq; -import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerCreateReq; -import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerQueryReq; -import org.dromara.safety.domain.req.questionuseranswer.HseQuestionUserAnswerUpdateReq; +import org.dromara.safety.domain.dto.questionuseranswer.HseQuestionUserAnswerBatchDownloadFileReq; +import org.dromara.safety.domain.dto.questionuseranswer.HseQuestionUserAnswerCreateReq; +import org.dromara.safety.domain.dto.questionuseranswer.HseQuestionUserAnswerQueryReq; +import org.dromara.safety.domain.dto.questionuseranswer.HseQuestionUserAnswerUpdateReq; import org.dromara.safety.domain.vo.questionuseranswer.HseQuestionUserAnswerVo; import org.springframework.web.multipart.MultipartFile; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsCategoryService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsCategoryService.java index 9047867c..58c50f4b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsCategoryService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsCategoryService.java @@ -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.safety.domain.HseQuestionsCategory; -import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryCreateReq; -import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryQueryReq; -import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryUpdateReq; +import org.dromara.safety.domain.dto.questionscategory.HseQuestionsCategoryCreateReq; +import org.dromara.safety.domain.dto.questionscategory.HseQuestionsCategoryQueryReq; +import org.dromara.safety.domain.dto.questionscategory.HseQuestionsCategoryUpdateReq; import org.dromara.safety.domain.vo.questionscategory.HseQuestionsCategoryVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsConfigService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsConfigService.java index ac0f13b8..30aa30a8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsConfigService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseQuestionsConfigService.java @@ -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.safety.domain.HseQuestionsConfig; -import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigCreateReq; -import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigQueryReq; -import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigUpdateReq; +import org.dromara.safety.domain.dto.questionsconfig.HseQuestionsConfigCreateReq; +import org.dromara.safety.domain.dto.questionsconfig.HseQuestionsConfigQueryReq; +import org.dromara.safety.domain.dto.questionsconfig.HseQuestionsConfigUpdateReq; import org.dromara.safety.domain.vo.questionsconfig.HseQuestionsConfigVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java index a84a73b5..c7c23918 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java @@ -7,10 +7,10 @@ import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.safety.domain.HseSafetyInspection; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionCreateReq; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionGisReq; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionQueryReq; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionUpdateReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionCreateReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionGisReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionQueryReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionUpdateReq; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyLogService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyLogService.java index 86583d55..cc4d6c58 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyLogService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyLogService.java @@ -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.safety.domain.HseSafetyLog; -import org.dromara.safety.domain.req.safetylog.HseSafetyLogCreateReq; -import org.dromara.safety.domain.req.safetylog.HseSafetyLogQueryReq; -import org.dromara.safety.domain.req.safetylog.HseSafetyLogUpdateReq; +import org.dromara.safety.domain.dto.safetylog.HseSafetyLogCreateReq; +import org.dromara.safety.domain.dto.safetylog.HseSafetyLogQueryReq; +import org.dromara.safety.domain.dto.safetylog.HseSafetyLogUpdateReq; import org.dromara.safety.domain.vo.safetylog.HseSafetyLogVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyWeeklyReportService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyWeeklyReportService.java index f3616b25..31d83f87 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyWeeklyReportService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyWeeklyReportService.java @@ -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.safety.domain.HseSafetyWeeklyReport; -import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportCreateReq; -import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportQueryReq; -import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportUpdateReq; +import org.dromara.safety.domain.dto.safetyweeklyreport.HseSafetyWeeklyReportCreateReq; +import org.dromara.safety.domain.dto.safetyweeklyreport.HseSafetyWeeklyReportQueryReq; +import org.dromara.safety.domain.dto.safetyweeklyreport.HseSafetyWeeklyReportUpdateReq; import org.dromara.safety.domain.vo.safetyweeklyreport.HseSafetyWeeklyReportVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseTeamMeetingService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseTeamMeetingService.java index db509793..0a08216b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseTeamMeetingService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseTeamMeetingService.java @@ -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.safety.domain.HseTeamMeeting; -import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingCreateReq; -import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingQueryReq; -import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingUpdateReq; +import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingCreateReq; +import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingQueryReq; +import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingUpdateReq; import org.dromara.safety.domain.vo.teammeeting.HseTeamMeetingVo; import java.util.Collection; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDocumentSafetyMeetingServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDocumentSafetyMeetingServiceImpl.java index c9f728b5..17b097c4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDocumentSafetyMeetingServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDocumentSafetyMeetingServiceImpl.java @@ -21,9 +21,9 @@ import org.dromara.safety.constant.HseDocumentSafetyMeetingConstant; import org.dromara.safety.domain.HseDocumentSafetyMeeting; import org.dromara.safety.domain.enums.HseDocumentStatusEnum; import org.dromara.safety.domain.enums.HseDocumentTypeEnum; -import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFileReq; -import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingCreateFolderReq; -import org.dromara.safety.domain.req.documentsafetymeeting.HseDocumentSafetyMeetingQueryReq; +import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingCreateFileReq; +import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingCreateFolderReq; +import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingQueryReq; import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingRecycleBinVo; import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingVo; import org.dromara.safety.mapper.HseDocumentSafetyMeetingMapper; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionBankServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionBankServiceImpl.java index 086e58c8..2a7ea3c6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionBankServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionBankServiceImpl.java @@ -19,9 +19,9 @@ import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.service.IBusProjectService; import org.dromara.safety.domain.HseQuestionBank; import org.dromara.safety.domain.HseQuestionsCategory; -import org.dromara.safety.domain.req.questionbank.HseQuestionBankCreateReq; -import org.dromara.safety.domain.req.questionbank.HseQuestionBankQueryReq; -import org.dromara.safety.domain.req.questionbank.HseQuestionBankUpdateReq; +import org.dromara.safety.domain.dto.questionbank.HseQuestionBankCreateReq; +import org.dromara.safety.domain.dto.questionbank.HseQuestionBankQueryReq; +import org.dromara.safety.domain.dto.questionbank.HseQuestionBankUpdateReq; import org.dromara.safety.domain.vo.questionbank.HseQuestionBankVo; import org.dromara.safety.mapper.HseQuestionBankMapper; import org.dromara.safety.service.IHseQuestionBankService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java index a487c10c..c1ba4c99 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionUserAnswerServiceImpl.java @@ -30,7 +30,7 @@ import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectTeamMemberService; import org.dromara.safety.domain.HseQuestionUserAnswer; import org.dromara.safety.domain.enums.HseSafetyExamTypeEnum; -import org.dromara.safety.domain.req.questionuseranswer.*; +import org.dromara.safety.domain.dto.questionuseranswer.*; import org.dromara.safety.domain.vo.questionuseranswer.HseQuestionUserAnswerVo; import org.dromara.safety.mapper.HseQuestionUserAnswerMapper; import org.dromara.safety.service.IHseQuestionUserAnswerService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsCategoryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsCategoryServiceImpl.java index e7df4db1..f070af82 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsCategoryServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsCategoryServiceImpl.java @@ -14,9 +14,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.service.IBusProjectService; import org.dromara.safety.domain.HseQuestionsCategory; -import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryCreateReq; -import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryQueryReq; -import org.dromara.safety.domain.req.questionscategory.HseQuestionsCategoryUpdateReq; +import org.dromara.safety.domain.dto.questionscategory.HseQuestionsCategoryCreateReq; +import org.dromara.safety.domain.dto.questionscategory.HseQuestionsCategoryQueryReq; +import org.dromara.safety.domain.dto.questionscategory.HseQuestionsCategoryUpdateReq; import org.dromara.safety.domain.vo.questionscategory.HseQuestionsCategoryVo; import org.dromara.safety.mapper.HseQuestionsCategoryMapper; import org.dromara.safety.service.IHseQuestionsCategoryService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsConfigServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsConfigServiceImpl.java index 2d489184..35640f09 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsConfigServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseQuestionsConfigServiceImpl.java @@ -13,9 +13,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.service.IBusProjectService; import org.dromara.safety.domain.HseQuestionsConfig; -import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigCreateReq; -import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigQueryReq; -import org.dromara.safety.domain.req.questionsconfig.HseQuestionsConfigUpdateReq; +import org.dromara.safety.domain.dto.questionsconfig.HseQuestionsConfigCreateReq; +import org.dromara.safety.domain.dto.questionsconfig.HseQuestionsConfigQueryReq; +import org.dromara.safety.domain.dto.questionsconfig.HseQuestionsConfigUpdateReq; import org.dromara.safety.domain.vo.questionsconfig.HseQuestionsConfigVo; import org.dromara.safety.mapper.HseQuestionsConfigMapper; import org.dromara.safety.service.IHseQuestionsConfigService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java index 55af7ad8..ec842db3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java @@ -31,10 +31,10 @@ import org.dromara.safety.domain.HseSafetyInspection; import org.dromara.safety.domain.HseTeamMeeting; import org.dromara.safety.domain.enums.HseSafetyInspectionReviewTypeEnum; import org.dromara.safety.domain.enums.HseSafetyInspectionStatusEnum; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionCreateReq; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionGisReq; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionQueryReq; -import org.dromara.safety.domain.req.safetyinspection.HseSafetyInspectionUpdateReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionCreateReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionGisReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionQueryReq; +import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionUpdateReq; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo; import org.dromara.safety.domain.vo.teammeeting.HseTeamMeetingGis; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyLogServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyLogServiceImpl.java index f4afeb01..2cf96f4f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyLogServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyLogServiceImpl.java @@ -15,9 +15,9 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.project.service.IBusProjectService; import org.dromara.safety.domain.HseSafetyLog; -import org.dromara.safety.domain.req.safetylog.HseSafetyLogCreateReq; -import org.dromara.safety.domain.req.safetylog.HseSafetyLogQueryReq; -import org.dromara.safety.domain.req.safetylog.HseSafetyLogUpdateReq; +import org.dromara.safety.domain.dto.safetylog.HseSafetyLogCreateReq; +import org.dromara.safety.domain.dto.safetylog.HseSafetyLogQueryReq; +import org.dromara.safety.domain.dto.safetylog.HseSafetyLogUpdateReq; import org.dromara.safety.domain.vo.safetylog.HseSafetyLogVo; import org.dromara.safety.mapper.HseSafetyLogMapper; import org.dromara.safety.service.IHseSafetyLogService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyWeeklyReportServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyWeeklyReportServiceImpl.java index e8838cf9..ce728442 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyWeeklyReportServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyWeeklyReportServiceImpl.java @@ -14,9 +14,9 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.project.service.IBusProjectService; import org.dromara.safety.domain.HseSafetyWeeklyReport; -import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportCreateReq; -import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportQueryReq; -import org.dromara.safety.domain.req.safetyweeklyreport.HseSafetyWeeklyReportUpdateReq; +import org.dromara.safety.domain.dto.safetyweeklyreport.HseSafetyWeeklyReportCreateReq; +import org.dromara.safety.domain.dto.safetyweeklyreport.HseSafetyWeeklyReportQueryReq; +import org.dromara.safety.domain.dto.safetyweeklyreport.HseSafetyWeeklyReportUpdateReq; import org.dromara.safety.domain.vo.safetyweeklyreport.HseSafetyWeeklyReportVo; import org.dromara.safety.mapper.HseSafetyWeeklyReportMapper; import org.dromara.safety.service.IHseSafetyWeeklyReportService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java index 223e1c8a..a6f3103d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseTeamMeetingServiceImpl.java @@ -23,9 +23,9 @@ import org.dromara.project.service.IBusContractorService; import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectTeamService; import org.dromara.safety.domain.HseTeamMeeting; -import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingCreateReq; -import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingQueryReq; -import org.dromara.safety.domain.req.teammeeting.HseTeamMeetingUpdateReq; +import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingCreateReq; +import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingQueryReq; +import org.dromara.safety.domain.dto.teammeeting.HseTeamMeetingUpdateReq; import org.dromara.safety.domain.vo.teammeeting.HseTeamMeetingVo; import org.dromara.safety.mapper.HseTeamMeetingMapper; import org.dromara.safety.service.IHseTeamMeetingService; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/utils/GeoJsonUtils.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/utils/GeoJsonUtils.java index 96c580aa..2204227a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/utils/GeoJsonUtils.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/utils/GeoJsonUtils.java @@ -3,7 +3,7 @@ package org.dromara.utils; import org.dromara.common.core.constant.HttpStatus; import org.dromara.common.core.exception.ServiceException; import org.dromara.constant.GeoJsonConstant; -import org.dromara.facility.domain.req.geojson.FacGeometry; +import org.dromara.facility.domain.dto.geojson.FacGeometry; import org.locationtech.jts.geom.*; import java.util.List; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/progress/PgsProgressCategoryMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/progress/PgsProgressCategoryMapper.xml new file mode 100644 index 00000000..6852dd5f --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/progress/PgsProgressCategoryMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/script/sql/xinnengyuan.sql b/xinnengyuan/script/sql/xinnengyuan.sql index f835ddac..f04cf8d2 100644 --- a/xinnengyuan/script/sql/xinnengyuan.sql +++ b/xinnengyuan/script/sql/xinnengyuan.sql @@ -1,4 +1,4 @@ -use energy; +use xinnengyuan; drop table if exists bus_project; create table `bus_project` @@ -801,7 +801,7 @@ CREATE TABLE `fac_photovoltaic_panel` `matrix_id` bigint not null comment '方阵id', `name` varchar(100) not null comment '光伏板名称', `positions` text null comment '光伏板位置', - `status` char(1) default 0 not null comment '完成状态（0未完成 1完成）', + `status` char(1) default 0 not null comment '完成状态（0未开始 1进行中 2完成）', `finish_type` char(1) null comment '完成类型（1手动填报 2AI填报）', `remark` varchar(512) null comment '备注', `create_by` varchar(64) null comment '创建者', @@ -823,7 +823,7 @@ CREATE TABLE `fac_photovoltaic_panel_point` `matrix_id` bigint not null comment '方阵id', `name` varchar(100) not null comment '光伏板桩点名称', `positions` text null comment '光伏板桩点位置', - `status` char(1) default 0 not null comment '完成状态（0未完成 1完成）', + `status` char(1) default 0 not null comment '完成状态（0未开始 1进行中 2完成）', `finish_type` char(1) null comment '完成类型（1手动填报 2AI填报）', `remark` varchar(512) null comment '备注', `create_by` varchar(64) null comment '创建者', @@ -845,7 +845,7 @@ CREATE TABLE `fac_photovoltaic_panel_column` `matrix_id` bigint not null comment '方阵id', `name` varchar(100) not null comment '光伏板立柱名称', `positions` text null comment '光伏板立柱位置', - `status` char(1) default 0 not null comment '完成状态（0未完成 1完成）', + `status` char(1) default 0 not null comment '完成状态（0未开始 1进行中 2完成）', `finish_type` char(1) null comment '完成类型（1手动填报 2AI填报）', `remark` varchar(512) null comment '备注', `create_by` varchar(64) null comment '创建者', @@ -867,7 +867,7 @@ CREATE TABLE `fac_photovoltaic_panel_support` `matrix_id` bigint not null comment '方阵id', `name` varchar(100) not null comment '光伏板支架名称', `positions` text null comment '光伏板支架位置', - `status` char(1) default 0 not null comment '完成状态（0未完成 1完成）', + `status` char(1) default 0 not null comment '完成状态（0未开始 1进行中 2完成）', `finish_type` char(1) null comment '完成类型（1手动填报 2AI填报）', `remark` varchar(512) null comment '备注', `create_by` varchar(64) null comment '创建者', @@ -889,7 +889,7 @@ CREATE TABLE `fac_inverter` `matrix_id` bigint not null comment '方阵id', `name` varchar(100) not null comment '逆变器名称', `positions` text null comment '逆变器位置', - `status` char(1) default 0 not null comment '完成状态（0未完成 1完成）', + `status` char(1) default 0 not null comment '完成状态（0未开始 1进行中 2完成）', `finish_type` char(1) null comment '完成类型（1手动填报 2AI填报）', `remark` varchar(512) null comment '备注', `create_by` varchar(64) null comment '创建者', @@ -911,7 +911,7 @@ CREATE TABLE `fac_box_transformer` `matrix_id` bigint not null comment '方阵id', `name` varchar(100) not null comment '箱变名称', `positions` text null comment '箱变位置', - `status` char(1) default 0 not null comment '完成状态（0未完成 1完成）', + `status` char(1) default 0 not null comment '完成状态（0未开始 1进行中 2完成）', `finish_type` char(1) null comment '完成类型（1手动填报 2AI填报）', `remark` varchar(512) null comment '备注', `create_by` varchar(64) null comment '创建者', @@ -957,3 +957,18 @@ CREATE TABLE `bus_project_news` PRIMARY KEY (`id`) USING BTREE, INDEX `idx_project_id` (`project_id` ASC) USING BTREE comment '项目id' ) comment = '项目新闻' COLLATE = utf8mb4_unicode_ci; + +DROP TABLE IF EXISTS `pgs_progress_category`; +CREATE TABLE `pgs_progress_category` +( + `id` bigint not null auto_increment comment '主键id', + `pid` bigint default 0 not null comment '父类别id', + `name` varchar(64) not null comment '类别名称', + `unit_type` char(1) not null comment '计量方式（0无 1数量 2百分比）', + `project_id` bigint default 0 not null comment '项目id（0表示共用）', + `create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间', + `update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', + PRIMARY KEY (`id`) USING BTREE, + INDEX `idx_pid` (`pid` ASC) USING BTREE comment '父类别id', + INDEX `idx_project_id` (`project_id` ASC) USING BTREE comment '项目id' +) comment ='进度类别'