admin/wisdomisitezw-city_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移动代码

Browse Source
This commit is contained in:
guo 2023-08-28 17:04:47 +08:00
parent 0b89b72475
commit 1dde0e0434
66 changed files with 154 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/zhgd/config/SwaggerConfig.java
View File

@ -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<RequestHandler> basePackage(final String basePackage) {
return input -> declaringClass(input).transform(handlerPackage(basePackage)).or(true);
}
private static Function<Class<?>, Boolean> handlerPackage(final String basePackage) {
private static Function<Class<?>, 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<? extends Class<?>> declaringClass(RequestHandler input) {
return Optional.fromNullable(input.declaringClass());
}

4
src/main/java/com/zhgd/mybatis/DataScopeHandler.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserDataScopeController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAiMonitorDevController.java
View File

@ -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;

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAttendanceDevController.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentApplyController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentPaymentItemController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentPaymentStatController.java
View File

@ -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;

8
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorDevController.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorQuestionController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProjectNodePlanController.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProjectSubItemController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedDeviceController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntUnmannedVideoController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerInfoController.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAiMonitorDevController.java
View File

@ -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;

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnvironmentDevController.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java
View File

@ -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;

8
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorDevController.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovMonitorQuestionController.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java
View File

@ -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;

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/basicdata/vo/EngineeringVo.java
View File

@ -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;

6
src/main/java/com/zhgd/xmgl/modules/engineering/controller/EngineeringController.java → src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/engineering/entity/Engineering.java → src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/engineering/mapper/EngineeringMapper.java → src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/engineering/mapper/xml/EngineeringMapper.xml → src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/EngineeringMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.engineering.mapper.EngineeringMapper">
<mapper namespace="com.zhgd.xmgl.modules.city.engineering.mapper.EngineeringMapper">
<select id="getSnListByGov" resultType="java.lang.String">

4
src/main/java/com/zhgd/xmgl/modules/engineering/service/IEngineeringService.java → src/main/java/com/zhgd/xmgl/modules/city/engineering/service/IEngineeringService.java
View File

@ -1,11 +1,11 @@
package com.zhgd.xmgl.modules.engineering.service;
package com.zhgd.xmgl.modules.city.engineering.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.AppIndexTopStatDto;
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.entity.EngineeringSingle;
import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat;
import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo;

8
src/main/java/com/zhgd/xmgl/modules/engineering/service/impl/EngineeringServiceImpl.java → src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/EngineeringServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.zhgd.xmgl.modules.engineering.service.impl;
package com.zhgd.xmgl.modules.city.engineering.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -13,12 +13,12 @@ import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.modules.basicdata.dto.AppIndexTopStatDto;
import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto;
import com.zhgd.xmgl.modules.basicdata.entity.*;
import com.zhgd.xmgl.modules.engineering.mapper.EngineeringMapper;
import com.zhgd.xmgl.modules.city.engineering.entity.Engineering;
import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService;
import com.zhgd.xmgl.modules.city.engineering.mapper.EngineeringMapper;
import com.zhgd.xmgl.modules.basicdata.service.*;
import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat;
import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo;
import com.zhgd.xmgl.modules.engineering.entity.Engineering;
import com.zhgd.xmgl.modules.engineering.service.IEngineeringService;
import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService;
import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService;
import com.zhgd.xmgl.security.SecurityUser;

8
src/main/java/com/zhgd/xmgl/modules/monitor/controller/MonitorDevController.java → src/main/java/com/zhgd/xmgl/modules/city/monitor/controller/MonitorDevController.java
View File

@ -1,4 +1,4 @@
package com.zhgd.xmgl.modules.monitor.controller;
package com.zhgd.xmgl.modules.city.monitor.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -13,9 +13,9 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants;
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.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.monitor.service.IMonitorDevService;
import com.zhgd.xmgl.security.SecurityUser;
import com.zhgd.xmgl.security.SecurityUtil;
import io.swagger.annotations.Api;

6
src/main/java/com/zhgd/xmgl/modules/monitor/controller/MonitorQuestionController.java → src/main/java/com/zhgd/xmgl/modules/city/monitor/controller/MonitorQuestionController.java
View File

@ -1,10 +1,10 @@
package com.zhgd.xmgl.modules.monitor.controller;
package com.zhgd.xmgl.modules.city.monitor.controller;
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;

2
src/main/java/com/zhgd/xmgl/modules/monitor/entity/MonitorDev.java → src/main/java/com/zhgd/xmgl/modules/city/monitor/entity/MonitorDev.java
View File

@ -1,4 +1,4 @@
package com.zhgd.xmgl.modules.monitor.entity;
package com.zhgd.xmgl.modules.city.monitor.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/zhgd/xmgl/modules/monitor/entity/MonitorQuestion.java → src/main/java/com/zhgd/xmgl/modules/city/monitor/entity/MonitorQuestion.java
View File

@ -1,4 +1,4 @@
package com.zhgd.xmgl.modules.monitor.entity;
package com.zhgd.xmgl.modules.city.monitor.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

4
src/main/java/com/zhgd/xmgl/modules/monitor/mapper/MonitorDevMapper.java → src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/MonitorDevMapper.java
View File

@ -1,11 +1,11 @@
package com.zhgd.xmgl.modules.monitor.mapper;
package com.zhgd.xmgl.modules.city.monitor.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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.monitor.entity.MonitorDev;
import com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

4
src/main/java/com/zhgd/xmgl/modules/monitor/mapper/MonitorQuestionMapper.java → src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/MonitorQuestionMapper.java
View File

@ -1,11 +1,11 @@
package com.zhgd.xmgl.modules.monitor.mapper;
package com.zhgd.xmgl.modules.city.monitor.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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.monitor.entity.MonitorQuestion;
import com.zhgd.xmgl.modules.city.monitor.entity.MonitorQuestion;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

8
src/main/java/com/zhgd/xmgl/modules/monitor/mapper/xml/MonitorDevMapper.xml → src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/xml/MonitorDevMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.monitor.mapper.MonitorDevMapper">
<mapper namespace="com.zhgd.xmgl.modules.city.monitor.mapper.MonitorDevMapper">
<select id="pageList" resultType="com.zhgd.xmgl.modules.monitor.entity.MonitorDev">
<select id="pageList" resultType="com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev">
SELECT m.*, p.project_name, e.engineering_name FROM monitor_dev m
LEFT JOIN project p ON m.project_sn = p.project_sn
LEFT JOIN engineering e ON m.engineering_sn = e.engineering_sn
@ -18,14 +18,14 @@
SELECT COUNT(1) AS monitorDevNum FROM monitor_dev
</select>
<select id="getDetail" resultType="com.zhgd.xmgl.modules.monitor.entity.MonitorDev">
<select id="getDetail" resultType="com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev">
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>
<select id="getByCode" resultType="com.zhgd.xmgl.modules.monitor.entity.MonitorDev">
<select id="getByCode" resultType="com.zhgd.xmgl.modules.city.monitor.entity.MonitorDev">
SELECT * FROM monitor_dev WHERE code = #{code}
</select>
</mapper>

8
src/main/java/com/zhgd/xmgl/modules/monitor/mapper/xml/MonitorQuestionMapper.xml → src/main/java/com/zhgd/xmgl/modules/city/monitor/mapper/xml/MonitorQuestionMapper.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.monitor.mapper.MonitorQuestionMapper">
<select id="getPageList" resultType="com.zhgd.xmgl.modules.monitor.entity.MonitorQuestion">
<mapper namespace="com.zhgd.xmgl.modules.city.monitor.mapper.MonitorQuestionMapper">
<select id="getPageList" resultType="com.zhgd.xmgl.modules.city.monitor.entity.MonitorQuestion">
SELECT q.*, m.`name` as monitorName FROM monitor_question q LEFT JOIN monitor_dev m ON q.device_code = m.`code`
${ew.customSqlSegment}
</select>
<select id="getPageListByGov" resultType="com.zhgd.xmgl.modules.monitor.entity.MonitorQuestion">
<select id="getPageListByGov" resultType="com.zhgd.xmgl.modules.city.monitor.entity.MonitorQuestion">
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>
<select id="getDetail" resultType="com.zhgd.xmgl.modules.monitor.entity.MonitorQuestion">
<select id="getDetail" resultType="com.zhgd.xmgl.modules.city.monitor.entity.MonitorQuestion">
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

6
src/main/java/com/zhgd/xmgl/modules/monitor/service/IMonitorDevService.java → src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorDevService.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/monitor/service/IMonitorQuestionService.java → src/main/java/com/zhgd/xmgl/modules/city/monitor/service/IMonitorQuestionService.java
View File

@ -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;

12
src/main/java/com/zhgd/xmgl/modules/monitor/service/impl/MonitorDevServiceImpl.java → src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorDevServiceImpl.java
View File

@ -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;

16
src/main/java/com/zhgd/xmgl/modules/monitor/service/impl/MonitorQuestionServiceImpl.java → src/main/java/com/zhgd/xmgl/modules/city/monitor/service/impl/MonitorQuestionServiceImpl.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptApplyServiceImpl.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/CheckAcceptPlanServiceImpl.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentApplyServiceImpl.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentContractServiceImpl.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectNodePlanServiceImpl.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedDeviceServiceImpl.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedVideoServiceImpl.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/AiMonitorAlarmServiceImpl.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/EnvironmentDevServiceImpl.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/LifterServiceImpl.java
View File

@ -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;

2
src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/TowerCraneServiceImpl.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/task/AlarmTask.java
View File

@ -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;

4
src/main/java/com/zhgd/xmgl/task/DevStateTask.java
View File

@ -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;