From ac59841c2b6c8c61f5a4a0c9f9ae309dd04912e8 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 9 Dec 2024 18:47:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=BF=9D=E7=AB=A0=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProVioController.java | 9 +-- .../controller/RiskRectController.java | 46 +++++++++++ .../supplement/domain/dto/ParamsDto.java | 4 + .../domain/vo/RiskRectDetailVo.java | 47 +++++++++++ .../supplement/domain/vo/RiskRectVo.java | 41 ++++++++++ .../supplement/mapper/RiskRectMapper.java | 59 ++++++++++++++ .../supplement/service/ProVioService.java | 1 - .../supplement/service/RiskRectService.java | 33 ++++++++ .../service/impl/RiskRectServiceImpl.java | 79 +++++++++++++++++++ .../mapper/supplement/ProVioMapper.xml | 1 + .../mapper/supplement/RiskRectMapper.xml | 72 +++++++++++++++++ 11 files changed, 384 insertions(+), 8 deletions(-) create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskRectController.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskRectDetailVo.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskRectVo.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/RiskRectMapper.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/RiskRectService.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/RiskRectServiceImpl.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/RiskRectMapper.xml diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java index fa1e9a5..9625c04 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java @@ -1,12 +1,8 @@ package com.sercurityControl.proteam.supplement.controller; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.securityControl.common.log.annotation.Log; import com.securityControl.common.log.enums.BusinessType; -import com.sercurityControl.proteam.dutyTask.domain.DutyPersonEntity; import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; -import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo; import com.sercurityControl.proteam.supplement.service.ProVioService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -15,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.HashMap; import java.util.Map; /** @@ -34,9 +29,9 @@ public class ProVioController { private ProVioService service; @ApiOperation(value = "工程违章统计-列表") - @PostMapping(value = "getDutyPersonList") + @PostMapping(value = "getProVioList") @Log(title = "工程违章统计", menu = "值班任务->工程违章统计", businessType = BusinessType.QUERY, details = "工程违章统计") - public Map getDutyPersonList(ParamsDto dto) { + public Map getProVioList(ParamsDto dto) { return service.getProVioList(dto); } } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskRectController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskRectController.java new file mode 100644 index 0000000..3b23d59 --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/RiskRectController.java @@ -0,0 +1,46 @@ +package com.sercurityControl.proteam.supplement.controller; + +import com.securityControl.common.core.web.domain.AjaxResult; +import com.securityControl.common.log.annotation.Log; +import com.securityControl.common.log.enums.BusinessType; +import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; +import com.sercurityControl.proteam.supplement.service.ProVioService; +import com.sercurityControl.proteam.supplement.service.RiskRectService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * @className:RiskRectController + * @author:cwchen + * @date:2024-12-09-14:53 + * @version:1.0 + * @description:风险整改分析-controller + */ +@RestController +@RequestMapping("/pot/riskRect/") +@Slf4j +public class RiskRectController { + + @Resource(name = "RiskRectService") + private RiskRectService service; + + @ApiOperation(value = "风险整改分析-列表") + @PostMapping(value = "getRiskRectList") + @Log(title = "风险整改分析", menu = "值班任务->风险整改分析", businessType = BusinessType.QUERY, details = "风险整改分析") + public Map getRiskRectList(ParamsDto dto) { + return service.getRiskRectList(dto); + } + + @ApiOperation(value = "风险整改分析-整改详情") + @PostMapping(value = "getRiskRectDetail") + @Log(title = "风险整改分析整改详情", menu = "值班任务->风险整改分析", businessType = BusinessType.QUERY, details = "整改详情") + public AjaxResult getRiskRectDetail(ParamsDto dto) { + return service.getRiskRectDetail(dto); + } +} diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java index 9a6148c..8659b80 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java @@ -16,6 +16,10 @@ public class ParamsDto { /**工程名称*/ private String proName; + /**风险等级*/ + private String riskLevel; + /**是否整改 0.未整改 1.已整改*/ + private String isRect; private int page; diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskRectDetailVo.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskRectDetailVo.java new file mode 100644 index 0000000..4d4a135 --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskRectDetailVo.java @@ -0,0 +1,47 @@ +package com.sercurityControl.proteam.supplement.domain.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @className:ProVioVo + * @author:cwchen + * @date:2024-12-09-15:12 + * @version:1.0 + * @description:工程违章统计-vo + */ +@Data +public class RiskRectDetailVo { + + /**id*/ + private String id; + /**作业票编号*/ + private String ticketNo; + /**作业票名称*/ + private String ticketName; + /**工程名称*/ + private String proName; + /**班组名称*/ + private String teamName; + /**班组长*/ + private String workManager; + /**班组长手机号*/ + private String workManagerPhone; + /**违章等级*/ + private String levelId; + /**风险等级*/ + private String riskLevel; + /**作业部位*/ + private String workSite; + /**工序*/ + private String gx; + /**告警时间*/ + private String time; + /**整改内容*/ + private String rectContent; + /**整改期限*/ + private String rectTime; + /**整改照片*/ + private List rectImgPath; +} diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskRectVo.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskRectVo.java new file mode 100644 index 0000000..cfc3bc6 --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/RiskRectVo.java @@ -0,0 +1,41 @@ +package com.sercurityControl.proteam.supplement.domain.vo; + +import lombok.Data; + +/** + * @className:ProVioVo + * @author:cwchen + * @date:2024-12-09-15:12 + * @version:1.0 + * @description:工程违章统计-vo + */ +@Data +public class RiskRectVo { + + /**id*/ + private String id; + /**作业票编号*/ + private String ticketNo; + /**作业票名称*/ + private String ticketName; + /**工程名称*/ + private String proName; + /**班组长*/ + private String workManager; + /**班组长手机号*/ + private String workManagerPhone; + /**违章等级*/ + private String levelId; + /**风险等级*/ + private String riskLevel; + /**作业部位*/ + private String workSite; + /**工序*/ + private String gx; + /**时间*/ + private String time; + /**风险整改状态*/ + private String isRect; + /**告警提示*/ + private String warnTips; +} diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/RiskRectMapper.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/RiskRectMapper.java new file mode 100644 index 0000000..88ad290 --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/RiskRectMapper.java @@ -0,0 +1,59 @@ +package com.sercurityControl.proteam.supplement.mapper; + +import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; +import com.sercurityControl.proteam.supplement.domain.vo.RiskRectDetailVo; +import com.sercurityControl.proteam.supplement.domain.vo.RiskRectVo; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @className:RiskRectMapper + * @author:cwchen + * @date:2024-12-09-16:58 + * @version:1.0 + * @description:风险整改分析-mapper + */ +@Repository(value = "RiskRectMapper") +public interface RiskRectMapper { + /** + * 风险整改分析 + * + * @param dto + * @return List + * @author cwchen + * @date 2024/12/9 17:03 + */ + List getRiskRectList(ParamsDto dto); + + /** + * 获取整改时间 + * + * @param item + * @return List + * @author cwchen + * @date 2024/12/9 17:15 + */ + List getRectTime(RiskRectVo item); + + /** + * 风险整改分析-整改详情 + * + * @param dto + * @return RiskRectDetailVo + * @author cwchen + * @date 2024/12/9 18:12 + */ + RiskRectDetailVo getRiskRectDetail(ParamsDto dto); + + /** + * 查询1.整改内容、2.整改照片 + * @param id + * @param type + * @return List + * @author cwchen + * @date 2024/12/9 18:26 + */ + List getRectImgPath(@Param("id") String id, @Param("type") int type); +} diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/ProVioService.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/ProVioService.java index 46c472e..8254e60 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/ProVioService.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/ProVioService.java @@ -1,7 +1,6 @@ package com.sercurityControl.proteam.supplement.service; import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; -import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo; import java.util.Map; diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/RiskRectService.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/RiskRectService.java new file mode 100644 index 0000000..2574fab --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/RiskRectService.java @@ -0,0 +1,33 @@ +package com.sercurityControl.proteam.supplement.service; + +import com.securityControl.common.core.web.domain.AjaxResult; +import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; + +import java.util.Map; + +/** + * @className:RiskRectService + * @author:cwchen + * @date:2024-12-09-16:57 + * @version:1.0 + * @description:风险整改分析-service + */ +public interface RiskRectService { + /** + * 风险整改分析 + * @param dto + * @return Map + * @author cwchen + * @date 2024/12/9 17:01 + */ + Map getRiskRectList(ParamsDto dto); + + /** + * 风险整改分析-整改详情 + * @param dto + * @return AjaxResult + * @author cwchen + * @date 2024/12/9 18:11 + */ + AjaxResult getRiskRectDetail(ParamsDto dto); +} diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/RiskRectServiceImpl.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/RiskRectServiceImpl.java new file mode 100644 index 0000000..105509f --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/RiskRectServiceImpl.java @@ -0,0 +1,79 @@ +package com.sercurityControl.proteam.supplement.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.securityControl.common.core.constant.HttpStatus; +import com.securityControl.common.core.web.domain.AjaxResult; +import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; +import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo; +import com.sercurityControl.proteam.supplement.domain.vo.RiskRectDetailVo; +import com.sercurityControl.proteam.supplement.domain.vo.RiskRectVo; +import com.sercurityControl.proteam.supplement.mapper.RiskRectMapper; +import com.sercurityControl.proteam.supplement.service.RiskRectService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @className:RiskRectServiceImpl + * @author:cwchen + * @date:2024-12-09-16:57 + * @version:1.0 + * @description:风险整改分析-impl + */ +@Slf4j +@Service(value = "RiskRectService") +public class RiskRectServiceImpl implements RiskRectService { + + @Resource(name = "RiskRectMapper") + private RiskRectMapper mapper; + + @Override + public Map getRiskRectList(ParamsDto dto) { + PageHelper.startPage(dto.getPage(), dto.getLimit()); + Map map = new HashMap<>(16); + List list = null; + try { + list = mapper.getRiskRectList(dto); + /*list.forEach(item->{ + List rectTimeList = mapper.getRectTime(item); + item.setTime(rectTimeList.get(0)); + });*/ + } catch (Exception e) { + log.error(e.toString(),e); + } + PageInfo pageInfo = new PageInfo<>(list); + map.put("code", HttpStatus.SUCCESS); + map.put("msg", "获取数据成功"); + map.put("count", pageInfo.getTotal()); + map.put("curr", dto.getPage()); + map.put("limit", dto.getLimit()); + map.put("data", pageInfo.getList()); + return map; + } + + @Override + public AjaxResult getRiskRectDetail(ParamsDto dto) { + RiskRectDetailVo vo = null; + try { + vo = mapper.getRiskRectDetail(dto); + // 查询整改内容、整改照片 + List rectContentList = mapper.getRectImgPath(vo.getId(),1); + List rectImgPathList = mapper.getRectImgPath(vo.getId(),2); + if(CollectionUtils.isNotEmpty(rectContentList)){ + vo.setRectContent(rectContentList.get(0)); + } + if(CollectionUtils.isNotEmpty(rectImgPathList)){ + vo.setRectImgPath(rectImgPathList); + } + } catch (Exception e) { + log.error(e.toString(),e); + } + return AjaxResult.success(vo); + } +} diff --git a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/ProVioMapper.xml b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/ProVioMapper.xml index 9bb55f4..23a672d 100644 --- a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/ProVioMapper.xml +++ b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/ProVioMapper.xml @@ -22,5 +22,6 @@ AND INSTR(tnv.pro_name,#{proName}) > 0 + ORDER BY tnv.iss_time DESC \ No newline at end of file diff --git a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/RiskRectMapper.xml b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/RiskRectMapper.xml new file mode 100644 index 0000000..3b9b71d --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/RiskRectMapper.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + \ No newline at end of file