From 983560600487c5dc07b14b0be638055dfd3b11a1 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 9 Dec 2024 15:33:46 +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 --- .../common/core/web/page/PageDomain.java | 20 ++++++++ .../dutyTask/domain/VioStatisticsVo.java | 1 - .../controller/ProVioController.java | 33 ++++++++++++ .../supplement/domain/vo/ProVioVo.java | 36 +++++++++++++ .../supplement/mapper/ProVioMapper.java | 25 ++++++++++ .../supplement/service/ProVioService.java | 23 +++++++++ .../service/impl/ProVioServiceImpl.java | 50 +++++++++++++++++++ .../mapper/dutyTask/TicketMapper.xml | 4 +- .../mapper/supplement/ProVioMapper.xml | 7 +++ 9 files changed, 196 insertions(+), 3 deletions(-) create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/ProVioVo.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/ProVioMapper.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/ProVioService.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/ProVioServiceImpl.java create mode 100644 securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/ProVioMapper.xml diff --git a/securityControl-common/securityControl-common-core/src/main/java/com/securityControl/common/core/web/page/PageDomain.java b/securityControl-common/securityControl-common-core/src/main/java/com/securityControl/common/core/web/page/PageDomain.java index f96d6fc..b6291b7 100644 --- a/securityControl-common/securityControl-common-core/src/main/java/com/securityControl/common/core/web/page/PageDomain.java +++ b/securityControl-common/securityControl-common-core/src/main/java/com/securityControl/common/core/web/page/PageDomain.java @@ -18,6 +18,10 @@ public class PageDomain /** 分页参数合理化 */ private Boolean reasonable = true; + private Integer page; + + private Integer limit; + public Integer getPageNum() { @@ -53,4 +57,20 @@ public class PageDomain { this.reasonable = reasonable; } + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } } diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/domain/VioStatisticsVo.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/domain/VioStatisticsVo.java index 43e026f..2a7b52c 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/domain/VioStatisticsVo.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/domain/VioStatisticsVo.java @@ -30,6 +30,5 @@ public class VioStatisticsVo { @Excel(name = "违章占比", width = 15.0, orderNum = "4") private String vioRateStr; /**排名*/ - @Excel(name = "排名", width = 15.0, orderNum = "5") private int ranking; } 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 new file mode 100644 index 0000000..7510a7f --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java @@ -0,0 +1,33 @@ +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.vo.ProVioVo; +import com.sercurityControl.proteam.supplement.service.ProVioService; +import org.springframework.web.bind.annotation.PostMapping; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +/** + * @className:ProVioController + * @author:cwchen + * @date:2024-12-09-14:53 + * @version:1.0 + * @description:工程违章统计-controller + */ +public class ProVioController { + + @Resource(name = "ProVioService") + private ProVioService service; + + @PostMapping(value = "getDutyPersonList") + @Log(title = "值班人员管理", menu = "值班人员管理->值班人员列表", businessType = BusinessType.QUERY, details = "值班人员列表") + public Map getDutyPersonList(ProVioVo dto) { + return service.getProVioList(dto); + } +} diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/ProVioVo.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/ProVioVo.java new file mode 100644 index 0000000..a0b5822 --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/vo/ProVioVo.java @@ -0,0 +1,36 @@ +package com.sercurityControl.proteam.supplement.domain.vo; + +import com.securityControl.common.core.web.page.PageDomain; +import lombok.Data; + +/** + * @className:ProVioVo + * @author:cwchen + * @date:2024-12-09-15:12 + * @version:1.0 + * @description:工程违章统计-vo + */ +@Data +public class ProVioVo extends PageDomain { + + /**id*/ + private String id; + /**作业票编号*/ + private String ticketNo; + /**工程名称*/ + private String proName; + /**班组长*/ + private String workManager; + /**风险等级*/ + private String riskLevel; + /**违章单位*/ + private String org; + /**违章类型*/ + private String type; + /**违章子类型*/ + private String childType; + /**违章等级*/ + private String levelId; + /**违章内容*/ + private String content; +} diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/ProVioMapper.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/ProVioMapper.java new file mode 100644 index 0000000..1a69d30 --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/mapper/ProVioMapper.java @@ -0,0 +1,25 @@ +package com.sercurityControl.proteam.supplement.mapper; + +import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @className:ProVioMapper + * @author:cwchen + * @date:2024-12-09-14:54 + * @version:1.0 + * @description:工程违章统计-mapper + */ +@Repository(value = "ProVioMapper") +public interface ProVioMapper { + /** + * 工程违章统计 + * @param dto + * @return List + * @author cwchen + * @date 2024/12/9 15:29 + */ + List getProVioList(ProVioVo dto); +} 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 new file mode 100644 index 0000000..2f3b995 --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/ProVioService.java @@ -0,0 +1,23 @@ +package com.sercurityControl.proteam.supplement.service; + +import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo; + +import java.util.Map; + +/** + * @className:ProVioService + * @author:cwchen + * @date:2024-12-09-14:53 + * @version:1.0 + * @description:工程违章统计-serivce + */ +public interface ProVioService { + /** + * 工程违章统计 + * @param dto + * @return Map + * @author cwchen + * @date 2024/12/9 15:24 + */ + Map getProVioList(ProVioVo dto); +} diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/ProVioServiceImpl.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/ProVioServiceImpl.java new file mode 100644 index 0000000..f0b1f61 --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/service/impl/ProVioServiceImpl.java @@ -0,0 +1,50 @@ +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.sercurityControl.proteam.supplement.domain.vo.ProVioVo; +import com.sercurityControl.proteam.supplement.mapper.ProVioMapper; +import com.sercurityControl.proteam.supplement.service.ProVioService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @className:ProVioServiceImpl + * @author:cwchen + * @date:2024-12-09-14:53 + * @version:1.0 + * @description:工程违章统计-impl + */ +@Slf4j +@Service(value = "ProVioService") +public class ProVioServiceImpl implements ProVioService { + + @Resource(name = "ProVioMapper") + private ProVioMapper mapper; + + @Override + public Map getProVioList(ProVioVo dto) { + PageHelper.startPage(dto.getPage(), dto.getLimit()); + Map map = new HashMap<>(16); + List list = null; + try { + list = mapper.getProVioList(dto); + } 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; + } +} diff --git a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/dutyTask/TicketMapper.xml b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/dutyTask/TicketMapper.xml index 8ddbe83..4853e23 100644 --- a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/dutyTask/TicketMapper.xml +++ b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/dutyTask/TicketMapper.xml @@ -12,8 +12,8 @@ jjt.assessment_risk_level AS assessmentRiskLevel, jjt.re_assessment_risk_level AS reAssessmentRiskLevel, jjt.ticket_name AS ticketName, - jjt.start_time AS startTime, - jjt.end_time AS endTime, + jjt.planned_start_date AS startTime, + jjt.planned_end_date AS endTime, jjt.issue_date AS issueDate, so.city_name AS orgName, jjt.working_team_name AS teamName, 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 new file mode 100644 index 0000000..89baa9d --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/supplement/ProVioMapper.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file