From fe73605f4913716e777fc7d7029dac2ed1ec7361 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 22 Sep 2023 19:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=81=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/BaseModuleController.java | 16 +++++++ .../admin/ModuleTemplateController.java | 21 ++++++++- .../admin/SystemConfigController.java | 20 +++++++-- .../enterprise/EntAiMonitorDevController.java | 10 +++-- .../EntEnvironmentDevController.java | 2 +- .../enterprise/EntMonitorDevController.java | 2 +- .../enterprise/EntTeamInfoController.java | 11 ++--- .../GovAcceptInspectRecordController.java | 3 +- .../GovCheckAcceptApplyController.java | 8 ++-- .../GovCheckAcceptPlanController.java | 8 ++-- .../project/AiMonitorDevController.java | 6 +-- .../project/EnvironmentDevController.java | 2 +- .../project/MonitorDevController.java | 2 +- .../basicdata/entity/ModuleTemplate.java | 11 +++++ .../basicdata/entity/SystemConfig.java | 12 ++++++ .../basicdata/mapper/xml/SystemUserMapper.xml | 1 + .../basicdata/service/IBaseMenuService.java | 3 +- .../service/IModuleTemplateService.java | 6 ++- .../service/impl/BaseMenuServiceImpl.java | 21 +++++++++ .../impl/ModuleTemplateServiceImpl.java | 43 ++++++++++++++++++- .../service/impl/ProjectServiceImpl.java | 8 ++++ .../service/impl/SystemUserServiceImpl.java | 1 + .../quality/entity/AcceptInspectRecord.java | 10 +++-- .../impl/CheckAcceptApplyServiceImpl.java | 2 + .../impl/CheckAcceptPlanServiceImpl.java | 9 +++- .../impl/InspectRecordServiceImpl.java | 2 - .../impl/ProjectSubItemServiceImpl.java | 6 +-- 27 files changed, 201 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseModuleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseModuleController.java index 988c216..e0ec6b2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseModuleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseModuleController.java @@ -7,8 +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.dto.MenuTreeDto; import com.zhgd.xmgl.modules.basicdata.entity.BaseModule; import com.zhgd.xmgl.modules.basicdata.entity.ModuleTemplate; +import com.zhgd.xmgl.modules.basicdata.service.IBaseMenuService; import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService; import com.zhgd.xmgl.modules.basicdata.service.IModuleTemplateService; import com.zhgd.xmgl.valid.AddGroup; @@ -43,6 +45,9 @@ public class BaseModuleController { @Autowired private IBaseModuleService baseModuleService; + @Autowired + private IBaseMenuService baseMenuService; + @Autowired private IModuleTemplateService moduleTemplateService; @@ -88,6 +93,17 @@ public class BaseModuleController { return result; } + /** + * 查询所有模块、菜单、按钮 + * @return + */ + @OperLog(operModul = "系统模块管理", operType = "列表查询", operDesc = "查询所有模块、菜单、按钮") + @ApiOperation(value = "查询所有模块、菜单、按钮", notes = "查询所有模块、菜单、按钮", httpMethod="POST") + @PostMapping(value = "/queryAllByType") + public Result> queryAllByType(@RequestBody BaseModule baseModule) { + return Result.success(baseMenuService.allMenu(baseModule)); + } + /** * 添加 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..5b57b8f 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 @@ -2,9 +2,11 @@ package com.zhgd.xmgl.modules.basicdata.controller.admin; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.basicdata.entity.ModuleTemplate; import com.zhgd.xmgl.modules.basicdata.service.IModuleTemplateService; import io.swagger.annotations.Api; @@ -41,8 +43,6 @@ public class ModuleTemplateController { @Autowired private IModuleTemplateService moduleTemplateService; - - /** * 批量添加/修改 * @return @@ -91,4 +91,21 @@ public class ModuleTemplateController { result.success("操作成功！"); return result; } + + /** + * 查询政务下的权限模板信息 + * @param moduleTemplate + * @return + */ + @OperLog(operModul = "政务模块模板管理", operType = "查询", operDesc = "查询政务下的权限模板信息") + @ApiOperation(value = " 查询政务下的权限模板信息", notes = "查询政务下的权限模板信息", httpMethod="POST") + @PostMapping(value = "/listByGovernment") + public Result> listByGovernment(@RequestBody ModuleTemplate moduleTemplate) { + Result> result = new Result>(); + QueryWrapper wrapper = QueryGenerator.initQueryWrapper(moduleTemplate); + List moduleTemplates = moduleTemplateService.listByGovernment(wrapper); + result.setSuccess(true); + result.setResult(moduleTemplates); + return result; + } } 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..2733adf 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 @@ -1,7 +1,9 @@ package com.zhgd.xmgl.modules.basicdata.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; @@ -168,11 +170,21 @@ public class SystemConfigController { */ @OperLog(operModul = "系统配置管理", operType = "查询", operDesc = "通过键名查询参数配置信息") @ApiOperation(value = "通过键名查询参数配置信息", notes = "通过键名查询参数配置信息" , httpMethod="POST") - @ApiImplicitParam(name = "configKey", value = "参数健名", paramType = "body", required = true, dataType = "String") + @ApiImplicitParams({ + @ApiImplicitParam(name = "configKey", value = "参数健名", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "configType", value = "参数健类型", paramType = "body", required = true, dataType = "String") + }) @PostMapping(value = "/queryByKey") - public Result queryByKey(@ApiIgnore @RequestBody SystemConfig systemConfigEntity) { - Result result = new Result(); - SystemConfig systemConfig = systemConfigService.getOne(Wrappers.lambdaQuery().eq(SystemConfig::getConfigKey, systemConfigEntity.getConfigKey())); + public Result> queryByKey(@ApiIgnore @RequestBody SystemConfig systemConfigEntity) { + Result> result = new Result>(); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + if (StringUtils.isNotBlank(systemConfigEntity.getConfigKey())) { + wrapper.eq(SystemConfig::getConfigKey, systemConfigEntity.getConfigKey()); + } + if (StringUtils.isNotBlank(systemConfigEntity.getConfigType())) { + wrapper.eq(SystemConfig::getConfigType, systemConfigEntity.getConfigType()); + } + List systemConfig = systemConfigService.list(wrapper); if(systemConfig==null) { result.error500("未找到对应实体"); }else { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAiMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAiMonitorDevController.java index 061a0ea..c775f95 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAiMonitorDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAiMonitorDevController.java @@ -1,12 +1,13 @@ package com.zhgd.xmgl.modules.basicdata.controller.enterprise; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.wisdom.entity.AiMonitorDev; @@ -72,6 +73,7 @@ public class EntAiMonitorDevController { if (StringUtils.isNotBlank(name)) { wrapper.like("d.name", name); } + wrapper.orderByAsc("d.priority"); return Result.success(aiMonitorDevService.pageList(page, wrapper)); } @@ -85,9 +87,9 @@ public class EntAiMonitorDevController { @ApiImplicitParam(name = "engineeringSn", value = "工程sn", dataType = "String") @PostMapping(value = "/list") public Result> queryList(@ApiIgnore @RequestBody AiMonitorDev aiMonitorDev) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - if (aiMonitorDev.getEngineeringSn() != null) { - wrapper.eq(AiMonitorDev::getEngineeringSn, aiMonitorDev.getEngineeringSn()); + QueryWrapper wrapper = QueryGenerator.initQueryWrapper(aiMonitorDev); + if (StringUtils.isNotBlank(aiMonitorDev.getProjectSn())) { + wrapper.lambda().eq(AiMonitorDev::getEngineeringSn, StrUtil.EMPTY); } List list = aiMonitorDevService.list(wrapper); return Result.success(list); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java index 77db119..44ec7aa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEnvironmentDevController.java @@ -76,7 +76,7 @@ public class EntEnvironmentDevController { wrapper.like("d.name", name); } Page page = PageUtil.getPage(map); - wrapper.orderByDesc("d.priority"); + wrapper.orderByAsc("d.priority"); IPage pageList = environmentDevService.pageList(page, wrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorDevController.java index bb48da5..4ac9ff4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntMonitorDevController.java @@ -75,7 +75,7 @@ public class EntMonitorDevController { if (StringUtils.isNotBlank(name)) { wrapper.like("m.name", name); } - wrapper.orderByDesc("m.priority"); + wrapper.orderByAsc("m.priority"); return Result.success(monitorDevService.pageList(page, wrapper)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTeamInfoController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTeamInfoController.java index 6b508de..72a4475 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTeamInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntTeamInfoController.java @@ -1,12 +1,13 @@ package com.zhgd.xmgl.modules.basicdata.controller.enterprise; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.wisdom.dto.TeamInfoDto; import com.zhgd.xmgl.modules.wisdom.entity.TeamInfo; import com.zhgd.xmgl.modules.wisdom.service.ITeamInfoService; @@ -69,9 +70,9 @@ public class EntTeamInfoController { @ApiImplicitParam(name = "engineeringSn", value = "工程sn", paramType = "body", dataType = "String") @PostMapping(value = "/list") public Result> queryList(@ApiIgnore @RequestBody TeamInfo teamInfo) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - if (StringUtils.isNotBlank(teamInfo.getEngineeringSn())) { - wrapper.eq(TeamInfo::getEngineeringSn, teamInfo.getEngineeringSn()); + QueryWrapper wrapper = QueryGenerator.initQueryWrapper(teamInfo); + if (StringUtils.isNotBlank(teamInfo.getProjectSn())) { + wrapper.lambda().eq(TeamInfo::getEngineeringSn, StrUtil.EMPTY); } List list = teamInfoService.list(wrapper); return Result.success(list); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java index 9db24d7..f0c4794 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAcceptInspectRecordController.java @@ -115,7 +115,6 @@ public class GovAcceptInspectRecordController { result.error500("该执法任务已提交审核"); } else { acceptInspectRecordVo.setCreateBy(acceptInspectRecordEntity.getCreateBy()); - acceptInspectRecordVo.setCreateTime(new Date()); acceptInspectRecordService.commit(acceptInspectRecordVo); Map resultMap = new HashMap<>(); if (StringUtils.isNotBlank(acceptInspectRecordEntity.getEngineeringSn())) { @@ -152,7 +151,7 @@ public class GovAcceptInspectRecordController { } if (acceptInspectRecordEntity.getState() == 0) { acceptInspectRecord.setState(1); - acceptInspectRecord.setCreateTime(new Date()); + acceptInspectRecord.setInspectTime(new Date()); } boolean ok = acceptInspectRecordService.updateById(acceptInspectRecord); if (ok) { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCheckAcceptApplyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCheckAcceptApplyController.java index 53050ff..9b6baf1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCheckAcceptApplyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCheckAcceptApplyController.java @@ -50,8 +50,8 @@ public class GovCheckAcceptApplyController { * * @return */ - @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询扬尘工程信息") - @ApiOperation(value = " 分页列表查询扬尘工程信息", notes = "分页列表查询扬尘工程信息", httpMethod = "POST") + @OperLog(operModul = "验收申请管理", operType = "分页查询", operDesc = "分页列表查询验收申请工程信息") + @ApiOperation(value = " 分页列表查询验收申请工程信息", notes = "分页列表查询验收申请工程信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "engineeringName", value = "工程名称", paramType = "body", dataType = "String"), @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), @@ -67,8 +67,8 @@ public class GovCheckAcceptApplyController { * * @return */ - @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询扬尘项目信息") - @ApiOperation(value = " 分页列表查询扬尘项目信息", notes = "分页列表查询扬尘项目信息", httpMethod = "POST") + @OperLog(operModul = "验收申请管理", operType = "分页查询", operDesc = "分页列表查询验收申请项目信息") + @ApiOperation(value = " 分页列表查询验收申请项目信息", notes = "分页列表查询验收申请项目信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "body", dataType = "String"), @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCheckAcceptPlanController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCheckAcceptPlanController.java index e2a9b98..7309608 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCheckAcceptPlanController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCheckAcceptPlanController.java @@ -48,8 +48,8 @@ public class GovCheckAcceptPlanController { * * @return */ - @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询扬尘工程信息") - @ApiOperation(value = " 分页列表查询扬尘工程信息", notes = "分页列表查询扬尘工程信息", httpMethod = "POST") + @OperLog(operModul = "验收计划管理", operType = "分页查询", operDesc = "分页列表查询验收计划工程信息") + @ApiOperation(value = " 分页列表查询验收计划工程信息", notes = "分页列表查询验收计划工程信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "engineeringName", value = "工程名称", paramType = "body", dataType = "String"), @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), @@ -65,8 +65,8 @@ public class GovCheckAcceptPlanController { * * @return */ - @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询扬尘项目信息") - @ApiOperation(value = " 分页列表查询扬尘项目信息", notes = "分页列表查询扬尘项目信息", httpMethod = "POST") + @OperLog(operModul = "验收计划管理", operType = "分页查询", operDesc = "分页列表查询验收计划项目信息") + @ApiOperation(value = " 分页列表查询验收计划项目信息", notes = "分页列表查询验收计划项目信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "body", dataType = "String"), @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java index 41fc311..737d17d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java @@ -3,7 +3,6 @@ package com.zhgd.xmgl.modules.basicdata.controller.project; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -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; @@ -66,6 +65,7 @@ public class AiMonitorDevController { queryWrapper.lambda().eq(AiMonitorDev::getEngineeringSn, StrUtil.EMPTY); } Page page = PageUtil.getPage(map); + queryWrapper.lambda().orderByAsc(AiMonitorDev::getPriority); return Result.success(aiMonitorDevService.page(page, queryWrapper)); } @@ -78,11 +78,11 @@ public class AiMonitorDevController { @ApiOperation(value = " 列表查询AI预警设备管理信息", notes = "列表查询AI预警设备管理信息", httpMethod = "POST") @PostMapping(value = "/list") public Result> queryList(@RequestBody AiMonitorDev aiMonitorDev) { - QueryWrapper wrapper = Wrappers.query(); + QueryWrapper wrapper = QueryGenerator.initQueryWrapper(aiMonitorDev); if (StringUtils.isNotBlank(aiMonitorDev.getProjectSn())) { wrapper.lambda().eq(AiMonitorDev::getEngineeringSn, StrUtil.EMPTY); } - List list = aiMonitorDevService.list(null); + List list = aiMonitorDevService.list(wrapper); return Result.success(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java index 0b57161..b874b3b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnvironmentDevController.java @@ -69,7 +69,7 @@ public class EnvironmentDevController { wrapper.lambda().eq(EnvironmentDev::getEngineeringSn, StrUtil.EMPTY); } Page page = PageUtil.getPage(map); - wrapper.lambda().orderByDesc(EnvironmentDev::getPriority); + wrapper.lambda().orderByAsc(EnvironmentDev::getPriority); IPage pageList = environmentDevService.page(page, wrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonitorDevController.java index 0f33c37..db61a40 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonitorDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonitorDevController.java @@ -70,7 +70,7 @@ public class MonitorDevController { queryWrapper.lambda().eq(MonitorDev::getEngineeringSn, StrUtil.EMPTY); } Page page = PageUtil.getPage(map); - queryWrapper.lambda().orderByDesc(MonitorDev::getPriority); + queryWrapper.lambda().orderByAsc(MonitorDev::getPriority); IPage pageList = monitorDevService.page(page, queryWrapper); result.setSuccess(true); result.setResult(pageList); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ModuleTemplate.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ModuleTemplate.java index f781b7c..f5d0b07 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ModuleTemplate.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/ModuleTemplate.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.basicdata.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -46,4 +47,14 @@ public class ModuleTemplate implements Serializable { @Excel(name = "模块id", width = 15) @ApiModelProperty(value = "模块id") private Long moduleId; + /** + * 菜单类型,0:模块 1:菜单;2:按钮 + */ + @Excel(name = "菜单类型,0:模块 1:菜单;2:按钮", width = 15) + @ApiModelProperty(value = "菜单类型,0:模块 1:菜单;2:按钮") + private Integer type; + + @TableField(exist = false) + @ApiModelProperty(value = "子集数量") + private Integer children = 0; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemConfig.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemConfig.java index fe3d25c..2939ad2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemConfig.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemConfig.java @@ -38,12 +38,24 @@ public class SystemConfig implements Serializable { @Excel(name = "参数名称", width = 15) @ApiModelProperty(value = "参数名称") private String configName; + /** + * 参数分类 + */ + @Excel(name = "参数分类", width = 15) + @ApiModelProperty(value = "参数分类") + private String configType; /** * 参数键名 */ @Excel(name = "参数键名", width = 15) @ApiModelProperty(value = "参数键名") private String configKey; + /** + * 参数值类型（1:文字描述;2:图片） + */ + @Excel(name = "参数值类型（1:文字描述;2:图片）", width = 15) + @ApiModelProperty(value = "参数值类型（1:文字描述;2:图片）") + private Integer configValueType; /** * 参数键值 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml index 4293938..f87812a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml @@ -16,6 +16,7 @@ SELECT , d.dept_name, ur.role_id FROM system_user u LEFT JOIN system_dept d ON u.department = d.dept_id LEFT JOIN system_user_role ur ON u.user_id = ur.user_id + LEFT JOIN system_role r ON r.role_id = ur.role_id ${ew.customSqlSegment} \ 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..d2b77af 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; @@ -47,6 +46,8 @@ public interface IBaseMenuService extends IService { JSONArray selectGroupList(Map map); + List allMenu(BaseModule baseModule); + List treeMenu(Integer type); List myTreeMenu(Long moduleId); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IModuleTemplateService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IModuleTemplateService.java index 809edc2..665e0a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IModuleTemplateService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IModuleTemplateService.java @@ -1,7 +1,10 @@ package com.zhgd.xmgl.modules.basicdata.service; -import com.zhgd.xmgl.modules.basicdata.entity.ModuleTemplate; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.basicdata.entity.ModuleTemplate; + +import java.util.List; /** * @Description: 所属政务模块模板 @@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IModuleTemplateService extends IService { + List listByGovernment(QueryWrapper wrapper); } 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 c850fc2..3add30c 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 @@ -77,6 +77,27 @@ public class BaseMenuServiceImpl extends ServiceImpl i return result; } + @Override + public List allMenu(BaseModule baseModule) { + // 查询当前账号所属政务下的模块 + List baseModules = baseModuleService.list(Wrappers.lambdaQuery() + .eq(BaseModule::getModuleType, baseModule.getModuleType()) + .eq(BaseModule::getStyleType, baseModule.getStyleType())); + if (baseModules.size() == 0) { + return null; + } + List menuList = TreeUtil.formatModule(baseModules); + // 查询相对应的菜单 + List baseMenus = baseMenuMapper.selectList(Wrappers.lambdaQuery().in(BaseMenu::getModuleId, + baseModules.stream().map(m -> m.getModuleId()).collect(Collectors.toList())).eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority)); + menuList.addAll(TreeUtil.formatMenu(baseMenus)); + // 查询相对应的按钮权限 + List baseAction = baseActionMapper.selectList(Wrappers.lambdaQuery().in(BaseAction::getMenuId, + baseMenus.stream().map(m -> m.getMenuId()).collect(Collectors.toList())).eq(BaseAction::getStatus, 1)); + menuList.addAll(TreeUtil.formatAction(baseAction)); + return TreeUtil.build(menuList, 1, 0L, 1); + } + @Override public List treeMenu(Integer type) { // 查询当前账号所属政务下的模块 diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ModuleTemplateServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ModuleTemplateServiceImpl.java index fee3499..d4afab5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ModuleTemplateServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ModuleTemplateServiceImpl.java @@ -1,11 +1,20 @@ package com.zhgd.xmgl.modules.basicdata.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.xmgl.modules.basicdata.entity.BaseAction; +import com.zhgd.xmgl.modules.basicdata.entity.BaseMenu; import com.zhgd.xmgl.modules.basicdata.entity.ModuleTemplate; +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.basicdata.service.IModuleTemplateService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; +import java.util.stream.Collectors; /** * @Description: 所属政务模块模板 @@ -16,4 +25,36 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ModuleTemplateServiceImpl extends ServiceImpl implements IModuleTemplateService { + @Autowired + private BaseMenuMapper baseMenuMapper; + @Autowired + private BaseActionMapper baseActionMapper; + + @Override + public List listByGovernment(QueryWrapper wrapper) { + // 查询角色下的菜单 + List moduleTemplateList = this.list(wrapper); + List menuIds = moduleTemplateList.stream().filter(s -> s.getType() == 1).map(s -> s.getModuleId()).collect(Collectors.toList()); + if (menuIds.size() == 0) { + menuIds.add(0L); + } + List baseMenuList = baseMenuMapper.selectList(Wrappers.lambdaQuery().in(BaseMenu::getMenuId, menuIds)); + List actionIds = moduleTemplateList.stream().filter(s -> s.getType() == 2).map(s -> s.getModuleId()).collect(Collectors.toList()); + if (actionIds.size() == 0) { + actionIds.add(0L); + } + List baseActionList = baseActionMapper.selectList(Wrappers.lambdaQuery().in(BaseAction::getActionId, actionIds)); + moduleTemplateList.stream().forEach(s -> { + if (s.getType() == 0) { + s.setChildren(baseMenuList.stream().filter(b -> b.getModuleId().equals(s.getModuleId())).collect(Collectors.toList()).size()); + } else if (s.getType() == 1) { + int number = baseMenuList.stream().filter(b -> b.getParentId().equals(s.getModuleId())).collect(Collectors.toList()).size(); + if (number == 0) { + number = baseActionList.stream().filter(a -> a.getMenuId().equals(s.getModuleId())).collect(Collectors.toList()).size(); + } + s.setChildren(number); + } + }); + return moduleTemplateList; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java index c136976..995267e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.async.AsyncEmail; import com.zhgd.xmgl.modules.basicdata.dto.ProjectDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; import com.zhgd.xmgl.modules.basicdata.entity.Project; @@ -51,6 +52,9 @@ public class ProjectServiceImpl extends ServiceImpl impl @Autowired private IEnvironmentAlarmService environmentAlarmService; + @Autowired + private AsyncEmail asyncEmail; + @Override public Page getPageList(Map map) { SecurityUser user = SecurityUtil.getUser(); @@ -115,6 +119,7 @@ public class ProjectServiceImpl extends ServiceImpl impl public boolean examine(Project project, Integer suggest) { SystemUser systemUser = systemUserMapper.selectOne(Wrappers.lambdaQuery() .eq(SystemUser::getSn, project.getProjectSn()).eq(SystemUser::getIsManager, true)); + String content = ""; if (suggest == 1) { LambdaUpdateWrapper projectWrapper = Wrappers.lambdaUpdate(); projectWrapper.set(Project::getState, 1); @@ -125,10 +130,13 @@ public class ProjectServiceImpl extends ServiceImpl impl userWrapper.set(SystemUser::getState, 1); userWrapper.eq(SystemUser::getUserId, systemUser.getUserId()); systemUserMapper.update(systemUser, userWrapper); + content = "项目审批已通过; 项目名称:"+ project.getProjectName() + ", 项目账号：" + systemUser.getAccount() + ", 密码：" + systemUser.getShowPassword(); } else { systemUserMapper.deleteById(systemUser.getUserId()); this.removeById(project.getProjectId()); + content = "项目审批已驳回; 项目名称:"+ project.getProjectName(); } + asyncEmail.sendEmail(project.getGovernmentSn(), systemUser.getEmail(), "项目审批结果通知", content); return true; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 810e7e5..e8d17ca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -76,6 +76,7 @@ public class SystemUserServiceImpl extends ServiceImpl pageListByGov(Map map) { Page pageListByGov = PageUtil.copyProperties(projectService.pageListForGov(map), CheckAcceptPlanProDto.class); pageListByGov.getRecords().stream().forEach(e -> { - e.setSingleProjectNum(baseMapper.selectCount(Wrappers.lambdaQuery().eq(CheckAcceptPlan::getProjectSn, e.getProjectSn()))); + e.setSingleProjectNum(baseMapper.selectCount(Wrappers.lambdaQuery() + .eq(CheckAcceptPlan::getProjectSn, e.getProjectSn()) + .eq(CheckAcceptPlan::getEngineeringSn, StrUtil.EMPTY))); e.setAcceptedNum(baseMapper.selectCount(Wrappers.lambdaQuery() - .eq(CheckAcceptPlan::getProjectSn, e.getProjectSn()).eq(CheckAcceptPlan::getState, 1))); + .eq(CheckAcceptPlan::getProjectSn, e.getProjectSn()) + .eq(CheckAcceptPlan::getEngineeringSn, StrUtil.EMPTY) + .eq(CheckAcceptPlan::getState, 1))); }); return pageListByGov; } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java index be273cd..ce7be3a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java @@ -97,8 +97,6 @@ public class InspectRecordServiceImpl extends ServiceImpl inspectRecordDtoPage = baseMapper.pageList(page, wrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java index dbbdf8e..335ef9f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java @@ -103,7 +103,7 @@ public class ProjectSubItemServiceImpl extends ServiceImpl list = this.list(Wrappers.lambdaQuery().eq(ProjectSubItem::getParentId, projectSubItem.getParentId())); BigDecimal reduce = list.stream().map(l -> l.getCompleteRatio()).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal total = new BigDecimal(list.size()); - parentNode.setCompleteRatio(reduce.divide(total)); + parentNode.setCompleteRatio(reduce.divide(total, 2, BigDecimal.ROUND_HALF_UP)); this.updateById(parentNode); } return flag; @@ -118,14 +118,14 @@ public class ProjectSubItemServiceImpl extends ServiceImpl list = this.list(Wrappers.lambdaQuery().eq(ProjectSubItem::getParentId, projectSubItem.getParentId())); BigDecimal reduce = list.stream().map(l -> l.getCompleteRatio()).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal total = new BigDecimal(list.size()); - parentNode.setCompleteRatio(reduce.divide(total)); + parentNode.setCompleteRatio(reduce.divide(total, 2, BigDecimal.ROUND_HALF_UP)); this.updateById(parentNode); } else { List list = this.list(Wrappers.lambdaQuery().eq(ProjectSubItem::getParentId, projectSubItem.getId())); if (list.size() > 0) { BigDecimal reduce = list.stream().map(l -> l.getCompleteRatio()).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal total = new BigDecimal(list.size()); - projectSubItem.setCompleteRatio(reduce.divide(total)); + projectSubItem.setCompleteRatio(reduce.divide(total, 2, BigDecimal.ROUND_HALF_UP)); } this.updateById(projectSubItem); }