图片管理和视频管理

wl

2022-11-08 bdb4a481d7ab7085a0832a7f1c0f5295596d498c

图片管理和视频管理

 ycl-generator/src/main/java/com/ycl/controller/message/MessageColumnSetController.java

New file
@@ -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 {

}

 ycl-generator/src/main/java/com/ycl/entity/message/MessageColumnSet.java

New file
@@ -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;


}

 ycl-generator/src/main/java/com/ycl/mapper/message/MessageColumnSetMapper.java

New file
@@ -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> {

}

 ycl-generator/src/main/java/com/ycl/service/message/IMessageColumnSetService.java

New file
@@ -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> {

}

 ycl-generator/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java

New file
@@ -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 {

}

 ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml

New file
@@ -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>

 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");
    }
}

 ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java

New file
@@ -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));
    }

}

 ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java

New file
@@ -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));
    }
}

 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;

    /**

 ycl-platform/src/main/java/com/ycl/entity/common/ImageResources.java

File was deleted

 ycl-platform/src/main/java/com/ycl/entity/resources/ImageResources.java

File was renamed from ycl-platform/src/main/java/com/ycl/entity/caseHandler/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;

    /**
     * 所属Id
@@ -38,7 +38,7 @@
    private Long belongToId;

    /**
     * 图片资源类型 01-上报  02-处置
     * 图片资源类型 01-上报  02-处置 03
     */
    @TableField("type")
    private String type;

 ycl-platform/src/main/java/com/ycl/entity/resources/VideoResources.java

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
File was copied from ycl-platform/src/main/java/com/ycl/entity/caseHandler/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,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;

    /**
     * 所属Id
     */
    @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;

    /**
     * 创建时间

 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

 ycl-platform/src/main/java/com/ycl/mapper/common/ImageResourcesMapper.java

File was deleted

 ycl-platform/src/main/java/com/ycl/mapper/resources/ImageResourcesMapper.java

New file
@@ -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);
}

 ycl-platform/src/main/java/com/ycl/mapper/resources/VideoResourcesMapper.java

New file
@@ -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);
}

 ycl-platform/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java

File was deleted

 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);
    }
}

 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;

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java

File was deleted

 ycl-platform/src/main/java/com/ycl/service/resources/IImageResourcesService.java

New file
@@ -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);
}

 ycl-platform/src/main/java/com/ycl/service/resources/IVideoResourcesService.java

New file
@@ -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);
}

 ycl-platform/src/main/java/com/ycl/service/resources/impl/ImageResourcesServiceImpl.java

New file
@@ -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);
    }
}

 ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java

New file
@@ -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);
    }
}

 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

 ycl-platform/src/main/java/com/ycl/vo/resources/MediaVO.java

New file
@@ -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;
}

 ycl-platform/src/main/resources/mapper/caseHandler/BaseImageResourcesMapper.xml

File was deleted

 ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml

New file
@@ -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>

 ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml

New file
@@ -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>