添加清楚缓存功能

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

@@ -42,8 +42,7 @@ public class AerialController {
 
     @ApiOperation(value = "列表", notes = NOTE_STR)
     @PostMapping("list")
-    public Result list(@RequestBody TypePageDto param) {
-//        return entityService.search(param);
+    public Result list() {
         return Result.success(entityService.list());
     }
 

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

@@ -9,9 +9,11 @@ import com.gis.cms.entity.po.AerialEntity;
 import com.gis.cms.mapper.ImgMapper;
 import com.gis.cms.mapper.AerialMapper;
 import com.gis.cms.service.AerialService;
+import com.gis.cms.service.WebService;
 import com.gis.common.util.BaseUtil;
 import com.gis.common.util.FileUtils;
 import com.gis.common.util.Result;
+import javassist.tools.web.Webserver;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,9 @@ public class AerialServiceImpl extends ServiceImpl<AerialMapper, AerialEntity> i
     @Autowired
     ImgMapper imgMapper;
 
+    @Autowired
+    WebService webService;
+
     @Override
     public Result search(TypePageDto param) {
         BaseUtil.startPage(param);
@@ -43,11 +48,6 @@ public class AerialServiceImpl extends ServiceImpl<AerialMapper, AerialEntity> i
         }
 
 
-//        String searchKey = param.getSearchKey();
-//        if (StringUtils.isNotBlank(searchKey)){
-//            wrapper.like(AerialEntity::getContent, searchKey);
-//        }
-
         wrapper.orderByDesc(AerialEntity::getCreateTime);
 
         IPage<AerialEntity> result = this.page(page, wrapper);
@@ -87,64 +87,11 @@ public class AerialServiceImpl extends ServiceImpl<AerialMapper, AerialEntity> i
 
         BeanUtils.copyProperties(param, entity);
         this.updateById(entity);
+        webService.clearCache();
 
         return Result.success();
     }
 
 
-//    @Override
-//    public Result<AerialEntity> fileDetail(Long id) {
-//        return Result.success(imgMapper.selectById(id));
-//    }
-//
-//
-//
-//    @Override
-//    public Result upload(MultipartFile file) {
-//        Map<String, Object> map = fileUtils.uploadMap(file, "/aerial", false);
-//        return Result.success(map);
-//    }
-//
-//    @Override
-//    public Result imgSave(ImgDto param) {
-//        Long id = param.getId();
-//        ImgEntity entity = null;
-//        if (id == null){
-//            entity = new ImgEntity();
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setModule(TypeCode.MODULE_AERIAL);
-//            imgMapper.insert(entity);
-//        } else {
-//            entity = imgMapper.selectById(id);
-//            if (entity == null){
-//                String msg = "对象id不存在 ";
-//                log.error(msg + id);
-//                return Result.failure(msg);
-//            }
-//
-//            // 删除旧文件-真删除
-//            if (!StringUtils.equals(entity.getThumb(), param.getThumb())){
-//                fileUtils.del(entity.getThumb());
-//            }
-//
-//            BeanUtils.copyProperties(param, entity);
-//            imgMapper.update(entity, null);
-//        }
-//
-//        return Result.success();
-//    }
-
-
-//
-//    @Override
-//    public Result imgList(PageDto param) {
-//        BaseUtil.startPage(param);
-//        IPage<ImgEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
-//
-//        LambdaQueryWrapper<ImgEntity> wrapper = new LambdaQueryWrapper<>();
-//        wrapper.eq(ImgEntity::getModule, TypeCode.MODULE_AERIAL);
-//        IPage<ImgEntity> iPage = imgMapper.selectPage(page, wrapper);
-//        return Result.success(iPage);
-//    }
 
 }

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

@@ -9,10 +9,12 @@ import com.gis.cms.entity.dto.TypePageDto;
 import com.gis.cms.entity.po.EnergyEntity;
 import com.gis.cms.mapper.EnergyMapper;
 import com.gis.cms.service.EnergyService;
+import com.gis.cms.service.WebService;
 import com.gis.common.util.BaseUtil;
 import com.gis.common.util.Result;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -22,6 +24,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnergyServiceImpl extends ServiceImpl<EnergyMapper, EnergyEntity> implements EnergyService {
 
+    @Autowired
+    WebService webService;
 
     @Override
     public Result search(TypePageDto param) {
@@ -35,10 +39,6 @@ public class EnergyServiceImpl extends ServiceImpl<EnergyMapper, EnergyEntity> i
         }
 
 
-//        String searchKey = param.getSearchKey();
-//        if (StringUtils.isNotBlank(searchKey)){
-//            wrapper.like(EnergyEntity::getContent, searchKey);
-//        }
 
         wrapper.orderByDesc(EnergyEntity::getCreateTime);
 
@@ -74,6 +74,7 @@ public class EnergyServiceImpl extends ServiceImpl<EnergyMapper, EnergyEntity> i
         }
         BeanUtils.copyProperties(param, entity);
         this.updateById(entity);
+        webService.clearCache();
         return Result.success();
     }
 

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

@@ -13,6 +13,7 @@ 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.cms.service.WebService;
 import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.constant.MsgCode;
 import com.gis.common.util.BaseUtil;
@@ -37,6 +38,9 @@ public class LotServiceImpl extends ServiceImpl<LotMapper, LotEntity> implements
     @Autowired
     LotAlarmMapper lotAlarmMapper;
 
+    @Autowired
+    WebService webService;
+
     @Override
     public Result search(TypePageDto param) {
         BaseUtil.startPage(param);
@@ -49,11 +53,6 @@ public class LotServiceImpl extends ServiceImpl<LotMapper, LotEntity> implements
         }
 
 
-//        String searchKey = param.getSearchKey();
-//        if (StringUtils.isNotBlank(searchKey)){
-//            wrapper.like(LotEntity::getContent, searchKey);
-//        }
-
         wrapper.orderByDesc(LotEntity::getCreateTime);
 
         IPage<LotEntity> result = this.page(page, wrapper);
@@ -93,7 +92,7 @@ public class LotServiceImpl extends ServiceImpl<LotMapper, LotEntity> implements
 
         BeanUtils.copyProperties(param, entity);
                     this.updateById(entity);
-
+        webService.clearCache();
 
         return Result.success();
     }

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

@@ -9,10 +9,12 @@ import com.gis.cms.entity.dto.TypePageDto;
 import com.gis.cms.entity.po.ParkEntity;
 import com.gis.cms.mapper.ParkMapper;
 import com.gis.cms.service.ParkService;
+import com.gis.cms.service.WebService;
 import com.gis.common.util.BaseUtil;
 import com.gis.common.util.Result;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -23,6 +25,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class ParkServiceImpl extends ServiceImpl<ParkMapper, ParkEntity> implements ParkService {
 
+    @Autowired
+    WebService webService;
 
     @Override
     public Result search(TypePageDto param) {
@@ -36,11 +40,6 @@ public class ParkServiceImpl extends ServiceImpl<ParkMapper, ParkEntity> impleme
         }
 
 
-//        String searchKey = param.getSearchKey();
-//        if (StringUtils.isNotBlank(searchKey)){
-//            wrapper.like(ParkEntity::getContent, searchKey);
-//        }
-
         wrapper.orderByDesc(ParkEntity::getCreateTime);
 
         IPage<ParkEntity> result = this.page(page, wrapper);
@@ -76,6 +75,7 @@ public class ParkServiceImpl extends ServiceImpl<ParkMapper, ParkEntity> impleme
 
         BeanUtils.copyProperties(param, entity);
         this.updateById(entity);
+        webService.clearCache();
 
         return Result.success();
     }

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

@@ -13,6 +13,7 @@ import com.gis.cms.entity.po.VideoEntity;
 import com.gis.cms.mapper.SecurityMapper;
 import com.gis.cms.mapper.VideoMapper;
 import com.gis.cms.service.SecurityService;
+import com.gis.cms.service.WebService;
 import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.constant.TypeCode;
 import com.gis.common.util.BaseUtil;
@@ -36,6 +37,9 @@ public class SecurityServiceImpl extends ServiceImpl<SecurityMapper, SecurityEnt
     @Autowired
     FileUtils fileUtils;
 
+    @Autowired
+    WebService webService;
+
     @Override
     public Result search(TypePageDto param) {
         BaseUtil.startPage(param);
@@ -48,11 +52,6 @@ public class SecurityServiceImpl extends ServiceImpl<SecurityMapper, SecurityEnt
         }
 
 
-//        String searchKey = param.getSearchKey();
-//        if (StringUtils.isNotBlank(searchKey)){
-//            wrapper.like(MonitorEntity::getContent, searchKey);
-//        }
-
         wrapper.orderByDesc(SecurityEntity::getCreateTime);
 
         IPage<SecurityEntity> result = this.page(page, wrapper);
@@ -92,6 +91,7 @@ public class SecurityServiceImpl extends ServiceImpl<SecurityMapper, SecurityEnt
 
         BeanUtils.copyProperties(param, entity);
         this.updateById(entity);
+        webService.clearCache();
 
         return Result.success();
     }

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

@@ -13,6 +13,7 @@ import com.gis.cms.entity.po.VideoEntity;
 import com.gis.cms.mapper.SiteMapper;
 import com.gis.cms.mapper.VideoMapper;
 import com.gis.cms.service.SiteService;
+import com.gis.cms.service.WebService;
 import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.constant.TypeCode;
 import com.gis.common.util.BaseUtil;
@@ -39,6 +40,9 @@ public class SiteServiceImpl extends ServiceImpl<SiteMapper, SiteEntity> impleme
     @Autowired
     VideoMapper videoMapper;
 
+    @Autowired
+    WebService webService;
+
 
     @Override
     public Result search(TypePageDto param) {
@@ -51,12 +55,6 @@ public class SiteServiceImpl extends ServiceImpl<SiteMapper, SiteEntity> impleme
             wrapper.eq(SiteEntity::getType, type);
         }
 
-
-//        String searchKey = param.getSearchKey();
-//        if (StringUtils.isNotBlank(searchKey)){
-//            wrapper.like(SiteEntity::getContent, searchKey);
-//        }
-
         wrapper.orderByDesc(SiteEntity::getCreateTime);
 
         IPage<SiteEntity> result = this.page(page, wrapper);
@@ -96,62 +94,11 @@ public class SiteServiceImpl extends ServiceImpl<SiteMapper, SiteEntity> impleme
 
         BeanUtils.copyProperties(param, entity);
         this.updateById(entity);
+        webService.clearCache();
 
         return Result.success();
     }
 
-//    @Override
-//    public Result upload(MultipartFile file, String type) {
-//        Map<String, Object> map = fileUtils.uploadMap(file, "/site/" + type, false);
-//        return Result.success(map);
-//    }
-//
-//    @Override
-//    public Result videoList(PageDto param) {
-//        BaseUtil.startPage(param);
-//        IPage<VideoEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
-//        LambdaQueryWrapper<VideoEntity> wrapper = new LambdaQueryWrapper<>();
-//        wrapper.eq(VideoEntity::getModule, TypeCode.MODULE_SITE);
-//        IPage<VideoEntity> iPage = videoMapper.selectPage(page, wrapper);
-//        return Result.success(iPage);
-//    }
-//
-//
-//    @Override
-//    public Result videoSave(VideoDto param) {
-//        Long id = param.getId();
-//        VideoEntity entity = null;
-//        if (id == null){
-//            entity = new VideoEntity();
-//            BeanUtils.copyProperties(param, entity);
-//            entity.setModule(TypeCode.MODULE_SITE);
-//            videoMapper.insert(entity);
-//        } else {
-//            entity = videoMapper.selectById(id);
-//            if (entity == null){
-//                String msg = "对象id不存在 ";
-//                log.error(msg + id);
-//                return Result.failure(msg);
-//            }
-//
-//            // 删除旧文件-真删除
-//            if (!StringUtils.equals(entity.getThumb(), param.getThumb())){
-//                fileUtils.del(entity.getThumb());
-//            }
-//
-//            if (!StringUtils.equals(entity.getVideo(), param.getVideo())){
-//                fileUtils.del(entity.getVideo());
-//            }
-//
-//
-//
-//            BeanUtils.copyProperties(param, entity);
-//            videoMapper.update(entity, null);
-//        }
-//
-//        return Result.success();
-//    }
-
 
 
 }

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

@@ -57,7 +57,7 @@ public class WebServiceImpl implements WebService {
     final static String CACHE_AERIAL = "cache:aerial";
 
     // 缓存过期时间
-    final static int CACHE_TIME = 60;
+    final static int CACHE_TIME = 30;
 
     @Override
     public Result getPartInfo() {
@@ -69,15 +69,15 @@ public class WebServiceImpl implements WebService {
 
         List<ParkEntity> list = parkService.list();
         ParkEntity parkEntity = list.get(0);
-        String data = parkEntity.getData();
-        JSONObject dJson = JSONObject.parseObject(data);
-        ParkVo parkVo = JSONObject.toJavaObject(dJson, ParkVo.class);
-        // 计算并赋值
-        calcPct(parkVo);
+//        String data = parkEntity.getData();
+//        JSONObject dJson = JSONObject.parseObject(data);
+//        ParkVo parkVo = JSONObject.toJavaObject(dJson, ParkVo.class);
+//        // 计算并赋值
+//        calcPct(parkVo);
 
         ParkEntity building = list.get(1);
 
-        result.put("park", parkVo);
+        result.put("park", parkEntity.getData());
         result.put("building", building.getData());
         redisCache.setCacheObject(CACHE_PART, result, CACHE_TIME, TimeUnit.MINUTES);