From 1dde0e0434b308747d523ccff4c3bf30f4a9b44c Mon Sep 17 00:00:00 2001 From: guo Date: Mon, 28 Aug 2023 17:04:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhgd/config/SwaggerConfig.java | 29 +++++++++++++++---- .../com/zhgd/mybatis/DataScopeHandler.java | 4 +-- .../admin/SystemUserDataScopeController.java | 4 +-- .../enterprise/EntAiMonitorDevController.java | 2 +- .../enterprise/EntAppIndexController.java | 6 ++-- .../EntAttendanceDevController.java | 2 +- .../enterprise/EntEngineeringController.java | 4 +-- .../EntEnvironmentDevController.java | 2 +- .../EntInvestmentApplyController.java | 2 +- .../EntInvestmentPaymentItemController.java | 2 +- .../EntInvestmentPaymentStatController.java | 2 +- .../enterprise/EntMonitorDevController.java | 8 ++--- .../EntMonitorQuestionController.java | 4 +-- .../EntProjectNodePlanController.java | 2 +- .../EntProjectSubItemController.java | 4 +-- .../EntUnmannedDeviceController.java | 2 +- .../EntUnmannedVideoController.java | 2 +- .../enterprise/EntWorkerInfoController.java | 2 +- .../GovAcceptInspectRecordController.java | 4 +-- .../government/GovAiMonitorDevController.java | 4 +-- .../government/GovAppIndexController.java | 6 ++-- .../government/GovEngineeringController.java | 4 +-- .../GovEnvironmentDevController.java | 2 +- .../GovInspectRecordController.java | 4 +-- .../GovInvestmentContractController.java | 2 +- .../government/GovMonitorDevController.java | 8 ++--- .../GovMonitorQuestionController.java | 4 +-- .../GovProjectNodePlanController.java | 4 +-- .../government/GovWorkerStatController.java | 4 +-- .../project/AppIndexController.java | 6 ++-- .../modules/basicdata/vo/EngineeringVo.java | 2 +- .../controller/EngineeringController.java | 6 ++-- .../engineering/entity/Engineering.java | 2 +- .../engineering/mapper/EngineeringMapper.java | 4 +-- .../mapper/xml/EngineeringMapper.xml | 2 +- .../service/IEngineeringService.java | 4 +-- .../service/impl/EngineeringServiceImpl.java | 8 ++--- .../controller/MonitorDevController.java | 8 ++--- .../controller/MonitorQuestionController.java | 6 ++-- .../{ => city}/monitor/entity/MonitorDev.java | 2 +- .../monitor/entity/MonitorQuestion.java | 2 +- .../monitor/mapper/MonitorDevMapper.java | 4 +-- .../monitor/mapper/MonitorQuestionMapper.java | 4 +-- .../monitor/mapper/xml/MonitorDevMapper.xml | 8 ++--- .../mapper/xml/MonitorQuestionMapper.xml | 8 ++--- .../monitor/service/IMonitorDevService.java | 6 ++-- .../service/IMonitorQuestionService.java | 4 +-- .../service/impl/MonitorDevServiceImpl.java | 12 ++++---- .../impl/MonitorQuestionServiceImpl.java | 16 +++++----- .../impl/AcceptInspectRecordServiceImpl.java | 4 +-- .../impl/CheckAcceptApplyServiceImpl.java | 2 +- .../impl/CheckAcceptPlanServiceImpl.java | 2 +- .../impl/InspectRecordServiceImpl.java | 4 +-- .../impl/InvestmentApplyServiceImpl.java | 2 +- .../impl/InvestmentContractServiceImpl.java | 4 +-- .../impl/InvestmentPaymentServiceImpl.java | 4 +-- .../impl/ProjectNodePlanServiceImpl.java | 2 +- .../impl/ProjectSubItemServiceImpl.java | 2 +- .../impl/UnmannedDeviceServiceImpl.java | 2 +- .../impl/UnmannedVideoServiceImpl.java | 2 +- .../impl/AiMonitorAlarmServiceImpl.java | 2 +- .../impl/EnvironmentDevServiceImpl.java | 4 +-- .../service/impl/LifterServiceImpl.java | 2 +- .../service/impl/TowerCraneServiceImpl.java | 2 +- .../java/com/zhgd/xmgl/task/AlarmTask.java | 4 +-- .../java/com/zhgd/xmgl/task/DevStateTask.java | 4 +-- 66 files changed, 154 insertions(+), 137 deletions(-) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/engineering/controller/EngineeringController.java (97%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/engineering/entity/Engineering.java (99%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/engineering/mapper/EngineeringMapper.java (91%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/engineering/mapper/xml/EngineeringMapper.xml (96%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/engineering/service/IEngineeringService.java (93%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/engineering/service/impl/EngineeringServiceImpl.java (97%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/controller/MonitorDevController.java (97%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/controller/MonitorQuestionController.java (96%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/entity/MonitorDev.java (98%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/entity/MonitorQuestion.java (98%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/mapper/MonitorDevMapper.java (87%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/mapper/MonitorQuestionMapper.java (88%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/mapper/xml/MonitorDevMapper.xml (74%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/mapper/xml/MonitorQuestionMapper.xml (79%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/service/IMonitorDevService.java (85%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/service/IMonitorQuestionService.java (85%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/service/impl/MonitorDevServiceImpl.java (95%) rename src/main/java/com/zhgd/xmgl/modules/{ => city}/monitor/service/impl/MonitorQuestionServiceImpl.java (90%) diff --git a/src/main/java/com/zhgd/config/SwaggerConfig.java b/src/main/java/com/zhgd/config/SwaggerConfig.java index 6e63eaf..7f4e4ec 100644 --- a/src/main/java/com/zhgd/config/SwaggerConfig.java +++ b/src/main/java/com/zhgd/config/SwaggerConfig.java @@ -32,12 +32,27 @@ public class SwaggerConfig { @Value("${swagger.enable}") private boolean enable; + @Bean + public Docket createCityRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .enable(enable) + .groupName("1.市接口文档") + .apiInfo(apiInfo("1.市接口文档", "公共性接口前后端联调api文档", "1.0")) + .select() + //.apis(RequestHandlerSelectors.basePackage("com.zhgd.xmgl")) + .apis(basePackage("com.zhgd.xmgl.modules.city")) + //.apis(basePackage("com.zhgd.xmgl"+splitor+"com.zhgd.xmgl.device")) + .paths(PathSelectors.any()) + //.paths(PathSelectors.regex("/xmgl.*")) + .build(); + } + @Bean public Docket createRestApi() { return new Docket(DocumentationType.SWAGGER_2) .enable(enable) .groupName("A公共性接口文档") - .apiInfo(apiInfo("公共性接口文档API","公共性接口前后端联调api文档","1.0")) + .apiInfo(apiInfo("公共性接口文档API", "公共性接口前后端联调api文档", "1.0")) .select() //.apis(RequestHandlerSelectors.basePackage("com.zhgd.xmgl")) .apis(basePackage("com.zhgd.xmgl.modules.basicdata.controller.admin")) @@ -52,7 +67,7 @@ public class SwaggerConfig { return new Docket(DocumentationType.SWAGGER_2) .enable(enable) .groupName("政务端个性化接口文档") - .apiInfo(apiInfo("政务端个性化接口文档","政务端个性化前后端联调api文档","1.0")) + .apiInfo(apiInfo("政务端个性化接口文档", "政务端个性化前后端联调api文档", "1.0")) .select() .apis(basePackage("com.zhgd.xmgl.modules.basicdata.controller.government")) .paths(PathSelectors.any()) @@ -64,7 +79,7 @@ public class SwaggerConfig { return new Docket(DocumentationType.SWAGGER_2) .enable(enable) .groupName("企业端个性化接口文档") - .apiInfo(apiInfo("企业端个性化接口文档","企业端个性化前后端联调api文档","1.0")) + .apiInfo(apiInfo("企业端个性化接口文档", "企业端个性化前后端联调api文档", "1.0")) .select() .apis(basePackage("com.zhgd.xmgl.modules.basicdata.controller.enterprise")) .paths(PathSelectors.any()) @@ -76,7 +91,7 @@ public class SwaggerConfig { return new Docket(DocumentationType.SWAGGER_2) .enable(enable) .groupName("项目端个性化接口文档") - .apiInfo(apiInfo("项目端个性化接口文档","项目端个性化前后端联调api文档","1.0")) + .apiInfo(apiInfo("项目端个性化接口文档", "项目端个性化前后端联调api文档", "1.0")) .select() .apis(basePackage("com.zhgd.xmgl.modules.basicdata.controller.project")) .paths(PathSelectors.any()) @@ -84,7 +99,7 @@ public class SwaggerConfig { } - private ApiInfo apiInfo(String titleName,String description,String version) { + private ApiInfo apiInfo(String titleName, String description, String version) { return new ApiInfoBuilder() .title(titleName) .description(description) @@ -95,7 +110,8 @@ public class SwaggerConfig { public static Predicate basePackage(final String basePackage) { return input -> declaringClass(input).transform(handlerPackage(basePackage)).or(true); } - private static Function, Boolean> handlerPackage(final String basePackage) { + + private static Function, Boolean> handlerPackage(final String basePackage) { return input -> { // 循环判断匹配 for (String strPackage : basePackage.split(splitor)) { @@ -107,6 +123,7 @@ public class SwaggerConfig { return false; }; } + private static Optional> declaringClass(RequestHandler input) { return Optional.fromNullable(input.declaringClass()); } diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index aea43e6..9b35fa8 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.SystemUserDataScope; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserDataScopeService; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserDataScopeController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserDataScopeController.java index bc35196..ca2fef0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserDataScopeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserDataScopeController.java @@ -8,9 +8,9 @@ import com.gexin.fastjson.JSON; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.SystemUserDataScope; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserDataScopeService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAiMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAiMonitorDevController.java index 66622b4..cdebbcc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAiMonitorDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAiMonitorDevController.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.entity.AiMonitorDev; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorDevService; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java index 5707b1a..91cb45e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java @@ -6,11 +6,11 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDevAlarmDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexTopStatDto; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.service.ICompanyService; -import com.zhgd.xmgl.modules.monitor.service.IMonitorDevService; -import com.zhgd.xmgl.modules.monitor.service.IMonitorQuestionService; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; import com.zhgd.xmgl.modules.wisdom.service.IWorkerInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAttendanceDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAttendanceDevController.java index ea8d141..aa58bf2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAttendanceDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAttendanceDevController.java @@ -9,7 +9,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.wisdom.entity.AttendanceDev; import com.zhgd.xmgl.modules.wisdom.service.IAttendanceDevService; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java index 1cede10..4a45a1c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java @@ -7,9 +7,9 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringSingle; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java index eda7cd2..12912df 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java @@ -10,7 +10,7 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentDevService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentApplyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentApplyController.java index e02232e..2604569 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentApplyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentApplyController.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.entity.InvestmentApply; import com.zhgd.xmgl.modules.safety.service.IInvestmentApplyService; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentPaymentItemController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentPaymentItemController.java index dcbc91d..4df1f68 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentPaymentItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentPaymentItemController.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.entity.InvestmentPaymentItem; import com.zhgd.xmgl.modules.safety.service.IInvestmentPaymentItemService; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentPaymentStatController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentPaymentStatController.java index a13cfbd..b91f924 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentPaymentStatController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentPaymentStatController.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.entity.InvestmentPaymentStat; import com.zhgd.xmgl.modules.safety.service.IInvestmentPaymentStatService; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorDevController.java index fd51d59..20af201 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorDevController.java @@ -10,10 +10,10 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.dto.MonitorTreeDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.monitor.entity.MonitorDev; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; -import com.zhgd.xmgl.modules.monitor.service.IMonitorDevService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorQuestionController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorQuestionController.java index 1fa26c0..e87ca9f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorQuestionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorQuestionController.java @@ -3,8 +3,8 @@ package com.zhgd.xmgl.modules.basicdata.controller.enterprise; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.modules.monitor.entity.MonitorQuestion; -import com.zhgd.xmgl.modules.monitor.service.IMonitorQuestionService; +import com.zhgd.xmgl.modules.city.monitor.entity.MonitorQuestion; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProjectNodePlanController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProjectNodePlanController.java index 48823f9..9e0e544 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProjectNodePlanController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProjectNodePlanController.java @@ -7,7 +7,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.entity.ProjectNodePlan; import com.zhgd.xmgl.modules.safety.service.IProjectNodePlanService; import com.zhgd.xmgl.security.SecurityUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProjectSubItemController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProjectSubItemController.java index 357f01f..854a488 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProjectSubItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProjectSubItemController.java @@ -8,8 +8,8 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.dto.ProjectSubItemDto; import com.zhgd.xmgl.modules.safety.entity.ProjectSubItem; import com.zhgd.xmgl.modules.safety.service.IProjectSubItemService; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedDeviceController.java index 8ea09b4..ac1e468 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedDeviceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedDeviceController.java @@ -7,7 +7,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.dto.UnmannedEntDto; import com.zhgd.xmgl.modules.safety.entity.UnmannedDevice; import com.zhgd.xmgl.modules.safety.service.IUnmannedDeviceService; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedVideoController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedVideoController.java index 5fd7748..f2fcb88 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedVideoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedVideoController.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.dto.UnmannedEntDto; import com.zhgd.xmgl.modules.safety.entity.UnmannedVideo; import com.zhgd.xmgl.modules.safety.service.IUnmannedVideoService; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerInfoController.java index aaa31a0..76e9e8e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerInfoController.java @@ -9,7 +9,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto; import com.zhgd.xmgl.modules.wisdom.entity.WorkerInfo; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.service.IWorkerInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java index dbccbd0..5bd5840 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java @@ -9,9 +9,9 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.Project; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.quality.dto.AcceptInspectRecordDto; import com.zhgd.xmgl.modules.quality.dto.AcceptInspectRecordStatDto; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAiMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAiMonitorDevController.java index 3617b0d..331cca2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAiMonitorDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAiMonitorDevController.java @@ -14,8 +14,8 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.dto.AiMonitorDevStatDto; import com.zhgd.xmgl.modules.wisdom.entity.AiMonitorAlarm; import com.zhgd.xmgl.modules.wisdom.entity.AiMonitorDev; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java index d629f8f..e859cd5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java @@ -7,11 +7,11 @@ import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDevAlarmDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexTopStatDto; import com.zhgd.xmgl.modules.basicdata.entity.Enterprise; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.entity.WorkerInfo; import com.zhgd.xmgl.modules.basicdata.service.*; -import com.zhgd.xmgl.modules.monitor.service.IMonitorDevService; -import com.zhgd.xmgl.modules.monitor.service.IMonitorQuestionService; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; import com.zhgd.xmgl.modules.wisdom.service.IWorkerInfoService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java index b0a5fa8..a4b567c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java @@ -13,9 +13,9 @@ import com.zhgd.xmgl.modules.basicdata.entity.Enterprise; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService; import com.zhgd.xmgl.modules.wisdom.dto.MapAiAlarmDto; import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java index a0d74d6..18bc394 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java @@ -12,7 +12,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto; import com.zhgd.xmgl.modules.wisdom.entity.EnvironmentDev; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java index 4902531..4a8d151 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java @@ -11,10 +11,10 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.safety.dto.InspectRecordDto; import com.zhgd.xmgl.modules.safety.dto.InspectRecordStatDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.safety.entity.InspectRecord; import com.zhgd.xmgl.modules.basicdata.entity.Project; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.service.IInspectRecordService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.safety.vo.InspectRecordVo; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java index cf1cfdd..056d009 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java @@ -9,7 +9,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.dto.InvestmentEntPageDto; import com.zhgd.xmgl.modules.safety.dto.InvestmentProPageDto; import com.zhgd.xmgl.modules.safety.entity.InvestmentContract; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java index 199ec6c..c8d7539 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java @@ -11,11 +11,11 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.dto.MonitorTreeDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.monitor.entity.MonitorDev; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev; import com.zhgd.xmgl.modules.basicdata.entity.Project; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; -import com.zhgd.xmgl.modules.monitor.service.IMonitorDevService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorQuestionController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorQuestionController.java index 8c7247b..51a37bb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorQuestionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorQuestionController.java @@ -3,8 +3,8 @@ package com.zhgd.xmgl.modules.basicdata.controller.government; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.modules.monitor.entity.MonitorQuestion; -import com.zhgd.xmgl.modules.monitor.service.IMonitorQuestionService; +import com.zhgd.xmgl.modules.city.monitor.entity.MonitorQuestion; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java index 63df523..ed7866f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java @@ -12,8 +12,8 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.entity.ProjectNodePlan; import com.zhgd.xmgl.modules.safety.service.IProjectNodePlanService; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java index 3a2032a..8516042 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.wisdom.dto.AttendanceRecordDto; import com.zhgd.xmgl.modules.wisdom.dto.WorkerAttendanceStatDto; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java index 438f4b5..d076372 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java @@ -6,11 +6,11 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDevAlarmDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexTopStatDto; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.service.ICompanyService; -import com.zhgd.xmgl.modules.monitor.service.IMonitorDevService; -import com.zhgd.xmgl.modules.monitor.service.IMonitorQuestionService; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; import com.zhgd.xmgl.modules.wisdom.service.IWorkerInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/EngineeringVo.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/EngineeringVo.java index 98b9d11..3d3a422 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/EngineeringVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/vo/EngineeringVo.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.vo; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringSingle; diff --git a/src/main/java/com/zhgd/xmgl/modules/engineering/controller/EngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/engineering/controller/EngineeringController.java rename to src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java index d1dd1b2..6d2dae6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/engineering/controller/EngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.engineering.controller; +package com.zhgd.xmgl.modules.city.engineering.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,9 +8,9 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringSingle; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo; import com.zhgd.xmgl.valid.AddGroup; diff --git a/src/main/java/com/zhgd/xmgl/modules/engineering/entity/Engineering.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/engineering/entity/Engineering.java rename to src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java index a0f5cc1..410e91c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/engineering/entity/Engineering.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.engineering.entity; +package com.zhgd.xmgl.modules.city.engineering.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/zhgd/xmgl/modules/engineering/mapper/EngineeringMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java similarity index 91% rename from src/main/java/com/zhgd/xmgl/modules/engineering/mapper/EngineeringMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java index f20bd1a..d80f9e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/engineering/mapper/EngineeringMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.engineering.mapper; +package com.zhgd.xmgl.modules.city.engineering.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/engineering/mapper/xml/EngineeringMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/EngineeringMapper.xml similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/engineering/mapper/xml/EngineeringMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/EngineeringMapper.xml index 2b04790..9e9a8af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/engineering/mapper/xml/EngineeringMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/EngineeringMapper.xml @@ -1,6 +1,6 @@ - + + - SELECT d.*, p.project_name, e.engineering_name FROM monitor_dev d LEFT JOIN project p ON d.project_sn = p.project_sn LEFT JOIN engineering e ON d.engineering_sn = e.engineering_sn WHERE d.monitor_id = #{monitorId} - SELECT * FROM monitor_dev WHERE code = #{code} diff --git a/src/main/java/com/zhgd/xmgl/modules/monitor/mapper/xml/MonitorQuestionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/xml/MonitorQuestionMapper.xml similarity index 79% rename from src/main/java/com/zhgd/xmgl/modules/monitor/mapper/xml/MonitorQuestionMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/xml/MonitorQuestionMapper.xml index 1837413..3f28151 100644 --- a/src/main/java/com/zhgd/xmgl/modules/monitor/mapper/xml/MonitorQuestionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/xml/MonitorQuestionMapper.xml @@ -1,12 +1,12 @@ - - SELECT q.*, m.`name` as monitorName FROM monitor_question q LEFT JOIN monitor_dev m ON q.device_code = m.`code` ${ew.customSqlSegment} - SELECT q.*, p.project_name, e.engineering_name FROM monitor_question q LEFT JOIN project p ON q.project_sn = p.project_sn LEFT JOIN engineering e ON q.engineering_sn = e.engineering_sn @@ -21,7 +21,7 @@ SELECT COUNT(DISTINCT engineering_sn) AS monitorAlarmNum FROM monitor_question WHERE engineering_sn != '' - SELECT q.*, p.project_name, e.engineering_name FROM monitor_question q LEFT JOIN project p ON q.project_sn = p.project_sn LEFT JOIN engineering e ON q.engineering_sn = e.engineering_sn diff --git a/src/main/java/com/zhgd/xmgl/modules/monitor/service/IMonitorDevService.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorDevService.java similarity index 85% rename from src/main/java/com/zhgd/xmgl/modules/monitor/service/IMonitorDevService.java rename to src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorDevService.java index a659ed3..586aed0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/monitor/service/IMonitorDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorDevService.java @@ -1,12 +1,12 @@ -package com.zhgd.xmgl.modules.monitor.service; +package com.zhgd.xmgl.modules.city.monitor.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.MonitorTreeDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.monitor.entity.MonitorDev; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev; import com.zhgd.xmgl.modules.basicdata.entity.Project; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/monitor/service/IMonitorQuestionService.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorQuestionService.java similarity index 85% rename from src/main/java/com/zhgd/xmgl/modules/monitor/service/IMonitorQuestionService.java rename to src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorQuestionService.java index f452434..1791328 100644 --- a/src/main/java/com/zhgd/xmgl/modules/monitor/service/IMonitorQuestionService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorQuestionService.java @@ -1,9 +1,9 @@ -package com.zhgd.xmgl.modules.monitor.service; +package com.zhgd.xmgl.modules.city.monitor.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDevAlarmDto; -import com.zhgd.xmgl.modules.monitor.entity.MonitorQuestion; +import com.zhgd.xmgl.modules.city.monitor.entity.MonitorQuestion; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/monitor/service/impl/MonitorDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorDevServiceImpl.java similarity index 95% rename from src/main/java/com/zhgd/xmgl/modules/monitor/service/impl/MonitorDevServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorDevServiceImpl.java index 711ac55..309784c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/monitor/service/impl/MonitorDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorDevServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.monitor.service.impl; +package com.zhgd.xmgl.modules.city.monitor.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -11,14 +11,14 @@ import com.zhgd.xmgl.handler.exception.CustomException; import com.zhgd.xmgl.modules.basicdata.api.camera.MonitorApi; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.MonitorTreeDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.mapper.EngineeringMapper; +import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev; +import com.zhgd.xmgl.modules.city.monitor.mapper.MonitorDevMapper; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.modules.basicdata.entity.Project; -import com.zhgd.xmgl.modules.engineering.mapper.EngineeringMapper; -import com.zhgd.xmgl.modules.monitor.entity.MonitorDev; import com.zhgd.xmgl.modules.wisdom.mapper.AiMonitorDevMapper; import com.zhgd.xmgl.modules.wisdom.mapper.EnvironmentDevMapper; -import com.zhgd.xmgl.modules.monitor.mapper.MonitorDevMapper; -import com.zhgd.xmgl.modules.monitor.service.IMonitorDevService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zhgd/xmgl/modules/monitor/service/impl/MonitorQuestionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorQuestionServiceImpl.java similarity index 90% rename from src/main/java/com/zhgd/xmgl/modules/monitor/service/impl/MonitorQuestionServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorQuestionServiceImpl.java index 430a596..3af642f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/monitor/service/impl/MonitorQuestionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorQuestionServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.monitor.service.impl; +package com.zhgd.xmgl.modules.city.monitor.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,15 +9,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDevAlarmDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.engineering.mapper.EngineeringMapper; -import com.zhgd.xmgl.modules.monitor.entity.MonitorDev; -import com.zhgd.xmgl.modules.monitor.entity.MonitorQuestion; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.mapper.EngineeringMapper; +import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev; +import com.zhgd.xmgl.modules.city.monitor.entity.MonitorQuestion; import com.zhgd.xmgl.modules.wisdom.mapper.AiMonitorAlarmMapper; import com.zhgd.xmgl.modules.wisdom.mapper.EnvironmentAlarmMapper; -import com.zhgd.xmgl.modules.monitor.mapper.MonitorDevMapper; -import com.zhgd.xmgl.modules.monitor.mapper.MonitorQuestionMapper; -import com.zhgd.xmgl.modules.monitor.service.IMonitorQuestionService; +import com.zhgd.xmgl.modules.city.monitor.mapper.MonitorDevMapper; +import com.zhgd.xmgl.modules.city.monitor.mapper.MonitorQuestionMapper; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; import com.zhgd.xmgl.util.DateUtils; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java index 066c39d..0742383 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java @@ -9,11 +9,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.handler.exception.CustomException; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; import com.zhgd.xmgl.modules.basicdata.entity.Project; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.quality.dto.AcceptInspectRecordDto; import com.zhgd.xmgl.modules.quality.dto.AcceptInspectRecordStatDto; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptApplyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptApplyServiceImpl.java index 96d2222..cbdcf8b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptApplyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptApplyServiceImpl.java @@ -11,7 +11,7 @@ import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.quality.dto.CheckAcceptApplyDto; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptPlanServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptPlanServiceImpl.java index d4e0c51..e42cffe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptPlanServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptPlanServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.quality.dto.CheckAcceptPlanEntDto; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java index 117d1bd..b9495e2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java @@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.handler.exception.CustomException; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; import com.zhgd.xmgl.modules.basicdata.entity.Project; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.safety.dto.InspectRecordDto; import com.zhgd.xmgl.modules.safety.dto.InspectRecordStatDto; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentApplyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentApplyServiceImpl.java index 2ef53ab..feae217 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentApplyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentApplyServiceImpl.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.safety.entity.InvestmentApply; import com.zhgd.xmgl.modules.safety.mapper.InvestmentApplyMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentContractServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentContractServiceImpl.java index 770066c..f0e553f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentContractServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentContractServiceImpl.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.safety.dto.InvestmentEntPageDto; import com.zhgd.xmgl.modules.safety.dto.InvestmentProPageDto; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java index 4671ac0..7e03917 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.entity.InvestmentApply; import com.zhgd.xmgl.modules.safety.entity.InvestmentPayment; import com.zhgd.xmgl.modules.safety.mapper.InvestmentPaymentMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectNodePlanServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectNodePlanServiceImpl.java index 0aaa13e..3d4ce77 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectNodePlanServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectNodePlanServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.safety.entity.ProjectNodePlan; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java index d2a4957..df5b5e2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java @@ -14,7 +14,7 @@ import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.handler.exception.CustomException; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IFileDetailService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.safety.dto.ProjectSubItemDto; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedDeviceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedDeviceServiceImpl.java index 243a68b..b957bf7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedDeviceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedDeviceServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.safety.dto.UnmannedEntDto; import com.zhgd.xmgl.modules.safety.dto.UnmannedProjectDto; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedVideoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedVideoServiceImpl.java index 8373878..da75032 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedVideoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedVideoServiceImpl.java @@ -10,7 +10,7 @@ import com.zhgd.xmgl.modules.safety.dto.UnmannedEntDto; import com.zhgd.xmgl.modules.safety.dto.UnmannedProjectDto; import com.zhgd.xmgl.modules.safety.entity.UnmannedVideo; import com.zhgd.xmgl.modules.safety.mapper.UnmannedVideoMapper; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.safety.service.IUnmannedVideoService; import com.zhgd.xmgl.modules.safety.vo.UnmannedVideoVo; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/AiMonitorAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/AiMonitorAlarmServiceImpl.java index eb465de..7d8c0e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/AiMonitorAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/AiMonitorAlarmServiceImpl.java @@ -13,7 +13,7 @@ import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.redis.lock.RedisRepository; import com.zhgd.xmgl.modules.basicdata.constant.CacheConstants; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringDeviceDto; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.dto.MapAiAlarmDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto; import com.zhgd.xmgl.modules.wisdom.entity.AiMonitorAlarm; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java index abf4fad..7be6483 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java @@ -16,8 +16,8 @@ import com.zhgd.xmgl.handler.exception.CustomException; import com.zhgd.xmgl.modules.basicdata.constant.CacheConstants; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevDto; import com.zhgd.xmgl.modules.wisdom.dto.EnvironmentDevStatDto; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java index 5fad10b..aa3c949 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java @@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.wisdom.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.wisdom.entity.Lifter; import com.zhgd.xmgl.modules.wisdom.mapper.LifterMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java index 439fdea..b35c881 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java @@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.wisdom.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.wisdom.entity.TowerCrane; import com.zhgd.xmgl.modules.wisdom.mapper.TowerCraneMapper; diff --git a/src/main/java/com/zhgd/xmgl/task/AlarmTask.java b/src/main/java/com/zhgd/xmgl/task/AlarmTask.java index ab41c37..7fb1ece 100644 --- a/src/main/java/com/zhgd/xmgl/task/AlarmTask.java +++ b/src/main/java/com/zhgd/xmgl/task/AlarmTask.java @@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.gexin.fastjson.JSON; import com.zhgd.redis.lock.RedisRepository; -import com.zhgd.xmgl.modules.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.Project; -import com.zhgd.xmgl.modules.engineering.service.IEngineeringService; +import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; import com.zhgd.xmgl.modules.wisdom.entity.AiMonitorAlarm; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; diff --git a/src/main/java/com/zhgd/xmgl/task/DevStateTask.java b/src/main/java/com/zhgd/xmgl/task/DevStateTask.java index 7bcceb1..3ee6825 100644 --- a/src/main/java/com/zhgd/xmgl/task/DevStateTask.java +++ b/src/main/java/com/zhgd/xmgl/task/DevStateTask.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.xmgl.modules.basicdata.api.camera.MonitorApi; -import com.zhgd.xmgl.modules.monitor.entity.MonitorDev; -import com.zhgd.xmgl.modules.monitor.service.IMonitorDevService; +import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev; +import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.modules.wisdom.entity.*; import com.zhgd.xmgl.modules.wisdom.service.*; import lombok.extern.slf4j.Slf4j;