diff --git a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java index fcba9964c..fda3ece1a 100644 --- a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java +++ b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java @@ -732,7 +732,9 @@ public class ParamEnum { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QualityInspectionRecordLevel implements BaseEnum { ZDYH(1, "重大隐患"), - YBYH(2, "一般隐患"), + JDYH(2, "较大隐患"), + YBYH(3, "一般隐患"), + DYH(4, "低隐患"), ; QualityInspectionRecordLevel(Integer value, String desc) { @@ -761,4 +763,38 @@ public class ParamEnum { } + /** + * 使用状态：1人为因素2环境因素3不可抵抗因素 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DelayEventTypeEnum implements BaseEnum { + RWYS(1, "人为因素"), + HJYS(2, "环境因素"), + BKDKYS(3, "不可抵抗因素"), + ; + + DelayEventTypeEnum(Integer value, String desc) { + this.value = value; + this.desc = desc; + } + + private Integer value; + private String desc; + + public Integer getValue() { + return value; + } + + public void setValue(Integer value) { + this.value = value; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java index 9c9b665df..a8aaa262d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.service.impl; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializeConfig; import com.alibaba.fastjson.serializer.ToStringSerializer; @@ -17,6 +18,8 @@ import com.zhgd.xmgl.modules.basicdata.mapper.NoticeMapper; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.push.service.UniPushService; +import com.zhgd.xmgl.security.entity.UserInfo; +import com.zhgd.xmgl.security.util.SecurityUtils; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -54,6 +57,13 @@ public class NoticeServiceImpl extends ServiceImpl impleme int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); Page page = new Page<>(pageNo, pageSize); + String accountId = MapUtils.getString(map, "accountId"); + if (StrUtil.isBlank(accountId)) { + UserInfo user = SecurityUtils.getUser(); + if (user != null) { + map.put("accountId", user.getUserId()); + } + } List list = noticeMapper.selectNoticePageList(page, map); return page.setRecords(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringProgressRecordController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringProgressRecordController.java index 39bd46b2d..c54f08175 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringProgressRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringProgressRecordController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.dangerous.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringProgressRecord; import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringProgressRecordService; @@ -36,29 +37,41 @@ public class DangerousEngineeringProgressRecordController { @Autowired private IDangerousEngineeringProgressRecordService dangerousEngineeringProgressRecordService; - /** - * 分页列表查询 - * @return - */ @ApiOperation(value = "列表查询现场危大工程-进度记录信息", notes = "列表查询现场危大工程-进度记录信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "engineeringId", value = "危大工程ID", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/list") - public Result> selectEngineeringProgressList(@RequestBody Map map) { + public Result> selectEngineeringProgressList(@RequestBody Map map) { return Result.success(dangerousEngineeringProgressRecordService.selectEngineeringProgressList(map)); } - /** - * 添加 - * @param dangerousEngineeringProgressRecord - * @return - */ - @ApiOperation(value = "添加现场危大工程-进度记录信息", notes = "添加现场危大工程-进度记录信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody DangerousEngineeringProgressRecord dangerousEngineeringProgressRecord) { - Result result = new Result(); + /** + * 分页列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询现场危大工程-进度记录信息", notes = "列表查询现场危大工程-进度记录信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "engineeringId", value = "危大工程ID", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/page") + public Result> selectEngineeringProgressPage(@RequestBody Map map) { + return Result.success(dangerousEngineeringProgressRecordService.selectEngineeringProgressPage(map)); + } + + /** + * 添加 + * + * @param dangerousEngineeringProgressRecord + * @return + */ + @ApiOperation(value = "添加现场危大工程-进度记录信息", notes = "添加现场危大工程-进度记录信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody DangerousEngineeringProgressRecord dangerousEngineeringProgressRecord) { + Result result = new Result(); try { dangerousEngineeringProgressRecord.setCreateTime(new Date()); dangerousEngineeringProgressRecordService.save(dangerousEngineeringProgressRecord); diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java index 465be104f..661a6c49b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.dangerous.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation; @@ -23,11 +24,11 @@ import java.util.List; import java.util.Map; - /** +/** * @Title: Controller * @Description: 危大工程-旁站记录 * @author： pds - * @date： 2021-06-29 + * @date： 2021-06-29 * @version： V1.0 */ @RestController @@ -35,112 +36,121 @@ import java.util.Map; @Slf4j @Api(tags = "现场危大工程-旁站记录") public class DangerousEngineeringSideStationController { - @Autowired - private IDangerousEngineeringSideStationService dangerousEngineeringSideStationService; + @Autowired + private IDangerousEngineeringSideStationService dangerousEngineeringSideStationService; - /** - * 分页列表查询 - * @return - */ - @ApiOperation(value = "列表查询危大工程-旁站记录信息", notes = "列表查询危大工程-旁站记录信息", httpMethod="POST") + @ApiOperation(value = "列表查询危大工程-旁站记录信息", notes = "列表查询危大工程-旁站记录信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "engineeringId", value = "危大工程ID", paramType = "body", required = false, dataType = "Integer"), @ApiImplicitParam(name = "projectSn", value = "projectSn", paramType = "body", required = false, dataType = "String"), }) - @PostMapping(value = "/selectList") - public Result> selectSideStationList(@RequestBody Map map) { - return Result.success(dangerousEngineeringSideStationService.selectSideStationList(map)); - } + @PostMapping(value = "/selectList") + public Result> selectSideStationList(@RequestBody Map map) { + return Result.success(dangerousEngineeringSideStationService.selectSideStationList(map)); + } - /** - * 添加 - * @param dangerousEngineeringSideStation - * @return - */ - @ApiOperation(value = "添加危大工程-旁站记录信息", notes = "添加危大工程-旁站记录信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody DangerousEngineeringSideStation dangerousEngineeringSideStation) { - Result result = new Result(); - try { + @ApiOperation(value = "分页列表查询危大工程-旁站记录信息", notes = "分页列表查询危大工程-旁站记录信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "engineeringId", value = "危大工程ID", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "projectSn", value = "projectSn", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/page") + public Result> selectSideStationPage(@RequestBody Map map) { + return Result.success(dangerousEngineeringSideStationService.selectSideStationPage(map)); + } + + /** + * 添加 + * + * @param dangerousEngineeringSideStation + * @return + */ + @ApiOperation(value = "添加危大工程-旁站记录信息", notes = "添加危大工程-旁站记录信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody DangerousEngineeringSideStation dangerousEngineeringSideStation) { + Result result = new Result(); + try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); dangerousEngineeringSideStation.setCreateTime(sdf.format(new Date())); - dangerousEngineeringSideStationService.save(dangerousEngineeringSideStation); + dangerousEngineeringSideStationService.save(dangerousEngineeringSideStation); result.successMsg(MessageUtil.get("addSucess")); - } catch (Exception e) { - log.error("error：", e); + } catch (Exception e) { + log.error("error：", e); log.info(e.getMessage()); result.error500(MessageUtil.get("failErr")); - } - return result; - } + } + return result; + } - /** - * 编辑 - * @param dangerousEngineeringSideStation - * @return - */ - @ApiOperation(value = "编辑危大工程-旁站记录信息", notes = "编辑危大工程-旁站记录信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody DangerousEngineeringSideStation dangerousEngineeringSideStation) { - Result result = new Result(); - DangerousEngineeringSideStation dangerousEngineeringSideStationEntity = dangerousEngineeringSideStationService.getById(dangerousEngineeringSideStation.getId()); - if(dangerousEngineeringSideStationEntity==null) { + /** + * 编辑 + * + * @param dangerousEngineeringSideStation + * @return + */ + @ApiOperation(value = "编辑危大工程-旁站记录信息", notes = "编辑危大工程-旁站记录信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody DangerousEngineeringSideStation dangerousEngineeringSideStation) { + Result result = new Result(); + DangerousEngineeringSideStation dangerousEngineeringSideStationEntity = dangerousEngineeringSideStationService.getById(dangerousEngineeringSideStation.getId()); + if (dangerousEngineeringSideStationEntity == null) { result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = dangerousEngineeringSideStationService.updateById(dangerousEngineeringSideStation); + } else { + boolean ok = dangerousEngineeringSideStationService.updateById(dangerousEngineeringSideStation); - if(ok) { + if (ok) { result.successMsg(MessageUtil.get("editSucess")); - } - } + } + } return result; - } + } - /** - * 通过id删除 - * @param - * @return - */ - @ApiOperation(value = "删除危大工程-旁站记录信息", notes = "删除危大工程-旁站记录信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "危大工程-旁站记录ID", paramType = "body", required = true, dataType = "Integer") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - Result result = new Result(); - DangerousEngineeringSideStation dangerousEngineeringSideStation = dangerousEngineeringSideStationService.getById(MapUtils.getString(map,"id")); - if(dangerousEngineeringSideStation==null) { + /** + * 通过id删除 + * + * @param + * @return + */ + @ApiOperation(value = "删除危大工程-旁站记录信息", notes = "删除危大工程-旁站记录信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "危大工程-旁站记录ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + Result result = new Result(); + DangerousEngineeringSideStation dangerousEngineeringSideStation = dangerousEngineeringSideStationService.getById(MapUtils.getString(map, "id")); + if (dangerousEngineeringSideStation == null) { result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = dangerousEngineeringSideStationService.removeById(MapUtils.getString(map,"id")); - if(ok) { + } else { + boolean ok = dangerousEngineeringSideStationService.removeById(MapUtils.getString(map, "id")); + if (ok) { result.successMsg(MessageUtil.get("deleteSucess")); - } - } + } + } - return result; - } + return result; + } - /** - * 通过id查询 - * @param - * @return - */ - @ApiOperation(value = "通过id查询危大工程-旁站记录信息", notes = "通过id查询危大工程-旁站记录信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "危大工程-旁站记录ID", paramType = "body", required = true, dataType = "Integer") - @PostMapping(value = "/queryById") - public Result queryById(@RequestBody Map map) { - Result result = new Result(); - DangerousEngineeringSideStation dangerousEngineeringSideStation = dangerousEngineeringSideStationService.getById(MapUtils.getString(map,"id")); - if(dangerousEngineeringSideStation==null) { + /** + * 通过id查询 + * + * @param + * @return + */ + @ApiOperation(value = "通过id查询危大工程-旁站记录信息", notes = "通过id查询危大工程-旁站记录信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "危大工程-旁站记录ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/queryById") + public Result queryById(@RequestBody Map map) { + Result result = new Result(); + DangerousEngineeringSideStation dangerousEngineeringSideStation = dangerousEngineeringSideStationService.getById(MapUtils.getString(map, "id")); + if (dangerousEngineeringSideStation == null) { result.error500(MessageUtil.get("notFindErr")); - }else { - result.setResult(dangerousEngineeringSideStation); - result.setSuccess(true); - } - return result; - } - + } else { + result.setResult(dangerousEngineeringSideStation); + result.setSuccess(true); + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringProgressRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringProgressRecordMapper.java index c6a4ab3df..fea603258 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringProgressRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringProgressRecordMapper.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.dangerous.mapper; import java.util.List; import java.util.Map; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringProgressRecord; @@ -11,13 +12,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 现场危大工程-进度记录 * @author： pds - * @date： 2021-08-24 + * @date： 2021-08-24 * @version： V1.0 */ @Mapper public interface DangerousEngineeringProgressRecordMapper extends BaseMapper { - List selectEngineeringProgressList(Map map); + List selectEngineeringProgressList(@Param("param") Map map); DangerousEngineeringProgressRecord selectNewestEngineeringProgressRecord(@Param("engineeringId") String engineeringId); + + Page selectEngineeringProgressList(@Param("param") Map map, Page page); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java index 75f3cdacf..4a30d74ef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java @@ -3,19 +3,23 @@ package com.zhgd.xmgl.modules.dangerous.mapper; import java.util.List; import java.util.Map; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @Description: 危大工程-旁站记录 * @author： pds - * @date： 2021-06-29 + * @date： 2021-06-29 * @version： V1.0 */ @Mapper public interface DangerousEngineeringSideStationMapper extends BaseMapper { - List selectSideStationList(Map map); + List selectSideStationList(@Param("param") Map map); + + Page selectSideStationList(@Param("param") Map map, Page page); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringProgressRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringProgressRecordMapper.xml index 9576f1b59..55d78053d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringProgressRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringProgressRecordMapper.xml @@ -8,11 +8,11 @@ from dangerous_engineering_progress_record a LEFT JOIN system_user b ON a.create_user=b.user_id left join dangerous_engineering_record d on d.id=a.engineering_id WHERE 1=1 - - and a.engineering_id=#{engineeringId} + + and a.engineering_id=#{param.engineeringId} - - and d.project_sn = #{projectSn} + + and d.project_sn = #{param.projectSn} ORDER BY a.create_time DESC diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringSideStationMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringSideStationMapper.xml index f54d04d3d..c3185bebe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringSideStationMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringSideStationMapper.xml @@ -7,11 +7,11 @@ from dangerous_engineering_side_station a LEFT JOIN system_user b ON a.create_user=b.user_id left join dangerous_engineering_record der on der.id=a.dangerous_engineering_id where 1=1 - - and a.dangerous_engineering_id = #{engineeringId} + + and a.dangerous_engineering_id = #{param.engineeringId} - - and der.project_sn = #{projectSn} + + and der.project_sn = #{param.projectSn} ORDER BY a.create_time DESC diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringProgressRecordService.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringProgressRecordService.java index 153f10580..298d0bb31 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringProgressRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringProgressRecordService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.dangerous.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringProgressRecord; import com.baomidou.mybatisplus.extension.service.IService; @@ -15,4 +16,6 @@ import java.util.Map; public interface IDangerousEngineeringProgressRecordService extends IService { List selectEngineeringProgressList(Map map); + + Page selectEngineeringProgressPage(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringSideStationService.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringSideStationService.java index 2c1e3c9b5..b1d7b47f1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringSideStationService.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringSideStationService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.dangerous.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation; import com.baomidou.mybatisplus.extension.service.IService; @@ -10,10 +11,12 @@ import java.util.Map; /** * @Description: 危大工程-旁站记录 * @author： pds - * @date： 2021-06-29 + * @date： 2021-06-29 * @version： V1.0 */ public interface IDangerousEngineeringSideStationService extends IService { List selectSideStationList(Map map); + + Page selectSideStationPage(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java index bf0734e0a..f5e6f184f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java @@ -1,8 +1,10 @@ package com.zhgd.xmgl.modules.dangerous.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringProgressRecord; import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringProgressRecordMapper; import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringProgressRecordService; +import com.zhgd.xmgl.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,4 +30,11 @@ public class DangerousEngineeringProgressRecordServiceImpl extends ServiceImpl selectEngineeringProgressList(Map map) { return dangerousEngineeringProgressRecordMapper.selectEngineeringProgressList(map); } + + @Override + public Page selectEngineeringProgressPage(Map map) { + Page page = PageUtil.getPage(map); + return dangerousEngineeringProgressRecordMapper.selectEngineeringProgressList(map, page); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java index 5749eaf3d..0b88b0c10 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java @@ -1,9 +1,11 @@ package com.zhgd.xmgl.modules.dangerous.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation; import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringSideStationMapper; import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService; +import com.zhgd.xmgl.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,10 +25,16 @@ import java.util.Map; @Transactional(rollbackFor = Exception.class) public class DangerousEngineeringSideStationServiceImpl extends ServiceImpl implements IDangerousEngineeringSideStationService { @Autowired - private DangerousEngineeringSideStationMapper dangerousEngineeringSideStationMapper; + private DangerousEngineeringSideStationMapper dangerousEngineeringSideStationMapper; @Override public List selectSideStationList(Map map) { return dangerousEngineeringSideStationMapper.selectSideStationList(map); } + + @Override + public Page selectSideStationPage(Map map) { + Page page = PageUtil.getPage(map); + return dangerousEngineeringSideStationMapper.selectSideStationList(map, page); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiStatisticController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiStatisticController.java index 2a20a557f..415731345 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiStatisticController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiStatisticController.java @@ -44,13 +44,14 @@ public class AiStatisticController { @ApiOperation(value = "AI预警类型统计", notes = "AI预警类型统计") @ApiImplicitParams({ @ApiImplicitParam(name = "sn", value = "公司或项目sn", paramType = "body", required = true, dataType = "String"), - @ApiImplicitParam(name = "type", value = "不传查今日，1查今明两天", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "type", value = "默认查今日，1查今天、今天较昨天、本月、历史", paramType = "body", required = false, dataType = "Integer"), }) @PostMapping("/selectAiAnalyseHardWareAlarmTypeCount") public Result selectAiAnalyseHardWareAlarmTypeCount(@RequestBody Map map) { return Result.success(aiStatisticService.selectAiAnalyseHardWareAlarmTypeCount(map)); } + @ApiOperation(value = "AI预警Top项目列表", notes = "AI预警Top项目列表") @ApiImplicitParams({ @ApiImplicitParam(name = "sn", value = "公司sn", paramType = "body", required = true, dataType = "String"), diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/AiAnalyseHardWareAlarmRecordVo.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/AiAnalyseHardWareAlarmRecordVo.java index dbc309c5b..28ec53d67 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/AiAnalyseHardWareAlarmRecordVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/AiAnalyseHardWareAlarmRecordVo.java @@ -9,14 +9,17 @@ import lombok.Data; @Data @JsonInclude(JsonInclude.Include.NON_NULL) public class AiAnalyseHardWareAlarmRecordVo extends AiAnalyseHardWareAlarmRecord { - @ApiModelProperty(value = "AI扣分规则") - private XzAiDeductRule aiDeductRule; - @ApiModelProperty(value = "报警数量") + @ApiModelProperty(value = "（历史）报警数量") private Integer alarmNum; @ApiModelProperty(value = "日期") private String date; @ApiModelProperty(value = "今日报警数量") private Integer alarmNumToday; + @ApiModelProperty(value = "今日报警数量") + private Integer alarmNumYesterday; @ApiModelProperty(value = "今日较昨日报警数量") private Integer subYesterday; + @ApiModelProperty(value = "本月报警数量") + private Integer alarmNumMonth; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java index 7739a4c6a..d354feaa5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java @@ -36,7 +36,7 @@ public interface AiAnalyseHardWareAlarmRecordMapper extends BaseMapper getAiAnalyseHardWareAlarmTotal(Map map); - List selectAiAnalyseHardWareAlarmTypeCount(Map map); + List selectAiAnalyseHardWareAlarmTypeCount(@Param("param") Map map); List> selectProjectAiAlarmCountList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml index 3f11a477b..6e4ded0c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml @@ -190,31 +190,41 @@ @@ -569,7 +600,7 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java index ed273bbb3..ec8a92ba1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java @@ -80,4 +80,8 @@ public interface IXzSecurityQualityInspectionRecordService extends IService statsByEnterprise(Map paramMap); SectorVo statsDangerType(Map paramMap); + + StatsDirectorateBigscreenVo statsDirectorateBigScreen(Map paramMap); + + void supervise(Map paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java index 1bf37fc4b..0a82f6471 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java @@ -210,7 +210,6 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv } private void setDifferYesterday(Map map, XzSecurityQualityInspectionRecordTotalVo total) { - Date date = new Date(); map.put("inspectStartTime", DateUtil.today()); map.put("inspectEndTime", DateUtil.format(DateUtil.endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss")); XzSecurityQualityInspectionRecordTotalVo todayTotal = xzSecurityQualityInspectionRecordMapper.selectQualityInspectionRecordPageTotal(map); @@ -273,12 +272,16 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv xzSecurityQualityInspectionRecord.setEnterpriseId(enterpriseInfo.getId()); } xzSecurityQualityInspectionRecordMapper.insert(xzSecurityQualityInspectionRecord); + noticeUser(xzSecurityQualityInspectionRecord); + + deductScoreIf(xzSecurityQualityInspectionRecord); + } + + private void noticeUser(XzSecurityQualityInspectionRecord xzSecurityQualityInspectionRecord) { if (xzSecurityQualityInspectionRecord.getRecordType() == 1 && xzSecurityQualityInspectionRecord.getStatus() == 2) { noticeService.addUserNoticeAndApp(xzSecurityQualityInspectionRecord.getChangeId(), "您有一条安全检查待整改，问题：" + xzSecurityQualityInspectionRecord.getDangerItemContent(), "安全管理待整改", "10", PushPayloads.buildPushPayload(10, xzSecurityQualityInspectionRecord)); } - - deductScoreIf(xzSecurityQualityInspectionRecord); } private void deductScoreIf(XzSecurityQualityInspectionRecord hiddenDangerInspectRecord) { @@ -556,6 +559,23 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv return SectorVo.getSectorVo(data); } + @Override + public StatsDirectorateBigscreenVo statsDirectorateBigScreen(Map paramMap) { + + StatsDirectorateBigscreenVo statsDirectorateBigscreenVo = new StatsDirectorateBigscreenVo(); + return statsDirectorateBigscreenVo; + } + + @Override + public void supervise(Map paramMap) { + Integer id = MapUtils.getInteger(paramMap, "id"); + XzSecurityQualityInspectionRecord record = baseMapper.selectById(id); + if (record == null) { + throw new OpenAlertException("数据不存在"); + } + noticeUser(record); + } + private void recoverScore(XzSecurityQualityInspectionRecord hiddenDangerInspectRecord) { if (hiddenDangerInspectRecord.getRecordType() == null || hiddenDangerInspectRecord.getRecordType() == 2) { return; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java index f2f475a0b..f246be5be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; import com.zhgd.xmgl.modules.xz.service.IXzTaskProgressContentService; import io.swagger.annotations.Api; @@ -30,6 +31,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.HashMap; import java.util.List; +import java.util.Map; /** @@ -57,6 +59,7 @@ public class XzTaskProgressContentController { @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "isAudit", value = "1已审核，0待审核", paramType = "query", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "date", value = "日期：yyyy-MM-dd", paramType = "query", required = false, dataType = "Integer"), }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { @@ -191,4 +194,13 @@ public class XzTaskProgressContentController { return mv; } + @ApiOperation(value = "统计影响进度因素", notes = "统计影响进度因素", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "month", value = "月份：yyyy-MM", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/statsDelayEventType") + public Result statsDelayEventType(@ApiIgnore @RequestBody Map paramMap) { + return Result.success(taskProgressContentService.statsDelayEventType(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressContentMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressContentMapper.java index fb1f1d795..08362bee6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressContentMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressContentMapper.java @@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @Description: 任务进度甘特图-内容 @@ -26,4 +29,6 @@ public interface XzTaskProgressContentMapper extends BaseMapper queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + ArrayList statsDelayEventType(Map paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml index 9cb173525..0f3288703 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml @@ -9,4 +9,22 @@ left join enterprise_info ei on ei.id=c.enterprise_id ${ew.customSqlSegment} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java index 5840cbc42..1d2184891 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java @@ -1,12 +1,14 @@ package com.zhgd.xmgl.modules.xz.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description: 任务进度甘特图-内容 @@ -26,4 +28,5 @@ public interface IXzTaskProgressContentService extends IService paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java index b819da982..77e552697 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.xz.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +11,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.enums.ParamEnum; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgress; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressContentMapper; @@ -25,9 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; +import java.util.*; /** * @Description: 任务进度甘特图-内容 @@ -101,8 +103,15 @@ public class XzTaskProgressContentServiceImpl extends ServiceImpl paramMap) { + ArrayList list = baseMapper.statsDelayEventType(paramMap); + return SectorVo.getSectorVoByEnum(list, ParamEnum.DelayEventTypeEnum.values(), false); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { String taskName = MapUtils.getString(paramMap, "taskName"); + String date = MapUtils.getString(paramMap, "date"); Integer isAudit = MapUtils.getInteger(paramMap, "isAudit"); String alias = "c."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressContent.class, paramMap, alias); @@ -115,6 +124,10 @@ public class XzTaskProgressContentServiceImpl extends ServiceImpl