pom.xml
@@ -168,7 +168,10 @@ <artifactId>jaxb-api</artifactId> <version>${jaxb-api.version}</version> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>javax.mail-api</artifactId> </dependency> <dependency> <groupId>com.alibaba</groupId> <artifactId>easyexcel</artifactId> @@ -185,16 +188,6 @@ <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-openfeign</artifactId> <version>3.1.3</version> </dependency> <!-- send_mail --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-mail</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-configuration-processor</artifactId> <optional>true</optional> </dependency> </dependencies>
@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.annotation.LogSave; import com.ycl.api.CommonResult; import com.ycl.controller.BaseController; import com.ycl.controller.video.common.constant.BaseCaseStatus; import com.ycl.controller.video.common.util.UtilNumber; import com.ycl.controller.BaseController; import com.ycl.dto.caseHandler.QueryForViolationParam; import com.ycl.dto.casePool.IllegalBuildingParam; import com.ycl.dto.casePool.VideoInspectParam; @@ -245,6 +245,32 @@ .set(BaseCase::getState, state))); } @ApiOperation(value = "案件批在学习") @PutMapping("/batch_case_study") public CommonResult batchHandCaseByStudy(@RequestParam List<Long> ids) { ids.stream().forEach(item -> { BaseCase baseCase = new BaseCase(); baseCase.setId(item); baseCase.setState(3); baseCaseService.updateById(baseCase); }); return CommonResult.success("success"); } @ApiOperation(value = "案件批暂不处理") @PutMapping("/batch_case_Ignore") public CommonResult batchHandCaseByIgnore(@RequestParam List<Long> ids) { ids.stream().forEach(item -> { BaseCase baseCase = new BaseCase(); baseCase.setId(item); baseCase.setState(4); baseCaseService.updateById(baseCase); }); return CommonResult.success("success"); } /** * @return com.ycl.api.CommonResult * @Description reset case @@ -300,19 +326,19 @@ @GetMapping("/video_inspection") @ApiOperation("预警研判") public CommonResult searchVideoInspection(@RequestParam Integer current){ return CommonResult.success(baseCaseService.selectVideoInspection(current)); public CommonResult searchVideoInspection(@RequestParam Integer current) { return CommonResult.success(baseCaseService.selectVideoInspection(current)); } @GetMapping("/video_inspection/Count") @ApiOperation("预警研判左上角待审核案件,今日审核,今日在学习") public CommonResult searchCount(){ return CommonResult.success(baseCaseService.selectCount()); public CommonResult searchCount() { return CommonResult.success(baseCaseService.selectCount()); } @PutMapping("/video_inspection") @ApiOperation("预警研判确定") public CommonResult searchCount(@RequestBody VideoInspectParam violationParam){ return CommonResult.success(baseCaseService.updateCase(violationParam)); public CommonResult searchCount(@RequestBody VideoInspectParam violationParam) { return CommonResult.success(baseCaseService.updateCase(violationParam)); } } ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java
@@ -69,7 +69,8 @@ @GetMapping("/video") public CommonResult video(@Validated CockpitVO params) { checkApiUtil.cockpit(params); return CommonResult.success(iVideoPointService.list(new LambdaQueryWrapper<VideoPoint>().eq(params.getStreetId()!=null,VideoPoint::getStreetId,params.getStreetId())).stream().map(item -> { /// TODO: 2022/12/13 视频点位设备为空 没数据 return CommonResult.success(iVideoPointService.list(new LambdaQueryWrapper<VideoPoint>().eq(params.getStreetId() != null, VideoPoint::getStreetId, params.getStreetId()).isNotNull(VideoPoint::getPlatResourceId)).stream().map(item -> { VideoVO videoVO = new VideoVO(); videoVO.setName(item.getName()); videoVO.setBrand(item.getEquipmentBrand()); ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
@@ -47,7 +47,7 @@ IBaseCaseService iBaseCaseService; @Autowired IViolationsService iViolationsService; @Autowired @Resource TrendAnalysisMapper trendAnalysisMapper; @ApiOperation(value = "执法事件统计") ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
@@ -2,8 +2,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.bo.casePool.CasePoolIllegalBuildingDO; import com.ycl.bo.casePool.CasePoolViolationDO; import com.ycl.dto.caseHandler.QueryForViolationParam; import com.ycl.dto.cockpitManage.DelayDO; import com.ycl.entity.caseHandler.BaseCase; @@ -11,8 +9,6 @@ import com.ycl.vo.casePool.CasePoolIllegalBuildingVO; import com.ycl.vo.casePool.CasePoolViolationVO; import com.ycl.vo.casePool.QueryForViolationVO; import com.ycl.vo.cockpit.enforcementEvents.DelayVO; import com.ycl.vo.cockpit.enforcementEvents.EnforcementEventsVO; import com.ycl.vo.cockpit.enforcementEvents.EventVO; import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO; import org.apache.ibatis.annotations.Param; @@ -35,11 +31,11 @@ BaseCase selectCondMap(Map map); Page<BaseCase> selectBaseCasePage(Page<BaseCase> page, @Param("code") String number,@Param("streetId") Integer streetId, @Param("categories") Integer categories, @Param("startTime") String startTime,@Param("endTime") String endTime,@Param("site") String site); Page<BaseCase> selectBaseCasePage(Page<BaseCase> page, @Param("code") String number, @Param("streetId") Integer streetId, @Param("categories") Integer categories, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("site") String site); Page<QueryForViolationVO> selectViolationPage(Page<QueryForViolationVO> setCurrent, QueryForViolationParam queryForViolationParam); Page<QueryForViolationVO> selectViolationPage(Page<QueryForViolationVO> setCurrent, @Param(value = "queryForViolationParam") QueryForViolationParam queryForViolationParam); List<QueryForViolationVO> selectViolationPage(QueryForViolationParam queryForViolationParam); List<QueryForViolationVO> selectViolationPage(@Param(value = "queryForViolationParam") QueryForViolationParam queryForViolationParam); Page<BaseCaseVO> selectVideoInspection(Page<Object> objectPage); @@ -55,6 +51,8 @@ Long selectRegisterCount(); Long selectStudyCount(); List<VideoAndAreaVO> areaCount(); List<DelayDO> selectDelayVOList(); ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -422,7 +422,7 @@ HashMap<String, Object> map = new HashMap<>(); Long review = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 1)); Long register = baseCaseMapper.selectRegisterCount(); Long study = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 3)); Long study = baseCaseMapper.selectStudyCount(); map.put("review", review); map.put("register", register); map.put("study", study); ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -187,7 +187,6 @@ LEFT JOIN ums_image_resources t8 on t8.belong_to_id=t1.id LEFT JOIN ums_video_point t9 on t9.id=t2.video_point_id <where> t1.state IN (7,8) <if test="queryForViolationParam.eventSource != null"> and t1.event_source=#{queryForViolationParam.eventSource} </if> @@ -219,7 +218,7 @@ and t2.car_number like concat('%',#{queryForViolationParam.carNumber},'%') </if> <if test="queryForViolationParam.videoPointId != null"> and t1.video_point_id=#{queryForViolationParam.videoPointId} and t2.video_point_id=#{queryForViolationParam.videoPointId} </if> <if test="queryForViolationParam.handlingOpinion != null and queryForViolationParam.handlingOpinion !=''"> and t1.handling_opinion like concat('%',#{queryForViolationParam.handlingOpinion},'%') @@ -259,6 +258,13 @@ and to_days(create_time) = TO_DAYS(now()); </select> <select id="selectStudyCount" resultType="java.lang.Long"> select count(1) from ums_base_case where state =3 and to_days(create_time) = TO_DAYS(now()); </select> <select id="dayCount" resultType="java.lang.Integer"> select count(1) from ums_base_case
