From 941b1e308245aa479f8462cfb5382ac9b9e7acb4 Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Thu, 20 Jun 2024 22:46:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Revert=20"=E5=86=85=E7=BD=91=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E5=9B=BE=E7=89=87"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e255264a01e7da8d1a457d297272cbddd59e1b47. --- src/main/java/com/zhgd/xmgl/call/HikvisionCall.java | 12 +----------- src/main/resources/application-xingzong.properties | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index 5e3c93664..42f83d411 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -206,12 +206,6 @@ public class HikvisionCall { @Lazy @Autowired private ISystemUserService systemUserService; - private static String xingzongIscIpPort; - - @Value("${xingzongIscIpPort:}") - public void setXingzongIscIpPort(String xingzongIscIpPort) { - HikvisionCall.xingzongIscIpPort = xingzongIscIpPort; - } /** * 获取图片 @@ -235,11 +229,7 @@ public class HikvisionCall { JSONObject rsJo = JSONObject.parseObject(rs); String code = rsJo.getString("code"); if (Objects.equals(code, "0")) { - String picUrl = rsJo.getJSONObject("data").getString("picUrl"); - if (EnvironmentUtil.isXingZong()) { - picUrl = picUrl.replaceAll("^https:\\/\\/[^/]+\\/", xingzongIscIpPort); - } - return picUrl; + return rsJo.getJSONObject("data").getString("picUrl"); } return null; } diff --git a/src/main/resources/application-xingzong.properties b/src/main/resources/application-xingzong.properties index 946477b66..a829fff91 100644 --- a/src/main/resources/application-xingzong.properties +++ b/src/main/resources/application-xingzong.properties @@ -73,4 +73,3 @@ spring.datasource.db2.jdbc-url=jdbc:mysql://127.0.0.1:3306/wflow_pro?useUnicode= spring.datasource.db2.driver-class-name=com.mysql.jdbc.Driver spring.datasource.db2.username=root spring.datasource.db2.password=JXJ@admin -xingzongIscIpPort=https://10.168.1.100:6113/ From 54012cc383f1f0cce31ab1fd7b6fbe6d3aa9aa5a Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Thu, 20 Jun 2024 23:30:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8B=89=E5=8F=96bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zhgd/xmgl/call/HikvisionCall.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index 42f83d411..56c876ef2 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -637,7 +637,7 @@ public class HikvisionCall { ); if (count != 0) { log.info("重复的人员通行的数据不保存，idCard：{},time:{}", workerInfo.getIdCard(), time); - return; + continue; } try { HikvisionEventsPictureRq rq = new HikvisionEventsPictureRq(); @@ -744,7 +744,7 @@ public class HikvisionCall { Integer count = carPassRecordMapper.selectCount(queryWrapper); if (count != 0) { log.info("重复的车辆通行的数据不保存，plateNo：{},time:{}", plateNo, time); - return; + continue; } try { //车牌 From 1f263fd275eae5e903282ae3da998bb29c004ae3 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 21 Jun 2024 10:36:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E5=A4=A9=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java | 2 ++ .../zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java | 1 + .../xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java | 3 +++ .../xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml | 6 ++++++ .../modules/xz/service/impl/XzTaskProgressServiceImpl.java | 5 +++++ 5 files changed, 17 insertions(+) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java index 144fa50cc..6240287e4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java @@ -9,6 +9,8 @@ public class CountTaskProgressVo { private Double projectTotalProgress; @ApiModelProperty("承包商总进度%") private Double enterpriseTotalProgress; + @ApiModelProperty("承包商剩余天数") + private Integer enterpriseSurplusDayNum; @ApiModelProperty("项目总天数") private Integer projectTotalDayNum; @ApiModelProperty("项目剩余天数") diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java index 9bc19cbb8..aaeec8fa9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java @@ -42,4 +42,5 @@ public interface XzTaskProgressMapper extends BaseMapper { CountTaskProgressVo getMaxMinProgress(HashMap paramMap); List statsByEnterprise(Map paramMap); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java index 9b106316f..1ee04d66d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java @@ -1,11 +1,13 @@ package com.zhgd.xmgl.modules.xz.mapper; +import com.alibaba.fastjson.JSONObject; import com.zhgd.xmgl.modules.xz.entity.vo.CountEnterpriseVo; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressTotal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -21,4 +23,5 @@ public interface XzTaskProgressTotalMapper extends BaseMapper countEnterprise(@Param("param") Map param); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml index 28c899d9c..c4aa5217c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml @@ -180,6 +180,12 @@ AND (p.enterprise_id = #{supplierEnterpriseId} OR p.enterprise_id IN ( SELECT t.id FROM project_enterprise t WHERE find_in_set(#{supplierEnterpriseId}, ancestors) )) + + AND (p.enterprise_id = #{enterpriseId} OR p.enterprise_id IN ( SELECT t.enterprise_id FROM + project_enterprise t + WHERE find_in_set((select id from project_enterprise where project_sn=#{projectSn} and enterprise_id = + #{enterpriseId}), ancestors) )) + - 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} + +