From af18c1ce8b137e8e5017f790873491b78f8efbe1 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 21 Jun 2024 17:01:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=92=8C=E5=85=B6=E4=BB=96bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SystemUserController.java | 5 +- .../basicdata/service/ISystemUserService.java | 2 +- .../service/impl/SystemUserServiceImpl.java | 12 +- .../ProjectEnterpriseController.java | 3 +- .../impl/QualityRegionServiceImpl.java | 2 +- .../SafetyHatDataToFenceController.java | 120 ------------------ .../safetyhat/mapper/SafetyHatDataMapper.java | 4 +- .../mapper/SafetyHatDataToFenceMapper.java | 16 --- .../mapper/SafetyHatFenceMapper.java | 2 + .../mapper/xml/SafetyHatDataMapper.xml | 15 +-- .../mapper/xml/SafetyHatDataToFenceMapper.xml | 4 - .../service/ISafetyHatDataToFenceService.java | 30 ----- .../impl/SafetyHatDataServiceImpl.java | 77 +++++++---- .../impl/SafetyHatDataToFenceServiceImpl.java | 93 -------------- .../impl/SafetyHatFenceServiceImpl.java | 2 +- ...iAnalyseHardWareAlarmRecordController.java | 1 - .../entity/AiAnalyseHardWareAlarmRecord.java | 3 + .../mapper/AiAnalyseHardWareRecordMapper.java | 4 +- .../xml/AiAnalyseHardWareRecordMapper.xml | 11 +- .../IAiAnalyseHardWareAlarmRecordService.java | 1 + ...AnalyseHardWareAlarmRecordServiceImpl.java | 13 +- .../AiAnalyseHardWareRecordServiceImpl.java | 2 +- .../worker/mapper/xml/WorkerInfoMapper.xml | 10 +- .../impl/EnterpriseInfoServiceImpl.java | 7 +- .../XzRiskPredictionController.java | 8 +- ...erousEngineeringAcceptanceServiceImpl.java | 3 +- .../service/impl/XzRegistryServiceImpl.java | 2 +- .../java/com/zhgd/xmgl/task/WorkerTask.java | 33 +++-- .../application-gsx-t-dev.properties | 4 +- 29 files changed, 133 insertions(+), 356 deletions(-) delete mode 100644 src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataToFenceController.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataToFenceMapper.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataToFenceMapper.xml delete mode 100644 src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataToFenceService.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataToFenceServiceImpl.java diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java index be69ec716..a19540d2a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java @@ -1,18 +1,15 @@ package com.zhgd.xmgl.modules.basicdata.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; -import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -168,7 +165,7 @@ public class SystemUserController { }) @PostMapping(value = "/getProjectChilderSystemUserList") public Result> getProjectChilderSystemUserList(@RequestBody Map map) { - return Result.success(systemUserService.getProjectChilderSystemUserList(map)); + return Result.success(systemUserService.getProjectChildernSystemUserList(map)); } @ApiOperation(value = "发送安全帽平台账号信息", notes = "发送安全帽平台账号信息", httpMethod = "POST") diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java index ffc7b9277..b80b22e15 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java @@ -123,7 +123,7 @@ public interface ISystemUserService extends IService { /** * 查找项目子账号列表 */ - List getProjectChilderSystemUserList(Map map); + List getProjectChildernSystemUserList(Map map); SystemUser queryById(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index e1b4df9ca..6292e27d5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -335,7 +335,7 @@ public class SystemUserServiceImpl extends ServiceImpl() .eq(XzSystemUserToCompanyProject::getType, 2) .eq(XzSystemUserToCompanyProject::getUserId, systemUser.getUserId()) @@ -385,7 +385,7 @@ public class SystemUserServiceImpl extends ServiceImpl users = getProjectChilderSystemUserList(new MapBuilder().put("projectSn", systemUser.getSn()) + List users = getProjectChildernSystemUserList(new MapBuilder().put("projectSn", systemUser.getSn()) .put("userId", systemUser.getUserId()).build()); if (CollUtil.isNotEmpty(users)) { systemUser.setPersonMail(users.get(0).getPersonMail()); @@ -862,7 +862,7 @@ public class SystemUserServiceImpl extends ServiceImpl getProjectChilderSystemUserList(Map map) { + public List getProjectChildernSystemUserList(Map map) { String enterpriseId = MapUtils.getString(map, "enterpriseId"); if (StrUtil.isNotBlank(enterpriseId)) { map.put("enterpriseIdList", StrUtil.split(enterpriseId, ",")); @@ -1309,7 +1309,8 @@ public class SystemUserServiceImpl extends ServiceImpl xzCheckingRouteTasks = xzCheckingRouteTaskService.list(Wrappers.lambdaQuery() .eq(XzCheckingRouteTask::getXzCheckingRouteId, xzCheckingRoute.getId())); for (XzCheckingRouteTask xzCheckingRouteTask : xzCheckingRouteTasks) { @@ -1689,6 +1690,9 @@ public class SystemUserServiceImpl extends ServiceImpl enterpriseIds = pageList.getRecords().stream().map(e -> e.getId()).collect(Collectors.toList()); Map userMap = new HashMap<>(); userMap.put("projectSn", map.get("projectSn").toString()); - List systemUserList = systemUserService.getProjectChilderSystemUserList(userMap); + List systemUserList = systemUserService.getProjectChildernSystemUserList(userMap); List workerInfoList = workerInfoService.listByIds(systemUserList.stream().map(u -> u.getWorkerId()).collect(Collectors.toList())); workerInfoList = workerInfoList.stream().filter(w -> enterpriseIds.contains(w.getEnterpriseId())).collect(Collectors.toList()); List> list = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java index 1588a97e0..2b7674df1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java @@ -187,7 +187,7 @@ public class QualityRegionServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("enterpriseIdList", enterpriseInfos.stream().map(EnterpriseInfo::getId).collect(Collectors.toList())); map.put("projectSn", qualityRegion.getProjectSn()); - List systemUserList = systemUserService.getProjectChilderSystemUserList(map); + List systemUserList = systemUserService.getProjectChildernSystemUserList(map); Map userMap = systemUserList.stream().collect(Collectors.toMap(SystemUser::getUserId, Function.identity())); if (CollUtil.isEmpty(userMap)) { return; diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataToFenceController.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataToFenceController.java deleted file mode 100644 index 7f89003d4..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataToFenceController.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.zhgd.xmgl.modules.safetyhat.controller; - -import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDataToFence; -import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatDataToFenceService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiImplicitParams; - -import java.util.HashMap; - -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; - -import com.zhgd.jeecg.common.api.vo.Result; -import org.apache.commons.collections.MapUtils; - -import org.simpleframework.xml.core.Validate; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -/** - * @Title: Controller - * @Description: 智能安全帽-实时数据-围栏中间表 - * @author： pds - * @date： 2024-06-13 - * @version： V1.0 - */ -@RestController -@RequestMapping("/xmgl/safetyHatDataToFence") -@Slf4j -@Api(tags = "智能安全帽-实时数据-围栏中间表相关Api") -public class SafetyHatDataToFenceController { - @Autowired - private ISafetyHatDataToFenceService safetyHatDataToFenceService; - - /** - * 分页列表查询 - * - * @return - */ - @ApiOperation(value = "分页列表查询智能安全帽-实时数据-围栏中间表信息", notes = "分页列表查询智能安全帽-实时数据-围栏中间表信息", httpMethod = "GET") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), - }) - @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { - return Result.success(safetyHatDataToFenceService.queryPageList(param)); - } - - /** - * 列表查询 - * - * @return - */ - @ApiOperation(value = "列表查询智能安全帽-实时数据-围栏中间表信息", notes = "列表查询智能安全帽-实时数据-围栏中间表信息", httpMethod = "GET") - @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { - return Result.success(safetyHatDataToFenceService.queryList(param)); - } - - /** - * 添加 - * - * @param safetyHatDataToFence - * @return - */ - @ApiOperation(value = "添加智能安全帽-实时数据-围栏中间表信息", notes = "添加智能安全帽-实时数据-围栏中间表信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody @Validate SafetyHatDataToFence safetyHatDataToFence) { - safetyHatDataToFenceService.add(safetyHatDataToFence); - return Result.ok(); - } - - /** - * 编辑 - * - * @param safetyHatDataToFence - * @return - */ - @ApiOperation(value = "编辑智能安全帽-实时数据-围栏中间表信息", notes = "编辑智能安全帽-实时数据-围栏中间表信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody SafetyHatDataToFence safetyHatDataToFence) { - safetyHatDataToFenceService.edit(safetyHatDataToFence); - return Result.ok(); - } - - /** - * 通过id删除 - * - * @return - */ - @ApiOperation(value = "删除智能安全帽-实时数据-围栏中间表信息", notes = "删除智能安全帽-实时数据-围栏中间表信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "智能安全帽-实时数据-围栏中间表ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") - @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { - safetyHatDataToFenceService.delete(MapUtils.getString(map, "id")); - return Result.ok(); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @ApiOperation(value = "通过id查询智能安全帽-实时数据-围栏中间表信息", notes = "通过id查询智能安全帽-实时数据-围栏中间表信息", httpMethod = "GET") - @ApiImplicitParam(name = "id", value = "智能安全帽-实时数据-围栏中间表ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { - return Result.success(safetyHatDataToFenceService.queryById(id)); - } - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java index f156a89bf..a5a0b491a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData; import com.zhgd.xmgl.modules.safetyhat.entity.vo.WorkerNumAndRegionName; -import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -28,11 +27,10 @@ public interface SafetyHatDataMapper extends BaseMapper { List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); - List getNewestDataGroupByDevSn(String projectSn); + List getNewestDataGroupByProjectSn(String projectSn); List getNewestList(HashMap paramMap); int batchInsert(@Param("list") List list); - List countWorkerNumByRegion(@Param("param") Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataToFenceMapper.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataToFenceMapper.java deleted file mode 100644 index 50c8df3af..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataToFenceMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zhgd.xmgl.modules.safetyhat.mapper; - -import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDataToFence; -import org.apache.ibatis.annotations.Mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 智能安全帽-实时数据-围栏中间表 - * @author： pds - * @date： 2024-06-13 - * @version： V1.0 - */ -@Mapper -public interface SafetyHatDataToFenceMapper extends BaseMapper { - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatFenceMapper.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatFenceMapper.java index 5dfeda6ba..f43b7680e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatFenceMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatFenceMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; /** @@ -23,4 +24,5 @@ public interface SafetyHatFenceMapper extends BaseMapper { List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage queryList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml index 8685040c9..3a0ea7038 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml @@ -8,7 +8,7 @@ ${ew.customSqlSegment} - select shd.*,wi.worker_name,wi.id_card from safety_hat_data shd join (select max(create_time) as create_time, dev_sn @@ -52,17 +52,4 @@ - diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataToFenceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataToFenceMapper.xml deleted file mode 100644 index b0734193c..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataToFenceMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataToFenceService.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataToFenceService.java deleted file mode 100644 index 896fe0045..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataToFenceService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zhgd.xmgl.modules.safetyhat.service; - -import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDataToFence; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.core.metadata.IPage; - -import java.util.HashMap; -import java.util.List; - -/** - * @Description: 智能安全帽-实时数据-围栏中间表 - * @author： pds - * @date： 2024-06-13 - * @version： V1.0 - */ -public interface ISafetyHatDataToFenceService extends IService { - - IPage queryPageList(HashMap param); - - List queryList(HashMap param); - - void add(SafetyHatDataToFence safetyHatDataToFence); - - void edit(SafetyHatDataToFence safetyHatDataToFence); - - void delete(String id); - - SafetyHatDataToFence queryById(String id); - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java index 387727e8b..326c308af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java @@ -23,10 +23,7 @@ import com.zhgd.xmgl.modules.safetyhat.entity.vo.WorkerNumByRegionVo; import com.zhgd.xmgl.modules.safetyhat.mapper.*; import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatAlarmService; import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatDataService; -import com.zhgd.xmgl.util.DateUtils; -import com.zhgd.xmgl.util.PageUtil; -import com.zhgd.xmgl.util.RefUtil; -import com.zhgd.xmgl.util.RegionUtil; +import com.zhgd.xmgl.util.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -34,8 +31,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -48,11 +45,11 @@ import java.util.stream.Collectors; @Transactional(rollbackFor = Exception.class) @Slf4j public class SafetyHatDataServiceImpl extends ServiceImpl implements ISafetyHatDataService { + @Resource + SafetyHatFenceServiceImpl safetyHatFenceService; @Autowired private SafetyHatDataMapper safetyHatDataMapper; @Autowired - private SafetyHatDataToFenceMapper safetyHatDataToFenceMapper; - @Autowired private SafetyHatDevMapper safetyHatDevMapper; @Autowired private SafetyHatFenceMapper safetyHatFenceMapper; @@ -141,10 +138,6 @@ public class SafetyHatDataServiceImpl extends ServiceImpl countWorkerNumByRegion(Map param) { List vos = Lists.newArrayList(); - List dataList = baseMapper.countWorkerNumByRegion(param); - Map> dateMap = dataList.stream().collect(Collectors.groupingBy(WorkerNumAndRegionName::getDate)); - Set regionNameSet = dataList.stream().map(WorkerNumAndRegionName::getRegionName).collect(Collectors.toSet()); + String projectSn = MapUtils.getString(param, "projectSn"); + List datas = safetyHatDataMapper.selectList(new LambdaQueryWrapper() + .eq(SafetyHatData::getProjectSn, projectSn) + .ge(SafetyHatData::getUploadTime, DateUtil.formatDate(DateUtil.offsetDay(new Date(), -6))) + ); + List regions = safetyHatFenceService.queryList(new MapBuilder() + .put("projectSn", projectSn) + .build()); List dateList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); for (String date : dateList) { List list = new ArrayList<>(); - for (String regionName : regionNameSet) { - List workerNumAndRegionNames = dateMap.get(date); - Map regionNameMap = Optional.ofNullable(workerNumAndRegionNames).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(WorkerNumAndRegionName::getRegionName, Function.identity(), (oldValue, newValue) -> oldValue)); - WorkerNumAndRegionName workerNumAndRegionName = regionNameMap.get(regionName); - if (workerNumAndRegionName == null) { - workerNumAndRegionName = new WorkerNumAndRegionName(); - workerNumAndRegionName.setWorkerNum(0); - workerNumAndRegionName.setDate(date); - workerNumAndRegionName.setRegionName(regionName); - } + for (SafetyHatFence region : regions) { + List datas1 = datas.stream().filter(safetyHatData -> DateUtil.compare(safetyHatData.getUploadTime(), DateUtil.beginOfDay(DateUtil.parse(date))) >= 0 + && DateUtil.compare(safetyHatData.getUploadTime(), DateUtil.endOfDay(DateUtil.parse(date))) <= 0).collect(Collectors.toList()); + int workerNum = getWorkerNumInFence(region, datas1); + WorkerNumAndRegionName workerNumAndRegionName = new WorkerNumAndRegionName(); + workerNumAndRegionName.setWorkerNum(workerNum); + workerNumAndRegionName.setDate(date); + workerNumAndRegionName.setRegionName(region.getRegionName()); list.add(workerNumAndRegionName); } WorkerNumByRegionVo oneVo = new WorkerNumByRegionVo(); @@ -298,8 +294,41 @@ public class SafetyHatDataServiceImpl extends ServiceImpl datas) { + int workerNum = 0; + Set inWorkerSet = new HashSet<>(); + for (SafetyHatData d : datas) { + boolean inFence = false; + //判断是否在围栏范围内 + if (Objects.equals(fence.getRangeType(), 1)) { + inFence = RegionUtil.isInCircle(d.getLongitude(), d.getLatitude(), fence.getLongitude(), fence.getLatitude(), fence.getAreaRadius()); + } else if (Objects.equals(fence.getRangeType(), 2)) { + String fenceShape = fence.getFenceShape(); + if (StrUtil.isNotBlank(fenceShape)) { + String[] couples = StringUtils.split(fenceShape, ","); + Double[] lon = new Double[couples.length]; + Double[] lat = new Double[couples.length]; + for (int i = 0; i < couples.length; i++) { + String couple = couples[i]; + String[] two = StringUtils.split(couple, "|"); + lon[i] = Double.valueOf(two[0]); + lat[i] = Double.valueOf(two[1]); + } + inFence = RegionUtil.isInPolygon(d.getLongitude(), d.getLatitude(), lon, lat); + } + } + if (inFence) { + if (inWorkerSet.add(d.getWorkerInfoId())) { + workerNum++; + } + } + } + return workerNum; + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataToFenceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataToFenceServiceImpl.java deleted file mode 100644 index 1e4e8e8ae..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataToFenceServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.zhgd.xmgl.modules.safetyhat.service.impl; - -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDataToFence; -import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatDataToFenceService; -import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDataToFenceMapper; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.util.HashMap; -import java.util.List; - -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @Description: 智能安全帽-实时数据-围栏中间表 - * @author： pds - * @date： 2024-06-13 - * @version： V1.0 - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class SafetyHatDataToFenceServiceImpl extends ServiceImpl implements ISafetyHatDataToFenceService { - @Autowired - private SafetyHatDataToFenceMapper safetyHatDataToFenceMapper; - - @Override - public IPage queryPageList(HashMap param) { - QueryWrapper queryWrapper = getQueryWrapper(param); - Page page = PageUtil.getPage(param); - IPage pageList = this.page(page, queryWrapper); - pageList.setRecords(dealList(pageList.getRecords())); - return pageList; - } - - @Override - public List queryList(HashMap param) { - QueryWrapper queryWrapper = getQueryWrapper(param); - return dealList(this.list(queryWrapper)); - } - - private QueryWrapper getQueryWrapper(HashMap param) { - String alias = ""; - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(SafetyHatDataToFence.class, param, alias); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SafetyHatDataToFence::getId)); - return queryWrapper; - } - - private List dealList(List list) { - return list; - } - - @Override - public void add(SafetyHatDataToFence safetyHatDataToFence) { - safetyHatDataToFence.setId(null); - baseMapper.insert(safetyHatDataToFence); - } - - @Override - public void edit(SafetyHatDataToFence safetyHatDataToFence) { - SafetyHatDataToFence oldSafetyHatDataToFence = baseMapper.selectById(safetyHatDataToFence.getId()); - if (oldSafetyHatDataToFence == null) { - throw new OpenAlertException("未找到对应实体"); - } - baseMapper.updateById(safetyHatDataToFence); - } - - @Override - public void delete(String id) { - SafetyHatDataToFence safetyHatDataToFence = baseMapper.selectById(id); - if (safetyHatDataToFence == null) { - throw new OpenAlertException("未找到对应实体"); - } - baseMapper.deleteById(id); - } - - @Override - public SafetyHatDataToFence queryById(String id) { - SafetyHatDataToFence entity = getById(id); - if (entity == null) { - throw new OpenAlertException("未找到对应实体"); - } - return entity; - } - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatFenceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatFenceServiceImpl.java index 6c9f30c60..b14f3c15e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatFenceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatFenceServiceImpl.java @@ -62,7 +62,7 @@ public class SafetyHatFenceServiceImpl extends ServiceImpl dealList(List list, HashMap paramMap) { String projectSn = MapUtils.getString(paramMap, "projectSn"); if (CollUtil.isNotEmpty(list)) { - List dataList = safetyHatDataMapper.getNewestDataGroupByDevSn(projectSn); + List dataList = safetyHatDataMapper.getNewestDataGroupByProjectSn(projectSn); for (SafetyHatFence fence : list) { ArrayList workerInfos = new ArrayList<>(); int workerNum = 0; diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java index 3985a994f..7e9d84feb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java @@ -302,5 +302,4 @@ public class AiAnalyseHardWareAlarmRecordController { return Result.ok(); } - } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java index ad9b6523a..15fa8ebd4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java @@ -181,5 +181,8 @@ public class AiAnalyseHardWareAlarmRecord implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "AI扣分规则") private XzAiDeductRule aiDeductRule; + @TableField(exist = false) + @ApiModelProperty(value = "项目子账号是否可以处置") + private Boolean isEnableHandle; } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareRecordMapper.java index 0a3aec64f..bc590df6f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareRecordMapper.java @@ -16,7 +16,9 @@ import java.util.List; @Mapper public interface AiAnalyseHardWareRecordMapper extends BaseMapper { - List getAiAnalyseHardIdsByUserId(Long userId); + List getSeeAiAnalyseHardIdsByUserId(Long userId); + + List getHandleAiAnalyseHardIdsByUserId(Long userId); List getAiAnalyseHardIdsByEnterpriseId(Long enterpriseId); diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareRecordMapper.xml index b9f0d0e0b..9ae23a898 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareRecordMapper.xml @@ -1,7 +1,16 @@ - + select distinct aahwr.hardware_id + from ai_analyse_hard_ware_record aahwr + join quality_region_to_ai_analyse_hard qrtaah on aahwr.id = qrtaah.ai_analyse_hard_ware_record_id + join quality_region_to_enterprise qrte on qrte.quality_region_id = qrtaah.quality_region_id + join worker_info wi on wi.enterprise_id = qrte.enterprise_id + join system_user su on su.worker_id = wi.id + where su.user_id = #{userId} + +