drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
@@ -46,13 +46,14 @@ public IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice) { List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId())); fwDevice.setDeptList(deptList); fwDevice.setCurrentDeptId(AuthUtil.getDeptId()); return fwDeviceService.selectCockpitDevicePage(page, fwDevice); } @Override public List<DeviceStatisticsVO> statisticalDeviceType() { List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId())); return fwDeviceService.statisticalDeviceType(deptList); return fwDeviceService.statisticalDeviceType(deptList,AuthUtil.getDeptId()); } @Override @@ -98,9 +99,9 @@ public AlarmStatisticsVO statisticsAlarmsAndDeviceRecords() { List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId())); // 设备统计 AlarmStatisticsVO alarmStatisticsVO = fwDeviceService.statisticalDeviceAtt(deptList); AlarmStatisticsVO alarmStatisticsVO = fwDeviceService.statisticalDeviceAtt(deptList,AuthUtil.getDeptId()); // 告警统计 AlarmStatisticsVO alarmStatistics = fwDroneAlarmRecordService.alarmTypeStatistics(deptList); AlarmStatisticsVO alarmStatistics = fwDroneAlarmRecordService.alarmTypeStatistics(deptList,AuthUtil.getDeptId()); alarmStatisticsVO.setHistoryAlarmCount(alarmStatistics.getHistoryAlarmCount()); alarmStatisticsVO.setRealTimeAlarmCount(alarmStatistics.getRealTimeAlarmCount()); return alarmStatisticsVO; drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
@@ -47,10 +47,19 @@ and counter_effect = #{param2.counterEffect} </if> <if test="param2.deptList != null and param2.deptList.size > 0"> and create_dept in and (create_dept in <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="param2.currentDeptId != null and param2.currentDeptId != '' "> or device_id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{param2.currentDeptId} AND is_deleted = 0 ) </if> ) </if> </where> </select> drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/param/FwEffectEvalParam.java
@@ -45,4 +45,7 @@ @ApiModelProperty(value = "部门集合",hidden = true) private List<Long> deptList; // 当前用户部门id @ApiModelProperty(value = "当前用户部门id",hidden = true) private String currentDeptId; } drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwEffectEvalServiceImpl.java
@@ -44,6 +44,7 @@ public IPage<FwEffectEvalVO> selectFwEffectEvalPage(IPage<FwEffectEvalVO> page, FwEffectEvalParam fwEffectEval) { List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId())); fwEffectEval.setDeptList(deptList); fwEffectEval.setCurrentDeptId(AuthUtil.getDeptId()); return page.setRecords(baseMapper.selectFwEffectEvalPage(page, fwEffectEval)); }
@@ -145,6 +145,9 @@ @ApiModelProperty(value = "部门集合",hidden = true) private List<Long> deptList; // 当前用户部门id @ApiModelProperty(value = "部门id",hidden = true) private String currentDeptId; /** drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java
@@ -69,7 +69,7 @@ * 设备统计 - 驾驶舱使用 * @return 统计数据 */ List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList); List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList, String currentDeptId); /** * 设备统计 - 按类型统计 @@ -93,7 +93,7 @@ * 告警统计 * @return */ AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList); AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList, String currentDeptId); /** * 获取设备列表 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -185,10 +185,19 @@ AND effective_range_km is not null AND effective_range_km > 0 <if test="deptList != null and deptList.size > 0"> and create_dept in and (create_dept in <foreach collection="deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="currentDeptId != null and currentDeptId != '' "> or id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{currentDeptId} AND is_deleted = 0 ) </if> ) </if> UNION ALL -- 合并拆分的反制部分 @@ -211,10 +220,19 @@ AND effective_range_km is not null AND effective_range_km > 0 <if test="deptList != null and deptList.size > 0"> and create_dept in and (create_dept in <foreach collection="deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="currentDeptId != null and currentDeptId != '' "> or id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{currentDeptId} AND is_deleted = 0 ) </if> ) </if> ) AS temp GROUP BY split_device_type @@ -319,10 +337,19 @@ and effective_range_km > 0 <if test="deptList != null and deptList.size > 0"> and create_dept in and (create_dept in <foreach collection="deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="currentDeptId != null and currentDeptId != '' "> or id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{currentDeptId} AND is_deleted = 0 ) </if> ) </if> ) AS deviceCount, -- 无线电设备数量 @@ -339,10 +366,19 @@ and effective_range_km > 0 <if test="deptList != null and deptList.size > 0"> and create_dept in and (create_dept in <foreach collection="deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="currentDeptId != null and currentDeptId != '' "> or id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{currentDeptId} AND is_deleted = 0 ) </if> ) </if> ) AS radioCount, -- 光电设备数量 @@ -355,10 +391,19 @@ and effective_range_km is not null and effective_range_km > 0 <if test="deptList != null and deptList.size > 0"> and create_dept in and (create_dept in <foreach collection="deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="currentDeptId != null and currentDeptId != '' "> or id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{currentDeptId} AND is_deleted = 0 ) </if> ) </if> ) AS opticalCount, -- 雷达设备数量 @@ -370,10 +415,19 @@ and effective_range_km is not null and effective_range_km > 0 <if test="deptList != null and deptList.size > 0"> and create_dept in and (create_dept in <foreach collection="deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="currentDeptId != null and currentDeptId != '' "> or id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{currentDeptId} AND is_deleted = 0 ) </if> ) </if> ) AS radarCount, -- 设备告警 @@ -385,10 +439,19 @@ and effective_range_km is not null and effective_range_km > 0 <if test="deptList != null and deptList.size > 0"> and create_dept in and (create_dept in <foreach collection="deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="currentDeptId != null and currentDeptId != '' "> or id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{currentDeptId} AND is_deleted = 0 ) </if> ) </if> ) AS deviceAlarmCount </select> @@ -443,10 +506,19 @@ and d.belong_dept = #{param2.belongDept} </if> <if test="param2.deptList != null and param2.deptList.size > 0"> and d.create_dept in and (d.create_dept in <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="param2.currentDeptId != null and param2.currentDeptId != '' "> or d.id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{param2.currentDeptId} AND is_deleted = 0 ) </if> ) </if> <if test="param2.deviceStatusList != null and param2.deviceStatusList != ''"> and d.status in drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
@@ -80,7 +80,7 @@ * 设备类型统计 * @return */ List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList); List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList, String currentDeptId); /** * 设备统计 - 按类型统计 @@ -104,7 +104,7 @@ * 设备报警统计 * @return */ AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList); AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList, String currentDeptId); /** * 驾驶舱获取设备列表 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
@@ -118,8 +118,8 @@ * @return */ @Override public List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList) { return baseMapper.statisticalDeviceType(deptList); public List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList,String currentDeptId) { return baseMapper.statisticalDeviceType(deptList,currentDeptId); } /** @@ -151,8 +151,8 @@ * @return */ @Override public AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList) { return baseMapper.statisticalDeviceAtt(deptList); public AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList, String currentDeptId) { return baseMapper.statisticalDeviceAtt(deptList, currentDeptId); } @Override drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/entity/FwDevicePerShareEntity.java
@@ -36,6 +36,8 @@ @EqualsAndHashCode(callSuper = true) public class FwDevicePerShareEntity extends BaseEntity { @ApiModelProperty(value = "设备ID") private Long deviceId; /** * 设备编号 */ drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/mapper/FwDevicePerShareMapper.java
@@ -51,4 +51,12 @@ */ List<FwDevicePerShareExcel> exportFwDevicePerShare(@Param("ew") Wrapper<FwDevicePerShareEntity> queryWrapper); /** * 根据部门ID获取共享的设备编号列表 * * @param deptId 部门ID * @return 设备编号列表 */ List<Long> selectSharedDeviceIdListByDeptId(@Param("deptId") Long deptId); } drone-service/drone-fw/src/main/java/org/sxkj/fw/fwDevicePerShare/mapper/FwDevicePerShareMapper.xml
@@ -6,6 +6,7 @@ <resultMap id="fwDevicePerShareResultMap" type="org.sxkj.fw.fwDevicePerShare.entity.FwDevicePerShareEntity"> <result column="id" property="id"/> <result column="device_sn" property="deviceSn"/> <result column="device_id" property="deviceId"/> <result column="loan_from_dept_id" property="loanFromDeptId"/> <result column="loan_to_dept_id" property="loanToDeptId"/> <result column="device_per_menu_id" property="devicePerMenuId"/> @@ -29,4 +30,10 @@ SELECT * FROM ja_fw_device_per_share ${ew.customSqlSegment} </select> <select id="selectSharedDeviceIdListByDeptId" resultType="java.lang.Long"> SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{deptId} AND is_deleted = 0 </select> </mapper> drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
@@ -153,4 +153,10 @@ @ApiModelProperty(value = "部门集合",hidden = true) private List<Long> deptList; @ApiModelProperty(value = "共享设备编号集合",hidden = true) private List<Long> sharedDeviceIdList; // 当前用户部门ID @ApiModelProperty(value = "当前用户部门ID",hidden = true) private String currentDeptId; } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java
@@ -94,4 +94,7 @@ @ApiModelProperty(value = "部门集合",hidden = true) private List<Long> deptList; @ApiModelProperty(value = "部门id",hidden = true) private String currentDeptId; } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.java
@@ -58,5 +58,5 @@ * 告警类型统计 * @return */ AlarmStatisticsVO alarmTypeStatistics(List<Long> deptList); AlarmStatisticsVO alarmTypeStatistics(List<Long> deptList, String currentDeptId); } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -118,10 +118,19 @@ and dar.area_name like CONCAT('%', #{param2.areaName}, '%') </if> <if test="param2.deptList != null and param2.deptList.size > 0"> and dar.create_dept in and (dar.create_dept in <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="param2.currentDeptId != null and param2.currentDeptId != '' "> or dar.device_id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{param2.currentDeptId} AND is_deleted = 0 ) </if> ) </if> </where> order by favorited desc @@ -155,10 +164,19 @@ ja_fw_drone_alarm_record WHERE is_deleted = 0 <if test="deptList != null and deptList.size > 0"> and create_dept in and (create_dept in <foreach collection="deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="currentDeptId != null and currentDeptId != '' "> or device_id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{currentDeptId} AND is_deleted = 0 ) </if> ) </if> </select>
@@ -23,7 +23,10 @@ <select id="selectFwDroneFlightRecordPage" resultMap="fwDroneFlightRecordResultMap"> select dfr.* from ja_fw_drone_flight_record dfr select dfr.* from ja_fw_drone_flight_record dfr <where> dfr.is_deleted = 0 <if test="param2.deviceId != null and param2.deviceId != ''"> @@ -57,10 +60,19 @@ and dfr.area_name like CONCAT('%', #{param2.areaName}, '%') </if> <if test="param2.deptList != null and param2.deptList.size > 0"> and dfr.create_dept in and (dfr.create_dept in <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")"> #{deptId} </foreach> <!-- 或者设备是共享给当前部门的 --> <if test="param2.currentDeptId != null and param2.currentDeptId != '' "> or dfr.device_id in ( SELECT device_id FROM ja_fw_device_per_share WHERE loan_to_dept_id = #{param2.currentDeptId} AND is_deleted = 0 ) </if> ) </if> </where> </select> drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneAlarmRecordService.java
@@ -56,5 +56,5 @@ * * @return */ AlarmStatisticsVO alarmTypeStatistics(List<Long> deptList); AlarmStatisticsVO alarmTypeStatistics(List<Long> deptList, String currentDeptId); } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java
@@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import org.sxkj.system.cache.SysCache; import org.sxkj.fw.fwDevicePerShare.mapper.FwDevicePerShareMapper; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; @@ -42,11 +44,19 @@ @Service public class FwDroneAlarmRecordServiceImpl extends BaseServiceImpl<FwDroneAlarmRecordMapper, FwDroneAlarmRecordEntity> implements IFwDroneAlarmRecordService { @Autowired private FwDevicePerShareMapper fwDevicePerShareMapper; @Override public IPage<FwDroneAlarmRecordVO> selectFwDroneAlarmRecordPage(IPage<FwDroneAlarmRecordVO> page, FwDroneAlarmRecordDTO fwDroneAlarmRecord) { // 设置当前用户ID fwDroneAlarmRecord.setCurrentUserId(AuthUtil.getUserId()); // 获取当前部门及其子部门列表 List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId())); fwDroneAlarmRecord.setDeptList(deptList); // 获取共享给当前部门的设备编号列表 fwDroneAlarmRecord.setCurrentDeptId(AuthUtil.getDeptId()); // 执行查询 return page.setRecords(baseMapper.selectFwDroneAlarmRecordPage(page, fwDroneAlarmRecord)); } @@ -63,7 +73,7 @@ * @return */ @Override public AlarmStatisticsVO alarmTypeStatistics(List<Long> deptList) { return baseMapper.alarmTypeStatistics(deptList); public AlarmStatisticsVO alarmTypeStatistics(List<Long> deptList, String currentDeptId) { return baseMapper.alarmTypeStatistics(deptList, currentDeptId); } } drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneFlightRecordServiceImpl.java
@@ -47,6 +47,7 @@ public IPage<FwDroneFlightRecordVO> selectFwDroneFlightRecordPage(IPage<FwDroneFlightRecordVO> page, FwDroneFlightRecordDTO fwDroneFlightRecord) { List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId())); fwDroneFlightRecord.setDeptList(deptList); fwDroneFlightRecord.setCurrentDeptId(AuthUtil.getDeptId()); return page.setRecords(baseMapper.selectFwDroneFlightRecordPage(page, fwDroneFlightRecord)); }
