Skip to content

A
amos-boot-biz
Commit 4a4ac636 authored by helinlin's avatar helinlin
Browse files
Options

添加副屏视频随主屏警情切换进行联动

parent df5e85dc
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 60 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java
View file @ 4a4ac636
......@@ -183,7 +183,9 @@ public interface EquipFeignClient {
* @return
*/
@RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam("current") long current, @RequestParam("size") long size, @RequestParam("buildingId") Long buildingId);
ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam("current") long current,
@RequestParam("size") long size,
@RequestParam("buildingId") Long buildingId);
@RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
ResponseModel<Page<Map<String, Object>>> getVideopag( @RequestParam("current") String current,
......@@ -203,13 +205,11 @@ public interface EquipFeignClient {
);
@RequestMapping(value = "/confirmAlarm/getDetailsById", method = RequestMethod.GET)
public ResponseModel<Map<String, Object>> getDetailsById(@RequestParam Long alamId, @RequestParam(required = false) Long equipId, @RequestParam(required = false) String type, @RequestParam String area) ;
ResponseModel<Map<String, Object>> getDetailsById(@RequestParam Long alamId,
@RequestParam(required = false) Long equipId,
@RequestParam(required = false) String type,
@RequestParam String area) ;
/**
*
*获取视频列表
......@@ -217,7 +217,11 @@ public interface EquipFeignClient {
* @return
*/
@RequestMapping(value = "/video/pageVideo", method = RequestMethod.GET)
ResponseModel<Page<Map<String, Object>>> pageVideo( @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam("longitude") Double longitude,@RequestParam("latitude") Double latitude,@RequestParam("distance") Double distance);
ResponseModel<Page<Map<String, Object>>> pageVideo(@RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("longitude") Double longitude,
@RequestParam("latitude") Double latitude,
@RequestParam("distance") Double distance);
@RequestMapping(value = "/video/pageList", method = RequestMethod.GET)
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @ 4a4ac636
......@@ -172,7 +172,7 @@ public class CommandController extends BaseController {
public ResponseModel<Page<AlertCalledZhDto>> listhistoryPage(Integer pageNum, Integer pageSize, RequestData par) {
if(par.getStatus() != null&&par.getStatus() == -1 ){
if (par.getStatus() != null && par.getStatus() == -1) {
AgencyUserModel agencyUserModel = getUserInfo();
Long id = null;
......@@ -181,17 +181,17 @@ public class CommandController extends BaseController {
//获取正在进行的灾情null
if (userCar != null) {
AlertCalled alertCalled = powerTransferCompanyResourcesService.getByPowerTransferCompanyResourId(userCar.getCarId());
if(alertCalled!=null){
if (alertCalled != null) {
par.setAlertId(alertCalled.getSequenceNbr());
par.setStatus(null);
}else{
} else {
return ResponseHelper.buildResponse(null);
}
}else{
} else {
return ResponseHelper.buildResponse(null);
}
}else{
} else {
if (par.getStatus() == null) {
par.setStatus(1);
}
......@@ -295,15 +295,12 @@ public class CommandController extends BaseController {
@GetMapping(value = "video/list")
@ApiOperation(httpMethod = "GET", value = " 视频分页查询88", notes = "视频分页查询88")
public ResponseModel<Object> getVideo(Integer pageNum, Integer pageSize, RequestData par) {
if (par.getAlertId() != null) {
AlertCalled alertCalled = iAlertCalledService.getAlertCalledById(par.getAlertId());
par.setLatitude(alertCalled.getCoordinateX());
par.setLongitude(alertCalled.getCoordinateY());
}
ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.pageVideo(pageNum == 0 ? 1 : pageNum, pageSize, par.getLongitude(), par.getLatitude(), par.getDistance());
Page<Map<String, Object>> pag = data != null ? data.getResult() : null;
List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
if (records != null && records.size() > 0) {
......@@ -343,21 +340,16 @@ public class CommandController extends BaseController {
}
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "分页查询视图下的视频列表")
@RequestMapping(value = "monitorView/video/page", method = RequestMethod.GET)
public ResponseModel<Page<Map<String, Object>>> queryUncheckedVideoList(
@RequestParam(value = "nodeId") Long nodeId,
@RequestParam(value = "nodeType" ,required =false) String nodeType,
@RequestParam(value = "nodeType", required = false) String nodeType,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size
) throws Exception
{
ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.queryVideoPage(nodeId,nodeType,current,size);
) throws Exception {
ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.queryVideoPage(nodeId, nodeType, current, size);
Page<Map<String, Object>> pag = data != null ? data.getResult() : null;
List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
if (records != null && records.size() > 0) {
......@@ -375,24 +367,21 @@ public class CommandController extends BaseController {
@GetMapping(value = "confirmAlarm/getDetailsById")
@ApiOperation(value = "根据id，type查询确警页面相关数据")
public ResponseModel<Map<String, Object>> getDetailsById(@RequestParam Long alamId, @RequestParam Long equipId, @RequestParam String type, @RequestParam String area) {
ResponseModel<Map<String, Object>> response = equipFeignClient.getDetailsById( alamId, equipId, type, area);
ResponseModel<Map<String, Object>> response = equipFeignClient.getDetailsById(alamId, equipId, type, area);
Map<String, Object> data = response.getResult();
List<Map<String, Object>> records = data != null ? (List<Map<String, Object>>)data.get("video") : null;
List<Map<String, Object>> records = data != null ? (List<Map<String, Object>>) data.get("video") : null;
if (records != null && records.size() > 0) {
for (Map<String, Object> record : records) {
ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(record.get("code") + "");
String url = da != null ? da.getResult().substring(da.getResult().indexOf("openUrl")) : null;
record.put("url", url);
}
data.put("video",records);
data.put("video", records);
}
return ResponseHelper.buildResponse(data);
}
/**
* 水源列表分页查询
*
......@@ -589,15 +578,15 @@ public class CommandController extends BaseController {
public ResponseModel<JSONObject> selectOne(Long id) {
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(iWaterResourceService.selectBySequenceNbr(id)));
if(!ValidationUtil.isEmpty(jsonObject.get("buildDate"))) {
if (!ValidationUtil.isEmpty(jsonObject.get("buildDate"))) {
String str = jsonObject.get("buildDate").toString();
Date date = new Date(Long.parseLong(str));
jsonObject.put("buildDate", DateUtils.convertDateToString(date,DateUtils.DATE_TIME_PATTERN));
jsonObject.put("buildDate", DateUtils.convertDateToString(date, DateUtils.DATE_TIME_PATTERN));
} else {
jsonObject.put("buildDate", "");
}
if(ValidationUtil.isEmpty(jsonObject.get("intakeHeight"))) {
if (ValidationUtil.isEmpty(jsonObject.get("intakeHeight"))) {
jsonObject.put("intakeHeight", "");
}
......@@ -1074,8 +1063,7 @@ public class CommandController extends BaseController {
Page page = new Page(current, size);
List<OrderItem> list = OrderItem.ascs("id");
page.setOrders(list);
ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.getVideo(current, size, 0l);
ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.getVideo(current, size, 0L);
Page<Map<String, Object>> pag = data != null ? data.getResult() : null;
List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
if (records != null && records.size() > 0) {
......@@ -1453,7 +1441,6 @@ public class CommandController extends BaseController {
}
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "getPowerTransferCompanyResourcesServiceNew", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取当前任务，车辆状态,随车人员，任务详情", notes = "获取当前任务，车辆状态,随车人员，任务详情")
......@@ -1464,7 +1451,7 @@ public class CommandController extends BaseController {
// 根据车牌查询车辆调派信息级警情id
List<PowerData> pw = powerTransferMapper.getPowerDataCar(id);
if(null != pw && pw.size() > 0) {
if (null != pw && pw.size() > 0) {
Long alertCalledId = Long.valueOf(pw.get(0).getAlertCallId());
Long carid = Long.valueOf(pw.get(0).getResourcesId());
//获取正在进行的灾情
......@@ -1474,17 +1461,16 @@ public class CommandController extends BaseController {
// List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(carid);
List<Map<String, Object>> equipmentList = iDutyCarService.getDutyCaruser(carid);
if(!ValidationUtil.isEmpty(equipmentList)) {
if (!ValidationUtil.isEmpty(equipmentList)) {
String str = "";
String newStr = "";
for(int i = 0; i < equipmentList.size(); i++ ) {
if(i==equipmentList.size()-1){
newStr = str.concat(equipmentList.get(i).get("userName")+"");
}else{
newStr = str.concat(equipmentList.get(i).get("userName")+",");
for (int i = 0; i < equipmentList.size(); i++) {
if (i == equipmentList.size() - 1) {
newStr = str.concat(equipmentList.get(i).get("userName") + "");
} else {
newStr = str.concat(equipmentList.get(i).get("userName") + ",");
}
}
powerTransferCompanyResources.setPw(newStr);
......@@ -1493,30 +1479,30 @@ public class CommandController extends BaseController {
}
//任务详情
PowerData powerData = powerTransferMapper.getPowerDataOther(alertCalledId,carid);
if(null != powerData) {
PowerData powerData = powerTransferMapper.getPowerDataOther(alertCalledId, carid);
if (null != powerData) {
powerTransferCompanyResources.setTaskInformation(powerData.getTaskInformation());
}
} else {
ResponseModel<Map<String, Object>> equipmentIndexDto = equipFeignClient.getCarDetailByCarNum(id);
if(equipmentIndexDto.getResult().size() == 0) {
if (equipmentIndexDto.getResult().size() == 0) {
return ResponseHelper.buildResponse(null);
}
// LambdaQueryWrapper<PowerTransferCompanyResources> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.eq(PowerTransferCompanyResources::getResourcesNum,id);
// powerTransferCompanyResources = powerTransferCompanyResourcesMapper.selectOne(queryWrapper);
if(!ValidationUtil.isEmpty(equipmentIndexDto.getResult())) {
Map<String,Object> map = equipmentIndexDto.getResult();
if (!ValidationUtil.isEmpty(equipmentIndexDto.getResult())) {
Map<String, Object> map = equipmentIndexDto.getResult();
// 随车人员
List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(Long.valueOf(map.get("id").toString()));
powerTransferCompanyResources.setResourcesName(map.get("name").toString());
powerTransferCompanyResources.setResourcesNum(map.get("carNum").toString());
if(!ValidationUtil.isEmpty(powerDataOne)) {
if (!ValidationUtil.isEmpty(powerDataOne)) {
String str = "";
String newStr = "";
for(int i = 0; i < powerDataOne.size(); i++ ) {
for (int i = 0; i < powerDataOne.size(); i++) {
newStr = str.concat(powerDataOne.get(i).getPostTypeName()).concat(":").concat(powerDataOne.get(i).getUser());
}
powerTransferCompanyResources.setPw(newStr);
......
amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml
View file @ 4a4ac636
......@@ -314,21 +314,14 @@
</if>
wle.latitude
FROM wl_video wle
where wle.longitude is not null and wle.latitude is not null
<if test='distance!=null'>
and Round(st_distance(point(wle.longitude,wle.latitude),point(#{longitude},#{latitude}))*111195,1) &lt;=
#{distance}
<if test='longitude!=null and latitude!=null and distance!=null'>
and distance &lt;= #{distance}
</if>
<if test='longitude!=null and latitude!=null '>
ORDER BY distance
</if>
limit #{pageNum},#{pageSize}
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment