From 488858cfe3382ac91df40f62067291384f15d288 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 07 十一月 2022 15:13:57 +0800 Subject: [PATCH] 驾驶舱接口完善 --- ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java | 13 ++++ ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 1 ycl-platform/src/main/java/com/ycl/service/video/impl/IVideoPointService.java | 6 ++ ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java | 8 ++ ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 45 +++++++++++++++ ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java | 5 + ycl-platform/src/main/java/com/ycl/vo/equipment/VideoPointVo.java | 10 +++ ycl-platform/src/main/resources/mapper/equipment/VideoMapper.xml | 46 +++++++++++++++ 8 files changed, 134 insertions(+), 0 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java index 5c1624b..dd28236 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java @@ -39,6 +39,7 @@ EnforcementEventsVO.StatisticsEventVO eventVO = new EnforcementEventsVO.StatisticsEventVO(); eventVO.setCount(10); eventVO.setRatio(new BigDecimal("0.69").setScale(2, RoundingMode.HALF_UP)); + eventVO.setUp(true); map.put("reported", eventVO); map.put("disposition", eventVO); map.put("dispositionInTime", eventVO); diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java index 2d2ac7a..feea793 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java @@ -1,12 +1,21 @@ package com.ycl.controller.cockpit.statisticsEvents; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.api.CommonResult; +import com.ycl.entity.cockpitManage.TeamConstruction; +import com.ycl.entity.video.VideoPoint; +import com.ycl.service.cockpitManage.ITeamConstructionService; +import com.ycl.service.video.impl.IVideoPointService; import com.ycl.util.CheckApiUtil; import com.ycl.vo.cockpit.CockpitVO; import com.ycl.vo.cockpit.statisticsEvents.StatisticsEventsVO; +import com.ycl.vo.equipment.VideoPointVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -31,6 +40,20 @@ public class StatisticsEventsController { @Resource private CheckApiUtil checkApiUtil; + + private IVideoPointService videoPointService; + + private ITeamConstructionService teamConstructionService; + + @Autowired + public void setTeamConstructionService(ITeamConstructionService teamConstructionService) { + this.teamConstructionService = teamConstructionService; + } + + @Autowired + public void setVideoPointService(IVideoPointService videoPointService) { + this.videoPointService = videoPointService; + } @ApiOperation(value = "鎵ф硶浜嬩欢") @GetMapping("/law_enforcement_event") @@ -150,4 +173,26 @@ return CommonResult.success(vo); } + + + @ApiOperation(value = "鐐逛綅") + @GetMapping("/video_point") + public CommonResult<List<VideoPointVo>> videoPoint(@Validated CockpitVO params) { + checkApiUtil.cockpit(params); + + IPage<VideoPointVo> page = videoPointService.getList(null, null, 1, 500); + + return CommonResult.success(page.getRecords()); + } + + + @ApiOperation(value = "闃熶紞寤鸿") + @GetMapping("/team_construction") + public CommonResult<List<TeamConstruction>> teamConstruction(@Validated CockpitVO params) { + checkApiUtil.cockpit(params); + LambdaQueryWrapper<TeamConstruction> queryWrapper = new LambdaQueryWrapper<TeamConstruction>().eq(TeamConstruction::getStatus, 1).eq(TeamConstruction::getIsDelete, 0); + List<TeamConstruction> list = teamConstructionService.list(queryWrapper); + + return CommonResult.success(list); + } } diff --git a/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java b/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java index 8284680..850702c 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java +++ b/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java @@ -1,12 +1,15 @@ package com.ycl.entity.video; import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.Version; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -91,5 +94,10 @@ @TableField("community_id") private Integer communityId; + /** + * 鍏蜂綋鍦板潃 + */ + @TableField("address") + private String address; } diff --git a/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java index 3f41baf..b3d16ee 100644 --- a/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java +++ b/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java @@ -1,7 +1,11 @@ package com.ycl.mapper.video; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.entity.video.VideoPoint; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.vo.equipment.VideoPointVo; +import org.apache.ibatis.annotations.Param; /** * <p> @@ -13,4 +17,5 @@ */ public interface VideoPointMapper extends BaseMapper<VideoPoint> { + IPage<VideoPointVo> search(Page<VideoPointVo> page, @Param("streetId") Integer streetId, @Param("communityId") Integer communityId); } diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/IVideoPointService.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/IVideoPointService.java index 79a83ad..81edc68 100644 --- a/ycl-platform/src/main/java/com/ycl/service/video/impl/IVideoPointService.java +++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/IVideoPointService.java @@ -1,8 +1,13 @@ package com.ycl.service.video.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.video.VideoPoint; +import com.ycl.vo.equipment.VideoPointVo; + +import java.util.List; /** * <p> @@ -14,4 +19,5 @@ */ public interface IVideoPointService extends IService<VideoPoint> { + IPage<VideoPointVo> getList(Integer streetId, Integer communityId, Integer current, Integer size); } diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java index 52ea0da..0600e9c 100644 --- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java @@ -1,9 +1,15 @@ package com.ycl.service.video.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.entity.video.VideoPoint; import com.ycl.mapper.video.VideoPointMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.vo.equipment.HandheldTerminalVo; +import com.ycl.vo.equipment.VideoPointVo; import org.springframework.stereotype.Service; + +import java.util.List; /** * <p> @@ -16,4 +22,11 @@ @Service public class VideoPointServiceImpl extends ServiceImpl<VideoPointMapper, VideoPoint> implements IVideoPointService { + @Override + public IPage<VideoPointVo> getList(Integer streetId, Integer communityId, Integer current, Integer size) { + + Page<VideoPointVo> page = new Page<>(current, size); + IPage<VideoPointVo> page1 = baseMapper.search(page, streetId, communityId); + return page1; + } } diff --git a/ycl-platform/src/main/java/com/ycl/vo/equipment/VideoPointVo.java b/ycl-platform/src/main/java/com/ycl/vo/equipment/VideoPointVo.java new file mode 100644 index 0000000..c914265 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/vo/equipment/VideoPointVo.java @@ -0,0 +1,10 @@ +package com.ycl.vo.equipment; + +import com.ycl.entity.video.VideoPoint; +import lombok.Data; + +@Data +public class VideoPointVo extends VideoPoint { + private String street; + private String community; +} diff --git a/ycl-platform/src/main/resources/mapper/equipment/VideoMapper.xml b/ycl-platform/src/main/resources/mapper/equipment/VideoMapper.xml new file mode 100644 index 0000000..45c3a2a --- /dev/null +++ b/ycl-platform/src/main/resources/mapper/equipment/VideoMapper.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.ycl.mapper.video.VideoPointMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.entity.video.VideoPoint"> + <id column="id" property="id" jdbcType="INTEGER"/> + <result column="name" property="name" jdbcType="VARCHAR"/> + <result column="longitude" property="longitude" jdbcType="FLOAT"/> + <result column="latitude" property="latitude" jdbcType="FLOAT"/> + <result column="street_id" property="streetId" jdbcType="INTEGER"/> + <result column="community_id" property="communityId" jdbcType="INTEGER"/> + <result column="address" property="address" jdbcType="VARCHAR"/> + <result column="plat_resource_id" property="platResourceId" jdbcType="VARCHAR"/> + <result column="equipment_brand" property="equipmentBrand" jdbcType="VARCHAR"/> + <result column="equipment_model" property="equipmentModel" jdbcType="VARCHAR"/> + <result column="equipment_ip" property="equipmentIp" jdbcType="VARCHAR"/> + <result column="url_address" property="urlAddress" jdbcType="VARCHAR"/> + </resultMap> + + <resultMap id="VoMap" type="com.ycl.vo.equipment.VideoPointVo" extends="BaseResultMap"> + <result column="community_name" property="community" jdbcType="VARCHAR"/> + <result column="street_name" property="street" jdbcType="VARCHAR"/> + + </resultMap> + <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> + <sql id="Base_Column_List"> + id + ,name,longitude,latitude,street_id,community_id,address,plat_resource_id,equipment_brand,equipment_model,equipment_ip,url_address + </sql> + <select id="search" resultMap="VoMap"> + SELECT vp.*,s.region_name street_name,c.region_name community_name FROM ums_video_point vp + LEFT JOIN ums_sccg_region s on vp.street_id = s.id + LEFT JOIN ums_sccg_region c on vp.community_id = c.id + <where> + <if test="streetId!=null"> + and vp.street_id = #{streetId} + </if> + <if test="communityId!=null"> + and vp.community_id = #{communityId} + </if> + </where> + ORDER BY vp.id DESC + </select> + +</mapper> -- Gitblit v1.8.0