From d13036f8f3d860c6c75c397e29b2a49f8eab1d22 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 9 Dec 2024 16:25:09 +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 | 19 --------------- .../controller/ProVioController.java | 13 +++++++++-- .../supplement/domain/dto/ParamsDto.java | 23 +++++++++++++++++++ .../supplement/domain/vo/ProVioVo.java | 4 +++- .../supplement/mapper/ProVioMapper.java | 3 ++- .../supplement/service/ProVioService.java | 3 ++- .../service/impl/ProVioServiceImpl.java | 3 ++- .../mapper/supplement/ProVioMapper.xml | 21 ++++++++++++++++- 8 files changed, 63 insertions(+), 26 deletions(-) create mode 100644 securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java 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 b6291b7..d171259 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,10 +18,6 @@ public class PageDomain /** 分页参数合理化 */ private Boolean reasonable = true; - private Integer page; - - private Integer limit; - public Integer getPageNum() { @@ -58,19 +54,4 @@ 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/supplement/controller/ProVioController.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/controller/ProVioController.java index 7510a7f..fa1e9a5 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 @@ -5,9 +5,14 @@ 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; 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.HashMap; @@ -20,14 +25,18 @@ import java.util.Map; * @version:1.0 * @description:工程违章统计-controller */ +@RestController +@RequestMapping("/pot/proVio/") +@Slf4j public class ProVioController { @Resource(name = "ProVioService") private ProVioService service; + @ApiOperation(value = "工程违章统计-列表") @PostMapping(value = "getDutyPersonList") - @Log(title = "值班人员管理", menu = "值班人员管理->值班人员列表", businessType = BusinessType.QUERY, details = "值班人员列表") - public Map getDutyPersonList(ProVioVo dto) { + @Log(title = "工程违章统计", menu = "值班任务->工程违章统计", businessType = BusinessType.QUERY, details = "工程违章统计") + public Map getDutyPersonList(ParamsDto dto) { return service.getProVioList(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 new file mode 100644 index 0000000..9a6148c --- /dev/null +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/supplement/domain/dto/ParamsDto.java @@ -0,0 +1,23 @@ +package com.sercurityControl.proteam.supplement.domain.dto; + +import lombok.Data; + +/** + * @className:ParamsDto + * @author:cwchen + * @date:2024-12-09-15:58 + * @version:1.0 + * @description:前端参数-dto + */ +@Data +public class ParamsDto { + + private String id; + + /**工程名称*/ + private String proName; + + private int page; + + private int limit; +} 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 index a0b5822..e269b1a 100644 --- 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 @@ -11,7 +11,7 @@ import lombok.Data; * @description:工程违章统计-vo */ @Data -public class ProVioVo extends PageDomain { +public class ProVioVo{ /**id*/ private String id; @@ -21,6 +21,8 @@ public class ProVioVo extends PageDomain { private String proName; /**班组长*/ private String workManager; + /**班组长手机号*/ + private String workManagerPhone; /**风险等级*/ private String riskLevel; /**违章单位*/ 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 index 1a69d30..dcaca28 100644 --- 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 @@ -1,5 +1,6 @@ package com.sercurityControl.proteam.supplement.mapper; +import com.sercurityControl.proteam.supplement.domain.dto.ParamsDto; import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo; import org.springframework.stereotype.Repository; @@ -21,5 +22,5 @@ public interface ProVioMapper { * @author cwchen * @date 2024/12/9 15:29 */ - List getProVioList(ProVioVo dto); + List getProVioList(ParamsDto 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 index 2f3b995..46c472e 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,5 +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; @@ -19,5 +20,5 @@ public interface ProVioService { * @author cwchen * @date 2024/12/9 15:24 */ - Map getProVioList(ProVioVo dto); + Map getProVioList(ParamsDto 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 index f0b1f61..63a3fd8 100644 --- 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 @@ -3,6 +3,7 @@ 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.dto.ParamsDto; import com.sercurityControl.proteam.supplement.domain.vo.ProVioVo; import com.sercurityControl.proteam.supplement.mapper.ProVioMapper; import com.sercurityControl.proteam.supplement.service.ProVioService; @@ -29,7 +30,7 @@ public class ProVioServiceImpl implements ProVioService { private ProVioMapper mapper; @Override - public Map getProVioList(ProVioVo dto) { + public Map getProVioList(ParamsDto dto) { PageHelper.startPage(dto.getPage(), dto.getLimit()); Map map = new HashMap<>(16); List list = null; 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 89baa9d..9bb55f4 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 @@ -3,5 +3,24 @@ - + \ No newline at end of file