From 7182dbfb374bef1f78d0698117e97137429f96cc Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 09 十一月 2022 11:21:11 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java | 1
ycl-generator/src/main/java/com/ycl/entity/message/MessageColumnSet.java | 52 ++++
ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java | 4
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 2
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java | 4
ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java | 9
ycl-platform/src/main/java/com/ycl/entity/cockpitManage/TeamConstruction.java | 26 +
ycl-platform/src/main/java/com/ycl/vo/resources/MediaVO.java | 35 ++
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java | 28 ++
ycl-platform/src/main/java/com/ycl/entity/resources/ImageResources.java | 10
ycl-generator/src/main/java/com/ycl/mapper/message/MessageColumnSetMapper.java | 16 +
ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml | 42 +++
ycl-generator/src/main/java/com/ycl/controller/message/MessageColumnSetController.java | 21 +
ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java | 3
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 2
ycl-platform/src/main/java/com/ycl/mapper/resources/VideoResourcesMapper.java | 19 +
ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java | 69 +++++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 12
ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java | 14 +
ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java | 3
ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml | 18 +
ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java | 70 +++++
ycl-platform/src/main/java/com/ycl/entity/resources/VideoResources.java | 20
ycl-platform/src/main/java/com/ycl/mapper/resources/ImageResourcesMapper.java | 19 +
ycl-platform/src/main/java/com/ycl/service/resources/IImageResourcesService.java | 19 +
ycl-generator/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java | 20 +
ycl-platform/src/main/java/com/ycl/service/resources/IVideoResourcesService.java | 19 +
ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java | 11
/dev/null | 20 -
ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java | 35 ++
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 4
ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml | 42 +++
ycl-generator/src/main/java/com/ycl/service/message/IMessageColumnSetService.java | 16 +
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 8
ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java | 41 +++
ycl-platform/src/main/java/com/ycl/service/resources/impl/ImageResourcesServiceImpl.java | 35 ++
36 files changed, 697 insertions(+), 72 deletions(-)
diff --git a/ycl-generator/src/main/java/com/ycl/controller/message/MessageColumnSetController.java b/ycl-generator/src/main/java/com/ycl/controller/message/MessageColumnSetController.java
new file mode 100644
index 0000000..8133eaf
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/controller/message/MessageColumnSetController.java
@@ -0,0 +1,21 @@
+package com.ycl.controller.message;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.ycl.base.BaseController;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰璁剧疆琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+@RestController
+@RequestMapping("/message-column-set")
+public class MessageColumnSetController extends BaseController {
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/entity/message/MessageColumnSet.java b/ycl-generator/src/main/java/com/ycl/entity/message/MessageColumnSet.java
new file mode 100644
index 0000000..273ea5c
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/entity/message/MessageColumnSet.java
@@ -0,0 +1,52 @@
+package com.ycl.entity.message;
+
+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;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰璁剧疆琛�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_message_column_set")
+public class MessageColumnSet implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭Id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鐢ㄦ埛Id
+ */
+ @TableField("user_id")
+ private Integer userId;
+
+ /**
+ * 鏍忕洰Id
+ */
+ @TableField("message_column_id")
+ private Integer messageColumnId;
+
+ /**
+ * 鏄惁鎺ユ敹0-涓嶆帴鏀�1-鎺ユ敹
+ */
+ @TableField("is_receive")
+ private Integer isReceive;
+
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/mapper/message/MessageColumnSetMapper.java b/ycl-generator/src/main/java/com/ycl/mapper/message/MessageColumnSetMapper.java
new file mode 100644
index 0000000..aede402
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/mapper/message/MessageColumnSetMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.mapper.message;
+
+import com.ycl.entity.message.MessageColumnSet;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰璁剧疆琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+public interface MessageColumnSetMapper extends BaseMapper<MessageColumnSet> {
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/service/message/IMessageColumnSetService.java b/ycl-generator/src/main/java/com/ycl/service/message/IMessageColumnSetService.java
new file mode 100644
index 0000000..4c31228
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/service/message/IMessageColumnSetService.java
@@ -0,0 +1,16 @@
+package com.ycl.service.message;
+
+import com.ycl.entity.message.MessageColumnSet;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰璁剧疆琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+public interface IMessageColumnSetService extends IService<MessageColumnSet> {
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java b/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java
new file mode 100644
index 0000000..3b76f3a
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ycl.service.message.impl;
+
+import com.ycl.entity.message.MessageColumnSet;
+import com.ycl.mapper.message.MessageColumnSetMapper;
+import com.ycl.service.message.IMessageColumnSetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 娑堟伅鏍忕洰璁剧疆琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+@Service
+public class MessageColumnSetServiceImpl extends ServiceImpl<MessageColumnSetMapper, MessageColumnSet> implements IMessageColumnSetService {
+
+}
diff --git a/ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml b/ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml
new file mode 100644
index 0000000..56c044b
--- /dev/null
+++ b/ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml
@@ -0,0 +1,18 @@
+<?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.message.MessageColumnSetMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.entity.message.MessageColumnSet">
+ <id column="id" property="id" />
+ <result column="user_id" property="userId" />
+ <result column="message_column_id" property="messageColumnId" />
+ <result column="is_receive" property="isReceive" />
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <sql id="Base_Column_List">
+ id, user_id, message_column_id, is_receive
+ </sql>
+
+</mapper>
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
index 71dfe4c..78057fc 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -1,26 +1,20 @@
package com.ycl.controller.caseHandler;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
-import com.ycl.common.constant.BaseCaseStatus;
-import com.ycl.common.constant.StepName;
import com.ycl.dto.caseHandler.DispatchInfoParam;
import com.ycl.dto.dispatch.UploadDisposingResultParam;
-import com.ycl.entity.caseHandler.*;
+import com.ycl.entity.caseHandler.DispatchInfo;
import com.ycl.service.caseHandler.*;
+import com.ycl.service.resources.IImageResourcesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
/**
* <p>
@@ -69,7 +63,7 @@
public CommonResult searchDisposeList(@RequestParam Long caseId,
@RequestParam Integer type,
@RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
- iDisposeRecordService.saveUpload(caseId,type,uploadDisposingResultParam);
+ iDisposeRecordService.saveUpload(caseId, type, uploadDisposingResultParam);
return CommonResult.success("add success");
}
}
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 feea793..65537c6 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
@@ -179,9 +179,7 @@
@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());
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
index ff7c125..d8bb664 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.region.SccgRegion;
@@ -45,11 +47,14 @@
public CommonResult addRegion(@Validated @RequestBody SccgRegion sccgRegion) {
return CommonResult.success(iSccgRegionService.save(sccgRegion));
}
+
@ApiOperation(value = "鑾峰彇琛屾斂鍖哄煙鍒嗛〉鏌ヨ")
@RequestMapping(value = "/list", method = RequestMethod.POST)
@ResponseBody
- public CommonResult<IPage<SccgRegion>> list(@Validated @RequestBody SccgRegion sccgRegion) {
- return CommonResult.success(iSccgRegionService.list(sccgRegion));
+ public CommonResult<CommonPage<SccgRegion>> list(@RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
+ @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
+ Page<SccgRegion> list = iSccgRegionService.list(pageSize, pageNum);
+ return CommonResult.success(CommonPage.restPage(list));
}
@@ -87,7 +92,7 @@
@ApiOperation("鑾峰彇瀛愮被")
@GetMapping("/getChildren/{parentId}")
@ApiImplicitParams({
- @ApiImplicitParam(name = "parentId",value = "椤剁骇parentId=0")
+ @ApiImplicitParam(name = "parentId", value = "椤剁骇parentId=0")
})
public CommonResult<List<SccgRegion>> getChildren(@PathVariable Long parentId) {
List<SccgRegion> treeList = iSccgRegionService.getChildren(parentId);
diff --git a/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java b/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java
new file mode 100644
index 0000000..f5b8966
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java
@@ -0,0 +1,70 @@
+package com.ycl.controller.resources;
+
+
+import com.ycl.annotation.LogSave;
+import com.ycl.api.CommonResult;
+import com.ycl.controller.BaseController;
+import com.ycl.entity.resources.ImageResources;
+import com.ycl.service.resources.IImageResourcesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+@RestController
+@RequestMapping("/image_resources")
+@Api(tags = "鍥剧墖璧勬簮绠＄悊")
+public class ImageResourcesController extends BaseController {
+
+ @Autowired
+ IImageResourcesService iImageResourcesService;
+
+ @GetMapping("/query")
+ @ApiOperation("鏌ヨ")
+ public CommonResult search(@RequestParam(required = false) Integer type,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime,
+ @RequestParam Long size,
+ @RequestParam Long current) {
+ return CommonResult.success(iImageResourcesService.selectImages(type, startTime, endTime, size, current));
+ }
+
+ @PutMapping("modification")
+ @ApiOperation("淇敼鍥剧墖")
+ @LogSave(operationType = "鍥剧墖绠＄悊",contain = "淇敼鍥剧墖")
+ public CommonResult modify(@RequestBody ImageResources imageResources) {
+ return CommonResult.success(iImageResourcesService.updateById(imageResources));
+ }
+
+ @DeleteMapping("deletion")
+ @ApiOperation("鍒犻櫎")
+ @LogSave(operationType = "鍥剧墖绠＄悊",contain = "鍒犻櫎鍥剧墖")
+ public CommonResult delete(@RequestParam Integer id) {
+ return CommonResult.success(iImageResourcesService.removeById(id));
+ }
+
+ @PostMapping("addition")
+ @ApiOperation("娣诲姞")
+ @LogSave(operationType = "鍥剧墖绠＄悊",contain = "娣诲姞鍥剧墖")
+ public CommonResult add(@RequestBody ImageResources imageResources) {
+ return CommonResult.success(iImageResourcesService.save(imageResources));
+ }
+
+ @DeleteMapping("deletion_batch")
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @LogSave(operationType = "鍥剧墖绠＄悊",contain = "鎵归噺鍒犻櫎鍥剧墖")
+ public CommonResult delete(@RequestParam List<Integer> ids) {
+ return CommonResult.success(iImageResourcesService.removeBatchByIds(ids));
+ }
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java b/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
new file mode 100644
index 0000000..8ef0a6f
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
@@ -0,0 +1,69 @@
+package com.ycl.controller.resources;
+
+
+import com.ycl.annotation.LogSave;
+import com.ycl.api.CommonResult;
+import com.ycl.controller.BaseController;
+import com.ycl.entity.resources.VideoResources;
+import com.ycl.service.resources.IVideoResourcesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+@RestController
+@RequestMapping("/video_resources")
+@Api(tags = "瑙嗛璧勬簮绠＄悊")
+public class VideoResourcesController extends BaseController {
+
+ @Autowired
+ IVideoResourcesService iVideoResourcesService;
+
+ @GetMapping("/query")
+ @ApiOperation("鏌ヨ")
+ public CommonResult search(@RequestParam(required = false) Integer type,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime,
+ @RequestParam Long size,
+ @RequestParam Long current) {
+ return CommonResult.success(iVideoResourcesService.selectImages(type, startTime, endTime, size, current));
+ }
+
+ @PutMapping("modification")
+ @ApiOperation("淇敼瑙嗛")
+ @LogSave(operationType = "瑙嗛绠＄悊", contain = "淇敼瑙嗛")
+ public CommonResult modify(@RequestBody VideoResources videoResources) {
+ return CommonResult.success(iVideoResourcesService.updateById(videoResources));
+ }
+
+ @DeleteMapping("deletion")
+ @ApiOperation("鍒犻櫎")
+ @LogSave(operationType = "瑙嗛绠＄悊", contain = "鍒犻櫎瑙嗛")
+ public CommonResult delete(@RequestParam Integer id) {
+ return CommonResult.success(iVideoResourcesService.removeById(id));
+ }
+
+ @PostMapping("addition")
+ @ApiOperation("娣诲姞")
+ @LogSave(operationType = "瑙嗛绠＄悊", contain = "娣诲姞瑙嗛")
+ public CommonResult add(@RequestBody VideoResources videoResources) {
+ return CommonResult.success(iVideoResourcesService.save(videoResources));
+ }
+
+ @DeleteMapping("deletion_batch")
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @LogSave(operationType = "瑙嗛绠＄悊", contain = "鎵归噺鍒犻櫎瑙嗛")
+ public CommonResult delete(@RequestParam List<Integer> ids) {
+ return CommonResult.success(iVideoResourcesService.removeBatchByIds(ids));
+ }
+}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index 67e4601..e52aff9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -62,7 +62,7 @@
public CommonResult<StoreInfo> getItem(@PathVariable Long id) {
StoreInfo storeInfo = storeInfoService.getById(id);
StoreInfoVO vo = new StoreInfoVO();
- BeanUtils.copyProperties(storeInfo,vo);
+ BeanUtils.copyProperties(storeInfo, vo);
vo.setVideoPoint(videoPointService.getById(storeInfo.getVideoId()));
return CommonResult.success(storeInfo);
}
@@ -70,7 +70,7 @@
@ApiOperation(value = "娣诲姞闂ㄥ簵淇℃伅")
@RequestMapping(value = "/add", method = RequestMethod.POST)
@ResponseBody
- @LogSave(operationType = "闂ㄥ簵绠＄悊",contain = "娣诲姞闂ㄥ簵")
+ @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "娣诲姞闂ㄥ簵")
public CommonResult<StoreInfo> add(@Validated @RequestBody UmsStoreInfoParam umsStoreInfoParam) {
StoreInfo storeInfo = StoreInfo.builder()
.owner(umsStoreInfoParam.getOwner())
diff --git a/ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java b/ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java
new file mode 100644
index 0000000..eb8132a
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java
@@ -0,0 +1,41 @@
+package com.ycl.controller.video;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.api.CommonPage;
+import com.ycl.api.CommonResult;
+import com.ycl.entity.video.VideoPoint;
+import com.ycl.service.video.IVideoInspectionService;
+import com.ycl.service.video.impl.IVideoPointService;
+import com.ycl.vo.equipment.VideoPointVo;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 瑙嗛宸℃煡鎺у埗鍣�
+ *
+ * @author 瀹夌懢鐒�
+ * @date 2022/11/08
+ */
+@RestController
+@RequestMapping("/video_inspection")
+@Api(tags = "瑙嗛宸℃煡")
+public class VideoInspectionController {
+
+ @Autowired
+ private IVideoInspectionService videoInspectionService;
+
+
+ @GetMapping("page")
+ public CommonResult page(@RequestParam(value = "size", required = false) Long size,
+ @RequestParam(value = "current", required = false) Long current,
+ @RequestParam(value = "regionId", required = false) Integer streetId,
+ @RequestParam(value = "regionId", required = false) Integer communityId) {
+ Page<VideoPointVo> list = videoInspectionService.page(size, current, streetId, communityId);
+ return CommonResult.success(CommonPage.restPage(list));
+ }
+
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/cockpitManage/TeamConstruction.java b/ycl-platform/src/main/java/com/ycl/entity/cockpitManage/TeamConstruction.java
index 94f8a7e..18b88a9 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/cockpitManage/TeamConstruction.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/cockpitManage/TeamConstruction.java
@@ -31,6 +31,9 @@
@ExcelIgnore
private Long id;
+ @ExcelIgnore
+ private String regionIds;
+
/**
* 閮ㄩ棬鍚嶇О
*/
@@ -53,59 +56,66 @@
private Integer upUndergraduatePeopleNumber;
/**
+ * 鏈瀛﹀巻鍙婁互涓婁汉鏁�
+ */
+ @TableField("holder_number")
+ @ExcelProperty(value = "鎸佽瘉浜烘暟", index = 3)
+ private Integer holderNumber;
+
+ /**
* 45宀佷互涓嬩汉鏁�
*/
@TableField("under_forty_five_people_number")
- @ExcelProperty(value = "45宀佷互涓嬩汉鏁�", index = 3)
+ @ExcelProperty(value = "45宀佷互涓嬩汉鏁�", index = 4)
private Integer underFortyFivePeopleNumber;
/**
* 娉曞緥鑱屼笟璧勬牸璇佷汉鏁�
*/
@TableField("legal_professional_qualification_certificate_people_number")
- @ExcelProperty(value = "娉曞緥鑱屼笟璧勬牸璇佷汉鏁�", index = 4)
+ @ExcelProperty(value = "娉曞緥鑱屼笟璧勬牸璇佷汉鏁�", index = 5)
private Integer legalProfessionalQualificationCertificatePeopleNumber;
/**
* 閫氭姤鏁伴噺
*/
@TableField("report_number")
- @ExcelProperty(value = "閫氭姤鏁伴噺", index = 5)
+ @ExcelProperty(value = "閫氭姤鏁伴噺", index = 6)
private Integer reportNumber;
/**
* 杩濈邯琛屼负鏁伴噺
*/
@TableField("disciplinary_offence_number")
- @ExcelProperty(value = "杩濈邯琛屼负鏁伴噺", index = 6)
+ @ExcelProperty(value = "杩濈邯琛屼负鏁伴噺", index = 7)
private Integer disciplinaryOffenceNumber;
/**
* 杩濇硶鐘姜琛屼负鏁伴噺
*/
@TableField("criminal_offense_number")
- @ExcelProperty(value = "杩濇硶鐘姜琛屼负鏁伴噺", index = 7)
+ @ExcelProperty(value = "杩濇硶鐘姜琛屼负鏁伴噺", index = 8)
private Integer criminalOffenseNumber;
/**
* 姣忔湀妗堜欢鏁伴噺
*/
@TableField("month_case_number")
- @ExcelProperty(value = "姣忔湀妗堜欢鏁伴噺", index = 8)
+ @ExcelProperty(value = "姣忔湀妗堜欢鏁伴噺", index = 9)
private Integer monthCaseNumber;
/**
* 鏈秴鏃舵浠舵暟閲�
*/
@TableField("no_timeout_case_number")
- @ExcelProperty(value = "鏈秴鏃舵浠舵暟閲�", index = 9)
+ @ExcelProperty(value = "鏈秴鏃舵浠舵暟閲�", index = 10)
private Integer noTimeoutCaseNumber;
/**
* 澶嶈瘔鎴栬瘔璁兼暟閲�
*/
@TableField("review_or_lawsuit_number")
- @ExcelProperty(value = "澶嶈瘔鎴栬瘔璁兼暟閲�", index = 10)
+ @ExcelProperty(value = "澶嶈瘔鎴栬瘔璁兼暟閲�", index = 11)
private Integer reviewOrLawsuitNumber;
/**
diff --git a/ycl-platform/src/main/java/com/ycl/entity/common/ImageResources.java b/ycl-platform/src/main/java/com/ycl/entity/common/ImageResources.java
deleted file mode 100644
index 61f215d..0000000
--- a/ycl-platform/src/main/java/com/ycl/entity/common/ImageResources.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.ycl.entity.common;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 鍥剧墖璧勬簮
- * </p>
- *
- * @author mg
- * @since 2022-09-29
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("ums_image_resources")
-@ApiModel(value = "鍥剧墖璧勬簮琛�")
-public class ImageResources implements Serializable {
-
- private static final long serialVersionUID = 1L;
- /**
- * id
- */
- @TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value = "id")
- private Long id;
- /**
- * 鎵�灞濱d
- */
- @TableField("belong_to_id")
- @ApiModelProperty(value = "鎵�灞濱d")
- private Long belongToId;
- /**
- * 鍥剧墖绫诲瀷
- */
- @TableField("type")
- @ApiModelProperty(value = "鍥剧墖绫诲瀷")
- private String type;
- /**
- * 璺緞
- */
- @TableField("url")
- @ApiModelProperty(value = "璺緞")
- private String url;
- /**
- * 鍒涘缓浜�
- */
- @TableField("create_user")
- @ApiModelProperty(value = "鍒涘缓浜�")
- private Integer createUser;
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField("create_time")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
-
-}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java b/ycl-platform/src/main/java/com/ycl/entity/resources/ImageResources.java
similarity index 87%
rename from ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java
rename to ycl-platform/src/main/java/com/ycl/entity/resources/ImageResources.java
index e31a2bc..8450c0b 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/resources/ImageResources.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.caseHandler;
+package com.ycl.entity.resources;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,8 +15,8 @@
*
* </p>
*
- * @author zhanghua
- * @since 2022-10-21
+ * @author lyq
+ * @since 2022-11-08
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -29,7 +29,7 @@
* 涓婚敭Id
*/
@TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ private Integer id;
/**
* 鎵�灞濱d
@@ -38,7 +38,7 @@
private Long belongToId;
/**
- * 鍥剧墖璧勬簮绫诲瀷 01-涓婃姤 02-澶勭疆
+ * 鍥剧墖璧勬簮绫诲瀷 01-涓婃姤 02-澶勭疆 03
*/
@TableField("type")
private String type;
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java b/ycl-platform/src/main/java/com/ycl/entity/resources/VideoResources.java
similarity index 73%
copy from ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java
copy to ycl-platform/src/main/java/com/ycl/entity/resources/VideoResources.java
index e31a2bc..7d95cc9 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/resources/VideoResources.java
@@ -1,4 +1,4 @@
-package com.ycl.entity.caseHandler;
+package com.ycl.entity.resources;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -15,13 +15,13 @@
*
* </p>
*
- * @author zhanghua
- * @since 2022-10-21
+ * @author lyq
+ * @since 2022-11-08
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName("ums_image_resources")
-public class ImageResources implements Serializable {
+@TableName("ums_video_resources")
+public class VideoResources implements Serializable {
private static final long serialVersionUID = 1L;
@@ -29,22 +29,22 @@
* 涓婚敭Id
*/
@TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ private Integer id;
/**
* 鎵�灞濱d
*/
@TableField("belong_to_id")
- private Long belongToId;
+ private Integer belongToId;
/**
- * 鍥剧墖璧勬簮绫诲瀷 01-涓婃姤 02-澶勭疆
+ * 瑙嗛璧勬簮绫诲瀷 01-瑙嗛涓婁紶 02-鍗曞叺
*/
@TableField("type")
private String type;
/**
- * 鍥剧墖璺緞
+ * 瑙嗛璺緞
*/
@TableField("url")
private String url;
@@ -53,7 +53,7 @@
* 鍒涘缓浜�
*/
@TableField("create_user")
- private Long createUser;
+ private Integer createUser;
/**
* 鍒涘缓鏃堕棿
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java
index d9251f9..8a41641 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java
@@ -1,11 +1,11 @@
package com.ycl.mapper.caseHandler;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.caseHandler.ImageResources;
+import com.ycl.entity.resources.ImageResources;
/**
* <p>
- * Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
* </p>
*
* @author zhanghua
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/common/ImageResourcesMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/common/ImageResourcesMapper.java
deleted file mode 100644
index 9226758..0000000
--- a/ycl-platform/src/main/java/com/ycl/mapper/common/ImageResourcesMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ycl.mapper.common;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.entity.common.ImageResources;
-
-/**
- * <p>
- * 绫昏鏄�
- * </p>
- *
- * @author mg
- * @since 2022-09-29
- */
-public interface ImageResourcesMapper extends BaseMapper<ImageResources> {
-}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/resources/ImageResourcesMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/resources/ImageResourcesMapper.java
new file mode 100644
index 0000000..f4a2c15
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/resources/ImageResourcesMapper.java
@@ -0,0 +1,19 @@
+package com.ycl.mapper.resources;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.entity.resources.ImageResources;
+import com.ycl.vo.resources.MediaVO;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+public interface ImageResourcesMapper extends BaseMapper<ImageResources> {
+
+ Page<MediaVO> selectImagePage(Page<MediaVO> imagesVOPage, Integer type, String startTime, String endTime);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/resources/VideoResourcesMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/resources/VideoResourcesMapper.java
new file mode 100644
index 0000000..fb242c2
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/resources/VideoResourcesMapper.java
@@ -0,0 +1,19 @@
+package com.ycl.mapper.resources;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.entity.resources.VideoResources;
+import com.ycl.vo.resources.MediaVO;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+public interface VideoResourcesMapper extends BaseMapper<VideoResources> {
+
+ Page<MediaVO> selectImagePage(Page<MediaVO> mediaVOPage, Integer type, String startTime, String endTime);
+}
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 b3d16ee..21c7c35 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
@@ -5,6 +5,7 @@
import com.ycl.entity.video.VideoPoint;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.vo.equipment.VideoPointVo;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
@@ -15,7 +16,9 @@
* @author zhanghua
* @since 2022-09-26
*/
+@Mapper
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/caseHandler/IImageResourcesService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java
deleted file mode 100644
index 4a0e462..0000000
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ycl.service.caseHandler;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.entity.caseHandler.ImageResources;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author zhanghua
- * @since 2022-10-21
- */
-public interface IImageResourcesService extends IService<ImageResources> {
-
-}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 081416e..7d3c506 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -14,13 +14,13 @@
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.*;
-import com.ycl.entity.common.ImageResources;
import com.ycl.entity.dict.DataDictionary;
+import com.ycl.entity.resources.ImageResources;
import com.ycl.entity.video.VideoAlarmReport;
import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.*;
-import com.ycl.mapper.common.ImageResourcesMapper;
import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.mapper.resources.ImageResourcesMapper;
import com.ycl.remote.dto.*;
import com.ycl.remote.service.CityPlatformService;
import com.ycl.service.caseHandler.IBaseCaseService;
@@ -287,7 +287,7 @@
//3.鏌ヨ妗堝嵎鍥剧墖淇℃伅
FilesPictureVo filesPictureVo = new FilesPictureVo();
QueryWrapper<ImageResources> wrapperIr = new QueryWrapper<>();
- wrapperIr.lambda().eq(ImageResources::getBelongToId,baseCase.getId());
+ wrapperIr.lambda().eq(ImageResources::getBelongToId, baseCase.getId());
List<ImageResources> irs = imageResourcesMapper.selectList(wrapperIr);
filesPictureVo.setImageResources(irs);
bcd.setFilesPictureVo(filesPictureVo);
@@ -377,6 +377,6 @@
@Override
public List<BaseCase> selectPage(Page<BaseCase> page, String number, Integer communityId, Integer categories, String startTime, String endTime, String site) {
- return baseCaseMapper.selectBaseCasePage(page,number,communityId,categories,startTime,endTime,site);
+ return baseCaseMapper.selectBaseCasePage(page, number, communityId, categories, startTime, endTime, site);
}
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index ac64166..540786d 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -9,11 +9,13 @@
import com.ycl.common.constant.StepName;
import com.ycl.dto.dispatch.UploadDisposingResultParam;
import com.ycl.entity.caseHandler.*;
+import com.ycl.entity.resources.ImageResources;
import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.BaseCaseMapper;
import com.ycl.mapper.caseHandler.DisposeRecordMapper;
import com.ycl.mapper.caseHandler.WorkflowConfigStepMapper;
import com.ycl.service.caseHandler.*;
+import com.ycl.service.resources.IImageResourcesService;
import com.ycl.vo.MyBacklogVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java
deleted file mode 100644
index f15457a..0000000
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ycl.service.caseHandler.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.caseHandler.ImageResources;
-import com.ycl.mapper.caseHandler.BaseImageResourcesMapper;
-import com.ycl.service.caseHandler.IImageResourcesService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author zhanghua
- * @since 2022-10-21
- */
-@Service
-public class ImageResourcesServiceImpl extends ServiceImpl<BaseImageResourcesMapper, ImageResources> implements IImageResourcesService {
-
-}
diff --git a/ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java b/ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java
index e10cabd..2cac581 100644
--- a/ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java
@@ -1,6 +1,7 @@
package com.ycl.service.region;
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.region.SccgRegion;
@@ -20,7 +21,7 @@
* @return
*/
List<SccgRegion> getTree();
- IPage<SccgRegion> list(SccgRegion sccgRegion);
+ Page<SccgRegion> list(Integer pageSize, Integer pageNum);
List<SccgRegion> getChildren(Long parentId);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
index 510d2fa..5759491 100644
--- a/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.region.SccgRegion;
import com.ycl.mapper.region.SccgRegionMapper;
@@ -39,7 +40,6 @@
if (StringUtils.isBlank(result)) {
// 1.鏌ュ嚭鎵�鏈夌綉鏍�
List<SccgRegion> list = this.list();
-
// 2.缁勮鎴愮埗瀛愮殑鏍戝瀷缁撴瀯
// 2.1銆佹壘鍒版墍鏈夌殑涓�绾х綉鏍�:浣跨敤jdk8鐨剆tream娴佽繘琛岃繃婊�
List<SccgRegion> collect = list.stream().filter(griddingEntity -> {
@@ -87,8 +87,11 @@
}
@Override
- public IPage<SccgRegion> list(SccgRegion sccgRegion) {
- return null;
+ public Page<SccgRegion> list(Integer pageSize, Integer pageNum) {
+ Page<SccgRegion> page = new Page<>();
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ return page(page);
}
@Override
diff --git a/ycl-platform/src/main/java/com/ycl/service/resources/IImageResourcesService.java b/ycl-platform/src/main/java/com/ycl/service/resources/IImageResourcesService.java
new file mode 100644
index 0000000..a138bc9
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/resources/IImageResourcesService.java
@@ -0,0 +1,19 @@
+package com.ycl.service.resources;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.resources.ImageResources;
+import com.ycl.vo.resources.MediaVO;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+public interface IImageResourcesService extends IService<ImageResources> {
+
+ Page<MediaVO> selectImages(Integer type, String startTime, String endTime, Long size, Long current);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/resources/IVideoResourcesService.java b/ycl-platform/src/main/java/com/ycl/service/resources/IVideoResourcesService.java
new file mode 100644
index 0000000..f9d1ce5
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/resources/IVideoResourcesService.java
@@ -0,0 +1,19 @@
+package com.ycl.service.resources;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.resources.VideoResources;
+import com.ycl.vo.resources.MediaVO;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+public interface IVideoResourcesService extends IService<VideoResources> {
+
+ Page<MediaVO> selectImages(Integer type, String startTime, String endTime, Long size, Long current);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/resources/impl/ImageResourcesServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/resources/impl/ImageResourcesServiceImpl.java
new file mode 100644
index 0000000..1e06397
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/resources/impl/ImageResourcesServiceImpl.java
@@ -0,0 +1,35 @@
+package com.ycl.service.resources.impl;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.resources.ImageResources;
+import com.ycl.mapper.resources.ImageResourcesMapper;
+import com.ycl.service.resources.IImageResourcesService;
+import com.ycl.vo.resources.MediaVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+@Service
+public class ImageResourcesServiceImpl extends ServiceImpl<ImageResourcesMapper, ImageResources> implements IImageResourcesService {
+
+ @Resource
+ ImageResourcesMapper imageResourcesMapper;
+
+ @Override
+ public Page<MediaVO> selectImages(Integer type, String startTime, String endTime, Long size, Long current) {
+ Page<MediaVO> imagesVOPage = new Page<>();
+ imagesVOPage.setCurrent(current);
+ imagesVOPage.setSize(size);
+ return imageResourcesMapper.selectImagePage(imagesVOPage,type,startTime,endTime);
+ }
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java
new file mode 100644
index 0000000..2a74441
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java
@@ -0,0 +1,35 @@
+package com.ycl.service.resources.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.resources.VideoResources;
+import com.ycl.mapper.resources.VideoResourcesMapper;
+import com.ycl.service.resources.IVideoResourcesService;
+import com.ycl.vo.resources.MediaVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-08
+ */
+@Service
+public class VideoResourcesServiceImpl extends ServiceImpl<VideoResourcesMapper, VideoResources> implements IVideoResourcesService {
+
+
+ @Resource
+ VideoResourcesMapper videoResourcesMapper;
+
+ @Override
+ public Page<MediaVO> selectImages(Integer type, String startTime, String endTime, Long size, Long current) {
+ Page<MediaVO> mediaVOPage = new Page<>();
+ mediaVOPage.setCurrent(current);
+ mediaVOPage.setSize(size);
+ return videoResourcesMapper.selectImagePage(mediaVOPage,type,startTime,endTime);
+ }
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java b/ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java
new file mode 100644
index 0000000..50cc700
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java
@@ -0,0 +1,14 @@
+package com.ycl.service.video;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.vo.equipment.VideoPointVo;
+
+/**
+ * 瑙嗛宸℃煡鏈嶅姟Service
+ *
+ * @author 瀹夌懢鐒�
+ * @date 2022/11/08
+ */
+public interface IVideoInspectionService {
+ Page<VideoPointVo> page(Long size, Long current, Integer streetId, Integer communityId);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java
new file mode 100644
index 0000000..1f6e35f
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java
@@ -0,0 +1,28 @@
+package com.ycl.service.video.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.common.util.CommonUtils;
+import com.ycl.entity.video.VideoPoint;
+import com.ycl.mapper.video.VideoPointMapper;
+import com.ycl.service.video.IVideoInspectionService;
+import com.ycl.vo.equipment.VideoPointVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 瑙嗛宸℃煡鏈嶅姟ServiceImpl
+ *
+ * @author 瀹夌懢鐒�
+ * @date 2022/11/08
+ */
+@Service
+public class VideoInspectionServiceImpl implements IVideoInspectionService {
+ @Autowired
+ private VideoPointMapper videoPointMapper;
+
+ @Override
+ public Page<VideoPointVo> page(Long size, Long current, Integer streetId, Integer communityId) {
+ Page<VideoPointVo> page = new Page<>(current, size);
+ return (Page<VideoPointVo>) videoPointMapper.search(page, streetId, communityId);
+ }
+}
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 0600e9c..b9ddd78 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
@@ -24,7 +24,6 @@
@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/casePool/FilesPictureVo.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java
index 2301d09..4630f46 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/FilesPictureVo.java
@@ -1,6 +1,6 @@
package com.ycl.vo.casePool;
-import com.ycl.entity.common.ImageResources;
+import com.ycl.entity.resources.ImageResources;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,7 +9,7 @@
/**
* <p>
- * 妗堝嵎鍥剧墖 绫�
+ * 妗堝嵎鍥剧墖 绫�
* </p>
*
* @author mg
diff --git a/ycl-platform/src/main/java/com/ycl/vo/resources/MediaVO.java b/ycl-platform/src/main/java/com/ycl/vo/resources/MediaVO.java
new file mode 100644
index 0000000..756f7eb
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/vo/resources/MediaVO.java
@@ -0,0 +1,35 @@
+package com.ycl.vo.resources;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@ApiModel
+@Data
+public class MediaVO {
+
+ @ApiModelProperty(name = "浜嬩欢鏉ユ簮(1-瑙嗛 2-鎵嬪姩鐧昏)")
+ private Integer category;
+
+ @ApiModelProperty(name = "闂绫诲埆锛�1-杩濊 2-杩濆缓锛�")
+ private Integer eventSource;
+
+ @ApiModelProperty(name = "id")
+ private Integer id;
+
+ @ApiModelProperty(name = "妗堜欢id")
+ private Long baseId;
+
+ @ApiModelProperty(name = "绀惧尯")
+ private String regionName;
+
+ @ApiModelProperty(name = "url")
+ private String url;
+
+ @ApiModelProperty(name = "涓婁紶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT")
+ private LocalDateTime createTime;
+}
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseImageResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseImageResourcesMapper.xml
deleted file mode 100644
index ce8cf38..0000000
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseImageResourcesMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.caseHandler.BaseImageResourcesMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.ImageResources">
- <id column="id" property="id" />
- <result column="belong_to_id" property="belongToId" />
- <result column="type" property="type" />
- <result column="url" property="url" />
- <result column="create_user" property="createUser" />
- <result column="create_time" property="createTime" />
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, belong_to_id, type, url, create_user, create_time
- </sql>
-
-</mapper>
diff --git a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
new file mode 100644
index 0000000..8eba162
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
@@ -0,0 +1,42 @@
+<?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.resources.ImageResourcesMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.entity.resources.ImageResources">
+ <id column="id" property="id"/>
+ <result column="belong_to_id" property="belongToId"/>
+ <result column="type" property="type"/>
+ <result column="url" property="url"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_time" property="createTime"/>
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <sql id="Base_Column_List">
+ id
+ , belong_to_id, type, url, create_user, create_time
+ </sql>
+ <select id="selectImagePage" resultType="com.ycl.vo.resources.MediaVO">
+ SELECT
+ t2.category,
+ t2.event_source,
+ t2.id as baseId,
+ t1.id,
+ t3.region_name,
+ t1.create_time,
+ t1.url
+ FROM
+ ums_image_resources t1
+ LEFT JOIN ums_base_case t2 ON t1.belong_to_id = t2.id
+ LEFT JOIN ums_sccg_region t3 on t3.id=t2.community_id
+ <where>
+ <if test="type != '' and type != null">
+ t1.type=#{type}
+ </if>
+ <if test="startTime != '' and endTime != '' and startTime != null and endTime != null">
+ and t1.create_time between #{startTime} and #{endTime}
+ </if>
+ </where>
+ </select>
+</mapper>
diff --git a/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
new file mode 100644
index 0000000..71aa120
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
@@ -0,0 +1,42 @@
+<?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.resources.VideoResourcesMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.entity.resources.VideoResources">
+ <id column="id" property="id" />
+ <result column="belong_to_id" property="belongToId" />
+ <result column="type" property="type" />
+ <result column="url" property="url" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <sql id="Base_Column_List">
+ id, belong_to_id, type, url, create_user, create_time
+ </sql>
+
+ <select id="selectImagePage" resultType="com.ycl.vo.resources.MediaVO">
+ SELECT
+ t2.category,
+ t2.event_source,
+ t2.id as baseId,
+ t1.id,
+ t3.region_name,
+ t1.create_time,
+ t1.url
+ FROM
+ ums_video_resources t1
+ LEFT JOIN ums_base_case t2 ON t1.belong_to_id = t2.id
+ LEFT JOIN ums_sccg_region t3 on t3.id=t2.community_id
+ <where>
+ <if test="type != '' and type != null">
+ t1.type=#{type}
+ </if>
+ <if test="startTime != '' and endTime != '' and startTime != null and endTime != null">
+ and t1.create_time between #{startTime} and #{endTime}
+ </if>
+ </where>
+ </select>
+</mapper>
--
Gitblit v1.8.0