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

依赖

Browse Source
This commit is contained in:
guo 2023-09-09 09:19:34 +08:00
parent 3ce55c6f51
commit 952f1cf935
139 changed files with 214 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java
View File

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

8
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/AppVersionController.java
View File

@ -42,7 +42,7 @@ import java.util.Map;
public class AppVersionController {
@Autowired
private IAppVersionService appVersionService;
/**
* 分页列表查询
* @return
@ -60,7 +60,7 @@ public class AppVersionController {
Page<AppVersion> 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

6
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseActionController.java
View File

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

12
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseMenuController.java
View File

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

16
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareAlarmController.java
View File

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

7
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/HardWareCallbackController.java
View File

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

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/ModuleTemplateController.java
View File

@ -42,7 +42,7 @@ public class ModuleTemplateController {
private IModuleTemplateService moduleTemplateService;
/**
* 批量添加/修改
* @return

12
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/OperationLogController.java
View File

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

14
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemConfigController.java
View File

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

14
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictDataController.java
View File

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

16
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemDictTypeController.java
View File

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

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
View File

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

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

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

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

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

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

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

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

@ -50,7 +50,7 @@ public class GovAiMonitorDevController {
private IAiMonitorAlarmService aiMonitorAlarmService;
@Autowired
private IAiMonitorDevService aiMonitorDevService;
private IAiMonitorDevService aiMonitorDevService;
@Autowired
private IEngineeringService engineeringService;

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

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

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseController.java
View File

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

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

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

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

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

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

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

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

@ -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<Page<WorkerInfoDto>> queryDetailBySn(@ApiIgnore Page page,@ApiIgnore @RequestBody WorkerInfo workerInfo) {
public Result<Page<WorkerInfoDto>> queryDetailBySn(@ApiIgnore Page page, @ApiIgnore @RequestBody WorkerInfo workerInfo) {
return Result.success(workerInfoService.getDetail(page, Wrappers.<WorkerInfo>lambdaQuery().eq(WorkerInfo::getIdCard, workerInfo.getIdCard())));
}
}

14
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CheckAcceptApplyAnnexController.java
View File

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

14
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CheckAcceptApplyDetailController.java
View File

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

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/UnmannedDeviceController.java
View File

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

2
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/NoticeAccept.java
View File

@ -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 = "接受方单位名称")

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/ModuleTemplateMapper.java
View File

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

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemConfigMapper.java
View File

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

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDictDataMapper.java
View File

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

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDictTypeMapper.java
View File

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

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemRoleMenuMapper.java
View File

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

3
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserRoleMapper.java
View File

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

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AnnexFileMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.AnnexFileMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/AppVersionMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.AppVersionMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseActionMapper.xml
View File

@ -57,4 +57,4 @@
<select id="getByModuleId" resultType="java.lang.String">
SELECT a.action_id FROM base_action a RIGHT JOIN base_menu m ON a.menu_id = m.menu_id WHERE m.module_id = #{moduleId}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseMenuMapper.xml
View File

@ -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
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
View File

@ -9,4 +9,4 @@
<select id="getByRoleId" resultType="java.lang.Long">
SELECT m.module_id FROM base_module m RIGHT JOIN system_role_menu r ON m.module_id = r.authority_id WHERE r.type = 0 AND r.role_id = #{roleId}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainPersonMapper.xml
View File

@ -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}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringSingleMapper.xml
View File

@ -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}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainLicenseMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMainLicenseMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/FileDetailMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.FileDetailMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/GovernmentConfigMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.GovernmentConfigMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/HardWareAlarmMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.HardWareAlarmMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/MessageRecordMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.MessageRecordMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/ModuleTemplateMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.ModuleTemplateMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeAcceptMapper.xml
View File

@ -8,4 +8,4 @@
LEFT JOIN project p ON n.accept = p.project_sn AND n.accept_type = 4
WHERE n.notice_id = #{noticeId}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml
View File

@ -15,4 +15,4 @@
LEFT JOIN system_user u ON n.create_by = u.user_id
${ew.customSqlSegment}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/OperationLogMapper.xml
View File

@ -42,4 +42,4 @@
</where>
ORDER BY oper_create_time DESC
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/PolicyMapper.xml
View File

@ -22,4 +22,4 @@
LEFT JOIN system_user u ON p.create_by = u.user_id
${ew.customSqlSegment}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemConfigMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.SystemConfigMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDeptMapper.xml
View File

@ -5,4 +5,4 @@
<select id="getChildrenByDeptId" resultType="java.lang.String">
SELECT GROUP_CONCAT(dept_id) FROM system_dept WHERE FIND_IN_SET(#{deptId},ancestors) OR dept_id = #{deptId}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDictDataMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.SystemDictDataMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemDictTypeMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.SystemDictTypeMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemRoleMapper.xml
View File

@ -5,4 +5,4 @@
<select id="getByUserId" resultType="java.lang.Long">
SELECT r.role_id FROM system_role r RIGHT JOIN system_user_role ur ON r.role_id = ur.role_id WHERE ur.user_id = #{userId} AND r.state = 1
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemRoleMenuMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.SystemRoleMenuMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserDataScopeMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.SystemUserDataScopeMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserRoleMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.SystemUserRoleMapper">
</mapper>
</mapper>

1
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseMenuService.java
View File

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

5
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
View File

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

5
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java
View File

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

12
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java
View File

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

5
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java
View File

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

4
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/PolicyServiceImpl.java
View File

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

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

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

1
src/main/java/com/zhgd/xmgl/modules/city/basicdata/controller/FileController.java
View File

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

1
src/main/java/com/zhgd/xmgl/modules/city/dust/service/IEnvironmentAlarmService.java
View File

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

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

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

1
src/main/java/com/zhgd/xmgl/modules/quality/dto/CheckAcceptApplyDto.java
View File

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

3
src/main/java/com/zhgd/xmgl/modules/quality/mapper/AcceptInspectQuestionExamineMapper.java
View File

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

3
src/main/java/com/zhgd/xmgl/modules/quality/mapper/CheckAcceptApplyAnnexMapper.java
View File

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

2
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectQuestionExamineMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.quality.mapper.AcceptInspectQuestionExamineMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectQuestionMapper.xml
View File

@ -8,4 +8,4 @@
LEFT JOIN system_user u ON q.create_by = u.user_id
${ew.customSqlSegment}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/AcceptInspectRecordMapper.xml
View File

@ -47,4 +47,4 @@
LEFT JOIN system_user u ON FIND_IN_SET(u.user_id, i.inspect_user)
WHERE i.id = #{id}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyAnnexMapper.xml
View File

@ -2,4 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.quality.mapper.CheckAcceptApplyAnnexMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyDetailMapper.xml
View File

@ -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}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptApplyMapper.xml
View File

@ -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}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/CheckAcceptPlanMapper.xml
View File

@ -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}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/api/ICommonFileService.java
View File

@ -10,4 +10,4 @@ import java.util.List;
public interface ICommonFileService extends IService<CommonFile> {
List<CommonFileUser> selectCommonFileUser(String userId);
List<CommonFileListVo> selectCommonFileByUser(String userId, String sessionUserId);
}
}

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/api/IFilePermissionService.java
View File

@ -5,4 +5,4 @@ import com.zhgd.xmgl.modules.quality.qiwen.domain.FilePermission;
public interface IFilePermissionService extends IService<FilePermission> {
}
}

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/component/AsyncTaskComp.java
View File

@ -191,4 +191,4 @@ public class AsyncTaskComp {
}
}
}

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/controller/FiletransferController.java
View File

@ -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");// 设置强制下载不打开

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/notice/NoticeListDTO.java
View File

@ -25,4 +25,4 @@ public class NoticeListDTO {
@Schema(description = "开始发布时间")
private String endTime;
}
}

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/CheckEndTimeDTO.java
View File

@ -9,4 +9,4 @@ public class CheckEndTimeDTO {
@Schema(description="批次号")
private String shareBatchNum;
}
}

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/CheckExtractionCodeDTO.java
View File

@ -14,4 +14,4 @@ public class CheckExtractionCodeDTO {
}
}

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareFileDTO.java
View File

@ -21,4 +21,4 @@ public class ShareFileDTO {
}
}

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareFileListDTO.java
View File

@ -14,4 +14,4 @@ public class ShareFileListDTO {
}
}

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/dto/sharefile/ShareTypeDTO.java
View File

@ -11,4 +11,4 @@ public class ShareTypeDTO {
private String shareBatchNum;
}
}

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/io/QiwenFile.java
View File

@ -101,5 +101,5 @@ public class QiwenFile {
return !isDirectory;
}
}

4
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/CommonFileMapper.xml
View File

@ -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}
</select>
</mapper>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileMapper.xml
View File

@ -16,6 +16,6 @@
#{file.fileSize}, #{file.isDir})
</foreach>
</insert>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileNoticeMapper.xml
View File

@ -30,4 +30,4 @@
order by createTime desc
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/FileTypeMapper.xml
View File

@ -21,4 +21,4 @@
</where>
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/RecoveryFileMapper.xml
View File

@ -12,4 +12,4 @@
left join qi_wen_file c on c.file_id = b.file_id
WHERE user_id = #{userId}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/ShareFileMapper.xml
View File

@ -59,4 +59,4 @@
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/ShareMapper.xml
View File

@ -31,4 +31,4 @@
</if>
AND c.user_id = #{userId}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/StorageMapper.xml
View File

@ -7,4 +7,4 @@
<mapper namespace="com.zhgd.xmgl.modules.quality.qiwen.mapper.StorageMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/SysParamMapper.xml
View File

@ -7,4 +7,4 @@
<mapper namespace="com.zhgd.xmgl.modules.quality.qiwen.mapper.SysParamMapper">
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/UploadTaskDetailMapper.xml
View File

@ -11,4 +11,4 @@
order by chunk_number asc
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/mapper/xml/UserFileMapper.xml
View File

@ -53,4 +53,4 @@
WHERE f.create_user_id = #{userId}
</select>
</mapper>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/quality/qiwen/service/FileService.java
View File

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

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