From 63f3d1cd39cff989c1eb1e4e6c869a6c502a1936 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Wed, 2 Aug 2023 18:07:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgd/mybatis/DataScopeInterceptor.java | 11 +++ .../admin/HardWareCallbackController.java | 37 ++++++--- .../admin/SystemUserAuthController.java | 10 +-- .../GovEnterpriseScoreStandardController.java | 2 - .../government/GovRemindController.java | 77 +++++++++++++++++++ .../basicdata/entity/EngineeringMain.java | 6 ++ .../service/impl/BaseMenuServiceImpl.java | 9 +-- .../service/impl/BaseModuleServiceImpl.java | 2 +- .../service/impl/EngineeringServiceImpl.java | 2 +- .../service/impl/EnterpriseServiceImpl.java | 2 +- .../safety/entity/InspectQuestion.java | 7 ++ .../safety/entity/InspectQuestionExamine.java | 7 ++ .../modules/safety/entity/InspectRecord.java | 7 ++ .../xmgl/modules/safety/entity/Remind.java | 68 ++++++++++++++++ .../safety/mapper/EnterpriseScoreMapper.java | 2 + .../modules/safety/mapper/RemindMapper.java | 16 ++++ .../safety/mapper/xml/RemindMapper.xml | 5 ++ .../safety/service/IRemindService.java | 14 ++++ .../impl/EnterpriseScoreServiceImpl.java | 8 +- .../InspectQuestionExamineServiceImpl.java | 3 + .../impl/InspectRecordServiceImpl.java | 6 +- .../service/impl/RemindServiceImpl.java | 19 +++++ .../modules/wisdom/entity/DustNoiseData.java | 23 +++--- .../wisdom/entity/EnvironmentAlarm.java | 5 +- .../impl/DustNoiseDataServiceImpl.java | 5 +- .../java/com/zhgd/xmgl/task/SlippageTask.java | 34 +++++++- .../java/com/zhgd/xmgl/util/CommonUtil.java | 6 +- 27 files changed, 345 insertions(+), 48 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovRemindController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/safety/entity/Remind.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/safety/mapper/RemindMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/RemindMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/safety/service/IRemindService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/safety/service/impl/RemindServiceImpl.java diff --git a/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java b/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java index 9cea7d0..a9551d1 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java @@ -86,6 +86,17 @@ public class DataScopeInterceptor extends JsqlParserSupport implements InnerInte FromItem fromItem = plainSelect.getFromItem(); if (fromItem instanceof Table) { this.dataScopeHandler.getSqlSegment(plainSelect, obj); + } else { + processFromItem(fromItem, obj); + } + } + + protected void processFromItem(FromItem fromItem, Object obj) { + if (fromItem instanceof SubSelect) { + SubSelect subSelect = (SubSelect) fromItem; + if (subSelect.getSelectBody() != null) { + processSelectBody(subSelect.getSelectBody(), obj); + } } } } 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 416b50e..884bfb6 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 @@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Map; @@ -120,10 +121,32 @@ public class HardWareCallbackController { param = dustNoiseData.getEngineeringSn(); } redisRepository.set(CacheConstants.DUST_NOISE_DATA + param, dustNoiseData); + DustNoiseData dustNoiseDataAlarm = dustNoiseDataService.setAlarm(dustNoiseData); + if (dustNoiseDataAlarm.getPm25Alarm()) { + checkAlarm(dustNoiseDataAlarm.getDeviceCode(), dustNoiseDataAlarm.getPm25(), "PM2.5"); + } + if (dustNoiseDataAlarm.getPm10Alarm()) { + checkAlarm(dustNoiseDataAlarm.getDeviceCode(), dustNoiseDataAlarm.getPm10(), "PM10"); + } + if (dustNoiseDataAlarm.getTspAlarm()) { + checkAlarm(dustNoiseDataAlarm.getDeviceCode(), dustNoiseDataAlarm.getTsp(), "TSP"); + } + if (dustNoiseDataAlarm.getNoiseAlarm()) { + checkAlarm(dustNoiseDataAlarm.getDeviceCode(), dustNoiseDataAlarm.getNoise(), "噪音"); + } // sendMessage(ParamEnum.KafkaTopic.DUST_NOISE.getValue(), JSON.toJSONString(dustNoiseData)); return Result.ok("操作成功!"); } + private void checkAlarm(String code, BigDecimal alarmValue, String type) { + EnvironmentAlarm environmentAlarm = new EnvironmentAlarm(); + environmentAlarm.setDeviceCode(code); + environmentAlarm.setType(type); + environmentAlarm.setAlarmValue(alarmValue); +// environmentAlarm.setCause("系统判定"); + addEnvironmentAlarm(environmentAlarm); + } + /** * 扬尘报警数据上报 * @param environmentAlarm @@ -142,17 +165,13 @@ public class HardWareCallbackController { environmentAlarm.setEngineeringSn(environmentDev.getEngineeringSn()); environmentAlarm.setState(0); - Integer dictLabel = 0; - for (ParamEnum.EnvironmentAlarmTypeThreshold value : ParamEnum.EnvironmentAlarmTypeThreshold.values()) { - if (environmentAlarm.getType().equals(value.getDesc())) { - dictLabel = value.getValue(); - } - } - if(dictLabel == 0) { + SystemDictData alarmType = systemDictDataService.getOne(Wrappers.lambdaQuery().eq(SystemDictData::getDictType, + ParamEnum.SysDictType.ENVIRONMENT_ALARM_TYPE).eq(SystemDictData::getDictValue, environmentAlarm.getType())); + if(alarmType == null) { return Result.error("未知报警类型!"); } - environmentAlarm.setThresholdValue(Double.valueOf(systemDictDataService.getOne(Wrappers.lambdaQuery().eq(SystemDictData::getDictType, - ParamEnum.SysDictType.ENVIRONMENT_ALARM_TYPE_THRESHOLD).eq(SystemDictData::getDictLabel, dictLabel)).getDictValue())); + environmentAlarm.setThresholdValue(new BigDecimal(systemDictDataService.getOne(Wrappers.lambdaQuery().eq(SystemDictData::getDictType, + ParamEnum.SysDictType.ENVIRONMENT_ALARM_TYPE_THRESHOLD).eq(SystemDictData::getDictLabel, alarmType.getDictLabel())).getDictValue())); environmentAlarm.setOffsetValue(CommonUtil.offset(environmentAlarm.getAlarmValue(), environmentAlarm.getThresholdValue())); environmentAlarmService.save(environmentAlarm); long num = redisRepository.leftPush(CacheConstants.ENVIRONMENT_ALARM_LIST + environmentDev.getCode(), environmentAlarm); 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 6cafe28..1b83a7b 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 @@ -26,7 +26,6 @@ import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -238,13 +237,10 @@ public class SystemUserAuthController { String account = ""; if (userId.equals("myy")) { account = "hzxmgl"; - } - if (userId.equals("test")) { + } else if (userId.equals("test")) { account = "hzxm"; - } - if (StringUtils.isBlank(account)) { - result.error500("用户不存在"); - return result; + } else { + account = userId; } SystemUser user = systemUserService.getOne(Wrappers.lambdaQuery() .eq(SystemUser::getAccount, account)); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java index c7ee8b5..bcbb71d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java @@ -58,7 +58,6 @@ public class GovEnterpriseScoreStandardController { @PostMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(EnterpriseScoreStandard.class, map); - queryWrapper.lambda().eq(EnterpriseScoreStandard::getCreateBy, SecurityUtil.getUser().getSn()); Page page = PageUtil.getPage(map); IPage pageList = enterpriseScoreStandardService.page(page, queryWrapper); return Result.success(pageList); @@ -74,7 +73,6 @@ public class GovEnterpriseScoreStandardController { @ApiOperation(value = " 列表查询企业类型评分标准信息", notes = "列表查询企业类型评分标准信息", httpMethod = "POST") @PostMapping(value = "/list") public Result> queryList(@RequestBody EnterpriseScoreStandard enterpriseScoreStandard) { - enterpriseScoreStandard.setCreateBy(SecurityUtil.getUser().getSn()); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(enterpriseScoreStandard); List list = enterpriseScoreStandardService.list(queryWrapper); return Result.success(list); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovRemindController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovRemindController.java new file mode 100644 index 0000000..ca205f6 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovRemindController.java @@ -0,0 +1,77 @@ +package com.zhgd.xmgl.modules.basicdata.controller.government; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.zhgd.annotation.OperLog; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.safety.entity.Remind; +import com.zhgd.xmgl.modules.safety.service.IRemindService; +import com.zhgd.xmgl.security.SecurityUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + + /** + * @Title: Controller + * @Description: 待办提醒 + * @author： pengj + * @date： 2023-08-02 + * @version： V1.0 + */ +@RestController +@RequestMapping("/gov/remind") +@Slf4j +@Api(tags = "待办提醒管理") +public class GovRemindController { + @Autowired + private IRemindService remindService; + + /** + * 列表查询 + * @param remind + * @return + */ + @OperLog(operModul = "待办提醒管理", operType = "列表查询", operDesc = "列表查询待办提醒信息") + @ApiOperation(value = " 列表查询待办提醒信息", notes = "列表查询待办提醒信息", httpMethod="POST") + @PostMapping(value = "/list") + public Result> queryList(@RequestBody Remind remind) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(remind); + queryWrapper.lambda().isNull(Remind::getUpdateTime); + queryWrapper.lambda().eq(Remind::getUserId, SecurityUtil.getUser().getUserId()); + List list = remindService.list(queryWrapper); + return Result.success(list); + } + + /** + * 编辑 + * @param remind + * @return + */ + @OperLog(operModul = "待办提醒管理", operType = "修改", operDesc = "编辑待办提醒信息") + @ApiOperation(value = "编辑待办提醒信息", notes = "编辑待办提醒信息" , httpMethod="POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody Remind remind) { + Result result = new Result(); + Remind remindEntity = remindService.getById(remind.getId()); + if(remindEntity==null) { + result.error500("未找到对应实体"); + }else { + boolean ok = remindService.updateById(remind); + if(ok) { + result.success("修改成功!"); + } else { + result.success("操作失败!"); + } + } + + return result; + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java index 14d74d7..d854e30 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java @@ -41,6 +41,12 @@ public class EngineeringMain implements Serializable { @Excel(name = "企业sn", width = 15) @ApiModelProperty(value = "企业sn") private String enterpriseSn; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private String projectSn; /** * 工程sn */ 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 15fbb7f..71316b2 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 @@ -104,7 +104,7 @@ public class BaseMenuServiceImpl extends ServiceImpl i // 查询当前账号角色下的菜单,管理员账号默认全部菜单 SecurityUser user = SecurityUtil.getUser(); List baseMenus = new ArrayList<>(); - if (user.isManager()) { + if (user.isManager() && user.getAccountType() != 3) { // 查询相对应的菜单 baseMenus = baseMenuMapper.selectList(Wrappers.lambdaQuery().in(BaseMenu::getModuleId, moduleId) .eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority)); @@ -159,10 +159,9 @@ public class BaseMenuServiceImpl extends ServiceImpl i if (userId.equals("myy")) { systemUser = systemUserMapper.selectOne(Wrappers.lambdaQuery().eq(SystemUser::getAccount, "hzxmgl")); moduleId = 1670639811581595650L; - } - if (userId.equals("test")) { - systemUser = systemUserMapper.selectOne(Wrappers.lambdaQuery().eq(SystemUser::getAccount, "hzxm")); - moduleId = 1670603312504918018L; + } else { + systemUser = systemUserMapper.selectOne(Wrappers.lambdaQuery().eq(SystemUser::getAccount, userId)); + moduleId = 1681837103227502594L; } if (systemUser == null) { throw new CustomException("用户不存在"); 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 8b03a91..9b6a9c3 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 @@ -69,7 +69,7 @@ public class BaseModuleServiceImpl extends ServiceImpl allIds = moduleTemplateService.list(Wrappers.lambdaQuery() .eq(ModuleTemplate::getModuleType, user.getAccountType()) .eq(ModuleTemplate::getGovernmentSn, governmentSn)).stream().map(b -> b.getModuleId()).collect(Collectors.toList()); - if (user.isManager()) { + if (user.isManager() && user.getAccountType() != 3) { ids = allIds; } else { SystemUserRole systemUserRole = systemUserRoleService.getOne(Wrappers.lambdaQuery().eq(SystemUserRole::getUserId, user.getUserId())); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java index 1d5cff2..e5b0060 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java @@ -236,7 +236,7 @@ public class EngineeringServiceImpl extends ServiceImpl getList(Engineering engineering) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(engineering); - queryWrapper.eq("examine_state", 3); + queryWrapper.lambda().eq(Engineering::getExamineState, 3); List list = this.list(queryWrapper); for (Engineering eng : list) { // AI报警信息 diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java index 2b11939..528b97f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java @@ -103,7 +103,7 @@ public class EnterpriseServiceImpl extends ServiceImpl { Page pageList(Page page, @Param(Constants.WRAPPER)Wrapper wrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/RemindMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/RemindMapper.java new file mode 100644 index 0000000..d5230dc --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/RemindMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.safety.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.xmgl.modules.safety.entity.Remind; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Description: 待办提醒 + * @author： pengj + * @date： 2023-08-02 + * @version： V1.0 + */ +@Mapper +public interface RemindMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/RemindMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/RemindMapper.xml new file mode 100644 index 0000000..5a14bac --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/RemindMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IRemindService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IRemindService.java new file mode 100644 index 0000000..91f6dd6 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IRemindService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.safety.service; + +import com.zhgd.xmgl.modules.safety.entity.Remind; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 待办提醒 + * @author： pengj + * @date： 2023-08-02 + * @version： V1.0 + */ +public interface IRemindService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java index 9a93f84..35e78b5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java @@ -7,9 +7,11 @@ 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.handler.exception.CustomException; +import com.zhgd.xmgl.modules.basicdata.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService; +import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.safety.dto.EnterpriseScoreDto; import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore; @@ -39,6 +41,9 @@ public class EnterpriseScoreServiceImpl extends ServiceImpllambdaQuery() + .eq(Engineering::getEngineeringSn, enterpriseScore.getEngineeringSn())).getProjectSn()); engineeringMain.setType(enterpriseScore.getEnterpriseType()); engineeringMainService.save(engineeringMain); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java index 82b9dcd..0c43a0b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java @@ -33,9 +33,11 @@ public class InspectQuestionExamineServiceImpl extends ServiceImpl wrapperQuestion = Wrappers.lambdaUpdate(); wrapperQuestion.set(InspectQuestion::getState, inspectQuestionExamine.getExamineState() == 1 ? 3 : 4); + wrapperQuestion.set(InspectQuestion::getLevel, level); wrapperQuestion.eq(InspectQuestion::getId, inspectQuestionExamine.getInspectQuestionId()); inspectQuestionService.update(wrapperQuestion); // 查询是否全部整改完成 @@ -49,6 +51,7 @@ public class InspectQuestionExamineServiceImpl extends ServiceImpl recordWrapper = Wrappers.lambdaUpdate(); + recordWrapper.set(InspectRecord::getLevel, level); recordWrapper.set(InspectRecord::getState, state); recordWrapper.eq(InspectRecord::getId, inspectQuestion.getRecordId()); inspectRecordService.update(recordWrapper); 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 35e0fe1..2857ab8 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 @@ -145,6 +145,7 @@ public class InspectRecordServiceImpl extends ServiceImpl list = Arrays.asList(1,4); @@ -156,12 +157,14 @@ public class InspectRecordServiceImpl extends ServiceImpl wrapperQuestion = Wrappers.lambdaUpdate(); wrapperQuestion.set(InspectQuestion::getState, questionState); + wrapperQuestion.set(InspectQuestion::getLevel, level); wrapperQuestion.eq(InspectQuestion::getRecordId, inspectRecord.getId()); - wrapperQuestion.eq(InspectQuestion::getState, 2); + wrapperQuestion.eq(InspectQuestion::getState, inspectRecord.getLevel() == 1 ? 2 : 3); boolean flag = inspectQuestionService.update(wrapperQuestion); if (flag) { List list = inspectQuestionService.list(Wrappers.lambdaQuery() @@ -171,6 +174,7 @@ public class InspectRecordServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaUpdate(); wrapper.set(InspectQuestionExamine::getExamineState, questionExamineState); wrapper.set(InspectQuestionExamine::getSuggest, suggest); + wrapper.set(InspectQuestionExamine::getLevel, level); wrapper.in(InspectQuestionExamine::getInspectQuestionId, questionId); wrapper.eq(InspectQuestionExamine::getExamineState, 0); inspectQuestionExamineService.update(wrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/RemindServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/RemindServiceImpl.java new file mode 100644 index 0000000..15495d6 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/RemindServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.safety.service.impl; + +import com.zhgd.xmgl.modules.safety.entity.Remind; +import com.zhgd.xmgl.modules.safety.mapper.RemindMapper; +import com.zhgd.xmgl.modules.safety.service.IRemindService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 待办提醒 + * @author： pengj + * @date： 2023-08-02 + * @version： V1.0 + */ +@Service +public class RemindServiceImpl extends ServiceImpl implements IRemindService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/DustNoiseData.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/DustNoiseData.java index 32ac39e..5af6b0d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/DustNoiseData.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/DustNoiseData.java @@ -10,6 +10,7 @@ import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -53,43 +54,43 @@ public class DustNoiseData implements Serializable { */ @Excel(name = "PM10", width = 15) @ApiModelProperty(value = "PM10") - private Float pm10; + private BigDecimal pm10; /** * PM25 */ @Excel(name = "PM25", width = 15) @ApiModelProperty(value = "PM25") - private Float pm25; + private BigDecimal pm25; /** * 噪音 */ @Excel(name = "噪音", width = 15) @ApiModelProperty(value = "噪音") - private Float noise; + private BigDecimal noise; /** * tsp测试值 */ @Excel(name = "tsp测试值", width = 15) @ApiModelProperty(value = "tsp测试值") - private Float tsp; + private BigDecimal tsp; /** * 温度 */ @Excel(name = "温度", width = 15) @ApiModelProperty(value = "温度") - private Float temperature; + private BigDecimal temperature; /** * 湿度 */ @Excel(name = "湿度", width = 15) @ApiModelProperty(value = "湿度") - private Float humidity; + private BigDecimal humidity; /** * 风速 */ @Excel(name = "风速", width = 15) @ApiModelProperty(value = "风速") - private Float windspeed; + private BigDecimal windspeed; /** * 风向 */ @@ -101,25 +102,25 @@ public class DustNoiseData implements Serializable { */ @Excel(name = "大气压", width = 15) @ApiModelProperty(value = "大气压") - private Float pressure; + private BigDecimal pressure; /** * 电压 */ @Excel(name = "电压", width = 15) @ApiModelProperty(value = "电压") - private Float voltage; + private BigDecimal voltage; /** * 板载温度 */ @Excel(name = "板载温度", width = 15) @ApiModelProperty(value = "板载温度") - private Float plateTemperature; + private BigDecimal plateTemperature; /** * 板载湿度 */ @Excel(name = "板载湿度", width = 15) @ApiModelProperty(value = "板载湿度") - private Float plateHumidity; + private BigDecimal plateHumidity; /** * 工程sn */ diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentAlarm.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentAlarm.java index 96b12ec..a2cbcf8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentAlarm.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/EnvironmentAlarm.java @@ -10,6 +10,7 @@ import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -62,13 +63,13 @@ public class EnvironmentAlarm implements Serializable { */ @Excel(name = "阈值", width = 15) @ApiModelProperty(value = "阈值") - private Double thresholdValue; + private BigDecimal thresholdValue; /** * 超标数据 */ @Excel(name = "超标数据", width = 15) @ApiModelProperty(value = "超标数据") - private Double alarmValue; + private BigDecimal alarmValue; /** * 超标原因 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java index 4730225..199815a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/DustNoiseDataServiceImpl.java @@ -12,6 +12,7 @@ import com.zhgd.xmgl.util.ParamEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; import java.util.stream.Collectors; @@ -54,12 +55,12 @@ public class DustNoiseDataServiceImpl extends ServiceImpl systemDictDataList, Integer type) { + private BigDecimal dictValue(List systemDictDataList, Integer type) { String thresholdValue = "0"; List systemDictData = systemDictDataList.stream().filter(d -> d.getDictLabel().equals(type)).collect(Collectors.toList()); if (systemDictData.size() > 0) { thresholdValue = systemDictData.get(0).getDictValue(); } - return Float.valueOf(thresholdValue); + return new BigDecimal(thresholdValue); } } diff --git a/src/main/java/com/zhgd/xmgl/task/SlippageTask.java b/src/main/java/com/zhgd/xmgl/task/SlippageTask.java index b47d732..bcb96da 100644 --- a/src/main/java/com/zhgd/xmgl/task/SlippageTask.java +++ b/src/main/java/com/zhgd/xmgl/task/SlippageTask.java @@ -2,10 +2,17 @@ package com.zhgd.xmgl.task; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; +import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.service.IEngineeringMainService; +import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.safety.entity.InspectRecord; import com.zhgd.xmgl.modules.safety.entity.ProjectSubItem; +import com.zhgd.xmgl.modules.safety.entity.Remind; import com.zhgd.xmgl.modules.safety.service.IInspectRecordService; import com.zhgd.xmgl.modules.safety.service.IProjectSubItemService; +import com.zhgd.xmgl.modules.safety.service.IRemindService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; @@ -29,10 +36,19 @@ public class SlippageTask { @Autowired private IInspectRecordService inspectRecordService; + @Autowired + private IRemindService remindService; + + @Autowired + private IEngineeringMainService engineeringMainService; + + @Autowired + private ISystemUserService systemUserService; + /** * 每天凌晨计算项目进度是否逾期、临期 */ - @Scheduled(cron = "0 0 2 * * ?") + @Scheduled(cron = "0 0 0 * * ?") private void projectSubItem() { List states = Arrays.asList(3, 6, 7); List change = new ArrayList<>(); @@ -45,6 +61,7 @@ public class SlippageTask { if (!states.contains(l.getState()) && DateUtil.between(l.getPlanEndTime(), new Date(), DateUnit.DAY, false) > 0) { l.setState(5); change.add(l); + saveRemind(1, "施工进度逾期", l.getEngineeringSn()); } }); if (change.size() > 0) { @@ -53,6 +70,21 @@ public class SlippageTask { log.info("=========定时修改项目进度状态任务执行成功========"); } + private void saveRemind(Integer type, String desc, String engineeringSn) { + Remind remind = new Remind(); + EngineeringMain jsUser = engineeringMainService.getOne(Wrappers.lambdaQuery() + .eq(EngineeringMain::getEnterpriseSn, engineeringSn).eq(EngineeringMain::getType, 1)); + if (jsUser != null) { + SystemUser manager = systemUserService.getOne(Wrappers.lambdaQuery().eq(SystemUser::getSn, jsUser.getEnterpriseSn()).eq(SystemUser::getIsManager, true)); + remind.setType(type); + remind.setRemindDesc(desc); + remind.setCreateTime(new Date()); + remind.setUserId(manager.getUserId()); + remind.setUserPhone(manager.getUserTel()); + remindService.save(remind); + } + } + /** * 每天凌晨计算安全质量临期 */ diff --git a/src/main/java/com/zhgd/xmgl/util/CommonUtil.java b/src/main/java/com/zhgd/xmgl/util/CommonUtil.java index f083861..a9aa36b 100644 --- a/src/main/java/com/zhgd/xmgl/util/CommonUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/CommonUtil.java @@ -27,10 +27,8 @@ public class CommonUtil { return ""; } - public Double offset(Double value1, Double value2) { - BigDecimal b1 = new BigDecimal(Double.toString(value1)); - BigDecimal b2 = new BigDecimal(Double.toString(value2)); - double v = b1.subtract(b2).doubleValue(); + public Double offset(BigDecimal value1, BigDecimal value2) { + double v = value1.subtract(value2).doubleValue(); return v > 0 ? v : 0; }