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); 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); } } 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; } 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); } 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); } 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; } } ycl-platform/src/main/java/com/ycl/vo/equipment/VideoPointVo.java
New file @@ -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; } ycl-platform/src/main/resources/mapper/equipment/VideoMapper.xml
New file @@ -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>
