diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index d1387fd88..ad4e4d38c 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java @@ -107,53 +107,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"); @@ -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 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/concrete/controller/ConcreteMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorDevController.java index 3ba76bb34..6f636581e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorDevController.java +++ b/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> queryPageList(@RequestBody Map map) { + public Result> queryPageList(@RequestBody Map map) { return Result.success(concreteMonitorDevService.selectConcreteMonitorDevPageList(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevMapper.java index 28bfa5e58..e7fb79866 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevMapper.java +++ b/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 { - Integer countPointNum(HashMap paramMap); + List selectConcreteMonitorDevPageList(Page page, @Param("param") Map map); - IPage queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, Page page); + Integer countPointNum(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevMapper.xml index ade95a1a1..196563b82 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevMapper.xml @@ -1,16 +1,15 @@ + + - - diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorDevService.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorDevService.java index 39b5b70e1..6b5db281c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorDevService.java @@ -16,7 +16,7 @@ import java.util.Map; */ public interface IConcreteMonitorDevService extends IService { - IPage selectConcreteMonitorDevPageList(Map map); + IPage selectConcreteMonitorDevPageList(Map map); List selectConcreteMonitorDevList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevServiceImpl.java index d2c7c215e..daa873ec1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevServiceImpl.java +++ b/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 selectConcreteMonitorDevPageList(Map map) { - String alias = "t."; - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ConcreteMonitorDev.class, map, alias); - queryWrapper.groupBy(alias + RefUtil.fieldNameUlc(ConcreteMonitorDev::getId)); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(ConcreteMonitorDev::getId)); - return baseMapper.queryList(queryWrapper, PageUtil.getPage(map)); + public IPage selectConcreteMonitorDevPageList(Map map) { + int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); + int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); + Page page = new Page<>(pageNo, pageSize); + List list = concreteMonitorDevMapper.selectConcreteMonitorDevPageList(page, map); + return page.setRecords(list); } @Override 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 * - 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 + from deep_excavation_engineering WHERE project_sn=#{projectSn} order by start_time - - - + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/foundation/service/IDeepExcavationEngineeringService.java b/src/main/java/com/zhgd/xmgl/modules/foundation/service/IDeepExcavationEngineeringService.java index 9836428ad..9d88c6a25 100644 --- a/src/main/java/com/zhgd/xmgl/modules/foundation/service/IDeepExcavationEngineeringService.java +++ b/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 selectDeepExcavationList(Map map); DeepExcavationEngineering edit(DeepExcavationEngineering deepExcavationEngineering); - - DeepExcavationEngineering queryById(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationEngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationEngineeringServiceImpl.java index 1a488bae5..ee5adaa9a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/foundation/service/impl/DeepExcavationEngineeringServiceImpl.java +++ b/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 map) { - return baseMapper.queryById(map); - } - private void checkParams(DeepExcavationEngineering deepExcavationEngineering) { if (DateUtil.parse(deepExcavationEngineering.getStartTime()).compareTo(DateUtil.parse(deepExcavationEngineering.getEndTime())) > 0) { throw new OpenAlertException("开工时间不能大于完工时间"); diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDevMapper.java index 5f71ff3cd..e404fa35d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/HangBasketDevMapper.java +++ b/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 java.util.List; +import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 挂篮设备 @@ -19,22 +11,6 @@ import java.util.List; * @version： V1.0 */ @Mapper -@DataScope(includeTable = "hang_basket_dev") public interface HangBasketDevMapper extends BaseMapper { - /** - * 列表查询挂篮设备信息 - * - * @param queryWrapper - * @return - */ - List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); - /** - * 分页列表查询挂篮设备信息 - * - * @param page - * @param queryWrapper - * @return - */ - IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDevMapper.xml index f26f0d597..0ec535efe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/mapper/xml/HangBasketDevMapper.xml @@ -1,11 +1,4 @@ - - diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDevServiceImpl.java index 209897dfe..2e7d829d5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDevServiceImpl.java +++ b/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 queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); - IPage pageList = baseMapper.queryList(page, queryWrapper); + IPage pageList = this.page(page, queryWrapper); pageList.setRecords(dealList(pageList.getRecords())); return pageList; } @@ -38,7 +37,7 @@ public class HangBasketDevServiceImpl extends ServiceImpl queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(baseMapper.queryList(queryWrapper)); + return dealList(this.list(queryWrapper)); } @Override @@ -66,10 +65,8 @@ public class HangBasketDevServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { - String alias = "t."; - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDev.class, paramMap, alias); - queryWrapper.groupBy(alias + RefUtil.fieldNameUlc(HangBasketDev::getId)); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(HangBasketDev::getId)); + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDev.class, paramMap); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(HangBasketDev::getId)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkPlaneFigureController.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkPlaneFigureController.java index 3cafc38e4..c7d52d64e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkPlaneFigureController.java +++ b/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> selectList(@RequestBody Map map) { - String alias = "t."; - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(HighFormworkPlaneFigure.class, map, alias); - queryWrapper.groupBy(alias + RefUtil.fieldNameUlc(HighFormworkPlaneFigure::getId)); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(HighFormworkPlaneFigure::getId)); - List list=highFormworkPlaneFigureService.queryList(queryWrapper); + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(HighFormworkPlaneFigure::getProjectSn, MapUtils.getString(map,"projectSn")); + List list=highFormworkPlaneFigureService.list(queryWrapper); return Result.success(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePoint.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePoint.java index 82a71ceed..574cf5c49 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePoint.java +++ b/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) - @ApiModelProperty(value = "企业名称（多个，分割）") - private java.lang.String enterpriseName; - - @TableField(exist = false) + @TableField(exist = false) @ApiModelProperty(value = "测量点报警预警阀值") private List thresholdList; @TableField(exist = false) diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkPlaneFigure.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkPlaneFigure.java index da021ed9f..762ee48dc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkPlaneFigure.java +++ b/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) - @ApiModelProperty(value = "企业名称（多个，分割）") - private java.lang.String enterpriseName; - - @TableField(exist = false) + @TableField(exist = false) @ApiModelProperty(value="测点ID,多个逗号分隔") private String pointIds ; } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasurePointMapper.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasurePointMapper.java index 338ceec0e..412bd3f17 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasurePointMapper.java +++ b/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 { List selectHighFormworkMeasurePointPage(Page page, @Param("param") Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkPlaneFigureMapper.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkPlaneFigureMapper.java index 017d9b888..82fec5956 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkPlaneFigureMapper.java +++ b/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 { - List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml index 81efde106..800714011 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml @@ -10,14 +10,12 @@ - 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} - - + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkPlaneFigureService.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkPlaneFigureService.java index b8c1cdd01..f2cbba037 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkPlaneFigureService.java +++ b/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 queryList(QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkPlaneFigureServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkPlaneFigureServiceImpl.java index 00c00c3d5..20c42c75f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkPlaneFigureServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkPlaneFigureServiceImpl.java @@ -91,9 +91,4 @@ public class HighFormworkPlaneFigureServiceImpl extends ServiceImpl queryList(QueryWrapper queryWrapper) { - return baseMapper.queryList(queryWrapper); - } } diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevMapper.java index a3e269583..82c534ad1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevMapper.java +++ b/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 { IPage queryPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevMapper.xml index d4f5314eb..5ac36c8a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevMapper.xml @@ -4,11 +4,9 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevServiceImpl.java index 60217db20..1fd8109f5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevServiceImpl.java @@ -29,10 +29,8 @@ public class PoisonousGasDevServiceImpl extends ServiceImpl queryPageList(PoisonousGasDev poisonousGasDev, Integer pageNo, Integer pageSize, HttpServletRequest req) { - String alias = "pgd."; QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(poisonousGasDev, req.getParameterMap(), null, - RefUtil.fieldNames(PoisonousGasDev::getDevName), alias); - queryWrapper.groupBy(alias + "id"); + RefUtil.fieldNames(PoisonousGasDev::getDevName), "pgd."); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PoisonousGasDev::getCreateDate)); Page page = new Page(pageNo, pageSize); return poisonousGasDevMapper.queryPageList(page, queryWrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDevMapper.java index 1464f266a..65f858ce3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDevMapper.java +++ b/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 { /** * 分页列表查询智能安全帽-设备信息 diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml index a3574d1bc..85fd6fb03 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml @@ -2,10 +2,9 @@ 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 f1edc2970..4072a3c53 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())) { //项目子账号就筛选自己能看到的