From 24fca2f0eb7b11b02a3640e1dc34ce40a3d30c05 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 2 Aug 2024 11:46:15 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=AE=BE=E5=A4=87=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=90=8D=E7=A7=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ef8df07e --- .../com/zhgd/mybatis/DataScopeHandler.java | 68 ------------------- .../xmgl/modules/bigdevice/entity/Tower.java | 8 --- .../car/controller/CarCameraController.java | 12 ++-- .../xmgl/modules/car/entity/CarCamera.java | 14 +--- .../modules/car/mapper/CarCameraMapper.java | 13 ---- .../car/mapper/xml/CarCameraMapper.xml | 9 +-- .../car/service/ICarCameraService.java | 8 --- .../service/impl/CarCameraServiceImpl.java | 5 -- .../mapper/EnvironmentDevMapper.java | 2 - .../mapper/xml/EnvironmentDevMapper.xml | 10 ++- .../safetyhat/mapper/SafetyHatDevMapper.java | 2 - .../mapper/xml/SafetyHatDevMapper.xml | 3 +- .../service/impl/SafetyHatDevServiceImpl.java | 2 - .../AiAnalyseHardWareRecordController.java | 4 +- .../video/entity/AiAnalyseHardWareRecord.java | 12 ---- .../xmgl/modules/video/entity/VideoItem.java | 10 --- .../mapper/AiAnalyseHardWareRecordMapper.java | 13 ---- .../xml/AiAnalyseHardWareRecordMapper.xml | 7 -- .../video/mapper/xml/VideoItemMapper.xml | 4 +- .../AiAnalyseHardWareRecordServiceImpl.java | 11 ++- .../modules/worker/mapper/UfaceDevMapper.java | 2 - .../worker/mapper/xml/UfaceDevMapper.xml | 4 +- .../service/impl/UfaceDevServiceImpl.java | 1 - 23 files changed, 20 insertions(+), 204 deletions(-) diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index 4df005b99..a511e6d43 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java @@ -105,53 +105,6 @@ public class DataScopeHandler implements DataPermissionHandler { return tables; } - private HashMap getFieldEnterpriseIdsTables() { - HashMap tables = new HashMap<>(16); - tables.put("video_item", "enterprise_ids"); - tables.put("ai_analyse_hard_ware_record", "enterprise_ids"); - tables.put("car_camera", "enterprise_ids"); - tables.put("hang_basket_dev", "enterprise_ids"); - tables.put("deep_excavation_engineering", "enterprise_ids"); - tables.put("high_formwork_plane_figure", "enterprise_ids"); - tables.put("high_formwork_measure_point", "enterprise_ids"); - tables.put("tower", "enterprise_ids"); - tables.put("safety_hat_dev", "enterprise_ids"); - tables.put("concrete_monitor_dev", "enterprise_ids"); - tables.put("environment_dev", "enterprise_ids"); - tables.put("poisonous_gas_dev", "enterprise_ids"); - tables.put("uface_dev", "enterprise_ids"); - -// tables.put("anti_pressure_fold_dev", "enterprise_ids"); -// tables.put("bridge_erect_machine_dev", "enterprise_ids"); -// tables.put("car_wash_dev", "enterprise_ids"); -// tables.put("concrete_mix_station_dev", "enterprise_ids"); -// tables.put("discharging_platform_dev", "enterprise_ids"); -// tables.put("double_carbon_dev", "enterprise_ids"); -// tables.put("electrical_dev", "enterprise_ids"); -// tables.put("frontier_protection_dev", "enterprise_ids"); -// tables.put("frontier_protection_no_net_dev", "enterprise_ids"); -// tables.put("gt_material_device", "enterprise_ids"); -// tables.put("high_formwork_measure_device", "enterprise_ids"); -// tables.put("mass_rebound_measure_dev", "enterprise_ids"); -// tables.put("ms_mixed_soil_dev", "enterprise_ids"); -// tables.put("pave_compaction_dev", "enterprise_ids"); -// tables.put("pave_dev", "enterprise_ids"); -// tables.put("photovoltaic_power_dev", "enterprise_ids"); -// tables.put("pitch_mix_station_dev", "enterprise_ids"); -// tables.put("pressure_test_machine_dev", "enterprise_ids"); -// tables.put("sewage_dev", "enterprise_ids"); -// tables.put("smart_grout_dev", "enterprise_ids"); -// tables.put("smart_tension_dev", "enterprise_ids"); -// tables.put("smoke_dev", "enterprise_ids"); -// tables.put("spray_dev", "enterprise_ids"); -// tables.put("spray_rt_dev", "enterprise_ids"); -// tables.put("stable_water_mix_station_dev", "enterprise_ids"); -// tables.put("standard_dev", "enterprise_ids"); -// tables.put("universal_test_dev", "enterprise_ids"); -// tables.put("vehicle_position_dev", "enterprise_ids"); - return tables; - } - private HashMap getFieldVideoTables() { HashMap tables = new HashMap<>(16); tables.put("video_item", "item_id"); @@ -194,27 +147,6 @@ public class DataScopeHandler implements DataPermissionHandler { } } - if (!EnvironmentUtil.isXingZongProd() && !EnvironmentUtil.isXingZongTest()) { - //对合作单位ids做数据权限 - //and (FIND_IN_SET(100,xxx.enterprise_ids) or FIND_IN_SET(102,xxx.enterprise_ids)) - List filterEnterpriseIds = getNeedFilterLeftExpression(plainSelect, getFieldEnterpriseIdsTables(), ds); - if (CollUtil.isNotEmpty(filterEnterpriseIds)) { - List enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject(); - for (String filterEnterpriseId : filterEnterpriseIds) { - List list1 = enterpriseIds.stream().map(s -> "FIND_IN_SET(" + s + "," + filterEnterpriseId + ")").collect(Collectors.toList()); - String s1 = StrUtil.join(" or ", list1); - String sql = " (" + s1 + ")"; - Expression expression = null; - try { - expression = CCJSqlParserUtil.parseCondExpression(sql); - expressions.add(expression); - } catch (JSQLParserException e) { - log.error("", e); - } - } - } - } - List filterItems = getNeedFilterLeftExpression(plainSelect, getFieldVideoTables(), ds); if (CollUtil.isNotEmpty(filterItems)) { List videoItems = userDevAuthorityService.getVideoItemsIfSubProject(); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java index c227b7313..8b789d586 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java @@ -443,11 +443,6 @@ public class Tower implements Serializable { @ApiModelProperty(value = "钢丝绳设备id") private java.lang.Long tckwWireRopeId; - /** - * 企业ids（多个，分割） - */ - @ApiModelProperty(value = "企业ids（多个，分割）") - private String enterpriseIds; @TableField(exist = false) @ApiModelProperty(value = "视频配置") @@ -479,7 +474,4 @@ public class Tower implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "报警数量") private Integer alarmNum; - @TableField(exist = false) - @ApiModelProperty(value = "企业名称（多个，分割）") - private java.lang.String enterpriseName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarCameraController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarCameraController.java index a625a8219..8abab315a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarCameraController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarCameraController.java @@ -3,11 +3,9 @@ package com.zhgd.xmgl.modules.car.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.car.entity.CarCamera; import com.zhgd.xmgl.modules.car.service.ICarCameraService; import com.zhgd.xmgl.util.MessageUtil; -import com.zhgd.xmgl.util.RefUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -40,7 +38,7 @@ public class CarCameraController { private ICarCameraService carCameraService; /** - * 列表查询 + * 分页列表查询 * * @return */ @@ -51,11 +49,9 @@ public class CarCameraController { }) @PostMapping(value = "/list") public Result> selectCarCameraList(@RequestBody Map map) { - String alias = "t."; - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(CarCamera.class, map, alias); - queryWrapper.groupBy(alias + RefUtil.fieldNameUlc(CarCamera::getId)); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(CarCamera::getId)); - List list = carCameraService.queryList(queryWrapper); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(CarCamera::getProjectSn, MapUtils.getString(map, "projectSn")); + List list = carCameraService.list(queryWrapper); return Result.success(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarCamera.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarCamera.java index 41a4aca5a..32c657d6c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarCamera.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarCamera.java @@ -1,7 +1,6 @@ package com.zhgd.xmgl.modules.car.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -25,8 +24,9 @@ import java.io.Serializable; @ApiModel(value="CarCamera实体类",description="CarCamera") public class CarCamera implements Serializable { private static final long serialVersionUID = 1L; - + /**id*/ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") private java.lang.Long id ; @@ -69,14 +69,4 @@ public class CarCamera implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value="心跳时间，30分钟没接收到实时数据表示设备离线") private java.util.Date heartBeatTime ; - /** - * 企业ids（多个，分割） - */ - @ApiModelProperty(value = "企业ids（多个，分割）") - private String enterpriseIds; - - @TableField(exist = false) - @ApiModelProperty(value = "企业名称（多个，分割）") - private java.lang.String enterpriseName; - } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarCameraMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarCameraMapper.java index 8db2e13f2..b4f86b687 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarCameraMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarCameraMapper.java @@ -1,14 +1,9 @@ package com.zhgd.xmgl.modules.car.mapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.car.entity.CarCamera; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import java.util.List; import java.util.Map; /** @@ -18,7 +13,6 @@ import java.util.Map; * @version： V1.0 */ @Mapper -@DataScope(includeTable = "car_camera") public interface CarCameraMapper extends BaseMapper { /** @@ -29,11 +23,4 @@ public interface CarCameraMapper extends BaseMapper { */ Map getCarPassRecordTotalInAndOut(Map map); - /** - * 列表查询车辆相机信息 - * - * @param queryWrapper - * @return - */ - List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarCameraMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarCameraMapper.xml index 05875f0bb..6df446040 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarCameraMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarCameraMapper.xml @@ -13,11 +13,4 @@ and a.pass_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00') - - - + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarCameraService.java b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarCameraService.java index 547030286..5968b52e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarCameraService.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarCameraService.java @@ -1,6 +1,5 @@ package com.zhgd.xmgl.modules.car.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.car.entity.CarCamera; @@ -50,11 +49,4 @@ public interface ICarCameraService extends IService { * @param cameraId */ void updateCarCamera(String projectSn, String cameraId); - - /** - * 列表查询车辆相机信息 - * @param queryWrapper - * @return - */ - List queryList(QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarCameraServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarCameraServiceImpl.java index 125052741..fb31eab4e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarCameraServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarCameraServiceImpl.java @@ -92,10 +92,5 @@ public class CarCameraServiceImpl extends ServiceImpl queryList(QueryWrapper queryWrapper) { - return baseMapper.queryList(queryWrapper); - } - } diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentDevMapper.java index 99aafc4c3..e2266cac0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentDevMapper.java @@ -3,7 +3,6 @@ package com.zhgd.xmgl.modules.environment.mapper; import java.util.List; import java.util.Map; -import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.environment.entity.EnvironmentDev; @@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Param; * @version： V1.0 */ @Mapper -@DataScope(includeTable = "environment_dev") public interface EnvironmentDevMapper extends BaseMapper { List selectEnvironmentDevList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml index f31e63c33..f28fa9a39 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml @@ -15,15 +15,13 @@ - select shd.*,wi.worker_name,group_concat(distinct ei.enterprise_name) as enterprise_name + select shd.*,wi.worker_name from safety_hat_dev shd left join worker_info wi on wi.id = shd.worker_info_id - left join enterprise_info ei on find_in_set(ei.id,shd.enterprise_ids) ${ew.customSqlSegment} diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java index 0a97d6dbb..168f3fb52 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.execption.OpenPromptException; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.car.entity.CarCamera; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatAlarm; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; @@ -77,7 +76,6 @@ public class SafetyHatDevServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initPageQueryWrapper(SafetyHatDev.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SafetyHatDev::getId)); - queryWrapper.groupBy(alias + RefUtil.fieldNameUlc(SafetyHatDev::getId)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareRecordController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareRecordController.java index 91e7659b2..0ff9d5880 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareRecordController.java @@ -35,11 +35,11 @@ public class AiAnalyseHardWareRecordController { private IAiAnalyseHardWareRecordService aiAnalyseHardWareRecordService; /** - * 列表查询 + * 分页列表查询 * * @return */ - @ApiOperation(value = "列表查询AI分析硬件设备信息", notes = "列表查询AI分析硬件设备信息", httpMethod = "POST") + @ApiOperation(value = "分页列表查询AI分析硬件设备信息", notes = "分页列表查询AI分析硬件设备信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), }) diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareRecord.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareRecord.java index bb3a56fe9..a11076b8f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareRecord.java @@ -1,7 +1,6 @@ package com.zhgd.xmgl.modules.video.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -63,15 +62,4 @@ public class AiAnalyseHardWareRecord implements Serializable { @Excel(name = "设备状态，1在线，2离线", width = 15) @ApiModelProperty(value = "设备状态，1在线，2离线") private java.lang.Integer deviceState; - /** - * 企业ids（多个，分割） - */ - @ApiModelProperty(value = "企业ids（多个，分割）") - private String enterpriseIds; - - - @TableField(exist = false) - @ApiModelProperty(value = "企业名称（多个，分割）") - private java.lang.String enterpriseName; - } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java index cf449d7ac..faff79844 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java @@ -139,12 +139,6 @@ public class VideoItem implements Serializable { private String longitude; @ApiModelProperty(value = "父级的对象") private String parentObj; - /** - * 企业id（多个，分割） - */ - @ApiModelProperty(value = "企业id（多个，分割）") - private String enterpriseIds; - /** * 项目sn */ @@ -203,8 +197,4 @@ public class VideoItem implements Serializable { @ApiModelProperty(value = "视频配置") private ProjectVideoConfig projectVideoConfig; - @TableField(exist = false) - @ApiModelProperty(value = "企业名称（多个，分割）") - private java.lang.String enterpriseName; - } 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 bc88b96bd..12b30540c 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 @@ -1,14 +1,9 @@ package com.zhgd.xmgl.modules.video.mapper; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.zhgd.annotation.DataScope; -import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDetectData; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareRecord; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,7 +14,6 @@ import java.util.List; * @version： V1.0 */ @Mapper -@DataScope(includeTable = "ai_analyse_hard_ware_record") public interface AiAnalyseHardWareRecordMapper extends BaseMapper { /** * 根据用户id查询AI分析硬件设备id列表 @@ -60,11 +54,4 @@ public interface AiAnalyseHardWareRecordMapper extends BaseMapper getEnterpriseIdAndAiAnalyseHardIdsByProjectSn(String projectSn); - - /** - * 列表查询AI分析硬件设备信息 - * @param queryWrapper - * @return - */ - List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } 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 9ad9a3e59..730f44dfc 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 @@ -47,11 +47,4 @@ join ai_analyse_hard_ware_record aahwr on aahwr.id = qrtaah.ai_analyse_hard_ware_record_id where aahwr.project_sn = #{projectSn} - - diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml index f6d4e8f5b..4919e529b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml @@ -18,10 +18,9 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java index e4cd40be9..55cafca52 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java @@ -71,7 +71,6 @@ public class UfaceDevServiceImpl extends ServiceImpl i QueryWrapper qw = new QueryWrapper<>(); String ufaceDevGroupId = MapUtils.getString(map, "ufaceDevGroupId"); qw.eq(alias + RefUtil.fieldNameUlc(UfaceDev::getProjectSn), MapUtils.getString(map, "projectSn")); - qw.groupBy(alias + "id"); UserInfo user = SecurityUtils.getUser(); if (Objects.equals(user.getAccountType(), SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue())) { //项目子账号就筛选自己能看到的