加入缓存机制

gis_admin/src/main/java/com/gis/admin/controller/LoginController.java

@@ -1,6 +1,5 @@
 package com.gis.admin.controller;
 
-import com.gis.admin.entity.po.SysRoleEntity;
 import com.gis.common.base.entity.po.LogEntity;
 import com.gis.common.base.service.LogService;
 import com.gis.common.constant.ConfigConstant;
@@ -11,7 +10,6 @@ import com.gis.admin.service.SysUserService;
 import com.gis.admin.entity.dto.LoginDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.extern.log4j.Log4j2;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -127,9 +125,7 @@ public class LoginController {
         // 保存操作日志
         saveLog(userId);
 
-        redisUtil.set(configConstant.redisPrefix + token, token, 23, TimeUnit.HOURS);
-
-
+        redisUtil.setCacheObject(configConstant.redisPrefix + token, token, 23, TimeUnit.HOURS);
         return Result.success(result);
 
     }
@@ -152,7 +148,7 @@ public class LoginController {
         if (StringUtils.isBlank(token)) {
             log.info("token is null");
         }
-        String o = (String) redisUtil.get(configConstant.redisPrefix + token);
+        String o = redisUtil.getCacheObject(configConstant.redisPrefix + token);
         return Result.success(o != null);
     }
 

gis_admin/src/main/java/com/gis/admin/service/SysUserService.java

@@ -9,6 +9,7 @@ import com.gis.admin.entity.dto.PasswordDto;
 import com.gis.admin.entity.dto.UserDto;
 import com.gis.admin.entity.dto.RegisterDto;
 import com.gis.admin.entity.po.SysUserEntity;
+import org.springframework.cache.annotation.Cacheable;
 
 
 /**
@@ -33,8 +34,6 @@ public interface SysUserService extends IService<SysUserEntity> {
 
     Result register(RegisterDto param);
 
-//    Result getRole();
-
     Result<SysUserEntity> detail(Long id);
 
     Result retrievePassword(ResetPasswordDto param);

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -19,6 +19,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -26,6 +28,7 @@ import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -45,12 +48,35 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
     /**重置密码redis key*/
     final static String RESET_PASSWORD_KEY = "reset:password:";
 
+    /**redis 用户名*/
+    final static String USER_NAME_KEY = "user:";
 
+    @Autowired
+    RedisUtil redisUtil;
+
+
+
+
+    /**
+     * unless 对传参进行条件判断
+     * @param userName
+     * @return
+     */
+//    @Cacheable(value = "module", key = "#userName", condition = "true ")
     @Override
     public SysUserEntity findByUserName(String userName) {
-        return entityMapper.findByUserName(userName);
+        SysUserEntity entity;
+        String userKey = USER_NAME_KEY + userName;
+        if (redisUtil.hasKey(userKey)){
+            entity =  redisUtil.getCacheObject(userKey);
+        } else {
+            entity =  entityMapper.findByUserName(userName);
+            redisUtil.setCacheObject(userKey, entity, 1, TimeUnit.MINUTES);
+        }
+        return entity;
     }
 
+//    @CacheEvict(value="module", allEntries=true)
     @Override
     public Result saveEntity(UserDto param) {
         SysUserEntity entity ;
@@ -75,11 +101,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
             BeanUtils.copyProperties(param, entity);
             this.updateById(entity);
 
+            String userKey = USER_NAME_KEY + entity.getUserName();
+            redisUtil.delete(userKey);
+
         }
 
         return Result.success();
     }
 
+//    @CacheEvict(value="sys_user", allEntries=true)
     @Override
     public Result removes(String ids) {
         List<String> idList = Arrays.asList(ids);
@@ -90,9 +120,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
                 log.error("管理员账户不能删除 {}", entity.getId());
                 return Result.failure("管理员账户不能删除");
             }
-//            entity.setIsDelete(1);
-//            entity.setUpdateTime(LocalDateTime.now());
-//            this.update(entity);
+
         }
         this.removeByIds(idList);
 
@@ -188,6 +216,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
         return Result.success();
     }
 
+//    @CacheEvict(value="sys_user", allEntries=true)
     @Override
     public Result editStatus(Long id, Integer isEnabled) {
 

gis_admin/src/main/java/com/gis/admin/shiro/ShiroRealm.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.gis.common.constant.ConfigConstant;
 import com.gis.common.util.JwtUtil;
 import com.gis.admin.entity.po.SysUserEntity;
-import com.gis.admin.service.SysResourceService;
 import com.gis.admin.service.SysUserService;
 import com.gis.common.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -18,14 +17,12 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.apache.shiro.realm.AuthorizingRealm;
 import org.apache.shiro.subject.PrincipalCollection;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @Description: 用户登录鉴权和获取用户授权
@@ -36,26 +33,13 @@ import java.util.Set;
 @Component
 @Slf4j
 public class ShiroRealm extends AuthorizingRealm {
-//	@Lazy
-//    @Resource
-//    private CommonAPI commonAPI;
-
-//    @Lazy
-//    @Resource
-//    private RedisUtil redisUtil;
 
     @Resource
     HttpServletRequest request;
 
-//    @Autowired
-//    SysResourceService sysResourceService;
-
     @Autowired
     SysUserService sysUserService;
 
-//    @Autowired
-//    RedisTemplate<String, String> redisTemplate;
-
     @Autowired
     ConfigConstant configConstant;
 
@@ -113,7 +97,7 @@ public class ShiroRealm extends AuthorizingRealm {
      */
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken auth) throws AuthenticationException {
-//        log.debug("===============Shiro身份认证开始============doGetAuthenticationInfo==========");
+        log.info("run doGetAuthenticationInfo");
         String token = (String) auth.getCredentials();
 //        log.info("token: {}", token);
         if (token == null) {
@@ -136,8 +120,7 @@ public class ShiroRealm extends AuthorizingRealm {
             throw new JwtAuthenticationException(5001, "token invalid");
         }
 
-//        String redisToken = redisTemplate.opsForValue().get(configConstant.redisPrefix + token);
-        String redisToken = (String)redisUtil.get(configConstant.redisPrefix + token);
+        String redisToken  = redisUtil.getCacheObject(configConstant.redisPrefix + token);
 
         if (!token.equals(redisToken)) {
             log.error("redis token is null");
@@ -145,6 +128,8 @@ public class ShiroRealm extends AuthorizingRealm {
 
         }
         // 查询用户信息
+
+
         if (! JwtUtil.isVerify(token, username)) {
             log.error("error token username or password");
             throw new JwtAuthenticationException(5001, "token invalid");

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

@@ -54,7 +54,6 @@ public class GoodsController {
     public Result remove(@PathVariable Long id) {
         entityService.removeById(id);
         return Result.success();
-
     }
 
     @ApiOperation("场景详情")
@@ -70,8 +69,15 @@ public class GoodsController {
         return entityService.upload(file, type);
     }
 
+
+    /**
+     * 精品典藏-图片类型使用： 多张图片，需要设置封面图， 图片地址需要存数据库。goods表记录多张图片fileId
+     * @param file
+     * @param code 目录码，将图片放在同一个目录里
+     * @return
+     */
     @WebControllerLog(description = "精品典藏-上传图片")
-    @ApiOperation(value = "上传图片", notes = "图片类型使用，重命名文件")
+    @ApiOperation(value = "上传图片(典藏图片类型)", notes = "图片类型使用, 返回文件id")
     @PostMapping("uploadImg")
     public Result uploadImg(MultipartFile file, String code) {
         return entityService.uploadImg(file, code);

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

@@ -1,84 +0,0 @@
-package com.gis.cms.controller;
-
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.dto.ImgDto;
-import com.gis.cms.entity.po.ImgEntity;
-import com.gis.cms.service.ImgService;
-import com.gis.common.base.aop.WebControllerLog;
-import com.gis.common.util.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-
-/**
- * Created by owen on 2021/12/28 0008 9:54
- */
-@ApiIgnore
-@Slf4j
-@Api(tags = "图片管理")
-@RestController
-@RequestMapping("cms/img")
-public class ImgController {
-
-    @Autowired
-    private ImgService entityService;
-
-
-    @ApiOperation(value = "列表")
-    @PostMapping("list")
-    public Result list(@RequestBody SortPageDto param) {
-        return entityService.search(param);
-    }
-
-    @ApiOperation("删除")
-    @GetMapping("remove/{id}")
-    public Result remove(@PathVariable Long id) {
-        return Result.success(entityService.removeById(id));
-    }
-
-    @WebControllerLog(description = "宣传片管理-新增/编辑", addDb = true)
-    @ApiOperation(value = "新增/编辑")
-    @PostMapping("save")
-    public Result save(@Valid @RequestBody ImgDto param) {
-        return entityService.saveEntity(param);
-    }
-
-
-    @ApiOperation("详情")
-    @GetMapping("detail/{id}")
-    public Result<ImgEntity> detail(@PathVariable Long id) {
-        return Result.success(entityService.getById(id));
-    }
-
-    @ApiOperation(value = "是否显示", notes = "display: 1:显示， 0：不显示")
-    @GetMapping(value = "display/{id}/{display}")
-    public Result<ImgEntity> display(@PathVariable Integer display, @PathVariable Long id) {
-        entityService.setDisplay(id, display);
-        return Result.success();
-    }
-
-    @ApiOperation(value = "排序", notes = "sort: 序号")
-    @GetMapping(value = "sort/{id}/{sort}")
-    public Result<ImgEntity> sort(@PathVariable Integer sort, @PathVariable Long id) {
-        entityService.setSort(id, sort);
-        return Result.success();
-    }
-
-    @ApiOperation(value = "图片上传")
-    @PostMapping("upload")
-    public Result upload(MultipartFile file) {
-        return entityService.upload(file);
-    }
-
-
-
-
-
-
-}

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

@@ -10,9 +10,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * Created by owen on 2021/6/24 0008 9:54
@@ -30,13 +32,8 @@ public class ModuleController {
 
     @ApiOperation(value = "v0.3-列表", notes = "goods:精品典藏， news:教育基地")
     @PostMapping("list/{module}")
-    public Result<ModuleEntity> search(@PathVariable String module) {
-        // 排序：默认模块>自定义模块还创建时间正序；
-        LambdaQueryWrapper<ModuleEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ModuleEntity::getModule, module);
-        wrapper.orderByDesc(ModuleEntity::getIsDefault);
-//        wrapper.orderByDesc(ModuleEntity::getCreateTime);
-        return Result.success(entityService.list(wrapper));
+    public Result search(@PathVariable String module) {
+        return entityService.search(module);
     }
 
 

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

@@ -1,89 +0,0 @@
-package com.gis.cms.controller;
-
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.dto.MusicDto;
-import com.gis.cms.entity.po.MusicEntity;
-import com.gis.cms.service.MusicService;
-import com.gis.common.base.aop.WebControllerLog;
-import com.gis.common.util.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-
-/**
- * Created by owen on 2021/12/28 0008 9:54
- */
-@ApiIgnore
-@Slf4j
-@Api(tags = "音乐管理")
-@RestController
-@RequestMapping("cms/music")
-public class MusicController {
-
-    @Autowired
-    private MusicService entityService;
-
-
-    @ApiOperation(value = "列表")
-    @PostMapping("list")
-    public Result list(@RequestBody SortPageDto param) {
-        return entityService.search(param);
-    }
-
-
-    @WebControllerLog(description = "音乐管理-新增/编辑", addDb = true)
-    @ApiOperation(value = "新增/编辑")
-    @PostMapping("save")
-    public Result save(@Valid @RequestBody MusicDto param) {
-        return entityService.saveEntity(param);
-    }
-
-    @ApiOperation("删除")
-    @GetMapping("remove/{id}")
-    public Result remove(@PathVariable Long id) {
-        return Result.success(entityService.removeById(id));
-    }
-
-    @ApiOperation("详情")
-    @GetMapping("detail/{id}")
-    public Result<MusicEntity> detail(@PathVariable Long id) {
-        return Result.success(entityService.getById(id));
-    }
-
-    @ApiOperation(value = "是否显示", notes = "display: 1:显示， 0：不显示")
-    @GetMapping(value = "display/{id}/{display}")
-    public Result<MusicEntity> display(@PathVariable Integer display, @PathVariable Long id) {
-        entityService.setDisplay(id, display);
-        return Result.success();
-    }
-
-    @ApiOperation(value = "排序", notes = "sort: 序号")
-    @GetMapping(value = "sort/{id}/{sort}")
-    public Result<MusicEntity> sort(@PathVariable Integer sort, @PathVariable Long id) {
-        entityService.setSort(id, sort);
-        return Result.success();
-    }
-
-    @ApiOperation(value = "图片上传")
-    @PostMapping("upload")
-    public Result upload(MultipartFile file) {
-        return entityService.upload(file);
-    }
-
-    @ApiOperation(value = "音乐上传")
-    @PostMapping("video/upload")
-    public Result videoUpload(MultipartFile file) {
-        String type = "music";
-        return entityService.fileUpload(file, type);
-    }
-
-
-
-
-}

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

@@ -48,7 +48,8 @@ public class NewsController {
     @ApiOperation("删除")
     @GetMapping("remove/{id}")
     public Result remove(@PathVariable Long id) {
-        return entityService.remove(id);
+         entityService.removeById(id);
+        return Result.success();
     }
 
     @ApiOperation("场景详情")

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

@@ -1,89 +0,0 @@
-package com.gis.cms.controller;
-
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.dto.StudentDto;
-import com.gis.cms.entity.po.StudentEntity;
-import com.gis.cms.entity.po.VideoEntity;
-import com.gis.cms.service.StudentService;
-import com.gis.common.base.aop.WebControllerLog;
-import com.gis.common.util.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-
-/**
- * Created by owen on 2021/12/28 0008 9:54
- */
-@ApiIgnore
-@Slf4j
-@Api(tags = "学籍管理")
-@RestController
-@RequestMapping("cms/student")
-public class StudentController {
-
-    @Autowired
-    private StudentService entityService;
-
-
-    @ApiOperation(value = "列表")
-    @PostMapping("list")
-    public Result list(@RequestBody SortPageDto param) {
-        return entityService.search(param);
-    }
-
-
-    @WebControllerLog(description = "领导管理-新增/编辑", addDb = true)
-    @ApiOperation(value = "新增/编辑")
-    @PostMapping("save")
-    public Result save(@Valid @RequestBody StudentDto param) {
-        return entityService.saveEntity(param);
-    }
-
-    @ApiOperation("删除")
-    @GetMapping("remove/{id}")
-    public Result remove(@PathVariable Long id) {
-        return Result.success(entityService.removeById(id));
-    }
-
-    @ApiOperation("详情")
-    @GetMapping("detail/{id}")
-    public Result<StudentEntity> detail(@PathVariable Long id) {
-        return Result.success(entityService.getById(id));
-    }
-
-    @ApiOperation(value = "是否显示", notes = "display: 1:显示， 0：不显示")
-    @GetMapping(value = "display/{id}/{display}")
-    public Result<StudentEntity> display(@PathVariable Integer display, @PathVariable Long id) {
-        entityService.setDisplay(id, display);
-        return Result.success();
-    }
-
-    @ApiOperation(value = "排序", notes = "sort: 序号")
-    @GetMapping(value = "sort/{id}/{sort}")
-    public Result<StudentEntity> sort(@PathVariable Integer sort, @PathVariable Long id) {
-        entityService.setSort(id, sort);
-        return Result.success();
-    }
-
-    @ApiOperation(value = "图片上传")
-    @PostMapping("upload")
-    public Result upload(MultipartFile file) {
-        return entityService.upload(file);
-    }
-
-    @ApiOperation(value = "富文本-上传", notes = "类型type, img:图片, video:视频  ")
-    @PostMapping("rich/upload/{type}")
-    public Result richUpload(MultipartFile file, @PathVariable String type) {
-        return entityService.richUpload(file, type);
-    }
-
-
-
-
-}

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

@@ -1,90 +0,0 @@
-package com.gis.cms.controller;
-
-import com.gis.cms.entity.dto.VideoDto;
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.po.VideoEntity;
-import com.gis.cms.service.VideoService;
-import com.gis.common.base.aop.WebControllerLog;
-import com.gis.common.util.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-
-/**
- * Created by owen on 2021/12/28 0008 9:54
- */
-@ApiIgnore
-@Slf4j
-@Api(tags = "宣传片管理")
-@RestController
-@RequestMapping("cms/video")
-public class VideoController {
-
-    @Autowired
-    private VideoService entityService;
-
-
-    @ApiOperation(value = "列表")
-    @PostMapping("list")
-    public Result list(@RequestBody SortPageDto param) {
-        return entityService.search(param);
-    }
-
-
-    @WebControllerLog(description = "宣传片管理-新增/编辑", addDb = true)
-    @ApiOperation(value = "新增/编辑")
-    @PostMapping("save")
-    public Result save(@Valid @RequestBody VideoDto param) {
-        return entityService.saveEntity(param);
-    }
-
-
-    @ApiOperation("详情")
-    @GetMapping("detail/{id}")
-    public Result<VideoEntity> detail(@PathVariable Long id) {
-        return Result.success(entityService.getById(id));
-    }
-
-    @ApiOperation("删除")
-    @GetMapping("remove/{id}")
-    public Result<VideoEntity> remove(@PathVariable Long id) {
-        return Result.success(entityService.removeById(id));
-    }
-
-    @ApiOperation(value = "是否显示", notes = "display: 1:显示， 0：不显示")
-    @GetMapping(value = "display/{id}/{display}")
-    public Result<VideoEntity> display(@PathVariable Integer display, @PathVariable Long id) {
-        entityService.setDisplay(id, display);
-        return Result.success();
-    }
-
-    @ApiOperation(value = "排序", notes = "sort: 序号")
-    @GetMapping(value = "sort/{id}/{sort}")
-    public Result<VideoEntity> sort(@PathVariable Integer sort, @PathVariable Long id) {
-        entityService.setSort(id, sort);
-        return Result.success();
-    }
-
-    @ApiOperation(value = "图片上传")
-    @PostMapping("upload")
-    public Result upload(MultipartFile file) {
-        return entityService.upload(file);
-    }
-
-    @ApiOperation(value = "视频上传")
-    @PostMapping("video/upload")
-    public Result videoUpload(MultipartFile file) {
-        String type = "video";
-        return entityService.videoUpload(file, type);
-    }
-
-
-
-
-}

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

@@ -2,15 +2,12 @@ package com.gis.cms.controller;
 
 import com.gis.cms.entity.dto.*;
 import com.gis.cms.entity.po.GoodsEntity;
-import com.gis.cms.entity.po.VideoEntity;
 import com.gis.cms.service.*;
 import com.gis.common.base.aop.WebControllerLog;
-import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.util.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -35,20 +32,10 @@ public class WebController {
     @Autowired
     GoodsService goodsService;
 
-    @Autowired
-    VideoService videoService;
-
-    @Autowired
-    ImgService imgService;
-
-    @Autowired
-    MusicService musicService;
 
     @Autowired
     LeaderService leaderService;
 
-    @Autowired
-    StudentService studentService;
 
     @Autowired
     BbsService bbsService;

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

@@ -1,27 +0,0 @@
-package com.gis.cms.entity.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * Created by owen on 2021/12/8 0008 14:34
- */
-@Data
-public class ImgDto {
-
-    @ApiModelProperty(value = "对象ID")
-    private Long id;
-
-    @NotBlank(message = "标题不能为空")
-    @ApiModelProperty(value = "标题", required = true)
-    private String name;
-
-    @NotBlank(message = "照片不能为空")
-    @ApiModelProperty(value = "照片", required = true)
-    private String thumb;
-
-
-
-}

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

@@ -1,39 +0,0 @@
-package com.gis.cms.entity.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * Created by owen on 2021/12/8 0008 14:34
- */
-@Data
-public class MusicDto {
-
-    @ApiModelProperty(value = "对象ID")
-    private Long id;
-
-    @NotBlank(message = "标题不能为空")
-    @ApiModelProperty(value = "标题", required = true)
-    private String name;
-
-    @ApiModelProperty(value = "照片")
-    private String thumb;
-
-    @NotBlank(message = "视频不能为空")
-    @ApiModelProperty(value = "视频", required = true)
-    private String filePath;
-
-    @NotBlank(message = "视频名称不能为空")
-    @ApiModelProperty(value = "视频名称", required = true)
-    private String fileName;
-
-    @ApiModelProperty(value = "简介-富文本")
-    private String description;
-
-
-}
-
-
-

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

@@ -1,52 +0,0 @@
-package com.gis.cms.entity.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * Created by owen on 2021/12/8 0008 14:34
- */
-@Data
-public class StudentDto {
-
-    @ApiModelProperty(value = "对象ID")
-    private Long id;
-
-    @NotBlank(message = "姓名不能为空")
-    @ApiModelProperty(value = "姓名", required = true)
-    private String name;
-
-    @NotBlank(message = "性别不能为空")
-    @ApiModelProperty(value = "性别 M:男  F：女", required = true)
-    private String sex;
-
-    @NotBlank(message = "政治面貌不能为空")
-    @ApiModelProperty(value = "政治面貌", required = true)
-    private String politics;
-
-    @NotBlank(message = "专业不能为空")
-    @ApiModelProperty(value = "专业", required = true)
-    private String job;
-
-    @NotBlank(message = "学年不能为空")
-    @ApiModelProperty(value = "学年", required = true)
-    private String tenure;
-
-    @NotBlank(message = "照片不能为空")
-    @ApiModelProperty(value = "照片", required = true)
-    private String thumb;
-
-    @ApiModelProperty(value = "简介-富文本")
-    private String description;
-
-    @NotBlank(message = "学号不能为空")
-    @ApiModelProperty(value = "学号", required = true)
-    private String num;
-
-    @ApiModelProperty(value = "显示：0：不显示，1：显示", notes = "后端使用")
-    private Integer display;
-
-
-}

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

@@ -1,37 +0,0 @@
-package com.gis.cms.entity.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * Created by owen on 2021/12/8 0008 14:34
- */
-@Data
-public class VideoDto {
-
-    @ApiModelProperty(value = "对象ID")
-    private Long id;
-
-    @NotBlank(message = "标题不能为空")
-    @ApiModelProperty(value = "标题", required = true)
-    private String name;
-
-    @NotBlank(message = "照片不能为空")
-    @ApiModelProperty(value = "照片", required = true)
-    private String thumb;
-
-    @NotBlank(message = "视频不能为空")
-    @ApiModelProperty(value = "视频", required = true)
-    private String filePath;
-
-    @NotBlank(message = "视频名称不能为空")
-    @ApiModelProperty(value = "视频名称", required = true)
-    private String fileName;
-
-    @ApiModelProperty(value = "显示：0：不显示，1：显示", notes = "后端使用")
-    private Integer display;
-
-
-}

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

@@ -1,49 +0,0 @@
-package com.gis.cms.entity.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.gis.common.base.entity.po.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 校园图片
- */
-@Data
-@TableName(value = "tb_img")
-public class ImgEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "标题")
-    private String name;
-
-    @ApiModelProperty(value = "照片")
-    private String thumb;
-
-    @ApiModelProperty(value = "显示：1：显示, 0:不显示(默认)")
-    private Integer display;
-
-    @ApiModelProperty(value = "排序，倒序排，默认为：1", notes = "排序值倒序>发布时间倒序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "浏览量，默认为：1")
-    private Integer visit;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

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

@@ -1,58 +0,0 @@
-package com.gis.cms.entity.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.gis.common.base.entity.po.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 校歌
- */
-@Data
-@TableName(value = "tb_music")
-public class MusicEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "标题")
-    private String name;
-
-    @ApiModelProperty(value = "封面")
-    private String thumb;
-
-    @ApiModelProperty(value = "音频文件")
-    private String filePath;
-
-    @ApiModelProperty(value = "视频名称")
-    private String fileName;
-
-    @ApiModelProperty(value = "显示：1：显示, 0:不显示(默认)")
-    private Integer display;
-
-    @ApiModelProperty(value = "排序，倒序排，默认为：1", notes = "排序值倒序>发布时间倒序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "浏览量，默认为：1")
-    private Integer visit;
-
-    @ApiModelProperty(value = "简介-富文本")
-    private String description;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

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

@@ -1,68 +0,0 @@
-package com.gis.cms.entity.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.gis.common.base.entity.po.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 学籍
- */
-@Data
-@TableName(value = "tb_student")
-public class StudentEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "性别 M:男  F：女")
-    private String sex;
-
-    @ApiModelProperty(value = "政治面貌")
-    private String politics;
-
-    @ApiModelProperty(value = "专业")
-    private String job;
-
-    @ApiModelProperty(value = "学年")
-    private String tenure;
-
-    @ApiModelProperty(value = "照片")
-    private String thumb;
-
-    @ApiModelProperty(value = "学号")
-    private String num;
-
-    @ApiModelProperty(value = "简介-富文本")
-    private String description;
-
-    @ApiModelProperty(value = "显示：1：显示, 0:不显示(默认)")
-    private Integer display;
-
-    @ApiModelProperty(value = "排序，倒序排，默认为：1", notes = "排序值倒序>发布时间倒序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "浏览量，默认为：1")
-    private Integer visit;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

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

@@ -1,56 +0,0 @@
-package com.gis.cms.entity.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.gis.common.base.entity.po.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 学院宣传片
- */
-@Data
-@TableName(value = "tb_video")
-public class VideoEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "标题")
-    private String name;
-
-    @ApiModelProperty(value = "照片")
-    private String thumb;
-
-    @ApiModelProperty(value = "视频")
-    private String filePath;
-
-    @ApiModelProperty(value = "视频名称")
-    private String fileName;
-
-    @ApiModelProperty(value = "显示：1：显示, 0:不显示(默认)")
-    private Integer display;
-
-    @ApiModelProperty(value = "排序，倒序排，默认为：1", notes = "排序值倒序>发布时间倒序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "浏览量，默认为：1")
-    private Integer visit;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

gis_cms/src/main/java/com/gis/cms/entity/vo/ParkVo.java

@@ -1,37 +0,0 @@
-package com.gis.cms.entity.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * 园区（整体）概况
- */
-@Data
-public class ParkVo  {
-
-
-    @ApiModelProperty(value = "综合大楼")
-    private String complexBuilding;
-
-    @ApiModelProperty(value = "学术交流中心")
-    private String exchangeCentre;
-
-    @ApiModelProperty(value = "公寓楼")
-    private String apartment;
-
-    @ApiModelProperty(value = "综合服务中心")
-    private String serviceCentre ;
-
-    @ApiModelProperty(value = "科研楼")
-    private String scientificBuilding;
-
-
-
-
-
-
-
-
-
-}

gis_cms/src/main/java/com/gis/cms/mapper/ImgMapper.java

@@ -1,32 +0,0 @@
-package com.gis.cms.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.po.ImgEntity;
-import com.gis.cms.entity.po.VideoEntity;
-import com.gis.cms.mapper.provider.ImgProvider;
-import com.gis.cms.mapper.provider.VideoProvider;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Component;
-
-@Component
-@Mapper
-public interface ImgMapper extends BaseMapper<ImgEntity> {
-
-
-    @SelectProvider(type = ImgProvider.class, method = "search")
-    IPage<ImgEntity> search(SortPageDto param, IPage<ImgEntity> page);
-
-    @Update("update tb_img set display = #{display} , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setDisplay(Long id, Integer display);
-
-    @Update("update tb_img set sort = #{sort} , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setSort(Long id, Integer sort);
-
-    @Update("update tb_img set visit = visit+1 , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setVisit(Long id);
-}

gis_cms/src/main/java/com/gis/cms/mapper/MusicMapper.java

@@ -1,32 +0,0 @@
-package com.gis.cms.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.po.MusicEntity;
-import com.gis.cms.entity.po.VideoEntity;
-import com.gis.cms.mapper.provider.MusicProvider;
-import com.gis.cms.mapper.provider.VideoProvider;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Component;
-
-@Component
-@Mapper
-public interface MusicMapper extends BaseMapper<MusicEntity> {
-
-
-    @SelectProvider(type = MusicProvider.class, method = "search")
-    IPage<MusicEntity> search(SortPageDto param, IPage<MusicEntity> page);
-
-    @Update("update tb_music set display = #{display} , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setDisplay(Long id, Integer display);
-
-    @Update("update tb_music set sort = #{sort} , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setSort(Long id, Integer sort);
-
-    @Update("update tb_music set visit = visit+1 , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setVisit(Long id);
-}

gis_cms/src/main/java/com/gis/cms/mapper/StudentMapper.java

@@ -1,30 +0,0 @@
-package com.gis.cms.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.po.StudentEntity;
-import com.gis.cms.mapper.provider.StudentProvider;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Component;
-
-@Component
-@Mapper
-public interface StudentMapper extends BaseMapper<StudentEntity> {
-
-
-    @SelectProvider(type = StudentProvider.class, method = "search")
-    IPage<StudentEntity> search(SortPageDto param, IPage<StudentEntity> page);
-
-    @Update("update tb_student set display = #{display} , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setDisplay(Long id, Integer display);
-
-    @Update("update tb_student set sort = #{sort} , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setSort(Long id, Integer sort);
-
-    @Update("update tb_student set visit = visit+1 , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setVisit(Long id);
-}

gis_cms/src/main/java/com/gis/cms/mapper/VideoMapper.java

@@ -1,30 +0,0 @@
-package com.gis.cms.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.po.VideoEntity;
-import com.gis.cms.mapper.provider.VideoProvider;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Component;
-
-@Component
-@Mapper
-public interface VideoMapper extends BaseMapper<VideoEntity> {
-
-
-    @SelectProvider(type = VideoProvider.class, method = "search")
-    IPage<VideoEntity> search(SortPageDto param, IPage<VideoEntity> page);
-
-    @Update("update tb_video set display = #{display} , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setDisplay(Long id, Integer display);
-
-    @Update("update tb_video set sort = #{sort} , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setSort(Long id, Integer sort);
-
-    @Update("update tb_video set visit = visit+1 , update_time = NOW() where is_delete=0 and id = #{id} ")
-    void setVisit(Long id);
-}

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

@@ -4,7 +4,6 @@ package com.gis.cms.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gis.cms.entity.dto.*;
 import com.gis.cms.entity.po.BbsEntity;
-import com.gis.cms.entity.po.ImgEntity;
 import com.gis.common.util.Result;
 import org.springframework.web.multipart.MultipartFile;
 

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

@@ -1,32 +0,0 @@
-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.SortPageDto;
-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.util.Result;
-import org.springframework.web.multipart.MultipartFile;
-
-
-/**
- * Created by owen on 2021/12/8 0011 16:14
- */
-public interface ImgService extends IService<ImgEntity> {
-
-    Result saveEntity(ImgDto param);
-
-    Result upload(MultipartFile file);
-
-//    Result videoUpload(MultipartFile file, String type);
-
-    Result search(SortPageDto param);
-
-    void setDisplay(Long id, Integer display);
-
-    void setSort(Long id, Integer sort);
-
-    void setVisit(Long id);
-}

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

@@ -20,10 +20,5 @@ public interface ModuleService extends IService<ModuleEntity> {
 
     Result remove(Long id);
 
-
-
-
-
-
-
+    Result search(String module);
 }

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

@@ -1,32 +0,0 @@
-package com.gis.cms.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.cms.entity.dto.MusicDto;
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.dto.VideoDto;
-import com.gis.cms.entity.po.MusicEntity;
-import com.gis.cms.entity.po.VideoEntity;
-import com.gis.common.util.Result;
-import org.springframework.web.multipart.MultipartFile;
-
-
-/**
- * Created by owen on 2021/12/8 0011 16:14
- */
-public interface MusicService extends IService<MusicEntity> {
-
-    Result saveEntity(MusicDto param);
-
-    Result upload(MultipartFile file);
-
-    Result fileUpload(MultipartFile file, String type);
-
-    Result search(SortPageDto param);
-
-    void setDisplay(Long id, Integer display);
-
-    void setSort(Long id, Integer sort);
-
-    void setVisit(Long id);
-}

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

@@ -23,7 +23,7 @@ public interface NewsService extends IService<NewsEntity> {
 
     Result saveEntity(NewsDto param);
 
-    Result remove(Long id);
+//    Result remove(Long id);
 
     Result<NewsEntity> detail(Long id);
 

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

@@ -1,31 +0,0 @@
-package com.gis.cms.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.cms.entity.dto.LeaderDto;
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.dto.StudentDto;
-import com.gis.cms.entity.po.StudentEntity;
-import com.gis.common.util.Result;
-import org.springframework.web.multipart.MultipartFile;
-
-
-/**
- * Created by owen on 2021/12/8 0011 16:14
- */
-public interface StudentService extends IService<StudentEntity> {
-
-    Result saveEntity(StudentDto param);
-
-    Result upload(MultipartFile file);
-
-    Result richUpload(MultipartFile file, String type);
-
-    Result search(SortPageDto param);
-
-    void setDisplay(Long id, Integer display);
-
-    void setSort(Long id, Integer sort);
-
-    void setVisit(Long id);
-}

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

@@ -1,32 +0,0 @@
-package com.gis.cms.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gis.cms.entity.dto.LeaderDto;
-import com.gis.cms.entity.dto.SortPageDto;
-import com.gis.cms.entity.dto.VideoDto;
-import com.gis.cms.entity.po.LeaderEntity;
-import com.gis.cms.entity.po.VideoEntity;
-import com.gis.common.util.Result;
-import org.springframework.web.multipart.MultipartFile;
-
-
-/**
- * Created by owen on 2021/12/8 0011 16:14
- */
-public interface VideoService extends IService<VideoEntity> {
-
-    Result saveEntity(VideoDto param);
-
-    Result upload(MultipartFile file);
-
-    Result videoUpload(MultipartFile file, String type);
-
-    Result search(SortPageDto param);
-
-    void setDisplay(Long id, Integer display);
-
-    void setSort(Long id, Integer sort);
-
-    void setVisit(Long id);
-}

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

@@ -165,24 +165,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> impl
         getBaseMapper().setVisit(id);
     }
 
-    @Override
-    public Result uploadImg(MultipartFile file, String code) {
-        if ("null".equals(code) || StringUtils.isBlank(code)) {
-            code = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
-        }
 
-        Map<String, Object> result = fileService.upload(file, "/goods/" + code );
-        FileEntity entity = new FileEntity();
-        entity.setModule("goods");
-        entity.setName(result.get("fileName").toString());
-
-
-        entity.setFilePath(result.get("filePath").toString());
-        fileService.save(entity);
-        result.put("id", entity.getId());
-        result.put("code", code);
-        return Result.success(result);
-    }
 
     @Override
     public Result removeFile(Long fileId) {
@@ -305,12 +288,28 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> impl
         }
 
         Map<String, Object> map = fileUtils.uploadMap(file, "/goods/" + type, flag);
+        return Result.success(map);
+    }
+
+    @Override
+    public Result uploadImg(MultipartFile file, String code) {
+        if ("null".equals(code) || StringUtils.isBlank(code)) {
+            code = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS");
+        }
+
+        Map<String, Object> result = fileService.upload(file, "/goods/" + code );
         FileEntity entity = new FileEntity();
         entity.setModule("goods");
-        entity.setName(map.get("fileName").toString());
-        entity.setFilePath(map.get("urlPath").toString());
+        entity.setName(result.get("fileName").toString());
+        String filePath = result.get("filePath").toString();
+        entity.setFilePath(filePath);
         fileService.save(entity);
-        return Result.success(entity);
+
+        HashMap<Object, Object> res = new HashMap<>();
+        res.put("id", entity.getId());
+        res.put("code", code);
+        res.put("filePath", filePath);
+        return Result.success(res);
     }
 
 

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

@@ -1,99 +0,0 @@
-package com.gis.cms.service.impl;
-
-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.SortPageDto;
-import com.gis.cms.entity.dto.ImgDto;
-import com.gis.cms.entity.po.ImgEntity;
-import com.gis.cms.mapper.ImgMapper;
-import com.gis.cms.service.ImgService;
-import com.gis.common.base.service.impl.IBaseService;
-import com.gis.common.util.BaseUtil;
-import com.gis.common.util.FileUtils;
-import com.gis.common.util.Result;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Map;
-
-
-/**
- * Created by owen on 2020/3/11 0011 16:16
- */
-@Slf4j
-@Service
-public class ImgServiceImpl extends ServiceImpl<ImgMapper, ImgEntity> implements ImgService {
-
-    @Autowired
-    FileUtils fileUtils;
-
-    @Autowired
-    IBaseService iBaseService;
-
-
-
-    @Override
-    public Result search(SortPageDto param) {
-        BaseUtil.startPage(param);
-        IPage<ImgEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
-        IPage<ImgEntity> result = getBaseMapper().search(param, page);
-        return Result.success(result);
-    }
-
-    @Override
-    public void setVisit(Long id) {
-        getBaseMapper().setVisit(id);
-    }
-
-    @Override
-    public void setDisplay(Long id, Integer display) {
-        getBaseMapper().setDisplay(id, display);
-    }
-
-    @Override
-    public void setSort(Long id, Integer sort) {
-        getBaseMapper().setSort(id, sort);
-    }
-
-
-    @Override
-    public Result saveEntity(ImgDto param) {
-        Long id = param.getId();
-        ImgEntity entity = null;
-        if (id == null){
-            entity = new ImgEntity();
-            entity.setCreatorId(iBaseService.getUserId());
-        } else {
-            entity = this.getById(id);
-            if (entity == null){
-                String msg = "对象id不存在 ";
-                log.error(msg + id);
-                return Result.failure(msg);
-            }
-            // 判断图片
-            String thumb = entity.getThumb();
-            if (StringUtils.isNotBlank(thumb) && !StringUtils.equals(param.getThumb(), thumb)){
-                fileUtils.del(thumb);
-            }
-        }
-
-        BeanUtils.copyProperties(param, entity);
-        this.saveOrUpdate(entity);
-        return Result.success();
-    }
-
-    @Override
-    public Result upload(MultipartFile file) {
-        Map<String, Object> map = fileUtils.uploadMap(file, "/img", false);
-        return Result.success(map);
-    }
-
-
-
-
-}

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

@@ -1,5 +1,6 @@
 package com.gis.cms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.cms.entity.dto.ModuleDto;
 import com.gis.cms.entity.po.ModuleEntity;
@@ -11,6 +12,8 @@ import com.gis.common.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -28,7 +31,7 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleMapper, ModuleEntity> i
     @Autowired
     GoodsService goodsService;
 
-
+    @CacheEvict(value="module", allEntries=true)
     @Override
     public Result saveEntity(ModuleDto param) {
         Long id = param.getId();
@@ -46,12 +49,16 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleMapper, ModuleEntity> i
             entity.setUpdateTime(LocalDateTime.now());
             this.updateById(entity);
         }
-
-
         return Result.success(entity);
     }
 
 
+    /**
+     * @CacheEvict 删除缓存
+     * key = "#id" 删除制定id下的缓存
+     * allEntries=true 删除module目录下的所有缓存
+     * */
+    @CacheEvict(value="module", allEntries=true)
     @Override
     public Result remove(Long id) {
         ModuleEntity entity = this.getById(id);
@@ -63,9 +70,7 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleMapper, ModuleEntity> i
             return Result.failure("预设模块不允许删除");
         }
 
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.updateById(entity);
+        this.removeById(id);
 
         // 删除该模块下数据
         goodsService.delByModelId(id);
@@ -74,9 +79,21 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleMapper, ModuleEntity> i
         return Result.success();
     }
 
+    @Cacheable(value = "module", key = "#module", condition = "true ")
+    @Override
+    public Result search(String module) {
+        // 排序：默认模块>自定义模块还创建时间正序；
+        LambdaQueryWrapper<ModuleEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ModuleEntity::getModule, module);
+        wrapper.orderByDesc(ModuleEntity::getIsDefault);
+        return Result.success(this.list(wrapper));
+    }
 
 
-
+    /**
+     * @Cacheable 缓存数据
+     * */
+    @Cacheable(value = "module", key = "#id", condition = "true ")
     @Override
     public Result detail(Long id) {
         ModuleEntity entity = this.getById(id);

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

@@ -1,113 +0,0 @@
-package com.gis.cms.service.impl;
-
-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.SortPageDto;
-import com.gis.cms.entity.dto.MusicDto;
-import com.gis.cms.entity.po.MusicEntity;
-import com.gis.cms.mapper.MusicMapper;
-import com.gis.cms.service.MusicService;
-import com.gis.common.base.service.impl.IBaseService;
-import com.gis.common.util.BaseUtil;
-import com.gis.common.util.FileUtils;
-import com.gis.common.util.Result;
-import com.gis.common.util.StrUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Map;
-
-
-/**
- * Created by owen on 2020/3/11 0011 16:16
- */
-@Slf4j
-@Service
-public class MusicServiceImpl extends ServiceImpl<MusicMapper, MusicEntity> implements MusicService {
-
-    @Autowired
-    FileUtils fileUtils;
-
-    @Autowired
-    IBaseService iBaseService;
-
-
-
-    @Override
-    public Result search(SortPageDto param) {
-        BaseUtil.startPage(param);
-        IPage<MusicEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
-        IPage<MusicEntity> result = getBaseMapper().search(param, page);
-        return Result.success(result);
-    }
-
-    @Override
-    public void setVisit(Long id) {
-        getBaseMapper().setVisit(id);
-    }
-
-    @Override
-    public void setDisplay(Long id, Integer display) {
-        getBaseMapper().setDisplay(id, display);
-    }
-
-    @Override
-    public void setSort(Long id, Integer sort) {
-        getBaseMapper().setSort(id, sort);
-    }
-
-
-    @Override
-    public Result saveEntity(MusicDto param) {
-        Long id = param.getId();
-
-        // 校验富文本内容长度
-        StrUtils.checkStrLength(param.getDescription(), 10000);
-
-        MusicEntity entity = null;
-        if (id == null){
-            entity = new MusicEntity();
-            entity.setCreatorId(iBaseService.getUserId());
-        } else {
-            entity = this.getById(id);
-            if (entity == null){
-                String msg = "对象id不存在 ";
-                log.error(msg + id);
-                return Result.failure(msg);
-            }
-            // 判断图片
-            String thumb = entity.getThumb();
-            if (StringUtils.isNotBlank(thumb) && !StringUtils.equals(param.getThumb(), thumb)){
-                fileUtils.del(thumb);
-            }
-
-            String fileUrl = entity.getFilePath();
-            if (StringUtils.isNotBlank(fileUrl) && !StringUtils.equals(param.getFilePath(), fileUrl)){
-                fileUtils.del(fileUrl);
-            }
-        }
-
-        BeanUtils.copyProperties(param, entity);
-        this.saveOrUpdate(entity);
-        return Result.success();
-    }
-
-    @Override
-    public Result upload(MultipartFile file) {
-        Map<String, Object> map = fileUtils.uploadMap(file, "/music/thumb", false);
-        return Result.success(map);
-    }
-
-    @Override
-    public Result fileUpload(MultipartFile file, String type) {
-        Map<String, Object> map = fileUtils.uploadMap(file, "/music/"+type, false);
-        return Result.success(map);
-    }
-
-
-}

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

@@ -131,18 +131,18 @@ public class NewsServiceImpl extends ServiceImpl<NewsMapper, NewsEntity> impleme
         return Result.success(entity);
     }
 
-    @Override
-    public Result remove(Long id) {
-        NewsEntity entity = this.getById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        // db数据软删除， 物理数据真删除
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.updateById(entity);
-        return  Result.success();
-    }
+//    @Override
+//    public Result remove(Long id) {
+//        NewsEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        // db数据软删除， 物理数据真删除
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+//        return  Result.success();
+//    }
 
     @Override
     public Result<NewsEntity> detail(Long id) {

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

@@ -1,107 +0,0 @@
-package com.gis.cms.service.impl;
-
-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.SortPageDto;
-import com.gis.cms.entity.dto.StudentDto;
-import com.gis.cms.entity.po.StudentEntity;
-import com.gis.cms.mapper.StudentMapper;
-import com.gis.cms.service.StudentService;
-import com.gis.common.base.service.impl.IBaseService;
-import com.gis.common.util.BaseUtil;
-import com.gis.common.util.FileUtils;
-import com.gis.common.util.Result;
-import com.gis.common.util.StrUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Map;
-
-
-/**
- * Created by owen on 2020/3/11 0011 16:16
- */
-@Slf4j
-@Service
-public class StudentServiceImpl extends ServiceImpl<StudentMapper, StudentEntity> implements StudentService {
-
-    @Autowired
-    FileUtils fileUtils;
-
-    @Autowired
-    IBaseService iBaseService;
-
-
-
-    @Override
-    public Result search(SortPageDto param) {
-        BaseUtil.startPage(param);
-        IPage<StudentEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
-        IPage<StudentEntity> result = getBaseMapper().search(param, page);
-        return Result.success(result);
-    }
-
-    @Override
-    public void setVisit(Long id) {
-        getBaseMapper().setVisit(id);
-    }
-
-    @Override
-    public void setDisplay(Long id, Integer display) {
-        getBaseMapper().setDisplay(id, display);
-    }
-
-    @Override
-    public void setSort(Long id, Integer sort) {
-        getBaseMapper().setSort(id, sort);
-    }
-
-
-    @Override
-    public Result saveEntity(StudentDto param) {
-        Long id = param.getId();
-        // 校验富文本内容长度
-        StrUtils.checkStrLength(param.getDescription(), 10000);
-
-        StudentEntity entity = null;
-        if (id == null){
-            entity = new StudentEntity();
-            entity.setCreatorId(iBaseService.getUserId());
-        } else {
-            entity = this.getById(id);
-            if (entity == null){
-                String msg = "对象id不存在 ";
-                log.error(msg + id);
-                return Result.failure(msg);
-            }
-            // 判断图片
-            String thumb = entity.getThumb();
-            if (StringUtils.isNotBlank(thumb) && !StringUtils.equals(param.getThumb(), thumb)){
-                fileUtils.del(thumb);
-            }
-        }
-
-        BeanUtils.copyProperties(param, entity);
-        this.saveOrUpdate(entity);
-        return Result.success();
-    }
-
-    @Override
-    public Result upload(MultipartFile file) {
-        Map<String, Object> map = fileUtils.uploadMap(file, "/student", false);
-        return Result.success(map);
-    }
-
-    @Override
-    public Result richUpload(MultipartFile file, String type) {
-        Map<String, Object> map = fileUtils.uploadMap(file, "/student/rich/"+type, false);
-        return Result.success(map);
-    }
-
-
-}

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

@@ -1,108 +0,0 @@
-package com.gis.cms.service.impl;
-
-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.SortPageDto;
-import com.gis.cms.entity.po.VideoEntity;
-import com.gis.cms.mapper.VideoMapper;
-import com.gis.cms.service.VideoService;
-import com.gis.common.base.service.impl.IBaseService;
-import com.gis.common.util.BaseUtil;
-import com.gis.common.util.FileUtils;
-import com.gis.common.util.Result;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Map;
-
-
-/**
- * Created by owen on 2020/3/11 0011 16:16
- */
-@Slf4j
-@Service
-public class VideoServiceImpl extends ServiceImpl<VideoMapper, VideoEntity> implements VideoService {
-
-    @Autowired
-    FileUtils fileUtils;
-
-    @Autowired
-    IBaseService iBaseService;
-
-
-
-    @Override
-    public Result search(SortPageDto param) {
-        BaseUtil.startPage(param);
-        IPage<VideoEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
-        IPage<VideoEntity> result = getBaseMapper().search(param, page);
-        return Result.success(result);
-    }
-
-    @Override
-    public void setVisit(Long id) {
-        getBaseMapper().setVisit(id);
-    }
-
-    @Override
-    public void setDisplay(Long id, Integer display) {
-        getBaseMapper().setDisplay(id, display);
-    }
-
-    @Override
-    public void setSort(Long id, Integer sort) {
-        getBaseMapper().setSort(id, sort);
-    }
-
-
-    @Override
-    public Result saveEntity(VideoDto param) {
-        Long id = param.getId();
-        VideoEntity entity = null;
-        if (id == null){
-            entity = new VideoEntity();
-            entity.setCreatorId(iBaseService.getUserId());
-        } else {
-            entity = this.getById(id);
-            if (entity == null){
-                String msg = "对象id不存在 ";
-                log.error(msg + id);
-                return Result.failure(msg);
-            }
-            // 判断图片
-            String thumb = entity.getThumb();
-            if (StringUtils.isNotBlank(thumb) && !StringUtils.equals(param.getThumb(), thumb)){
-                fileUtils.del(thumb);
-            }
-
-            String fileUrl = entity.getFilePath();
-            if (StringUtils.isNotBlank(fileUrl) && !StringUtils.equals(param.getFilePath(), fileUrl)){
-                fileUtils.del(fileUrl);
-            }
-        }
-
-        BeanUtils.copyProperties(param, entity);
-        this.saveOrUpdate(entity);
-        return Result.success();
-    }
-
-    @Override
-    public Result upload(MultipartFile file) {
-        Map<String, Object> map = fileUtils.uploadMap(file, "/video/thumb", false);
-        return Result.success(map);
-    }
-
-    @Override
-    public Result videoUpload(MultipartFile file, String type) {
-        Map<String, Object> map = fileUtils.uploadMap(file, "/video/"+type, false);
-        return Result.success(map);
-    }
-
-
-}

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

@@ -1,7 +1,7 @@
 package com.gis.cms.service.impl;
 
 import com.gis.cms.service.*;
-import com.gis.common.util.RedisCache;
+import com.gis.common.util.RedisUtil;
 import com.gis.common.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,20 +24,9 @@ public class WebServiceImpl implements WebService {
 
     @Autowired
     GoodsService goodsService;
-    @Autowired
-    VideoService videoService;
-
-    @Autowired
-    ImgService imgService;
-
-    @Autowired
-    MusicService musicService;
-
-    @Autowired
-    StudentService studentService;
 
     @Autowired
-    RedisCache redisCache;
+    RedisUtil redisCache;
 
     // 缓存key
     final static String CACHE_PART = "cache:part";
@@ -84,22 +73,7 @@ public class WebServiceImpl implements WebService {
             case "leader":
                 leaderService.setVisit(id);
                 break;
-
-            case "student":
-                studentService.setVisit(id);
-                break;
-
-            case "video":
-                videoService.setVisit(id);
-                break;
-
-            case "img":
-                imgService.setVisit(id);
-                break;
-
-            case "music":
-                musicService.setVisit(id);
-                break;
+                
         }
 
         return Result.success();

gis_common/src/main/java/com/gis/common/config/RedisConfig.java

@@ -5,15 +5,24 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import javax.annotation.Resource;
+import java.time.Duration;
+
 /**
  * redis配置
  * 
@@ -23,6 +32,13 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 @EnableCaching
 public class RedisConfig extends CachingConfigurerSupport
 {
+
+    /**
+     * by owen 2022-5-5
+     * 缓存对象序列化
+     * @param connectionFactory
+     * @return
+     */
     @Bean
     @SuppressWarnings(value = { "unchecked", "rawtypes" })
     public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory)
@@ -76,4 +92,52 @@ public class RedisConfig extends CachingConfigurerSupport
                 "end\n" +
                 "return tonumber(current);";
     }
+
+
+    @Resource
+    private LettuceConnectionFactory lettuceConnectionFactory;
+
+
+    /**
+     * by owen 2022-5-5
+     * 配置CacheManager
+     * 配置key 过期时间
+     *
+     * @return
+     */
+    @Bean
+    public CacheManager cacheManager() {
+        RedisSerializer<String> redisSerializer = new StringRedisSerializer();
+//        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+        FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
+
+        //解决查询缓存转换异常的问题
+        ObjectMapper om = new ObjectMapper();
+        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        serializer.setObjectMapper(om);
+
+
+
+        // 配置序列化（解决乱码的问题）
+        RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
+//                .entryTtl(Duration.ZERO)
+                .entryTtl(Duration.ofSeconds(20))   //设置缓存失效时间
+                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(serializer))
+                .disableCachingNullValues();
+
+        RedisCacheManager cacheManager = RedisCacheManager.builder(lettuceConnectionFactory)
+                .cacheDefaults(config)
+                .withCacheConfiguration("module", config.entryTtl(Duration.ofMinutes(5))) // module类型过期时间5分钟
+                .build();
+        return cacheManager;
+    }
+
+
+
+
+
+
+
 }

gis_common/src/main/java/com/gis/common/util/FileUtils.java

@@ -27,7 +27,6 @@ public class FileUtils {
 
     public boolean checkFile(MultipartFile file) {
         //设置允许上传文件类型
-//        String suffixList = ".jpg,.gif,.png,.ico,.bmp,.jpeg,.zip,.zp,.rar,.mp3,.mp4,.avi,.mov,.4dage,.wav,.wma,.m4a";
         String suffixList = configConstant.serverFileFallow;
         // 获取文件后缀
         if(file == null){
@@ -95,8 +94,7 @@ public class FileUtils {
         String newName = this.upload(file, savePath, isPinYinRename);
         HashMap<String, Object> result = new HashMap<>();
         result.put("fileName", file.getOriginalFilename());
-        result.put("urlPath", savePath + "/" + newName);
-//        result.put("newName", newName);
+        result.put("filePath", savePath + "/" + newName);
         return result;
 
     }