基本版本

gis_cms/src/main/java/com/gis/cms/controller/AerialController.java

@@ -81,11 +81,17 @@ public class AerialController {
         return imgService.imgList(param, TypeCode.MODULE_AERIAL);
     }
 
-//    @ApiOperation("文件-详情")
-//    @GetMapping("file/detail/{id}")
-//    public Result<AerialEntity> fileDetail(@PathVariable Long id) {
-//        return entityService.fileDetail(id);
-//    }
+    @ApiOperation("无人机监控图-详情")
+    @GetMapping("img/detail/{id}")
+    public Result<AerialEntity> imgDetail(@PathVariable Long id) {
+        return Result.success(imgService.getById(id));
+    }
+
+    @ApiOperation("无人机监控图-删除")
+    @GetMapping("img/remove/{id}")
+    public Result imgRemove(@PathVariable Long id) {
+        return imgService.removeEntity(id);
+    }
 
 
 }

gis_cms/src/main/java/com/gis/cms/controller/LotController.java

@@ -3,6 +3,7 @@ package com.gis.cms.controller;
 import com.gis.cms.entity.dto.BaseDto;
 import com.gis.cms.entity.dto.LotAlarmDto;
 import com.gis.cms.entity.dto.TypePageDto;
+import com.gis.cms.entity.po.AerialEntity;
 import com.gis.cms.entity.po.LotEntity;
 import com.gis.cms.service.LotService;
 import com.gis.common.base.aop.WebControllerLog;
@@ -35,7 +36,6 @@ public class LotController {
     @ApiOperation(value = "列表", notes = NOTE_DOC)
     @PostMapping("list")
     public Result list(@RequestBody TypePageDto param) {
-//        return entityService.search(param);
         return Result.success(entityService.list());
     }
 
@@ -68,5 +68,18 @@ public class LotController {
         return entityService.alarmSave(param);
     }
 
+    @ApiOperation("今日报警-详情")
+    @GetMapping("alarm/detail/{id}")
+    public Result alarmDetail(@PathVariable Long id) {
+        return entityService.alarmDetail(id);
+    }
+
+
+    @ApiOperation("今日报警-删除")
+    @GetMapping("alarm/remove/{id}")
+    public Result alarmRemove(@PathVariable Long id) {
+        return entityService.alarmRemove(id);
+    }
+
 
 }

gis_cms/src/main/java/com/gis/cms/controller/SecurityController.java

@@ -81,5 +81,17 @@ public class SecurityController {
         return videoService.videoSave(param, TypeCode.MODULE_SECURITY);
     }
 
+    @ApiOperation("监控画面-详情")
+    @GetMapping("video/detail/{id}")
+    public Result fileDetail(@PathVariable Long id) {
+        return Result.success(videoService.getById(id));
+    }
+
+    @ApiOperation("监控画面-删除")
+    @GetMapping("video/remove/{id}")
+    public Result videoRemove(@PathVariable Long id) {
+        return videoService.removeEntity(id);
+    }
+
 
 }

gis_cms/src/main/java/com/gis/cms/controller/SiteController.java

@@ -47,7 +47,6 @@ public class SiteController {
     @ApiOperation(value = "列表", notes = NOTE_DOC)
     @PostMapping("list")
     public Result list(@RequestBody TypePageDto param) {
-//        return entityService.search(param);
         return Result.success(entityService.list());
     }
 
@@ -86,6 +85,19 @@ public class SiteController {
         return videoService.videoSave(param, TypeCode.MODULE_SITE);
     }
 
+    @ApiOperation("监控画面-详情")
+    @GetMapping("video/detail/{id}")
+    public Result videoDetail(@PathVariable Long id) {
+        return Result.success(videoService.getById(id));
+    }
+
+    @ApiOperation("监控画面-删除")
+    @GetMapping("video/remove/{id}")
+    public Result videoRemove(@PathVariable Long id) {
+        return videoService.removeEntity(id);
+    }
+
+
 
 
     @ApiOperation(value = "进度管理-上传图片")
@@ -107,5 +119,17 @@ public class SiteController {
         return imgService.imgList(param, TypeCode.MODULE_SITE);
     }
 
+    @ApiOperation("进度管理-详情")
+    @GetMapping("img/detail/{id}")
+    public Result imgDetail(@PathVariable Long id) {
+        return Result.success(imgService.getById(id));
+    }
+
+    @ApiOperation("进度管理-删除")
+    @GetMapping("img/remove/{id}")
+    public Result imgRemove(@PathVariable Long id) {
+        return imgService.removeEntity(id);
+    }
+
 
 }

gis_cms/src/main/java/com/gis/cms/entity/dto/ImgDto.java

@@ -18,8 +18,7 @@ public class ImgDto {
     @ApiModelProperty(value = "年份", required = true)
     private String year;
 
-    @NotBlank(message = "修改时间不能为空")
-    @ApiModelProperty(value = "修改时间", required = true)
+    @ApiModelProperty(value = "修改时间")
     private String userUpdateTime;
 
     @NotBlank(message = "图片不能为空")

gis_cms/src/main/java/com/gis/cms/entity/dto/VideoDto.java

@@ -19,6 +19,7 @@ public class VideoDto {
     @ApiModelProperty(value = "名称", required = true)
     private String name;
 
+
     @NotBlank(message = "封面图不能为空")
     @ApiModelProperty(value = "封面图(相对地址)", required = true)
     private String thumb;
@@ -30,6 +31,16 @@ public class VideoDto {
     @ApiModelProperty(value = "用户更新时间")
     private String userUpdateTime;
 
+    @NotBlank(message = "文件名称不能为空")
+    @ApiModelProperty(value = "文件名称", required = true)
+    private String fileName;
+
+    @ApiModelProperty(value = "经度")
+    private String lon;
+
+    @ApiModelProperty(value = "纬度")
+    private String lat;
+
 
 
 

gis_cms/src/main/java/com/gis/cms/entity/po/VideoEntity.java

@@ -20,6 +20,9 @@ public class VideoEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "名称")
     private String name;
 
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
+
     @ApiModelProperty(value = "封面图(相对地址)")
     private String thumb;
 
@@ -32,6 +35,12 @@ public class VideoEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "用户更新时间")
     private String userUpdateTime;
 
+    @ApiModelProperty(value = "经度")
+    private String lon;
+
+    @ApiModelProperty(value = "纬度")
+    private String lat;
+
 
 
 

gis_cms/src/main/java/com/gis/cms/service/ImgService.java

@@ -27,4 +27,6 @@ public interface ImgService extends IService<ImgEntity> {
     Result imgList(PageDto param, String module);
 
     List<ImgEntity> listByModule(String module);
+
+    Result removeEntity(Long id);
 }

gis_cms/src/main/java/com/gis/cms/service/LotService.java

@@ -7,7 +7,6 @@ import com.gis.cms.entity.dto.LotAlarmDto;
 import com.gis.cms.entity.dto.TypePageDto;
 import com.gis.cms.entity.po.LotAlarmEntity;
 import com.gis.cms.entity.po.LotEntity;
-import com.gis.cms.entity.po.ParkEntity;
 import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.util.Result;
 
@@ -29,4 +28,8 @@ public interface LotService extends IService<LotEntity> {
     Result alarmSave(LotAlarmDto param);
 
     List<LotAlarmEntity> alarmList();
+
+    Result alarmDetail(Long id);
+
+    Result alarmRemove(Long id);
 }

gis_cms/src/main/java/com/gis/cms/service/VideoService.java

@@ -2,9 +2,7 @@ package com.gis.cms.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.cms.entity.dto.ImgDto;
 import com.gis.cms.entity.dto.VideoDto;
-import com.gis.cms.entity.po.ImgEntity;
 import com.gis.cms.entity.po.VideoEntity;
 import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.util.Result;
@@ -25,4 +23,6 @@ public interface VideoService extends IService<VideoEntity> {
     Result videoSave(VideoDto param, String module);
 
     List<VideoEntity> listByModule(String module);
+
+    Result removeEntity(Long id);
 }

gis_cms/src/main/java/com/gis/cms/service/impl/ImgServiceImpl.java

@@ -9,10 +9,12 @@ import com.gis.cms.entity.dto.ImgDto;
 import com.gis.cms.entity.dto.TypePageDto;
 import com.gis.cms.entity.po.ImgEntity;
 import com.gis.cms.entity.po.ImgEntity;
+import com.gis.cms.entity.po.VideoEntity;
 import com.gis.cms.mapper.ImgMapper;
 import com.gis.cms.mapper.ImgMapper;
 import com.gis.cms.service.ImgService;
 import com.gis.common.base.entity.dto.PageDto;
+import com.gis.common.constant.MsgCode;
 import com.gis.common.constant.TypeCode;
 import com.gis.common.util.BaseUtil;
 import com.gis.common.util.FileUtils;
@@ -52,6 +54,12 @@ public class ImgServiceImpl extends ServiceImpl<ImgMapper, ImgEntity> implements
         Long id = param.getId();
         ImgEntity entity = null;
         if (id == null){
+
+
+            if (checkSize(module) > 100){
+                return Result.failure(MsgCode.e3002, "数据量最大为100条");
+            }
+
             entity = new ImgEntity();
             BeanUtils.copyProperties(param, entity);
             entity.setModule(module);
@@ -70,21 +78,30 @@ public class ImgServiceImpl extends ServiceImpl<ImgMapper, ImgEntity> implements
             }
 
             BeanUtils.copyProperties(param, entity);
-            imgMapper.update(entity, null);
+            imgMapper.updateById(entity);
         }
 
         return Result.success();
     }
 
+    private long checkSize(String module){
+        LambdaQueryWrapper<ImgEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ImgEntity::getModule, module);
+        return this.count(wrapper);
+
+    }
+
 
 
     @Override
     public Result imgList(PageDto param, String module) {
+
         BaseUtil.startPage(param);
         IPage<ImgEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
 
         LambdaQueryWrapper<ImgEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ImgEntity::getModule, module);
+
         IPage<ImgEntity> iPage = imgMapper.selectPage(page, wrapper);
         return Result.success(iPage);
     }
@@ -96,4 +113,16 @@ public class ImgServiceImpl extends ServiceImpl<ImgMapper, ImgEntity> implements
         return this.list(wrapper);
     }
 
+    @Override
+    public Result removeEntity(Long id) {
+        ImgEntity entity = this.getById(id);
+        if (entity == null){
+            return Result.success();
+        }
+        fileUtils.del(entity.getThumb());
+        this.removeById(entity);
+        return Result.success();
+
+    }
+
 }

gis_cms/src/main/java/com/gis/cms/service/impl/LotServiceImpl.java

@@ -9,10 +9,12 @@ import com.gis.cms.entity.dto.LotAlarmDto;
 import com.gis.cms.entity.dto.TypePageDto;
 import com.gis.cms.entity.po.LotAlarmEntity;
 import com.gis.cms.entity.po.LotEntity;
+import com.gis.cms.entity.po.VideoEntity;
 import com.gis.cms.mapper.LotAlarmMapper;
 import com.gis.cms.mapper.LotMapper;
 import com.gis.cms.service.LotService;
 import com.gis.common.base.entity.dto.PageDto;
+import com.gis.common.constant.MsgCode;
 import com.gis.common.util.BaseUtil;
 import com.gis.common.util.Result;
 import lombok.extern.slf4j.Slf4j;
@@ -109,6 +111,11 @@ public class LotServiceImpl extends ServiceImpl<LotMapper, LotEntity> implements
         Long id = param.getId();
         LotAlarmEntity entity = null;
         if (id == null){
+
+            if (checkSize() > 100){
+                return Result.failure(MsgCode.e3002, "数据量最大为100条");
+            }
+
             entity = new LotAlarmEntity();
             BeanUtils.copyProperties(param, entity);
             lotAlarmMapper.insert(entity);
@@ -120,7 +127,7 @@ public class LotServiceImpl extends ServiceImpl<LotMapper, LotEntity> implements
                 return Result.failure(msg);
             }
             BeanUtils.copyProperties(param, entity);
-            lotAlarmMapper.update(entity, null);
+            lotAlarmMapper.updateById(entity);
         }
 
         return Result.success();
@@ -131,5 +138,25 @@ public class LotServiceImpl extends ServiceImpl<LotMapper, LotEntity> implements
         return lotAlarmMapper.selectList(null);
     }
 
+    @Override
+    public Result alarmDetail(Long id) {
+        return Result.success(lotAlarmMapper.selectById(id));
+    }
+
+    @Override
+    public Result alarmRemove(Long id) {
+        lotAlarmMapper.deleteById(id);
+        return Result.success();
+    }
+
+    private long checkSize(){
+        LambdaQueryWrapper<LotAlarmEntity> wrapper = new LambdaQueryWrapper<>();
+        return lotAlarmMapper.selectCount(wrapper);
+
+    }
+
+
+
+
 
 }

gis_cms/src/main/java/com/gis/cms/service/impl/VideoServiceImpl.java

@@ -5,13 +5,12 @@ 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.gis.cms.entity.dto.VideoDto;
-import com.gis.cms.entity.dto.VideoDto;
-import com.gis.cms.entity.po.VideoEntity;
+import com.gis.cms.entity.po.ImgEntity;
 import com.gis.cms.entity.po.VideoEntity;
 import com.gis.cms.mapper.VideoMapper;
 import com.gis.cms.service.VideoService;
 import com.gis.common.base.entity.dto.PageDto;
-import com.gis.common.constant.TypeCode;
+import com.gis.common.constant.MsgCode;
 import com.gis.common.util.BaseUtil;
 import com.gis.common.util.FileUtils;
 import com.gis.common.util.Result;
@@ -58,6 +57,9 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, VideoEntity> impl
         Long id = param.getId();
         VideoEntity entity = null;
         if (id == null){
+            if (checkSize(module) > 100){
+                return Result.failure(MsgCode.e3002, "数据量最大为100条");
+            }
             entity = new VideoEntity();
             BeanUtils.copyProperties(param, entity);
             entity.setModule(module);
@@ -92,5 +94,26 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, VideoEntity> impl
         return this.list(wrapper);
     }
 
+    @Override
+    public Result removeEntity(Long id) {
+        VideoEntity entity = this.getById(id);
+        if (entity == null){
+            return Result.success();
+        }
+
+        fileUtils.del(entity.getThumb());
+        fileUtils.del(entity.getVideo());
+
+        this.removeById(entity);
+        return Result.success();
+    }
+
+    private long checkSize(String module){
+        LambdaQueryWrapper<VideoEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(VideoEntity::getModule, module);
+        return this.count(wrapper);
+
+    }
+
 
 }

gis_common/src/main/java/com/gis/common/constant/MsgCode.java

@@ -8,7 +8,7 @@ public class MsgCode {
     /** 对象不存在*/
     public static final Integer e3001 = 3001;
 
-    /** 长传文件非法*/
+    /** 数据量超长*/
     public static final Integer e3002 = 3002;
 
     /** 空目录*/