Revert "设备加企业名称"

This reverts commit ef8df07ec20f8c6bdb0fcb08351fe8b2455f3251.

src/main/java/com/zhgd/mybatis/DataScopeHandler.java

@@ -107,53 +107,6 @@ public class DataScopeHandler implements DataPermissionHandler {
         return tables;
     }
 
-    private HashMap<String, String> getFieldEnterpriseIdsTables() {
-        HashMap<String, String> 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<String, String> getFieldVideoTables() {
         HashMap<String, String> tables = new HashMap<>(16);
         tables.put("video_item", "item_id");
@@ -198,27 +151,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<String> filterEnterpriseIds = getNeedFilterLeftExpression(plainSelect, getFieldEnterpriseIdsTables(), ds);
-                    if (CollUtil.isNotEmpty(filterEnterpriseIds)) {
-                        List<String> enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject();
-                        for (String filterEnterpriseId : filterEnterpriseIds) {
-                            List<String> 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<String> filterItems = getNeedFilterLeftExpression(plainSelect, getFieldVideoTables(), ds);
                 if (CollUtil.isNotEmpty(filterItems)) {
                     List<String> videoItems = userDevAuthorityService.getVideoItemsIfSubProject();

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;
 }

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<List<CarCamera>> selectCarCameraList(@RequestBody Map<String, Object> map) {
-        String alias = "t.";
+        QueryWrapper<CarCamera> queryWrapper = new QueryWrapper<>();
-        QueryWrapper<CarCamera> queryWrapper = QueryGenerator.initPageQueryWrapper(CarCamera.class, map, alias);
+        queryWrapper.lambda().eq(CarCamera::getProjectSn, MapUtils.getString(map, "projectSn"));
-        queryWrapper.groupBy(alias + RefUtil.fieldNameUlc(CarCamera::getId));
+        List<CarCamera> list = carCameraService.list(queryWrapper);
-        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(CarCamera::getId));
-        List<CarCamera> list = carCameraService.queryList(queryWrapper);
         return Result.success(list);
     }
 

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;
-
 }

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<CarCamera> {
 
     /**
@@ -29,11 +23,4 @@ public interface CarCameraMapper extends BaseMapper<CarCamera> {
      */
     Map<String, Object> getCarPassRecordTotalInAndOut(Map<String, Object> map);
 
-    /**
-     * 列表查询车辆相机信息
-     *
-     * @param queryWrapper
-     * @return
-     */
-    List<CarCamera> queryList(@Param(Constants.WRAPPER) QueryWrapper<CarCamera> queryWrapper);
 }

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')
 
     </select>
-
+</mapper>
-    <select id="queryList" resultType="com.zhgd.xmgl.modules.car.entity.CarCamera">
-        select t.*,group_concat(distinct ei.enterprise_name) as enterprise_name
-        from car_camera t
-        left join enterprise_info ei on find_in_set(ei.id,t.enterprise_ids)
-        ${ew.customSqlSegment}
-    </select>
-</mapper>

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<CarCamera> {
      * @param cameraId
      */
     void updateCarCamera(String projectSn, String cameraId);
-
-    /**
-     * 列表查询车辆相机信息
-     * @param queryWrapper
-     * @return
-     */
-    List<CarCamera> queryList(QueryWrapper<CarCamera> queryWrapper);
 }

src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarCameraServiceImpl.java

@@ -92,10 +92,5 @@ public class CarCameraServiceImpl extends ServiceImpl<CarCameraMapper, CarCamera
         carCameraMapper.update(carCamera,carCameraQueryWrapper);
     }
 
-    @Override
-    public List<CarCamera> queryList(QueryWrapper<CarCamera> queryWrapper) {
-        return baseMapper.queryList(queryWrapper);
-    }
-
 
 }

src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorDevController.java

@@ -49,7 +49,7 @@ public class ConcreteMonitorDevController {
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
     })
     @PostMapping(value = "/list")
-    public Result<IPage<ConcreteMonitorDev>> queryPageList(@RequestBody Map<String, Object> map) {
+    public Result<IPage<EntityMap>> queryPageList(@RequestBody Map<String, Object> map) {
         return Result.success(concreteMonitorDevService.selectConcreteMonitorDevPageList(map));
     }
 

src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevMapper.java

@@ -4,11 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.annotation.DataScope;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -22,10 +18,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version： V1.0
  */
 @Mapper
-@DataScope(includeTable = "concrete_monitor_dev")
 public interface ConcreteMonitorDevMapper extends BaseMapper<ConcreteMonitorDev> {
 
-    Integer countPointNum(HashMap<String, Object> paramMap);
+    List<EntityMap> selectConcreteMonitorDevPageList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
 
-    IPage<ConcreteMonitorDev> queryList(@Param(Constants.WRAPPER) QueryWrapper<ConcreteMonitorDev> queryWrapper, Page page);
+    Integer countPointNum(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevMapper.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevMapper">
+    <select id="selectConcreteMonitorDevPageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
+        SELECT a.*
+        FROM concrete_monitor_dev a
+        where a.project_sn=#{param.projectSn}
+    </select>
+
     <select id="countPointNum" resultType="java.lang.Integer">
         SELECT ifnull(sum(point_num),0)
         FROM concrete_monitor_dev a
         where a.project_sn=#{projectSn}
     </select>
-
-    <select id="queryList" resultType="com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDev">
-        select t.*,group_concat(distinct ei.enterprise_name) as enterprise_name
-        from concrete_monitor_dev t
-        left join enterprise_info ei on find_in_set(ei.id,t.enterprise_ids)
-        ${ew.customSqlSegment}
-    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorDevService.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 public interface IConcreteMonitorDevService extends IService<ConcreteMonitorDev> {
 
-    IPage<ConcreteMonitorDev> selectConcreteMonitorDevPageList(Map<String, Object> map);
+    IPage<EntityMap> selectConcreteMonitorDevPageList(Map<String, Object> map);
 
     List<ConcreteMonitorDev> selectConcreteMonitorDevList(Map<String, Object> map);
 

src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevServiceImpl.java

@@ -6,16 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
-import com.zhgd.jeecg.common.system.query.QueryGenerator;
-import com.zhgd.xmgl.modules.car.entity.CarCamera;
 import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDev;
 import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition;
 import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevMapper;
 import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevPointPositionMapper;
 import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorDevService;
 import com.zhgd.xmgl.util.MessageUtil;
-import com.zhgd.xmgl.util.PageUtil;
-import com.zhgd.xmgl.util.RefUtil;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,12 +39,12 @@ public class ConcreteMonitorDevServiceImpl extends ServiceImpl<ConcreteMonitorDe
     private ConcreteMonitorDevPointPositionMapper concreteMonitorDevPointPositionMapper;
 
     @Override
-    public IPage<ConcreteMonitorDev> selectConcreteMonitorDevPageList(Map<String, Object> map) {
+    public IPage<EntityMap> selectConcreteMonitorDevPageList(Map<String, Object> map) {
-        String alias = "t.";
+        int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
-        QueryWrapper<ConcreteMonitorDev> queryWrapper = QueryGenerator.initPageQueryWrapper(ConcreteMonitorDev.class, map, alias);
+        int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
-        queryWrapper.groupBy(alias + RefUtil.fieldNameUlc(ConcreteMonitorDev::getId));
+        Page<EntityMap> page = new Page<>(pageNo, pageSize);
-        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(ConcreteMonitorDev::getId));
+        List<EntityMap> list = concreteMonitorDevMapper.selectConcreteMonitorDevPageList(page, map);
-        return baseMapper.queryList(queryWrapper, PageUtil.getPage(map));
+        return page.setRecords(list);
     }
 
     @Override

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<EnvironmentDev> {
 
     List<EnvironmentDev> selectEnvironmentDevList(Map<String, Object> map);

src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentDevMapper.xml

@@ -15,15 +15,13 @@
     </update>
 
     <select id="selectEnvironmentDevList" resultType="com.zhgd.xmgl.modules.environment.entity.EnvironmentDev">
-        select t.*,
+        select *,
         <include refid="getOnline">
-            <property name="real_time" value="t.real_time"/>
+            <property name="real_time" value="real_time"/>
         </include>
-        dev_online,group_concat(distinct ei.enterprise_name) as enterprise_name
+        dev_online
-        from environment_dev t
+        from environment_dev
-        left join enterprise_info ei on find_in_set(ei.id,t.enterprise_ids)
         where project_sn = #{projectSn}
-        group by t.id
     </select>
 
     <select id="selectAllDevCount" resultType="java.util.Map">

src/main/java/com/zhgd/xmgl/modules/foundation/controller/DeepExcavationEngineeringController.java

@@ -109,7 +109,15 @@ public class DeepExcavationEngineeringController {
     @ApiImplicitParam(name = "id", value = "深基坑-工程ID", paramType = "body", required = true, dataType = "Integer")
     @PostMapping(value = "/queryById")
     public Result<DeepExcavationEngineering> queryById(@RequestBody Map<String, Object> map) {
-        return Result.success(deepExcavationEngineeringService.queryById(map));
+        Result<DeepExcavationEngineering> result = new Result<DeepExcavationEngineering>();
+        DeepExcavationEngineering deepExcavationEngineering = deepExcavationEngineeringService.getById(MapUtils.getString(map, "id"));
+        if (deepExcavationEngineering == null) {
+            result.error500(MessageUtil.get("notFindErr"));
+        } else {
+            result.setResult(deepExcavationEngineering);
+            result.setSuccess(true);
+        }
+        return result;
     }
 
 

src/main/java/com/zhgd/xmgl/modules/foundation/entity/DeepExcavationEngineering.java

@@ -111,16 +111,6 @@ public class DeepExcavationEngineering implements Serializable {
 	@Excel(name = "状态，0，未开工，1进行中，2已完成", width = 15)
 	@ApiModelProperty(value = "状态，0，未开工，1进行中，2已完成")
 	private Integer status;
-	/**
-	 * 企业ids（多个，分割）
-	 */
-	@ApiModelProperty(value = "企业ids（多个，分割）")
-	private String enterpriseIds;
-
-
-	@TableField(exist = false)
-	@ApiModelProperty(value = "企业名称（多个，分割）")
-	private java.lang.String enterpriseName;
 
 	@ApiModelProperty(value = "默认监测内容ID")
 	@TableField(exist = false)

src/main/java/com/zhgd/xmgl/modules/foundation/mapper/DeepExcavationEngineeringMapper.java

@@ -2,8 +2,6 @@ package com.zhgd.xmgl.modules.foundation.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.annotation.DataScope;
-import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.modules.foundation.entity.DeepExcavationEngineering;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -18,12 +16,9 @@ import java.util.Map;
  * @version： V1.0
  */
 @Mapper
-@DataScope(includeTable = "deep_excavation_engineering")
 public interface DeepExcavationEngineeringMapper extends BaseMapper<DeepExcavationEngineering> {
 
     List<DeepExcavationEngineering> selectDeepExcavationEngineeringPage(Page<DeepExcavationEngineering> page, @Param("param")Map<String, Object> map);
 
     List<DeepExcavationEngineering> selectDeepExcavationList(Map<String, Object> map);
-
-    DeepExcavationEngineering queryById(Map<String, Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/foundation/mapper/xml/DeepExcavationEngineeringMapper.xml

@@ -13,24 +13,9 @@
     <select id="selectDeepExcavationList"
             resultType="com.zhgd.xmgl.modules.foundation.entity.DeepExcavationEngineering">
         SELECT *
-        from (SELECT t.*,group_concat(distinct ei.enterprise_name) as enterprise_name
+        from deep_excavation_engineering
-        from deep_excavation_engineering t
-        left join enterprise_info ei on find_in_set(ei.id,t.enterprise_ids)
-        group by t.id
-        ) t
         WHERE project_sn=#{projectSn}
         order by start_time
 
     </select>
-
+</mapper>
-    <select id="queryById" resultType="com.zhgd.xmgl.modules.foundation.entity.DeepExcavationEngineering">
-        SELECT *
-        from (SELECT t.*,group_concat(distinct ei.enterprise_name) as enterprise_name
-        from deep_excavation_engineering t
-        left join enterprise_info ei on find_in_set(ei.id,t.enterprise_ids)
-        group by t.id
-        ) t
-        WHERE id=#{id}
-        order by start_time
-    </select>
-</mapper>

src/main/java/com/zhgd/xmgl/modules/foundation/service/IDeepExcavationEngineeringService.java

@@ -2,7 +2,6 @@ package com.zhgd.xmgl.modules.foundation.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.modules.foundation.entity.DeepExcavationEngineering;
 
 import java.util.List;
@@ -25,6 +24,4 @@ public interface IDeepExcavationEngineeringService extends IService<DeepExcavati
     List<DeepExcavationEngineering> selectDeepExcavationList(Map<String, Object> map);
 
     DeepExcavationEngineering edit(DeepExcavationEngineering deepExcavationEngineering);
-
-    DeepExcavationEngineering queryById(Map<String, Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationEngineeringServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.modules.foundation.entity.DeepExcavationEngineering;
 import com.zhgd.xmgl.modules.foundation.entity.DeepExcavationMonitorTypeRela;
@@ -104,11 +103,6 @@ public class DeepExcavationEngineeringServiceImpl extends ServiceImpl<DeepExcava
         return deepExcavationEngineering;
     }
 
-    @Override
-    public DeepExcavationEngineering queryById(Map<String, Object> map) {
-        return baseMapper.queryById(map);
-    }
-
     private void checkParams(DeepExcavationEngineering deepExcavationEngineering) {
         if (DateUtil.parse(deepExcavationEngineering.getStartTime()).compareTo(DateUtil.parse(deepExcavationEngineering.getEndTime())) > 0) {
             throw new OpenAlertException("开工时间不能大于完工时间");

src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDevMapper.java

@@ -1,16 +1,8 @@
 package com.zhgd.xmgl.modules.hangbasket.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.annotation.DataScope;
-import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import java.util.List;
 
 /**
  * @Description: 挂篮设备
@@ -19,22 +11,6 @@ import java.util.List;
  * @version： V1.0
  */
 @Mapper
-@DataScope(includeTable = "hang_basket_dev")
 public interface HangBasketDevMapper extends BaseMapper<HangBasketDev> {
-    /**
-     * 列表查询挂篮设备信息
-     *
-     * @param queryWrapper
-     * @return
-     */
-    List<HangBasketDev> queryList(@Param(Constants.WRAPPER) QueryWrapper<HangBasketDev> queryWrapper);
 
-    /**
-     * 分页列表查询挂篮设备信息
-     *
-     * @param page
-     * @param queryWrapper
-     * @return
-     */
-    IPage<HangBasketDev> queryList(Page<HangBasketDev> page, @Param(Constants.WRAPPER) QueryWrapper<HangBasketDev> queryWrapper);
 }

src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDevMapper.xml

@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDevMapper">
-
-<select id="queryList" resultType="com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev">
-    select t.*,group_concat(distinct ei.enterprise_name) as enterprise_name
-    from hang_basket_dev t
-    left join enterprise_info ei on find_in_set(ei.id,t.enterprise_ids)
-    ${ew.customSqlSegment}
-    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDevServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
-import com.zhgd.xmgl.modules.car.entity.CarCamera;
 import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev;
 import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDevMapper;
 import com.zhgd.xmgl.modules.hangbasket.service.IHangBasketDevService;
@@ -30,7 +29,7 @@ public class HangBasketDevServiceImpl extends ServiceImpl<HangBasketDevMapper, H
     public IPage<HangBasketDev> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<HangBasketDev> queryWrapper = getQueryWrapper(paramMap);
         Page<HangBasketDev> page = PageUtil.getPage(paramMap);
-        IPage<HangBasketDev> pageList = baseMapper.queryList(page, queryWrapper);
+        IPage<HangBasketDev> pageList = this.page(page, queryWrapper);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;
     }
@@ -38,7 +37,7 @@ public class HangBasketDevServiceImpl extends ServiceImpl<HangBasketDevMapper, H
     @Override
     public List<HangBasketDev> queryList(HashMap<String, Object> paramMap) {
         QueryWrapper<HangBasketDev> queryWrapper = getQueryWrapper(paramMap);
-        return dealList(baseMapper.queryList(queryWrapper));
+        return dealList(this.list(queryWrapper));
     }
 
     @Override
@@ -66,10 +65,8 @@ public class HangBasketDevServiceImpl extends ServiceImpl<HangBasketDevMapper, H
     }
 
     private QueryWrapper<HangBasketDev> getQueryWrapper(HashMap<String, Object> paramMap) {
-        String alias = "t.";
+        QueryWrapper<HangBasketDev> queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDev.class, paramMap);
-        QueryWrapper<HangBasketDev> queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDev.class, paramMap, alias);
+        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(HangBasketDev::getId));
-        queryWrapper.groupBy(alias + RefUtil.fieldNameUlc(HangBasketDev::getId));
-        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(HangBasketDev::getId));
         return queryWrapper;
     }
 

src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkPlaneFigureController.java

@@ -2,12 +2,9 @@ package com.zhgd.xmgl.modules.highformwork.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.highformwork.entity.HighFormworkPlaneFigure;
 import com.zhgd.xmgl.modules.highformwork.service.IHighFormworkPlaneFigureService;
 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;
@@ -49,11 +46,9 @@ public class HighFormworkPlaneFigureController {
     })
     @PostMapping(value = "/selectList")
     public Result<List<HighFormworkPlaneFigure>> selectList(@RequestBody Map<String,Object> map) {
-		String alias = "t.";
+        QueryWrapper<HighFormworkPlaneFigure> queryWrapper=new QueryWrapper<>();
-		QueryWrapper<HighFormworkPlaneFigure> queryWrapper = QueryGenerator.initPageQueryWrapper(HighFormworkPlaneFigure.class, map, alias);
+        queryWrapper.lambda().eq(HighFormworkPlaneFigure::getProjectSn, MapUtils.getString(map,"projectSn"));
-		queryWrapper.groupBy(alias + RefUtil.fieldNameUlc(HighFormworkPlaneFigure::getId));
+        List<HighFormworkPlaneFigure> list=highFormworkPlaneFigureService.list(queryWrapper);
-		queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(HighFormworkPlaneFigure::getId));
-		List<HighFormworkPlaneFigure> list=highFormworkPlaneFigureService.queryList(queryWrapper);
         return Result.success(list);
     }
 

src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePoint.java

@@ -63,18 +63,8 @@ public class HighFormworkMeasurePoint implements Serializable {
     @Excel(name = "报警状态，1正常，2预警，3报警", width = 15)
     @ApiModelProperty(value = "报警状态，1正常，2预警，3报警")
     private java.lang.Integer alarmState;
- /**
-  * 企业ids（多个，分割）
-  */
- @ApiModelProperty(value = "企业ids（多个，分割）")
- private String enterpriseIds;
 
-
+    @TableField(exist = false)
- @TableField(exist = false)
- @ApiModelProperty(value = "企业名称（多个，分割）")
- private java.lang.String enterpriseName;
-
- @TableField(exist = false)
     @ApiModelProperty(value = "测量点报警预警阀值")
     private List<HighFormworkMeasurePointThreshold> thresholdList;
     @TableField(exist = false)

src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkPlaneFigure.java

@@ -23,7 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="HighFormworkPlaneFigure实体类",description="HighFormworkPlaneFigure")
 public class HighFormworkPlaneFigure implements Serializable {
     private static final long serialVersionUID = 1L;
-
+    
 	/**id*/
     @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="id")
@@ -40,17 +40,8 @@ public class HighFormworkPlaneFigure implements Serializable {
 	@Excel(name = "图片url", width = 15)
    @ApiModelProperty(value="图片url")
 	private String imageUrl  ;
-	/**
-	 * 企业ids（多个，分割）
-	 */
-	@ApiModelProperty(value = "企业ids（多个，分割）")
-	private String enterpriseIds;
 
-	@TableField(exist = false)
+    @TableField(exist = false)
-	@ApiModelProperty(value = "企业名称（多个，分割）")
-	private java.lang.String enterpriseName;
-
-	@TableField(exist = false)
     @ApiModelProperty(value="测点ID,多个逗号分隔")
     private String pointIds  ;
 }

src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasurePointMapper.java

@@ -2,7 +2,6 @@ package com.zhgd.xmgl.modules.highformwork.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.annotation.DataScope;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePoint;
 import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePointQo;
@@ -21,7 +20,6 @@ import java.util.Map;
  * @version： V1.0
  */
 @Mapper
-@DataScope(includeTable = "high_formwork_measure_point")
 public interface HighFormworkMeasurePointMapper extends BaseMapper<HighFormworkMeasurePoint> {
 
     List<EntityMap> selectHighFormworkMeasurePointPage(Page<EntityMap> page, @Param("param") Map<String, Object> map);

src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkPlaneFigureMapper.java

@@ -1,14 +1,8 @@
 package com.zhgd.xmgl.modules.highformwork.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.highformwork.entity.HighFormworkPlaneFigure;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * @Description: 高支模-平面图配置
@@ -17,8 +11,6 @@ import java.util.List;
  * @version： V1.0
  */
 @Mapper
-@DataScope(includeTable = "high_formwork_plane_figure")
 public interface HighFormworkPlaneFigureMapper extends BaseMapper<HighFormworkPlaneFigure> {
 
-    List<HighFormworkPlaneFigure> queryList(@Param(Constants.WRAPPER) QueryWrapper<HighFormworkPlaneFigure> queryWrapper);
 }

src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml

@@ -10,14 +10,12 @@
     </resultMap>
     <select id="selectHighFormworkMeasurePointPage" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
         SELECT a.* ,(case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(real_time))/60) &lt;=10 then 1 else 2 end)
-        is_closed,group_concat(distinct ei.enterprise_name) as enterprise_name
+        is_closed
         from high_formwork_measure_point a
-        left join enterprise_info ei on find_in_set(ei.id,a.enterprise_ids)
         WHERE a.project_sn=#{param.projectSn}
         <if test="param.alarmState!=null and param.alarmState!=''">
             and a.alarm_state=#{param.alarmState}
         </if>
-        group by a.id
     </select>
     <select id="selectPointList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
         SELECT a.*,

src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkPlaneFigureMapper.xml

@@ -2,10 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.highformwork.mapper.HighFormworkPlaneFigureMapper">
 
-<select id="queryList" resultType="com.zhgd.xmgl.modules.highformwork.entity.HighFormworkPlaneFigure">
+</mapper>
-    select t.*,group_concat(distinct ei.enterprise_name) as enterprise_name
-    from high_formwork_plane_figure t
-    left join enterprise_info ei on find_in_set(ei.id,t.enterprise_ids)
-    ${ew.customSqlSegment}
-    </select>
-</mapper>

src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkPlaneFigureService.java

@@ -1,11 +1,8 @@
 package com.zhgd.xmgl.modules.highformwork.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkPlaneFigure;
 
-import java.util.List;
-
 /**
  * @Description: 高支模-平面图配置
  * @author： pds
@@ -19,6 +16,4 @@ public interface IHighFormworkPlaneFigureService extends IService<HighFormworkPl
     void editHighFormworkPlaneFigure(HighFormworkPlaneFigure highFormworkPlaneFigure);
 
     void deleteHighFormworkPlaneFigure(String id);
-
-    List<HighFormworkPlaneFigure> queryList(QueryWrapper<HighFormworkPlaneFigure> queryWrapper);
 }

src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkPlaneFigureServiceImpl.java

@@ -91,9 +91,4 @@ public class HighFormworkPlaneFigureServiceImpl extends ServiceImpl<HighFormwork
         queryWrapper.lambda().eq(HighFormworkPlaneFigureCoordinate::getPlaneFigureId,id);
         highFormworkPlaneFigureCoordinateMapper.delete(queryWrapper);
     }
-
-    @Override
-    public List<HighFormworkPlaneFigure> queryList(QueryWrapper<HighFormworkPlaneFigure> queryWrapper) {
-        return baseMapper.queryList(queryWrapper);
-    }
 }

src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevMapper.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.annotation.DataScope;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDev;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Param;
  * @version： V1.0
  */
 @Mapper
-@DataScope(includeTable = "poisonous_gas_dev")
 public interface PoisonousGasDevMapper extends BaseMapper<PoisonousGasDev> {
 
     IPage<PoisonousGasDev> queryPageList(Page<PoisonousGasDev> page, @Param(Constants.WRAPPER) QueryWrapper<PoisonousGasDev> queryWrapper);

src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevMapper.xml

@@ -4,11 +4,9 @@
     <select id="queryPageList" resultType="com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDev">
         select pgd.*,
         ti.team_name dutyTeamInfoName,
-        1 online,
+        1 online
-        group_concat(distinct ei.enterprise_name) as enterprise_name
         from poisonous_gas_dev pgd
-        left join team_info ti on ti.id = pgd.duty_team_info_id
+        join team_info ti on ti.id = pgd.duty_team_info_id
-        left join enterprise_info ei on find_in_set(ei.id,pgd.enterprise_ids)
         ${ew.customSqlSegment}
     </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevServiceImpl.java

@@ -29,10 +29,8 @@ public class PoisonousGasDevServiceImpl extends ServiceImpl<PoisonousGasDevMappe
 
     @Override
     public IPage<PoisonousGasDev> queryPageList(PoisonousGasDev poisonousGasDev, Integer pageNo, Integer pageSize, HttpServletRequest req) {
-        String alias = "pgd.";
         QueryWrapper<PoisonousGasDev> queryWrapper = QueryGenerator.initQueryWrapper(poisonousGasDev, req.getParameterMap(), null,
-                RefUtil.fieldNames(PoisonousGasDev::getDevName), alias);
+                RefUtil.fieldNames(PoisonousGasDev::getDevName), "pgd.");
-        queryWrapper.groupBy(alias + "id");
         queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PoisonousGasDev::getCreateDate));
         Page<PoisonousGasDev> page = new Page<PoisonousGasDev>(pageNo, pageSize);
         return poisonousGasDevMapper.queryPageList(page, queryWrapper);

src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDevMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.annotation.DataScope;
 import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev;
 import com.zhgd.xmgl.modules.vehicleposition.entity.vo.CountVehiclePositionDevVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -21,7 +20,6 @@ import java.util.List;
  * @version： V1.0
  */
 @Mapper
-@DataScope(includeTable = "safety_hat_dev")
 public interface SafetyHatDevMapper extends BaseMapper<SafetyHatDev> {
     /**
      * 分页列表查询智能安全帽-设备信息

src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml

@@ -2,10 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDevMapper">
     <select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev">
-        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}
     </select>
 

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<SafetyHatDevMapper, Saf
         String alias = "shd.";
         QueryWrapper<SafetyHatDev> queryWrapper = QueryGenerator.initPageQueryWrapper(SafetyHatDev.class, paramMap, alias);
         queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SafetyHatDev::getId));
-        queryWrapper.groupBy(alias + RefUtil.fieldNameUlc(SafetyHatDev::getId));
         return queryWrapper;
     }
 

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"),
     })

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;
-
 }

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;
-
 }

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<AiAnalyseHardWareRecord> {
     /**
      * 根据用户id查询AI分析硬件设备id列表
@@ -60,11 +54,4 @@ public interface AiAnalyseHardWareRecordMapper extends BaseMapper<AiAnalyseHardW
      * @return
      */
     List<JSONObject> getEnterpriseIdAndAiAnalyseHardIdsByProjectSn(String projectSn);
-
-    /**
-     * 列表查询AI分析硬件设备信息
-     * @param queryWrapper
-     * @return
-     */
-    List<AiAnalyseHardWareRecord> queryList(@Param(Constants.WRAPPER) QueryWrapper<HangBasketDetectData> queryWrapper);
 }

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}
     </select>
-
-    <select id="queryList" resultType="com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareRecord">
-        select t.*,group_concat(distinct ei.enterprise_name) as enterprise_name
-        from ai_analyse_hard_ware_record t
-        left join enterprise_info ei on find_in_set(ei.id,t.enterprise_ids)
-        ${ew.customSqlSegment}
-    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml

@@ -18,10 +18,9 @@
     </resultMap>
 
     <select id="selectVideoItemListByVideoId" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
-        SELECT vi.*, vn.nvr_sn nvr_sn,group_concat(distinct ei.enterprise_name) as enterprise_name
+        SELECT vi.*, vn.nvr_sn nvr_sn
         from video_item vi
         left join video_nvr vn on vi.nvr_id = vn.id
-        left join enterprise_info ei on find_in_set(ei.id,vi.enterprise_ids)
         WHERE vi.video_id = #{videoId}
         <if test="groupId != null and groupId != ''">
             and vi.group_id = #{groupId}
@@ -32,7 +31,6 @@
                 #{item}
             </foreach>
         </if>
-        group by vi.item_id
         order by vi.sort_num
     </select>
     <select id="selectAllDevCount" resultType="java.util.Map">

src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareRecordServiceImpl.java

@@ -5,16 +5,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
-import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.basicdata.enums.SystemUserAccountTypeEnum;
-import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDetectData;
 import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareRecord;
 import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareRecordMapper;
 import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareRecordService;
 import com.zhgd.xmgl.security.entity.UserInfo;
 import com.zhgd.xmgl.security.util.SecurityUtils;
 import com.zhgd.xmgl.util.MessageUtil;
-import com.zhgd.xmgl.util.RefUtil;
+import org.apache.commons.collections.MapUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -37,10 +35,9 @@ public class AiAnalyseHardWareRecordServiceImpl extends ServiceImpl<AiAnalyseHar
 
     @Override
     public List<AiAnalyseHardWareRecord> getAiAnalyseHardWareRecordList(Map<String, Object> map) {
-        QueryWrapper<HangBasketDetectData> queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDetectData.class, map);
+        QueryWrapper<AiAnalyseHardWareRecord> qw = new QueryWrapper<>();
-        queryWrapper.groupBy("t.id");
+        qw.lambda().eq(AiAnalyseHardWareRecord::getProjectSn, MapUtils.getString(map, "projectSn"));
-        queryWrapper.orderByDesc("t." + RefUtil.fieldNameUlc(HangBasketDetectData::getId));
+        return aiAnalyseHardWareRecordMapper.selectList(qw);
-        return aiAnalyseHardWareRecordMapper.queryList(queryWrapper);
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevMapper.java

@@ -3,7 +3,6 @@ package com.zhgd.xmgl.modules.worker.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.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.worker.entity.UfaceDev;
 import org.apache.ibatis.annotations.Mapper;
@@ -22,7 +21,6 @@ import java.util.Map;
  */
 @Mapper
 @Repository
-@DataScope(includeTable = "uface_dev")
 public interface UfaceDevMapper extends BaseMapper<UfaceDev> {
     /**
      * 统计人脸设备数量

src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/UfaceDevMapper.xml

@@ -122,10 +122,8 @@
         (case
         when round((UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(ud.heart_beat_time)) / 60) <= 30 then 1
         else 0 end)
-        dev_online,
+        dev_online
-        group_concat(distinct ei.enterprise_name) as enterprise_name
         from uface_dev ud
-        left join enterprise_info ei on find_in_set(ei.id,ud.enterprise_ids)
         ${ew.customSqlSegment}
     </select>
 

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java

@@ -71,7 +71,6 @@ public class UfaceDevServiceImpl extends ServiceImpl<UfaceDevMapper, UfaceDev> i
         QueryWrapper<UfaceDev> 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())) {
             //项目子账号就筛选自己能看到的