diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectVideoConfig.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectVideoConfig.java index 00b72232a..aceee8f02 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectVideoConfig.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectVideoConfig.java @@ -37,10 +37,10 @@ public class ProjectVideoConfig implements Serializable { @ApiModelProperty(value = "项目sn") private java.lang.String projectSn; /** - * 视频类型，1萤石云，2乐橙，3ISC，4大华，5宇视，6国标 + * 视频类型，1萤石云，3ISC */ - @Excel(name = "视频类型，1萤石云，2乐橙，3ISC，4大华，5宇视，6国标", width = 15) - @ApiModelProperty(value = "视频类型，1萤石云，2乐橙，3ISC，4大华，5宇视，6国标") + @Excel(name = "视频类型，1萤石云，3ISC", width = 15) + @ApiModelProperty(value = "视频类型，1萤石云，3ISC") private java.lang.Integer videoType; /** * 是否启用，1是，0否 diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionAlarmController.java index efbf0a061..f55d17c8f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionAlarmController.java @@ -60,8 +60,8 @@ public class VehiclePositionAlarmController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "createTime_begin", value = "报警时间开始", paramType = "query", required = true, dataType = "String"), - @ApiImplicitParam(name = "createTime_end", value = "报警时间结束", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "createTime_begin", value = "报警时间开始", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "createTime_end", value = "报警时间结束", paramType = "query", required = false, dataType = "String"), }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java index 61d86a646..920c2142a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java @@ -54,6 +54,8 @@ public class VehiclePositionDataController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "createTime_begin", value = "时间开始", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "createTime_end", value = "时间结束", paramType = "query", required = false, dataType = "String"), }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDevController.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDevController.java index 47e78ef5b..f17988c3e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDevController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.vehicleposition.controller; import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionDev; +import com.zhgd.xmgl.modules.vehicleposition.entity.vo.CountVehiclePositionDevVo; import com.zhgd.xmgl.modules.vehicleposition.service.IVehiclePositionDevService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -182,4 +183,12 @@ public class VehiclePositionDevController { return mv; } + @ApiOperation(value = "统计车辆（人员）定位-设备信息", notes = "统计车辆（人员）定位-设备信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countVehiclePositionDev") + public Result countVehiclePositionDev(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(vehiclePositionDevService.countVehiclePositionDev(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionFence.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionFence.java index 459734592..d590360ac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionFence.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionFence.java @@ -67,6 +67,8 @@ public class VehiclePositionFence implements Serializable { @Excel(name = "围栏形状（坐标对见用“| ”分隔；经度和纬度用”,“分隔）", width = 15) @ApiModelProperty(value = "围栏形状（坐标对见用“| ”分隔；经度和纬度用“,“分隔）") private java.lang.String fenceShape; + @ApiModelProperty(value = "围栏形状json数组") + private java.lang.String fenceShapeArr; /** * 项目sn */ diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/vo/CountVehiclePositionDevVo.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/vo/CountVehiclePositionDevVo.java new file mode 100644 index 000000000..678ff13b0 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/vo/CountVehiclePositionDevVo.java @@ -0,0 +1,11 @@ +package com.zhgd.xmgl.modules.vehicleposition.entity.vo; + +import lombok.Data; + +@Data +public class CountVehiclePositionDevVo { + private Integer count; + private Integer onlineCount; + private Integer offlineCount; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionDevMapper.java index 95c025ed9..010ccbca6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/VehiclePositionDevMapper.java @@ -5,10 +5,12 @@ 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.xmgl.modules.vehicleposition.entity.VehiclePositionDev; +import com.zhgd.xmgl.modules.vehicleposition.entity.vo.CountVehiclePositionDevVo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; /** @@ -23,4 +25,6 @@ public interface VehiclePositionDevMapper extends BaseMapper IPage pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); List pageList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + CountVehiclePositionDevVo countVehiclePositionDev(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml index 5f145414b..fb46105c7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.xml @@ -7,9 +7,31 @@ left join worker_info wi on vpd.worker_info_id = wi.id left join (select t1.* from vehicle_position_data t1 - join (select max(id) id from vehicle_position_data group by dev_sn) t2 on t1.id=t2.id + join (select max(id) id from vehicle_position_data group by dev_sn) t2 + on t1.id = t2.id ) vpd2 on vpd2.dev_sn = vpd.dev_sn ${ew.customSqlSegment} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java index 263ec8eff..ab726cfe7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.vehicleposition.service; import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionDev; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.vehicleposition.entity.vo.CountVehiclePositionDevVo; import java.util.HashMap; import java.util.List; @@ -18,4 +19,6 @@ public interface IVehiclePositionDevService extends IService IPage queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + CountVehiclePositionDevVo countVehiclePositionDev(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java index a4e51c655..96864911f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionDev; +import com.zhgd.xmgl.modules.vehicleposition.entity.vo.CountVehiclePositionDevVo; import com.zhgd.xmgl.modules.vehicleposition.mapper.VehiclePositionDataMapper; import com.zhgd.xmgl.modules.vehicleposition.mapper.VehiclePositionDevMapper; import com.zhgd.xmgl.modules.vehicleposition.service.IVehiclePositionDevService; @@ -16,6 +17,7 @@ import com.zhgd.xmgl.util.RefUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import reactor.core.publisher.Mono; import java.util.Date; import java.util.HashMap; @@ -47,6 +49,11 @@ public class VehiclePositionDevServiceImpl extends ServiceImpl paramMap) { + return baseMapper.countVehiclePositionDev(paramMap); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { String alias = "vpd."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(VehiclePositionDev.class, paramMap, alias); diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java index 1e1acd80c..3855b5ae0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java @@ -119,7 +119,7 @@ public class VideoItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId()) .eq(VideoItem::getSerialNumber, videoItem.getSerialNumber()) @@ -128,7 +128,18 @@ public class VideoItemServiceImpl extends ServiceImpl 0) { throw new OpenAlertException(MessageUtil.get("serialNumberExistErr")); } + } else if (projectVideoConfig.getVideoType() == 1) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId()) + .eq(VideoItem::getChannelId, videoItem.getChannelId()) + .eq(VideoItem::getSerialNumber, videoItem.getSerialNumber()) + .ne(VideoItem::getItemId, videoItem.getItemId()); + int count = videoItemMapper.selectCount(queryWrapper); + if (count > 0) { + throw new OpenAlertException(MessageUtil.get("serialNumberExistErr")); + } } + videoItemMapper.updateById(videoItem); } @@ -140,16 +151,16 @@ public class VideoItemServiceImpl extends ServiceImpl temp = YsVideoUtil.getVideoInfo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), accessToken); - if (temp != null && temp.size() > 0) { - boolean falg = YsVideoUtil.deleteVideo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), accessToken); - if (!falg) { - throw new OpenAlertException(MessageUtil.get("failErr")); - } - } - } + //if (projectVideoConfig.getVideoType() == 1) { + // String accessToken = YsVideoUtil.getToken(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret()); + // Map temp = YsVideoUtil.getVideoInfo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), accessToken); + // if (temp != null && temp.size() > 0) { + // boolean falg = YsVideoUtil.deleteVideo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), accessToken); + // if (!falg) { + // throw new OpenAlertException(MessageUtil.get("failErr")); + // } + // } + //} videoItemMapper.deleteById(itemId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java index dbd199281..2344955c4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java @@ -132,7 +132,7 @@ public class WorkerInfoController { @ApiImplicitParam(name = "teamId", value = "班组ID", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "query", required = false, dataType = "String"), @ApiImplicitParam(name = "inserviceType", value = "在职状态 1在职 2离职", paramType = "query", required = false, dataType = "String"), - @ApiImplicitParam(name = "personType", value = "人员类型 1、劳务人员 2、管理人员", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "personType", value = "人员类型 1、劳务人员 2、管理人员 3、临时人员", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),