diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEventImportantFileController.java b/zc-business/src/main/java/com/zc/business/controller/DcEventImportantFileController.java index e72348a5..2ea37c94 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcEventImportantFileController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcEventImportantFileController.java @@ -162,4 +162,13 @@ public class DcEventImportantFileController extends BaseController { return toAjax(dcEventImportantFileService.deleteDcEventImportantFileByEventIds(ids)); } + + /** + * 获取重要事件状态 + */ + @ApiOperation("获取重要事件状态") + @GetMapping("/getImportantFileStatus/{eventId}") + public AjaxResult getImportantFileStatus(@PathVariable("eventId") String eventId){ + return dcEventImportantFileService.getImportantFileStatus(eventId); + } } diff --git a/zc-business/src/main/java/com/zc/business/controller/VideoController.java b/zc-business/src/main/java/com/zc/business/controller/VideoController.java index 7c374ad6..9365d7f6 100644 --- a/zc-business/src/main/java/com/zc/business/controller/VideoController.java +++ b/zc-business/src/main/java/com/zc/business/controller/VideoController.java @@ -401,7 +401,7 @@ public class VideoController extends BaseController { public Object nearCamPileNum(@ApiParam(value = "桩号", name = "pileNum", required = true) String pileNum) throws HttpException, IOException { // 获取济菏运管中心相机信息 - JSONObject camInfo = getCamByDept("1301730"); + /*JSONObject camInfo = getCamByDept("1301730"); if (!camInfo.containsKey("data")) { return camInfo; @@ -435,8 +435,17 @@ public class VideoController extends BaseController { .filter(item -> "1".equals(item.get("camOrientation")) && Integer.parseInt(item.get("distance").toString()) < 2000) .sorted(comparing(item -> Integer.parseInt(item.get("distance").toString()))) .collect(Collectors.toList()); - result.put("downCamera",downCameraList); + result.put("downCamera",downCameraList);*/ + + Map result = new HashMap<>(); + Integer pileNumDistance = pileNumTransformMetre(pileNum); + String startMileage = String.valueOf(pileNumDistance - 2000); + String endMileage = String.valueOf(pileNumDistance + 2000); + List upCameraList = iDcDeviceService.selectNearCamPile("1",startMileage,endMileage); + List downCameraList = iDcDeviceService.selectNearCamPile("3",startMileage,endMileage); + result.put("upCamera",upCameraList); + result.put("downCamera",downCameraList); return AjaxResult.success(result); } diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcDeviceMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcDeviceMapper.java index 13576c48..3caf756f 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcDeviceMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcDeviceMapper.java @@ -3,8 +3,10 @@ package com.zc.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zc.business.domain.DcDevice; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 设备Mapper接口 @@ -18,5 +20,5 @@ public interface DcDeviceMapper extends BaseMapper { List numberOfDevicesByType(DcDevice dcDevice); List numberOfDevicesByType(); - + List selectNearCamPile(@Param("direction") String direction,@Param("startMileage") String startMileage,@Param("endMileage") String endMileage); } diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcEventImportantFileMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcEventImportantFileMapper.java index af094b3b..56e388eb 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcEventImportantFileMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcEventImportantFileMapper.java @@ -1,6 +1,8 @@ package com.zc.business.mapper; import java.util.List; + +import com.ruoyi.common.core.domain.AjaxResult; import com.zc.business.domain.DcEventImportantFile; /** @@ -58,4 +60,12 @@ public interface DcEventImportantFileMapper * @return 结果 */ int deleteDcEventImportantFileByEventIds(String[] ids); + + /** + * 获取重要事件状态 + * + * @param eventId 事件id + * @return 结果 + */ + int getImportantFileStatus(String eventId); } diff --git a/zc-business/src/main/java/com/zc/business/service/IDcDeviceService.java b/zc-business/src/main/java/com/zc/business/service/IDcDeviceService.java index 5144990d..b3eb5f00 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcDeviceService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcDeviceService.java @@ -81,4 +81,6 @@ public interface IDcDeviceService extends IService { List numberOfDevicesByType(DcDevice dcDevice); List numberOfDevicesByType(); + + List selectNearCamPile(String direction,String startMileage,String endMileage); } diff --git a/zc-business/src/main/java/com/zc/business/service/IDcEventImportantFileService.java b/zc-business/src/main/java/com/zc/business/service/IDcEventImportantFileService.java index f67f2899..223b11de 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcEventImportantFileService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcEventImportantFileService.java @@ -1,6 +1,8 @@ package com.zc.business.service; import java.util.List; + +import com.ruoyi.common.core.domain.AjaxResult; import com.zc.business.domain.DcEventImportantFile; /** @@ -58,4 +60,12 @@ public interface IDcEventImportantFileService * @return 结果 */ int deleteDcEventImportantFileByEventId(String id); + + /** + * 获取重要事件状态 + * + * @param eventId 事件id + * @return 结果 + */ + AjaxResult getImportantFileStatus(String eventId); } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java index 77460775..f6e446e3 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java @@ -467,5 +467,10 @@ public class DcDeviceServiceImpl extends ServiceImpl i } return null; } + + @Override + public List selectNearCamPile(String direction,String startMileage,String endMileage){ + return dcDeviceMapper.selectNearCamPile(direction,startMileage,endMileage); + } } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventImportantFileServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventImportantFileServiceImpl.java index 586619f6..07fae61e 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventImportantFileServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventImportantFileServiceImpl.java @@ -2,6 +2,8 @@ package com.zc.business.service.impl; import java.util.Date; import java.util.List; + +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.zc.business.domain.DcEventProcess; @@ -109,7 +111,7 @@ public class DcEventImportantFileServiceImpl implements IDcEventImportantFileSer /** * 删除重要事件文件内容信息 * - * @param eventId 重要事件文件内容主键 + * @param id 重要事件文件内容主键 * @return 结果 */ @Override @@ -117,4 +119,17 @@ public class DcEventImportantFileServiceImpl implements IDcEventImportantFileSer { return dcEventImportantFileMapper.deleteDcEventImportantFileByEventId(id); } + + /** + * 获取重要事件状态 + * + * @param eventId 事件id + * @return 结果 + */ + @Override + public AjaxResult getImportantFileStatus(String eventId){ + int num = dcEventImportantFileMapper.getImportantFileStatus(eventId); + return AjaxResult.success(num); + } + } diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml index fcf49c66..28b3fc01 100644 --- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml @@ -118,4 +118,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY device_type, child_type; + + diff --git a/zc-business/src/main/resources/mapper/business/DcEventImportantFileMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventImportantFileMapper.xml index 5d16abf7..42c51df5 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventImportantFileMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventImportantFileMapper.xml @@ -41,7 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + insert into dc_event_important_file