From a421fb3be790d4d81309a1c55b92532af39d5891 Mon Sep 17 00:00:00 2001 From: guo Date: Mon, 15 Jan 2024 17:08:10 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FrontierProtectionDevAlarmController.java | 9 +++++++- .../modules/frontier/enums/AlarmEnum.java | 3 +++ .../controller/WorkerApiController.java | 2 +- .../controller/WorkerInfoController.java | 17 +++++++++++--- .../modules/worker/entity/WorkerInfo.java | 15 ++++++++++++ .../entity/vo/CountEntryAndExitNumVo.java | 12 ++++++++++ .../worker/mapper/WorkerInfoMapper.java | 4 +++- .../worker/mapper/xml/WorkerInfoMapper.xml | 23 +++++++++++++++++-- .../worker/service/IWorkerInfoService.java | 4 +++- .../service/impl/WorkerInfoServiceImpl.java | 11 ++++++--- .../zhgd/xmgl/security/WebSecurityConfig.java | 2 ++ 11 files changed, 90 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/CountEntryAndExitNumVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java index 9541d51db..f7680ddaa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/controller/FrontierProtectionDevAlarmController.java @@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.enums.ParamEnum; import com.zhgd.xmgl.modules.frontier.entity.FrontierProtectionDevAlarm; import com.zhgd.xmgl.modules.frontier.entity.vo.CountFrontierProtectionDevAlarmVo; import com.zhgd.xmgl.modules.frontier.entity.vo.CountFrontierProtectionVo; +import com.zhgd.xmgl.modules.frontier.enums.AlarmEnum; import com.zhgd.xmgl.modules.frontier.service.IFrontierProtectionDevAlarmService; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; @@ -190,5 +192,10 @@ public class FrontierProtectionDevAlarmController { return Result.success(frontierProtectionDevAlarmService.countFrontierProtectionDevAlarmTrend(paramMap)); } - + @ApiOperation(value = "获取临边防护报警类型枚举信息", notes = "获取临边防护报警类型枚举信息") + @GetMapping(value = "/getFrontierProtectionAlarmTypeEnum") + public Result getFrontierProtectionAlarmTypeEnum() { + AlarmEnum[] values = AlarmEnum.values(); + return Result.success(values); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/enums/AlarmEnum.java b/src/main/java/com/zhgd/xmgl/modules/frontier/enums/AlarmEnum.java index ed4a8bc95..c15831913 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/enums/AlarmEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/enums/AlarmEnum.java @@ -1,5 +1,8 @@ package com.zhgd.xmgl.modules.frontier.enums; +import com.fasterxml.jackson.annotation.JsonFormat; + +@JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AlarmEnum { PROXIMITY("人员靠近", 2, "入侵", 1), PORT_STATUS1("线锁1", 2, "断开", 2), diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerApiController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerApiController.java index c0a992b9a..03dc80393 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerApiController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerApiController.java @@ -276,7 +276,7 @@ public class WorkerApiController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), }) @PostMapping(value = "/selectWorkerInfoList") - public Result> selectWorkerInfoList(@RequestBody Map map) { + public Result> selectWorkerInfoList(@RequestBody Map map) { return Result.success(workerInfoService.selectWorkerInfoList(map)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java index 7b89b5229..be60f6e05 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java @@ -140,9 +140,10 @@ public class WorkerInfoController { @ApiImplicitParam(name = "chargePersonName", value = "负责人姓名（部门）", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "belongingSection", value = "所属标段（部门）", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "orderBy", value = "排序：1退场时间倒序2进场日期倒序", paramType = "body", required = false, dataType = "Integer"), }) @PostMapping(value = "/selectWorkerInfoList") - public Result> selectWorkerInfoList(@RequestBody Map map) { + public Result> selectWorkerInfoList(@RequestBody Map map) { return Result.success(workerInfoService.selectWorkerInfoList(map)); } @@ -165,7 +166,7 @@ public class WorkerInfoController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = false, dataType = "String"), }) @GetMapping(value = "/selectPersonList") - public Result> selectPersonList(WorkerInfo workerInfo) { + public Result> selectPersonList(WorkerInfo workerInfo) { Map map = BeanUtil.beanToMap(workerInfo); return Result.success(workerInfoService.selectWorkerInfoList(map)); } @@ -189,7 +190,7 @@ public class WorkerInfoController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = false, dataType = "String"), }) @GetMapping(value = "/selectPersonListZW") - public Result>> selectPersonListZW(WorkerInfo workerInfo) { + public Result>> selectPersonListZW(WorkerInfo workerInfo) { Map map = BeanUtil.beanToMap(workerInfo); return Result.success(Collections.singleton(workerInfoService.selectWorkerInfoList(map))); } @@ -628,4 +629,14 @@ public class WorkerInfoController { return Result.success(workerInfoService.statisticsWorkerAge(map)); } + @ApiOperation(value = "统计出场人数和进场人数", notes = "统计出场人数和进场人数", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String") + }) + @PostMapping("/countEntryAndExitNum") + public Result countEntryAndExitNum(@ApiIgnore @RequestBody Map map) { + return Result.success(workerInfoService.countEntryAndExitNum(map)); + } + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java index a7cc44751..d3182e096 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java @@ -360,6 +360,21 @@ public class WorkerInfo implements Serializable { @TableField(exist = false) private java.lang.Integer count; + @TableField(exist = false) + private java.lang.String enterpriseName; + @TableField(exist = false) + private java.lang.String age; + @TableField(exist = false) + private java.lang.String jobTypeName; + @TableField(exist = false) + private java.lang.String jobNameValue; + @TableField(exist = false) + private java.lang.String vvaccineStatusName; + @TableField(exist = false) + private java.lang.String codeStateName; + @TableField(exist = false) + private java.lang.String acidStatusName; + public String toExistString() { return "WorkerInfo{" + ", workerName='" + workerName + '\'' + diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/CountEntryAndExitNumVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/CountEntryAndExitNumVo.java new file mode 100644 index 000000000..70e347551 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/CountEntryAndExitNumVo.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.modules.worker.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountEntryAndExitNumVo { + @ApiModelProperty("进场人数") + private Integer entryTodayNum; + @ApiModelProperty("出场人数") + private Integer exitTodayNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java index 5bcba3921..a1da43739 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoMapper.java @@ -24,7 +24,7 @@ import java.util.Map; @Repository public interface WorkerInfoMapper extends BaseMapper { - List selectWorkerInfoList(Page page, @Param("param") Map map); + List selectWorkerInfoList(Page page, @Param("param") Map map); EntityMap getWorkerNumByPersonType(Map map); @@ -230,4 +230,6 @@ public interface WorkerInfoMapper extends BaseMapper { List countWorkerNumGroupByWorkerType(Map map); SpecialWorkerStaticsVo getSpecialWorkerStatics(HashMap map); + + CountEntryAndExitNumVo countEntryAndExitNum(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index 31e6c62ec..8e4cd1ab6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -1,7 +1,7 @@ - SELECT a.*, b.team_name, c.department_name, @@ -160,7 +160,17 @@ and a.vaccine_status = 3 - order by a.add_time desc + + + order by a.exit_date desc + + + order by a.enter_date desc + + + order by a.add_time desc + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java index 09c9e9292..18b8e09f9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java @@ -22,7 +22,7 @@ import java.util.Map; */ public interface IWorkerInfoService extends IService { - IPage selectWorkerInfoList(Map map); + IPage selectWorkerInfoList(Map map); void updateWorkerTeam(Map map); @@ -124,4 +124,6 @@ public interface IWorkerInfoService extends IService { WorkerAgeVo statisticsWorkerAge(Map map); GetWorkerInfoByDevVo getWorkerInfoByDev(GetWorkerInfoByDevDto dto); + + CountEntryAndExitNumVo countEntryAndExitNum(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index c9af817fd..d1e653cdd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -143,11 +143,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl selectWorkerInfoList(Map map) { + public IPage selectWorkerInfoList(Map map) { int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10000).toString()); - Page page = new Page<>(pageNo, pageSize); - List list = workerInfoMapper.selectWorkerInfoList(page, map); + Page page = new Page<>(pageNo, pageSize); + List list = workerInfoMapper.selectWorkerInfoList(page, map); return page.setRecords(list); } @@ -1933,6 +1933,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl map) { + return baseMapper.countEntryAndExitNum(map); + } + private void addDatas(List infos, String del, ArrayList datas) { for (WorkerInfo workerInfo : infos) { diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 3c5df0d13..3262271f4 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -292,6 +292,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/videoItem/getPlayUrlFromHikvision").permitAll() .antMatchers("/xmgl/workerInfo/selectProjectWorkerTypeTotalList").permitAll() .antMatchers("/xmgl/aiAnalyseHardWareAlarmRecord/callback").permitAll() + .antMatchers("/xmgl/workerInfo/selectWorkerInfoList").permitAll() + .antMatchers("/xmgl/workerInfo/countEntryAndExitNum").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证 .and()