admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "设备加企业名称"

Browse Source 
This reverts commit ef8df07e
This commit is contained in:
guoshengxiong 2024-08-02 11:46:15 +08:00
parent 7601ed7b16
commit 24fca2f0eb
23 changed files with 20 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/main/java/com/zhgd/mybatis/DataScopeHandler.java
View File

@ -105,53 +105,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");
@ -194,27 +147,6 @@ public class DataScopeHandler implements DataPermissionHandler {
}
}
if (!EnvironmentUtil.isXingZongProd() && !EnvironmentUtil.isXingZongTest()) {
//对合作单位ids做数据权限
//and (FIND_IN_SET(100,xxx.enterprise_ids) or FIND_IN_SET(102,xxx.enterprise_ids))
List<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();

8
src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java
View File

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

12
src/main/java/com/zhgd/xmgl/modules/car/controller/CarCameraController.java
View File

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

14
src/main/java/com/zhgd/xmgl/modules/car/entity/CarCamera.java
View File

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

13
src/main/java/com/zhgd/xmgl/modules/car/mapper/CarCameraMapper.java
View File

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

9
src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarCameraMapper.xml
View File

@ -13,11 +13,4 @@
and a.pass_time>=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00')
</select>
<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>
</mapper>

8
src/main/java/com/zhgd/xmgl/modules/car/service/ICarCameraService.java
View File

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

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

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

2
src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentDevMapper.java
View File

@ -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);

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

@ -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
from environment_dev t
left join enterprise_info ei on find_in_set(ei.id,t.enterprise_ids)
dev_online
from environment_dev
where project_sn = #{projectSn}
group by t.id
</select>
<select id="selectAllDevCount" resultType="java.util.Map">

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

@ -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> {
/**
* 分页列表查询智能安全帽-设备信息

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

@ -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>

2
src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java
View File

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

4
src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareRecordController.java
View File

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

12
src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareRecord.java
View File

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

10
src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java
View File

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

13
src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareRecordMapper.java
View File

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

7
src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareRecordMapper.xml
View File

@ -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>

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

@ -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">

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

@ -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.groupBy("t.id");
queryWrapper.orderByDesc("t." + RefUtil.fieldNameUlc(HangBasketDetectData::getId));
return aiAnalyseHardWareRecordMapper.queryList(queryWrapper);
QueryWrapper<AiAnalyseHardWareRecord> qw = new QueryWrapper<>();
qw.lambda().eq(AiAnalyseHardWareRecord::getProjectSn, MapUtils.getString(map, "projectSn"));
return aiAnalyseHardWareRecordMapper.selectList(qw);
}
@Override

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

@ -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> {
/**
* 统计人脸设备数量

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

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

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

@ -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())) {
//项目子账号就筛选自己能看到的