diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java b/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java index c78100c..88bc8e3 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java @@ -1,7 +1,10 @@ package com.zhgd.xmgl.async; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.zhgd.xmgl.modules.basicdata.entity.*; +import com.zhgd.xmgl.modules.basicdata.entity.MessageRecord; +import com.zhgd.xmgl.modules.basicdata.entity.Notice; +import com.zhgd.xmgl.modules.basicdata.entity.NoticeAccept; +import com.zhgd.xmgl.modules.basicdata.entity.Policy; import com.zhgd.xmgl.modules.basicdata.service.IMessageRecordService; import com.zhgd.xmgl.modules.city.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.city.basicdata.entity.SystemUser; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/AppVersionController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/AppVersionController.java index caebd28..9faafeb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/AppVersionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/AppVersionController.java @@ -42,7 +42,7 @@ import java.util.Map; public class AppVersionController { @Autowired private IAppVersionService appVersionService; - + /** * 分页列表查询 * @return @@ -60,7 +60,7 @@ public class AppVersionController { Page page = PageUtil.getPage(map); return Result.success(appVersionService.page(page, queryWrapper)); } - + /** * 添加 * @param appVersion @@ -73,7 +73,7 @@ public class AppVersionController { appVersionService.save(appVersion); return Result.success("添加成功！"); } - + /** * 编辑 * @param appVersion @@ -96,7 +96,7 @@ public class AppVersionController { } return result; } - + /** * 通过id查询 * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseActionController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseActionController.java index f747c09..3f54154 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseActionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseActionController.java @@ -79,7 +79,7 @@ public class BaseActionController { baseActionService.addBaseAction(baseAction); return Result.ok(); } - + /** * 编辑 * @param baseAction @@ -92,7 +92,7 @@ public class BaseActionController { baseActionService.editBaseAction(baseAction); return Result.ok(); } - + /** * 通过id删除 * @param @@ -106,7 +106,7 @@ public class BaseActionController { baseActionService.deleteBaseAction(MapUtils.getString(map,"actionId")); return Result.ok(); } - + /** * 通过id查询 * @param diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseMenuController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseMenuController.java index 75dcb4b..dd62f6d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseMenuController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseMenuController.java @@ -39,7 +39,7 @@ import java.util.Set; public class BaseMenuController { @Autowired private IBaseMenuService baseMenuService; - + /** * 列表查询 * @return @@ -76,7 +76,7 @@ public class BaseMenuController { baseMenuService.saveBaseMenu(baseMenu); return Result.ok(); } - + /** * 编辑 * @param baseMenu @@ -89,7 +89,7 @@ public class BaseMenuController { baseMenuService.editBaseMenu(baseMenu); return Result.ok(); } - + /** * 通过id删除 * @param @@ -110,12 +110,12 @@ public class BaseMenuController { result.successMsg(MessageUtil.get("deleteSucess")); } } - + return result; } - - + + /** * 通过id查询 * @param diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareAlarmController.java index 11066c4..5c0dccf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareAlarmController.java @@ -48,7 +48,7 @@ import java.util.Map; public class HardWareAlarmController { @Autowired private IHardWareAlarmService hardWareAlarmService; - + /** * 分页列表查询 * @param hardWareAlarm @@ -69,7 +69,7 @@ public class HardWareAlarmController { result.setResult(pageList); return result; } - + /** * 添加 * @param hardWareAlarm @@ -89,7 +89,7 @@ public class HardWareAlarmController { } return result; } - + /** * 编辑 * @param hardWareAlarm @@ -108,10 +108,10 @@ public class HardWareAlarmController { result.success("修改成功!"); } } - + return result; } - + /** * 通过id删除 * @param id @@ -131,10 +131,10 @@ public class HardWareAlarmController { result.success("删除成功!"); } } - + return result; } - + /** * 批量删除 * @param ids @@ -153,7 +153,7 @@ public class HardWareAlarmController { } return result; } - + /** * 通过id查询 * @param id diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java index 97ee8d9..b9cfec0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java @@ -34,8 +34,11 @@ import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneAlarmService; import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneCurrentDataService; import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneService; import com.zhgd.xmgl.modules.city.towercrane.service.ITowerCraneWorkCycleService; -import com.zhgd.xmgl.modules.wisdom.entity.*; -import com.zhgd.xmgl.modules.wisdom.service.*; +import com.zhgd.xmgl.modules.wisdom.entity.AiMonitorAlarm; +import com.zhgd.xmgl.modules.wisdom.entity.AiMonitorDev; +import com.zhgd.xmgl.modules.wisdom.entity.AttendanceDev; +import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; +import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorDevService; import com.zhgd.xmgl.util.CommonUtil; import com.zhgd.xmgl.util.ParamEnum; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/ModuleTemplateController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/ModuleTemplateController.java index d1460c1..330bf21 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/ModuleTemplateController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/ModuleTemplateController.java @@ -42,7 +42,7 @@ public class ModuleTemplateController { private IModuleTemplateService moduleTemplateService; - + /** * 批量添加/修改 * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/OperationLogController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/OperationLogController.java index c4dc364..0ed2c24 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/OperationLogController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/OperationLogController.java @@ -33,7 +33,7 @@ import java.util.Map; public class OperationLogController { @Autowired private IOperationLogService operationLogService; - + /** * 分页列表查询 */ @@ -66,9 +66,9 @@ public class OperationLogController { result.successMsg("添加成功！"); return result; } - - + + /** * 通过id删除 * @param id @@ -89,10 +89,10 @@ public class OperationLogController { result.successMsg("删除成功!"); } } - + return result; } - + /** * 批量删除 * @param ids @@ -112,7 +112,7 @@ public class OperationLogController { } return result; } - + /** * 通过id查询 * @param id diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemConfigController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemConfigController.java index a90968d..6768765 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemConfigController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemConfigController.java @@ -43,7 +43,7 @@ import java.util.Map; public class SystemConfigController { @Autowired private ISystemConfigService systemConfigService; - + /** * 分页列表查询 * @return @@ -80,7 +80,7 @@ public class SystemConfigController { result.setResult(list); return result; } - + /** * 添加 * @param systemConfig @@ -95,7 +95,7 @@ public class SystemConfigController { result.success("添加成功！"); return result; } - + /** * 编辑 * @param systemConfig @@ -115,10 +115,10 @@ public class SystemConfigController { result.success("修改成功!"); } } - + return result; } - + /** * 通过id删除 * @return @@ -138,10 +138,10 @@ public class SystemConfigController { result.success("删除成功!"); } } - + return result; } - + /** * 通过id查询 * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictDataController.java index 6394f52..f44c049 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictDataController.java @@ -48,7 +48,7 @@ import java.util.Map; public class SystemDictDataController { @Autowired private ISystemDictDataService systemDictDataService; - + /** * 分页列表查询 * @return @@ -101,7 +101,7 @@ public class SystemDictDataController { result.setResult(list); return result; } - + /** * 添加 * @param systemDictData @@ -130,7 +130,7 @@ public class SystemDictDataController { } return result; } - + /** * 编辑 * @param systemDictData @@ -151,10 +151,10 @@ public class SystemDictDataController { result.success("修改成功!"); } } - + return result; } - + /** * 通过id删除 * @return @@ -176,7 +176,7 @@ public class SystemDictDataController { } return result; } - + /** * 批量删除 * @return @@ -196,7 +196,7 @@ public class SystemDictDataController { } return result; } - + /** * 通过id查询 * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictTypeController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictTypeController.java index 29fc1c0..3184ec1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictTypeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictTypeController.java @@ -47,7 +47,7 @@ import java.util.Map; public class SystemDictTypeController { @Autowired private ISystemDictTypeService systemDictTypeService; - + /** * 分页列表查询 * @return @@ -87,7 +87,7 @@ public class SystemDictTypeController { result.setResult(list); return result; } - + /** * 添加 * @param systemDictType @@ -103,7 +103,7 @@ public class SystemDictTypeController { result.success("添加成功！"); return result; } - + /** * 编辑 * @param systemDictType @@ -123,10 +123,10 @@ public class SystemDictTypeController { result.success("修改成功!"); } } - + return result; } - + /** * 通过id删除 * @return @@ -146,10 +146,10 @@ public class SystemDictTypeController { result.success("删除成功!"); } } - + return result; } - + /** * 批量删除 * @return @@ -169,7 +169,7 @@ public class SystemDictTypeController { } return result; } - + /** * 通过id查询 * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java index c4037f1..6740c07 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java @@ -6,12 +6,12 @@ import com.qiwenshare.common.result.RestResult; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.constant.CommonConstant; +import com.zhgd.xmgl.modules.basicdata.service.ISystemRoleService; import com.zhgd.xmgl.modules.basicdata.dto.SystemUserAuthDto; import com.zhgd.xmgl.modules.city.government.entity.Government; import com.zhgd.xmgl.modules.city.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.entity.SystemUserDataScope; import com.zhgd.xmgl.modules.city.government.service.IGovernmentService; -import com.zhgd.xmgl.modules.basicdata.service.ISystemRoleService; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserDataScopeService; import com.zhgd.xmgl.modules.city.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.basicdata.vo.UserLoginVo; 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 4a45a1c..5c35532 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,10 +7,10 @@ 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.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringSingle; 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; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemDeptController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemDeptController.java index 8716214..aec6d5e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemDeptController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemDeptController.java @@ -2,8 +2,8 @@ package com.zhgd.xmgl.modules.basicdata.controller.enterprise; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.modules.basicdata.entity.SystemDept; import com.zhgd.xmgl.modules.basicdata.service.ISystemDeptService; +import com.zhgd.xmgl.modules.basicdata.entity.SystemDept; import com.zhgd.xmgl.valid.AddGroup; import com.zhgd.xmgl.valid.EditGroup; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemRoleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemRoleController.java index 8272626..1caa6e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemRoleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntSystemRoleController.java @@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.modules.basicdata.entity.SystemRole; -import com.zhgd.xmgl.modules.basicdata.entity.SystemRoleMenu; import com.zhgd.xmgl.modules.basicdata.service.ISystemRoleMenuService; import com.zhgd.xmgl.modules.basicdata.service.ISystemRoleService; +import com.zhgd.xmgl.modules.basicdata.entity.SystemRole; +import com.zhgd.xmgl.modules.basicdata.entity.SystemRoleMenu; import com.zhgd.xmgl.valid.AddGroup; import com.zhgd.xmgl.valid.EditGroup; import io.swagger.annotations.Api; 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 331cca2..a4060e3 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 @@ -50,7 +50,7 @@ public class GovAiMonitorDevController { private IAiMonitorAlarmService aiMonitorAlarmService; @Autowired - private IAiMonitorDevService aiMonitorDevService; + private IAiMonitorDevService aiMonitorDevService; @Autowired private IEngineeringService engineeringService; 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 8f0c277..08f97d8 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 @@ -8,16 +8,16 @@ 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.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; import com.zhgd.xmgl.modules.city.enterprise.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.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; -import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo; import com.zhgd.xmgl.valid.EditGroup; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java index 857196f..329378b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java @@ -1,7 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.controller.government; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -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; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java index 9172a95..8307f8e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java @@ -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.xmgl.modules.safety.dto.EnterpriseScoreDto; -import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore; import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreService; import com.zhgd.xmgl.modules.safety.vo.EnterpriseScoreVo; +import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; 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 7606586..a246a95 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,13 +11,13 @@ 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.safety.vo.InspectRecordVo; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.city.inspect.entity.InspectRecord; import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.inspect.service.IInspectRecordService; import com.zhgd.xmgl.modules.city.project.service.IProjectService; -import com.zhgd.xmgl.modules.safety.vo.InspectRecordVo; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java index 0feb2f3..47a9925 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java @@ -3,12 +3,12 @@ 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.wisdom.dto.MapEnvironAlarmDto; -import com.zhgd.xmgl.modules.basicdata.dto.ProjectDto; import com.zhgd.xmgl.modules.wisdom.dto.MapAiAlarmDto; +import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; +import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; +import com.zhgd.xmgl.modules.basicdata.dto.ProjectDto; import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise; import com.zhgd.xmgl.modules.city.project.entity.Project; -import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; import com.zhgd.xmgl.modules.city.dust.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.city.project.service.IProjectService; import com.zhgd.xmgl.security.SecurityUtil; 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 33b7901..13e0dc4 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,18 +6,18 @@ 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.basicdata.statistics.EngineeringStat; 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; import com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto; -import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.service.IAttendanceRecordService; +import com.zhgd.xmgl.modules.wisdom.vo.AttendanceRecordVo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.city.worker.service.IWorkerAttendanceService; import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import com.zhgd.xmgl.modules.wisdom.statistics.WorkerInfoStat; -import com.zhgd.xmgl.modules.wisdom.vo.AttendanceRecordVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -136,7 +136,7 @@ public class GovWorkerStatController { @ApiOperation(value = " 查询在册人员从业经历", notes = "查询在册人员从业经历", httpMethod = "POST") @ApiImplicitParam(name = "idCard", value = "人员身份证号", paramType = "body", dataType = "String") @PostMapping(value = "/queryDetailBySn") - public Result> queryDetailBySn(@ApiIgnore Page page,@ApiIgnore @RequestBody WorkerInfo workerInfo) { + public Result> queryDetailBySn(@ApiIgnore Page page, @ApiIgnore @RequestBody WorkerInfo workerInfo) { return Result.success(workerInfoService.getDetail(page, Wrappers.lambdaQuery().eq(WorkerInfo::getIdCard, workerInfo.getIdCard()))); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CheckAcceptApplyAnnexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CheckAcceptApplyAnnexController.java index c270d96..f972425 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CheckAcceptApplyAnnexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CheckAcceptApplyAnnexController.java @@ -41,7 +41,7 @@ import java.util.Map; public class CheckAcceptApplyAnnexController { @Autowired private ICheckAcceptApplyAnnexService checkAcceptApplyAnnexService; - + /** * 分页列表查询 * @return @@ -74,7 +74,7 @@ public class CheckAcceptApplyAnnexController { return Result.success(list); } - + /** * 添加 * @param checkAcceptApplyAnnex @@ -87,7 +87,7 @@ public class CheckAcceptApplyAnnexController { checkAcceptApplyAnnexService.save(checkAcceptApplyAnnex); return Result.success("添加成功！"); } - + /** * 编辑 * @param checkAcceptApplyAnnex @@ -109,10 +109,10 @@ public class CheckAcceptApplyAnnexController { result.success("操作失败!"); } } - + return result; } - + /** * 通过id删除 * @return @@ -136,7 +136,7 @@ public class CheckAcceptApplyAnnexController { } return result; } - + /** * 批量删除 * @return @@ -156,7 +156,7 @@ public class CheckAcceptApplyAnnexController { } return result; } - + /** * 通过id查询 * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CheckAcceptApplyDetailController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CheckAcceptApplyDetailController.java index e8d9d20..680d939 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CheckAcceptApplyDetailController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CheckAcceptApplyDetailController.java @@ -41,7 +41,7 @@ import java.util.Map; public class CheckAcceptApplyDetailController { @Autowired private ICheckAcceptApplyDetailService checkAcceptApplyDetailService; - + /** * 分页列表查询 * @return @@ -74,7 +74,7 @@ public class CheckAcceptApplyDetailController { return Result.success(list); } - + /** * 添加 * @param checkAcceptApplyDetail @@ -88,7 +88,7 @@ public class CheckAcceptApplyDetailController { checkAcceptApplyDetailService.save(checkAcceptApplyDetail); return Result.success("添加成功！"); } - + /** * 编辑 * @param checkAcceptApplyDetail @@ -110,10 +110,10 @@ public class CheckAcceptApplyDetailController { result.success("操作失败!"); } } - + return result; } - + /** * 通过id删除 * @return @@ -137,7 +137,7 @@ public class CheckAcceptApplyDetailController { } return result; } - + /** * 批量删除 * @return @@ -157,7 +157,7 @@ public class CheckAcceptApplyDetailController { } return result; } - + /** * 通过id查询 * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/UnmannedDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/UnmannedDeviceController.java index a083eff..e8f814a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/UnmannedDeviceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/UnmannedDeviceController.java @@ -12,7 +12,6 @@ import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.safety.entity.UnmannedDevice; import com.zhgd.xmgl.modules.safety.service.IUnmannedDeviceService; -import com.zhgd.xmgl.security.SecurityUtil; 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/entity/NoticeAccept.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/NoticeAccept.java index 84bc167..e2de8ef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/NoticeAccept.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/NoticeAccept.java @@ -62,7 +62,7 @@ public class NoticeAccept implements Serializable { @ApiModelProperty(value = "单位类型，2.政务;3.企业;4.项目") private Integer acceptType; - + @TableField(exist = false) @Excel(name = "接受方单位名称", width = 15) @ApiModelProperty(value = "接受方单位名称") diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/ModuleTemplateMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/ModuleTemplateMapper.java index 8591606..200b50d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/ModuleTemplateMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/ModuleTemplateMapper.java @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.basicdata.entity.ModuleTemplate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemConfigMapper.java index f8995f5..c2a20aa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemConfigMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemConfigMapper.java @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.basicdata.entity.SystemConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDictDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDictDataMapper.java index 83a86a1..d4b6a20 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDictDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDictDataMapper.java @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDictTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDictTypeMapper.java index 514368d..03dd9c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDictTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDictTypeMapper.java @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemRoleMenuMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemRoleMenuMapper.java index 06911f7..751ba99 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemRoleMenuMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemRoleMenuMapper.java @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.basicdata.entity.SystemRoleMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserRoleMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserRoleMapper.java index 456faf4..f42c92d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserRoleMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserRoleMapper.java @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.basicdata.entity.SystemUserRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AnnexFileMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AnnexFileMapper.xml index 23873e3..c2e408f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AnnexFileMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AnnexFileMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AppVersionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AppVersionMapper.xml index 7cd469c..4ebaaef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AppVersionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AppVersionMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseActionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseActionMapper.xml index 7d680ed..4f32fae 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseActionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseActionMapper.xml @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml index 093b871..94d0a35 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml @@ -59,4 +59,4 @@ SELECT m.* FROM system_role_menu r LEFT JOIN base_menu m ON r.authority_id = m.menu_id WHERE r.type = 1 AND m.status = 1 AND m.module_id = #{moduleId} AND r.role_id = #{roleId} ORDER BY priority - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml index 702de32..c008b5c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainPersonMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainPersonMapper.xml index a3e62ca..63b58ba 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainPersonMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainPersonMapper.xml @@ -7,4 +7,4 @@ LEFT JOIN system_dict_data d ON p.job_id = d.dict_label AND d.dict_type = 'engineering_post' WHERE p.engineering_sn = #{engineeringSn} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringSingleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringSingleMapper.xml index 5731c4c..ce26801 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringSingleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringSingleMapper.xml @@ -7,4 +7,4 @@ LEFT JOIN system_dict_data d ON s.shape = d.dict_label AND d.dict_type = 'structural_style' WHERE s.engineering_sn = #{engineeringSn} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainLicenseMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainLicenseMapper.xml index e8f9f73..599e5ac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainLicenseMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainLicenseMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/FileDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/FileDetailMapper.xml index afda210..2e1aaf0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/FileDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/FileDetailMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/GovernmentConfigMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/GovernmentConfigMapper.xml index c6e4fbe..0b91dfe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/GovernmentConfigMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/GovernmentConfigMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/HardWareAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/HardWareAlarmMapper.xml index 40eecff..4a8c27d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/HardWareAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/HardWareAlarmMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/MessageRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/MessageRecordMapper.xml index 5e6a66f..00be467 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/MessageRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/MessageRecordMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ModuleTemplateMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ModuleTemplateMapper.xml index de9fb05..2f85d3e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ModuleTemplateMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ModuleTemplateMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeAcceptMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeAcceptMapper.xml index 6ec48ac..0c6cad0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeAcceptMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeAcceptMapper.xml @@ -8,4 +8,4 @@ LEFT JOIN project p ON n.accept = p.project_sn AND n.accept_type = 4 WHERE n.notice_id = #{noticeId} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml index eb06c2e..bcbbd34 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml @@ -15,4 +15,4 @@ LEFT JOIN system_user u ON n.create_by = u.user_id ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/OperationLogMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/OperationLogMapper.xml index 29675de..c311f0b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/OperationLogMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/OperationLogMapper.xml @@ -42,4 +42,4 @@ ORDER BY oper_create_time DESC - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/PolicyMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/PolicyMapper.xml index fe7ef02..73fac3a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/PolicyMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/PolicyMapper.xml @@ -22,4 +22,4 @@ LEFT JOIN system_user u ON p.create_by = u.user_id ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemConfigMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemConfigMapper.xml index ab07fa4..6eb2309 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemConfigMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemConfigMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDeptMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDeptMapper.xml index 9d5817e..01812ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDeptMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDeptMapper.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDictDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDictDataMapper.xml index 5fea13e..b667c7d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDictDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDictDataMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDictTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDictTypeMapper.xml index 8a093c0..d69e42c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDictTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDictTypeMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemRoleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemRoleMapper.xml index fb12299..c8631df 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemRoleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemRoleMapper.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemRoleMenuMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemRoleMenuMapper.xml index 1683a1f..bb6932a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemRoleMenuMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemRoleMenuMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserDataScopeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserDataScopeMapper.xml index 6b5f820..c37f754 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserDataScopeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserDataScopeMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserRoleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserRoleMapper.xml index 1dbc787..a7c1bde 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserRoleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserRoleMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java index 11d68d7..a26364b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java @@ -3,7 +3,6 @@ package com.zhgd.xmgl.modules.basicdata.service; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.basicdata.dto.MenuHzDto; import com.zhgd.xmgl.modules.basicdata.dto.MenuTreeDto; import com.zhgd.xmgl.modules.basicdata.entity.BaseMenu; import com.zhgd.xmgl.modules.basicdata.entity.BaseModule; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java index 91ecb08..514d54f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java @@ -12,8 +12,11 @@ import com.zhgd.xmgl.modules.basicdata.mapper.BaseActionMapper; import com.zhgd.xmgl.modules.basicdata.mapper.BaseMenuMapper; import com.zhgd.xmgl.modules.basicdata.mapper.ModuleTemplateMapper; import com.zhgd.xmgl.modules.city.basicdata.mapper.SystemUserMapper; -import com.zhgd.xmgl.modules.basicdata.service.*; import com.zhgd.xmgl.modules.city.government.service.IGovernmentService; +import com.zhgd.xmgl.modules.basicdata.service.IBaseMenuService; +import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService; +import com.zhgd.xmgl.modules.basicdata.service.ISystemRoleMenuService; +import com.zhgd.xmgl.modules.basicdata.service.ISystemUserRoleService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.util.ListUtils; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java index 94c3a35..1485ed9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java @@ -8,8 +8,11 @@ import com.zhgd.xmgl.modules.basicdata.entity.*; import com.zhgd.xmgl.modules.basicdata.mapper.BaseActionMapper; import com.zhgd.xmgl.modules.basicdata.mapper.BaseMenuMapper; import com.zhgd.xmgl.modules.basicdata.mapper.BaseModuleMapper; -import com.zhgd.xmgl.modules.basicdata.service.*; import com.zhgd.xmgl.modules.city.government.service.IGovernmentService; +import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService; +import com.zhgd.xmgl.modules.basicdata.service.IModuleTemplateService; +import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; +import com.zhgd.xmgl.modules.basicdata.service.ISystemUserRoleService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.util.CommonUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java index ebad4bb..4436731 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java @@ -1,14 +1,20 @@ package com.zhgd.xmgl.modules.basicdata.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.zhgd.xmgl.modules.basicdata.entity.*; +import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; +import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; +import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMainPerson; +import com.zhgd.xmgl.modules.basicdata.entity.EngineeringSingle; import com.zhgd.xmgl.modules.basicdata.mapper.EngineeringSingleMapper; -import com.zhgd.xmgl.modules.basicdata.service.*; +import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; +import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainPersonService; +import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService; +import com.zhgd.xmgl.modules.basicdata.service.IEngineeringSingleService; import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo; import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.city.project.service.IProjectService; -import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore; import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreService; +import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore; import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.util.ParamEnum; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java index 7244335..1074758 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java @@ -15,7 +15,10 @@ import com.zhgd.xmgl.modules.basicdata.entity.Notice; import com.zhgd.xmgl.modules.basicdata.entity.NoticeAccept; import com.zhgd.xmgl.modules.city.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.NoticeMapper; -import com.zhgd.xmgl.modules.basicdata.service.*; +import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; +import com.zhgd.xmgl.modules.basicdata.service.IMessageRecordService; +import com.zhgd.xmgl.modules.basicdata.service.INoticeAcceptService; +import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.modules.basicdata.vo.NoticeVo; import com.zhgd.xmgl.modules.city.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.city.government.service.IGovernmentService; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java index a137bfb..649ca08 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java @@ -13,7 +13,9 @@ import com.zhgd.xmgl.modules.basicdata.entity.AnnexFile; import com.zhgd.xmgl.modules.basicdata.entity.Policy; import com.zhgd.xmgl.modules.city.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.PolicyMapper; -import com.zhgd.xmgl.modules.basicdata.service.*; +import com.zhgd.xmgl.modules.basicdata.service.IAnnexFileService; +import com.zhgd.xmgl.modules.basicdata.service.IMessageRecordService; +import com.zhgd.xmgl.modules.basicdata.service.IPolicyService; import com.zhgd.xmgl.modules.basicdata.vo.PolicyVo; import com.zhgd.xmgl.modules.city.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.city.government.service.IGovernmentService; 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 3d3a422..a3f4791 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,9 +1,9 @@ package com.zhgd.xmgl.modules.basicdata.vo; -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; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/controller/FileController.java b/src/main/java/com/zhgd/xmgl/modules/city/basicdata/controller/FileController.java index 28ba97d..d5a7936 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/controller/FileController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/basicdata/controller/FileController.java @@ -17,7 +17,6 @@ import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; -import java.io.File; import java.net.URLEncoder; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java index 22a3f56..e3bf879 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java @@ -6,7 +6,6 @@ import com.zhgd.xmgl.modules.city.dust.entity.vo.EnvironmentAlarmTypeVo; import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; import com.zhgd.xmgl.modules.city.dust.entity.EnvironmentAlarm; -import java.util.List; import java.util.Map; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java index 667093c..deb3a46 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java @@ -11,7 +11,6 @@ import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; 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 io.swagger.models.auth.In; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/dto/CheckAcceptApplyDto.java b/src/main/java/com/zhgd/xmgl/modules/quality/dto/CheckAcceptApplyDto.java index ac62c2a..7c836e1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/dto/CheckAcceptApplyDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/dto/CheckAcceptApplyDto.java @@ -1,6 +1,5 @@ package com.zhgd.xmgl.modules.quality.dto; -import com.zhgd.xmgl.modules.quality.entity.AcceptInspectRecord; import com.zhgd.xmgl.modules.quality.entity.CheckAcceptApply; import com.zhgd.xmgl.modules.quality.entity.CheckAcceptApplyAnnex; import com.zhgd.xmgl.modules.quality.entity.CheckAcceptApplyDetail; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/AcceptInspectQuestionExamineMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/AcceptInspectQuestionExamineMapper.java index 3ea8dc2..b0fee51 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/AcceptInspectQuestionExamineMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/AcceptInspectQuestionExamineMapper.java @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.quality.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.quality.entity.AcceptInspectQuestionExamine; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/CheckAcceptApplyAnnexMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/CheckAcceptApplyAnnexMapper.java index f81d33d..56f93fc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/CheckAcceptApplyAnnexMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/CheckAcceptApplyAnnexMapper.java @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.quality.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.quality.entity.CheckAcceptApplyAnnex; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectQuestionExamineMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectQuestionExamineMapper.xml index c5eb0c9..6d78c34 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectQuestionExamineMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectQuestionExamineMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectQuestionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectQuestionMapper.xml index 586bfed..3c9d2cb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectQuestionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectQuestionMapper.xml @@ -8,4 +8,4 @@ LEFT JOIN system_user u ON q.create_by = u.user_id ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectRecordMapper.xml index 4123df9..639d190 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectRecordMapper.xml @@ -47,4 +47,4 @@ LEFT JOIN system_user u ON FIND_IN_SET(u.user_id, i.inspect_user) WHERE i.id = #{id} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyAnnexMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyAnnexMapper.xml index 3f519da..ad900b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyAnnexMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyAnnexMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyDetailMapper.xml index 5fe88f8..d2a1dc5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyDetailMapper.xml @@ -6,4 +6,4 @@ SELECT * FROM (SELECT d.*, s.`name` singleProject FROM check_accept_apply_detail d LEFT JOIN engineering_single s ON d.single_id = s.single_id) a ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyMapper.xml index db5261f..4291b15 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyMapper.xml @@ -6,4 +6,4 @@ SELECT * FROM (SELECT c.*, e.engineering_name FROM check_accept_apply c LEFT JOIN engineering e ON c.engineering_sn = e.engineering_sn) a ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptPlanMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptPlanMapper.xml index d6cbd11..93deee4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptPlanMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptPlanMapper.xml @@ -6,4 +6,4 @@ SELECT * FROM (SELECT c.*, s.`name` singleProject FROM check_accept_plan c LEFT JOIN engineering_single s ON c.single_id = s.single_id) a ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/api/ICommonFileService.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/api/ICommonFileService.java index 6e48f8a..3f178a1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/api/ICommonFileService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/api/ICommonFileService.java @@ -10,4 +10,4 @@ import java.util.List; public interface ICommonFileService extends IService { List selectCommonFileUser(String userId); List selectCommonFileByUser(String userId, String sessionUserId); -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/api/IFilePermissionService.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/api/IFilePermissionService.java index 71d8f5c..594bd68 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/api/IFilePermissionService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/api/IFilePermissionService.java @@ -5,4 +5,4 @@ import com.zhgd.xmgl.modules.quality.qiwen.domain.FilePermission; public interface IFilePermissionService extends IService { -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/component/AsyncTaskComp.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/component/AsyncTaskComp.java index bc98b98..0296137 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/component/AsyncTaskComp.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/component/AsyncTaskComp.java @@ -191,4 +191,4 @@ public class AsyncTaskComp { } -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FiletransferController.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FiletransferController.java index 958e113..3ede28e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FiletransferController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FiletransferController.java @@ -165,7 +165,7 @@ public class FiletransferController { userFileIds.add(userFile.getUserFileId()); userFileIds.addAll(userFileIds1); } - + } UserFile userFile = userFileService.getById(userFileIdStrs[0]); httpServletResponse.setContentType("application/force-download");// 设置强制下载不打开 diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/notice/NoticeListDTO.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/notice/NoticeListDTO.java index 7fa9b79..7c4b29a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/notice/NoticeListDTO.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/notice/NoticeListDTO.java @@ -25,4 +25,4 @@ public class NoticeListDTO { @Schema(description = "开始发布时间") private String endTime; -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/CheckEndTimeDTO.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/CheckEndTimeDTO.java index a83333b..64d7d23 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/CheckEndTimeDTO.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/CheckEndTimeDTO.java @@ -9,4 +9,4 @@ public class CheckEndTimeDTO { @Schema(description="批次号") private String shareBatchNum; -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/CheckExtractionCodeDTO.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/CheckExtractionCodeDTO.java index f6c7063..ad2eadf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/CheckExtractionCodeDTO.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/CheckExtractionCodeDTO.java @@ -14,4 +14,4 @@ public class CheckExtractionCodeDTO { -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareFileDTO.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareFileDTO.java index c72d3fe..8c836f3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareFileDTO.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareFileDTO.java @@ -21,4 +21,4 @@ public class ShareFileDTO { -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareFileListDTO.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareFileListDTO.java index be8c177..e98eb8a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareFileListDTO.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareFileListDTO.java @@ -14,4 +14,4 @@ public class ShareFileListDTO { -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareTypeDTO.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareTypeDTO.java index 04dc5ff..b780229 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareTypeDTO.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareTypeDTO.java @@ -11,4 +11,4 @@ public class ShareTypeDTO { private String shareBatchNum; -} \ No newline at end of file +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/io/QiwenFile.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/io/QiwenFile.java index 6e75a02..6963677 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/io/QiwenFile.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/io/QiwenFile.java @@ -101,5 +101,5 @@ public class QiwenFile { return !isDirectory; } - + } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/CommonFileMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/CommonFileMapper.xml index 050e52b..dda203a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/CommonFileMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/CommonFileMapper.xml @@ -23,6 +23,6 @@ left join qi_wen_file_permission c on c.common_file_id = a.common_file_id WHERE b.user_id = #{userId} and c.user_id = #{sessionUserId} - - \ No newline at end of file + + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileMapper.xml index 2d0ede1..95216bb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileMapper.xml @@ -16,6 +16,6 @@ #{file.fileSize}, #{file.isDir}) - - \ No newline at end of file + + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileNoticeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileNoticeMapper.xml index 06061a8..3cb63c6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileNoticeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileNoticeMapper.xml @@ -30,4 +30,4 @@ order by createTime desc - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileTypeMapper.xml index 412f665..3231577 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileTypeMapper.xml @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/RecoveryFileMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/RecoveryFileMapper.xml index 029ff1c..3c0fec7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/RecoveryFileMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/RecoveryFileMapper.xml @@ -12,4 +12,4 @@ left join qi_wen_file c on c.file_id = b.file_id WHERE user_id = #{userId} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/ShareFileMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/ShareFileMapper.xml index a8904f9..33bb5f9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/ShareFileMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/ShareFileMapper.xml @@ -59,4 +59,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/ShareMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/ShareMapper.xml index 9db4dd4..ea10788 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/ShareMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/ShareMapper.xml @@ -31,4 +31,4 @@ AND c.user_id = #{userId} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/StorageMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/StorageMapper.xml index 4eb7d50..5bd9a04 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/StorageMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/StorageMapper.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/SysParamMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/SysParamMapper.xml index e021cc2..486d5f9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/SysParamMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/SysParamMapper.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/UploadTaskDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/UploadTaskDetailMapper.xml index cea3908..996a206 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/UploadTaskDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/UploadTaskDetailMapper.xml @@ -11,4 +11,4 @@ order by chunk_number asc - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/UserFileMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/UserFileMapper.xml index 83e6a5a..f49da87 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/UserFileMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/UserFileMapper.xml @@ -53,4 +53,4 @@ WHERE f.create_user_id = #{userId} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/FileService.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/FileService.java index 1d35b65..8b8d970 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/FileService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/FileService.java @@ -11,9 +11,9 @@ import com.qiwenshare.ufop.operation.download.domain.DownloadFile; import com.qiwenshare.ufop.util.UFOPUtils; import com.zhgd.jeecg.upload.operation.FileOperation; import com.zhgd.jeecg.upload.util.DateUtil; -import com.zhgd.xmgl.modules.quality.qiwen.api.IFileService; import com.zhgd.xmgl.modules.quality.qiwen.component.AsyncTaskComp; import com.zhgd.xmgl.modules.quality.qiwen.component.FileDealComp; +import com.zhgd.xmgl.modules.quality.qiwen.api.IFileService; import com.zhgd.xmgl.modules.quality.qiwen.domain.FileBean; import com.zhgd.xmgl.modules.quality.qiwen.domain.Image; import com.zhgd.xmgl.modules.quality.qiwen.domain.Music; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/FiletransferService.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/FiletransferService.java index df85a2c..f91dec5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/FiletransferService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/FiletransferService.java @@ -22,8 +22,8 @@ import com.qiwenshare.ufop.operation.upload.Uploader; import com.qiwenshare.ufop.operation.upload.domain.UploadFile; import com.qiwenshare.ufop.operation.upload.domain.UploadFileResult; import com.qiwenshare.ufop.util.UFOPUtils; -import com.zhgd.xmgl.modules.quality.qiwen.api.IFiletransferService; import com.zhgd.xmgl.modules.quality.qiwen.component.FileDealComp; +import com.zhgd.xmgl.modules.quality.qiwen.api.IFiletransferService; import com.zhgd.xmgl.modules.quality.qiwen.domain.*; import com.zhgd.xmgl.modules.quality.qiwen.dto.file.DownloadFileDTO; import com.zhgd.xmgl.modules.quality.qiwen.dto.file.PreviewDTO; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/RecoveryFileService.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/RecoveryFileService.java index e113d8d..dcafe04 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/RecoveryFileService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/RecoveryFileService.java @@ -3,8 +3,8 @@ package com.zhgd.xmgl.modules.quality.qiwen.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhgd.xmgl.modules.quality.qiwen.api.IRecoveryFileService; import com.zhgd.xmgl.modules.quality.qiwen.component.FileDealComp; +import com.zhgd.xmgl.modules.quality.qiwen.api.IRecoveryFileService; import com.zhgd.xmgl.modules.quality.qiwen.domain.RecoveryFile; import com.zhgd.xmgl.modules.quality.qiwen.domain.UserFile; import com.zhgd.xmgl.modules.quality.qiwen.io.QiwenFile; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/UserFileService.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/UserFileService.java index 0da65f6..eb48b34 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/UserFileService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/UserFileService.java @@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qiwenshare.common.constant.FileConstant; import com.qiwenshare.common.util.DateUtil; -import com.zhgd.xmgl.modules.quality.qiwen.api.IUserFileService; import com.zhgd.xmgl.modules.quality.qiwen.component.FileDealComp; +import com.zhgd.xmgl.modules.quality.qiwen.api.IUserFileService; import com.zhgd.xmgl.modules.quality.qiwen.domain.RecoveryFile; import com.zhgd.xmgl.modules.quality.qiwen.domain.UserFile; import com.zhgd.xmgl.modules.quality.qiwen.io.QiwenFile; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/vo/file/UploadFileVo.java b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/vo/file/UploadFileVo.java index b5f9882..4d1c908 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/vo/file/UploadFileVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/qiwen/vo/file/UploadFileVo.java @@ -19,4 +19,4 @@ public class UploadFileVo { private List uploaded; -} \ No newline at end of file +} 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 b00d965..45b008d 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,10 +9,10 @@ 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.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; -import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService; +import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; +import com.zhgd.xmgl.modules.city.project.entity.Project; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.project.service.IProjectService; import com.zhgd.xmgl.modules.quality.dto.AcceptInspectRecordDto; 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 5727f78..8722739 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,9 +11,9 @@ 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.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.project.service.IProjectService; -import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.quality.dto.CheckAcceptApplyDto; import com.zhgd.xmgl.modules.quality.entity.AcceptInspectRecord; import com.zhgd.xmgl.modules.quality.entity.CheckAcceptApply; 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 5253819..94b9565 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,9 +6,9 @@ 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.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.project.service.IProjectService; -import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.quality.dto.CheckAcceptPlanEntDto; import com.zhgd.xmgl.modules.quality.dto.CheckAcceptPlanProDto; import com.zhgd.xmgl.modules.quality.entity.CheckAcceptPlan; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentDetailMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentDetailMapper.java index cb367df..5ab271f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentDetailMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentDetailMapper.java @@ -1,9 +1,6 @@ package com.zhgd.xmgl.modules.safety.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.safety.entity.InvestmentPaymentDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml index 5cfc5b8..d70b5cc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml index 6165f3b..3283ef5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml @@ -27,4 +27,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml index ec43e2d..d4dacf3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InspectLibraryDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InspectLibraryDetailMapper.xml index 2500113..c4d7d8d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InspectLibraryDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InspectLibraryDetailMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InspectLibraryMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InspectLibraryMapper.xml index d90c92e..7051b8f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InspectLibraryMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InspectLibraryMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentApplyMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentApplyMapper.xml index 317e8dc..42e2a1a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentApplyMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentApplyMapper.xml @@ -7,4 +7,4 @@ LEFT JOIN project p ON a.project_sn = p.project_sn ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentContractMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentContractMapper.xml index 0e0b9d6..d8ba81e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentContractMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentContractMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentDetailMapper.xml index 44c13a4..2b37704 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentDetailMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentItemMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentItemMapper.xml index 14382bd..943d151 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentItemMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentItemMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentMapper.xml index 810bc56..50b72d8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentStatMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentStatMapper.xml index 21f04d1..6e20ab8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentStatMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentPaymentStatMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceExamineMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceExamineMapper.xml index 544ee7f..16cc1d7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceExamineMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceExamineMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceMapper.xml index a75e723..32b2630 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceUseMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceUseMapper.xml index 82aca70..3d0de13 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceUseMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/LiftingDeviceUseMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/ProjectNodePlanMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/ProjectNodePlanMapper.xml index 4c74b33..e0c097b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/ProjectNodePlanMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/ProjectNodePlanMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/ProjectSubItemMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/ProjectSubItemMapper.xml index a316c78..c9c7b6f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/ProjectSubItemMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/ProjectSubItemMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/UnmannedDeviceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/UnmannedDeviceMapper.xml index 3abd37c..41a4e3e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/UnmannedDeviceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/UnmannedDeviceMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/UnmannedVideoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/UnmannedVideoMapper.xml index 66dd6f5..d16e995 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/UnmannedVideoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/UnmannedVideoMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerInfoDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerInfoDto.java index 23428d2..797e6c1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerInfoDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerInfoDto.java @@ -32,7 +32,7 @@ public class WorkerInfoDto { @ApiModelProperty(value = "手机号") private String phone; - + @ApiModelProperty(value = "身份证号") private String idCard; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorAlarmMapper.xml index e573887..af3296d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorAlarmMapper.xml @@ -53,4 +53,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorDevMapper.xml index 7c326af..6d1eb26 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorDevMapper.xml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorQuestionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorQuestionMapper.xml index bffed90..e69532d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorQuestionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AiMonitorQuestionMapper.xml @@ -32,4 +32,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceDevMapper.xml index 28d65e6..a9dc574 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceDevMapper.xml @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceDevSyncMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceDevSyncMapper.xml index e555ef2..ab951af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceDevSyncMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceDevSyncMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceRecordMapper.xml index c6d9b25..f1f7857 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceRecordMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceStatisticsMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceStatisticsMapper.xml index b3540e3..835f360 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceStatisticsMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/AttendanceStatisticsMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/CompanyMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/CompanyMapper.xml index 5d34257..83bbb85 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/CompanyMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/CompanyMapper.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/IAttendanceDevSyncService.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/IAttendanceDevSyncService.xml index e555ef2..ab951af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/IAttendanceDevSyncService.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/IAttendanceDevSyncService.xml @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TeamInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TeamInfoMapper.xml index c6e3b98..e8f350c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TeamInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/TeamInfoMapper.xml @@ -7,4 +7,4 @@ LEFT JOIN engineering e ON t.engineering_sn = e.engineering_sn ${ew.customSqlSegment} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerTypeMapper.xml index cc14466..0d73525 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerTypeMapper.xml @@ -13,4 +13,4 @@ ${ew.customSqlSegment} UNION ALL SELECT * FROM worker_type WHERE is_public = 1 - \ No newline at end of file + 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 230872f..61e8e90 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,15 +13,15 @@ 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.basicdata.dto.ProjectDeviceDto; +import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.project.service.IProjectService; +import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.wisdom.dto.MapAiAlarmDto; -import com.zhgd.xmgl.modules.basicdata.dto.ProjectDeviceDto; import com.zhgd.xmgl.modules.wisdom.entity.AiMonitorAlarm; import com.zhgd.xmgl.modules.wisdom.entity.AiMonitorDev; -import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; import com.zhgd.xmgl.modules.wisdom.mapper.AiMonitorAlarmMapper; -import com.zhgd.xmgl.modules.basicdata.service.*; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorDevService; import com.zhgd.xmgl.util.CommonUtil;