diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a372f4a..8d21fd0 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -106,6 +106,12 @@ easypoi-annotation 4.4.0 + + com.casic + casic-file-support + 2.0.0.alpha + compile + diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a372f4a..8d21fd0 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -106,6 +106,12 @@ easypoi-annotation 4.4.0 + + com.casic + casic-file-support + 2.0.0.alpha + compile + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java index df68dd2..628064a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java @@ -31,9 +31,7 @@ @RestController @RequestMapping("/voice") public class VoiceLogController extends BaseController { - private final IVoiceLogService voiceLogService; - public VoiceLogController(IVoiceLogService voiceLogService) { this.voiceLogService = voiceLogService; } @@ -94,4 +92,4 @@ public ResponseDataDTO detail(@RequestBody IdDTO dto) { return ResponseDataDTO.success(voiceLogService.getById(dto.getId())); } -} +} \ No newline at end of file diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a372f4a..8d21fd0 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -106,6 +106,12 @@ easypoi-annotation 4.4.0 + + com.casic + casic-file-support + 2.0.0.alpha + compile + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java index df68dd2..628064a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java @@ -31,9 +31,7 @@ @RestController @RequestMapping("/voice") public class VoiceLogController extends BaseController { - private final IVoiceLogService voiceLogService; - public VoiceLogController(IVoiceLogService voiceLogService) { this.voiceLogService = voiceLogService; } @@ -94,4 +92,4 @@ public ResponseDataDTO detail(@RequestBody IdDTO dto) { return ResponseDataDTO.success(voiceLogService.getById(dto.getId())); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/model/DeviceGroupInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/device/model/DeviceGroupInfo.java index 94946db..3e0994e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/model/DeviceGroupInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/model/DeviceGroupInfo.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.device.dto.CameraDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** @@ -53,7 +55,9 @@ @ApiModelProperty(value = "分组相机id,用逗号隔开", dataType = "String") @TableField("camera_ids") private String cameraIds; - + @ApiModelProperty(value = "相机url集合", dataType = "String") + @TableField(exist = false) + private List cameras; @Override public String toString() { diff --git a/casic-server/pom.xml b/casic-server/pom.xml index a372f4a..8d21fd0 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -106,6 +106,12 @@ easypoi-annotation 4.4.0 + + com.casic + casic-file-support + 2.0.0.alpha + compile + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java index df68dd2..628064a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/controller/VoiceLogController.java @@ -31,9 +31,7 @@ @RestController @RequestMapping("/voice") public class VoiceLogController extends BaseController { - private final IVoiceLogService voiceLogService; - public VoiceLogController(IVoiceLogService voiceLogService) { this.voiceLogService = voiceLogService; } @@ -94,4 +92,4 @@ public ResponseDataDTO detail(@RequestBody IdDTO dto) { return ResponseDataDTO.success(voiceLogService.getById(dto.getId())); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/model/DeviceGroupInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/device/model/DeviceGroupInfo.java index 94946db..3e0994e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/model/DeviceGroupInfo.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/model/DeviceGroupInfo.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.modular.device.dto.CameraDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** @@ -53,7 +55,9 @@ @ApiModelProperty(value = "分组相机id,用逗号隔开", dataType = "String") @TableField("camera_ids") private String cameraIds; - + @ApiModelProperty(value = "相机url集合", dataType = "String") + @TableField(exist = false) + private List cameras; @Override public String toString() { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/DeviceGroupInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/DeviceGroupInfoServiceImpl.java index f5e4f83..69710d6 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/DeviceGroupInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/device/service/impl/DeviceGroupInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.device.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,11 +9,16 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.data.constants.DataConstants; import com.casic.missiles.modular.device.dao.DeviceGroupInfoMapper; +import com.casic.missiles.modular.device.dto.CameraDTO; +import com.casic.missiles.modular.device.model.BusDeviceInfo; import com.casic.missiles.modular.device.model.DeviceGroupInfo; +import com.casic.missiles.modular.device.service.IBusDeviceInfoService; import com.casic.missiles.modular.device.service.IDeviceGroupInfoService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; @@ -27,9 +33,11 @@ @Service public class DeviceGroupInfoServiceImpl extends ServiceImpl implements IDeviceGroupInfoService { private final AbstractDictService dictService; + private final IBusDeviceInfoService deviceInfoService; - public DeviceGroupInfoServiceImpl(AbstractDictService dictService) { + public DeviceGroupInfoServiceImpl(AbstractDictService dictService, IBusDeviceInfoService deviceInfoService) { this.dictService = dictService; + this.deviceInfoService = deviceInfoService; } @Override @@ -37,6 +45,7 @@ return this.baseMapper.selectDeviceGroupInfoPage(page, query); } + @Transactional @Override public > E page(E page, Wrapper queryWrapper) { IPage infoIPage = super.page(page, queryWrapper); @@ -44,6 +53,7 @@ return (E) infoIPage; } + @Transactional @Override public DeviceGroupInfo getById(Serializable id) { DeviceGroupInfo deviceGroupInfo = super.getById(id); @@ -55,5 +65,24 @@ private void wrapInfo(DeviceGroupInfo deviceGroupInfo) { deviceGroupInfo.setSafeName(dictService.getDictNameByCode(DataConstants.DICT_SECRET_LEVEL_TYPE, deviceGroupInfo.getSafe() + "")); + List deviceInfos = new ArrayList<>(); + List cameras = new ArrayList<>(); + if (StrUtil.isNotEmpty(deviceGroupInfo.getCameraIds())) { + List ids = StrUtil.split(deviceGroupInfo.getCameraIds(), ","); + + for (String id : ids) { + CameraDTO cameraDTO = new CameraDTO(); + BusDeviceInfo deviceInfo = deviceInfoService.getById(id); + if (deviceInfo != null && StrUtil.isNotEmpty(deviceInfo.getPlayUrl())) { + cameraDTO.setId(id); + cameraDTO.setUrl(deviceInfo.getPlayUrl()); + cameras.add(cameraDTO); + } + deviceInfos.add(deviceInfo); + } + + } + deviceGroupInfo.setCameras(cameras); + } }