From 35554aa6cc480feebb5dea970118b393ebfa8fa0 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Sat, 1 Apr 2023 10:46:58 +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 --- .../HiddenDangerInspectRecordController.java | 10 + ...iddenDangerInspectionStatisticsMapper.java | 2 + ...HiddenDangerInspectionStatisticsMapper.xml | 14 + .../IHiddenDangerInspectRecordService.java | 2 + .../HiddenDangerInspectRecordServiceImpl.java | 17 +- .../impl/EnvironmentAlarmServiceImpl.java | 7 +- .../mapper/xml/WorkerAttendanceMapper.xml | 424 ++++++++++-------- .../service/impl/UfaceDevServiceImpl.java | 4 +- .../impl/WorkerAttendanceServiceImpl.java | 15 +- .../java/com/zhgd/xmgl/task/VideoTask.java | 4 +- .../com/zhgd/xmgl/util/ProfileJudgeUtil.java | 10 +- .../resources/application-dev-gsx.properties | 74 +++ .../resources/application-ljw-gsx.properties | 86 ++++ src/main/resources/application-ljw.properties | 2 +- 14 files changed, 462 insertions(+), 209 deletions(-) create mode 100644 src/main/resources/application-dev-gsx.properties create mode 100644 src/main/resources/application-ljw-gsx.properties diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/HiddenDangerInspectRecordController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/HiddenDangerInspectRecordController.java index 7eb5d48cb..f55493d1a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/HiddenDangerInspectRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/HiddenDangerInspectRecordController.java @@ -274,4 +274,14 @@ public class HiddenDangerInspectRecordController { public Result> selectHiddenDangerStateTrend(@RequestBody Map map) { return Result.success(hiddenDangerInspectRecordService.selectHiddenDangerStateTrend(map)); } + + @ApiOperation(value = "按问题状态统计问题趋势（按周算）", notes = "按问题状态统计问题趋势（按周算）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "offsetWeek", value = "查询几周的数量(不填默认5周)", paramType = "query", dataType = "Integer"), + }) + @PostMapping(value = "/selectHiddenDangerStateTrendByWeek") + public Result> selectHiddenDangerStateTrendByWeek(@RequestBody Map map) { + return Result.success(hiddenDangerInspectRecordService.selectHiddenDangerStateTrendByWeek(map)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectionStatisticsMapper.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectionStatisticsMapper.java index c178c712a..f5bd66a6a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectionStatisticsMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectionStatisticsMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.dangerous.mapper; import java.util.List; +import java.util.Map; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface HiddenDangerInspectionStatisticsMapper extends BaseMapper { + List selectHiddenDangerStateTrendByWeek(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectionStatisticsMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectionStatisticsMapper.xml index a223e11dd..e95555312 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectionStatisticsMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectionStatisticsMapper.xml @@ -2,4 +2,18 @@ + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IHiddenDangerInspectRecordService.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IHiddenDangerInspectRecordService.java index 8a45fc43b..cc8bce494 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IHiddenDangerInspectRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IHiddenDangerInspectRecordService.java @@ -70,4 +70,6 @@ public interface IHiddenDangerInspectRecordService extends IService selectHiddenDangerTypeRatio(Map map); List selectHiddenDangerStateTrend(Map map); + + List selectHiddenDangerStateTrendByWeek(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java index 7637020c6..0df0c663a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java @@ -1,7 +1,6 @@ package com.zhgd.xmgl.modules.dangerous.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.NumberUtil; @@ -430,12 +429,26 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl - lambdaQuery().eq(HiddenDangerInspectionStatistics::getProjectSn, MapUtils.getString(map, "projectSn")) + lambdaQuery().eq(HiddenDangerInspectionStatistics::getProjectSn, MapUtils.getString(map, "projectSn")) .between(HiddenDangerInspectionStatistics::getCreateTime, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), offsetDay)), DateUtil.endOfDay(DateUtil.offsetDay(new Date(), -1)))); } + @Override + public List selectHiddenDangerStateTrendByWeek(Map map) { + Integer offsetWeek = MapUtils.getInteger(map, "offsetWeek"); + if (offsetWeek == null || offsetWeek <= 0) { + offsetWeek = 5; + } + map.put("offsetWeek", offsetWeek + 1); + List statisticsList = hiddenDangerInspectionStatisticsMapper.selectHiddenDangerStateTrendByWeek(map); + //删除最新的没有完全统计的一周的数据，一条数据 + statisticsList.remove(0); + Collections.sort(statisticsList,(o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime())); + return statisticsList; + } + /** * 设置全部占比 * diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java index 4bd232f51..5c8bc91bb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java @@ -832,7 +832,12 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl @@ -124,44 +133,45 @@ INNER JOIN worker_attendance p ON w1.person_sn=p.person_sn Left JOIN company f ON b.parent_id=f.company_id where p.is_statistics=0 - - and p.create_time>=DATE_ADD(NOW(),INTERVAL -6 DAY) - - - and p.create_time>=DATE_ADD(NOW(),INTERVAL -14 DAY) - - - and p.create_time>=DATE_ADD(NOW(),INTERVAL -1 MONTH ) - - - and a.project_name like CONCAT(CONCAT('%',#{projectName}),'%') - - - and f.headquarters_sn=#{sn} - - - and f.company_sn=#{sn} - - - and b.company_sn=#{sn} - - - and w1.project_sn=#{sn} - - - and cp.company_sn=#{sn} - + + and p.create_time>=DATE_ADD(NOW(),INTERVAL -6 DAY) + + + and p.create_time>=DATE_ADD(NOW(),INTERVAL -14 DAY) + + + and p.create_time>=DATE_ADD(NOW(),INTERVAL -1 MONTH ) + + + and a.project_name like CONCAT(CONCAT('%',#{projectName}),'%') + + + and f.headquarters_sn=#{sn} + + + and f.company_sn=#{sn} + + + and b.company_sn=#{sn} + + + and w1.project_sn=#{sn} + + + and cp.company_sn=#{sn} + GROUP BY DATE_FORMAT(p.create_time,"%Y-%m-%d") order by DATE_FORMAT(p.create_time,"%Y-%m-%d") - SELECT p.*, - w1.worker_name,w1.id_card,en.enterprise_name,c.team_name,d.department_name,w1.person_type,w1.inService_type + w1.worker_name,w1.id_card,en.enterprise_name,c.team_name,d.department_name,w1.person_type,w1.inService_type from worker_info w1 INNER JOIN worker_attendance p ON w1.person_sn=p.person_sn - LEFT JOIN enterprise_info en ON en.id=w1.enterprise_id - LEFT JOIN team_info c ON w1.team_id=c.id - LEFT JOIN department_info d ON w1.department_id=d.id + LEFT JOIN enterprise_info en ON en.id=w1.enterprise_id + LEFT JOIN team_info c ON w1.team_id=c.id + LEFT JOIN department_info d ON w1.department_id=d.id where w1.project_sn=#{projectSn} and w1.inService_type=#{inserviceType} and w1.person_type=#{personType} @@ -170,7 +180,7 @@ and w1.enterprise_id=#{enterpriseId} - and FIND_IN_SET(w1.enterprise_id,#{userEnterpriseId}) + and FIND_IN_SET(w1.enterprise_id,#{userEnterpriseId}) and w1.worker_name like CONCAT(CONCAT('%',#{workerName}),'%') @@ -196,38 +206,47 @@ - SELECT a.*, - IF(a.image_url IS NOT NULL,a.image_url,b.id_card_big_photo_url) image_url, - b.worker_name,b.id_card,c.team_name,d.department_name,b.field_acquisition_url - from worker_attendance a LEFT JOIN worker_info b ON a.person_sn=b.person_sn - LEFT JOIN team_info c ON b.team_id=c.id - LEFT JOIN department_info d ON b.department_id=d.id - WHERE a.project_sn=#{projectSn} and a.dev_sn=#{devSn} - and a.create_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00') and b.inService_type=1 - order by a.create_time desc - LIMIT 10 + IF(a.image_url IS NOT NULL, a.image_url, b.id_card_big_photo_url) image_url, + b.worker_name, + b.id_card, + c.team_name, + d.department_name, + b.field_acquisition_url + from worker_attendance a + LEFT JOIN worker_info b ON a.person_sn = b.person_sn + LEFT JOIN team_info c ON b.team_id = c.id + LEFT JOIN department_info d ON b.department_id = d.id + WHERE a.project_sn = #{projectSn} + and a.dev_sn = #{devSn} + and a.create_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00') + and b.inService_type = 1 + order by a.create_time desc LIMIT 10 @@ -374,7 +401,7 @@ LEFT JOIN enterprise_info en ON en.id=b.enterprise_id WHERE a.project_sn=#{projectSn} - and FIND_IN_SET(b.enterprise_id,#{userEnterpriseId}) + and FIND_IN_SET(b.enterprise_id,#{userEnterpriseId}) and a.pass_type=#{passType} @@ -390,70 +417,81 @@