更新为 mybatis 已测试完成

gis_admin/src/main/java/com/gis/admin/mapper/SysBaseMapper.java

@@ -4,9 +4,6 @@ package com.gis.admin.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.admin.entity.po.SysUserEntity;
 import com.gis.admin.entity.vo.RankVo;
-import com.gis.admin.mapper.provider.SysUserProvider;
-import com.gis.common.base.entity.dto.UserPageDateDto;
-import com.gis.common.base.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Component;
 

gis_admin/src/main/java/com/gis/admin/mapper/SysResourceMapper.java

@@ -1,7 +1,6 @@
 package com.gis.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.admin.entity.po.SysResourceEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

gis_admin/src/main/java/com/gis/admin/mapper/SysRoleMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gis.admin.mapper.provider.SysRoleProvider;
 import com.gis.common.base.entity.dto.PageDto;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.admin.entity.po.SysRoleEntity;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Component;

gis_admin/src/main/java/com/gis/admin/mapper/SysUserMapper.java

@@ -3,9 +3,6 @@ package com.gis.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gis.admin.mapper.provider.SysUserProvider;
-import com.gis.common.base.entity.dto.UserPageDateDto;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.admin.entity.po.SysUserEntity;
 import com.gis.common.base.mapper.provider.BaseProvider;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -136,9 +136,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
                 log.error("管理员账户不能删除 {}", id);
                 return Result.failure("管理员账户不能删除");
             }
-            entity.setIsDelete(1);
-            entity.setUpdateTime(LocalDateTime.now());
-            this.updateById(entity);
+//            entity.setIsDelete(1);
+//            entity.setUpdateTime(LocalDateTime.now());
+//            this.updateById(entity);
+            this.removeById(id);
         }
 
         return Result.success();

gis_application/src/main/resources/application.properties

@@ -27,15 +27,26 @@ spring.servlet.multipart.max-request-size=2048MB
 
 
 
-#\u914D\u7F6E\u81EA\u52A8\u8BC6\u522B\u5B57\u6BB5\u8F6C\u6362
-mybatis.configuration.mapUnderscoreToCamelCase=true
-mapper.identity=MYSQL
-mapper.mappers=tk.mybatis.mapper.common.Mapper
-#pager
-pagehelper.helper-dialect=mysql
-pagehelper.params=count=countSql
-pagehelper.reasonable=false
-pagehelper.support-methods-arguments=true
+##\u914D\u7F6E\u81EA\u52A8\u8BC6\u522B\u5B57\u6BB5\u8F6C\u6362
+#mybatis.configuration.mapUnderscoreToCamelCase=true
+#mapper.identity=MYSQL
+#mapper.mappers=tk.mybatis.mapper.common.Mapper
+##pager
+#pagehelper.helper-dialect=mysql
+#pagehelper.params=count=countSql
+#pagehelper.reasonable=false
+#pagehelper.support-methods-arguments=true
+
+#\u5F00\u542Fsql\u65E5\u5FD7
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+# \u8BE5\u914D\u7F6E\u5C31\u662F\u5C06\u5E26\u6709\u4E0B\u5212\u7EBF\u7684\u8868\u5B57\u6BB5\u6620\u5C04\u4E3A\u9A7C\u5CF0\u683C\u5F0F\u7684\u5B9E\u4F53\u7C7B\u5C5E\u6027
+mybatis-plus.configuration.map-underscore-to-camel-case=true
+mybatis-plus.configuration.call-setters-on-nulls=true
+# \u903B\u8F91\u5220\u9664\u8BBE\u7F6E
+mybatis-plus.global-config.db-config.logic-delete-value=1
+mybatis-plus.global-config.db-config.logic-not-delete-value=0
+mybatis-plus.global-config.db-config.logic-delete-field = isDelete
+mybatis-plus.mapper-locations=classpath*:/mappers/**.xml
 
 
 

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

@@ -1,14 +1,11 @@
 package com.gis.cms.controller;
 
 import com.gis.cms.entity.po.BarrageEntity;
-import com.gis.cms.entity.po.CommentEntity;
-import com.gis.cms.entity.vo.BarrageVo;
 import com.gis.common.base.aop.WebControllerLog;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.util.Result;
 import com.gis.cms.entity.dto.CommentDto;
 import com.gis.cms.service.BarrageService;
-import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +30,7 @@ public class BarrageController  {
 //    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
     @ApiOperation("列表")
     @PostMapping("list")
-    public Result<PageInfo<BarrageVo>> list(@RequestBody PageDateDto param) {
+    public Result list(@RequestBody PageDateDto param) {
         return entityService.search(param, null);
     }
 
@@ -55,13 +52,13 @@ public class BarrageController  {
     @ApiOperation("是否显示")
     @GetMapping("display/{id}/{display}")
     public Result display(@PathVariable Long id, @PathVariable Integer display) {
-        BarrageEntity entity = entityService.findById(id);
+        BarrageEntity entity = entityService.getById(id);
         if (entity == null) {
             log.error("对象id不存在 ： {}", id);
             return Result.failure("对象id不存在");
         }
         entity.setDisplay(display);
-        entityService.update(entity);
+        entityService.updateById(entity);
         return Result.success();
     }
 

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

@@ -1,14 +1,11 @@
 package com.gis.cms.controller;
 
 import com.gis.cms.entity.po.CommentEntity;
-import com.gis.cms.entity.po.QuestionGroupEntity;
 import com.gis.common.base.aop.WebControllerLog;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.util.Result;
 import com.gis.cms.entity.dto.CommentDto;
-import com.gis.cms.entity.vo.CommentVo;
 import com.gis.cms.service.CommentService;
-import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +30,7 @@ public class CommentController  {
 //    @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
     @ApiOperation("列表")
     @PostMapping("list")
-    public Result<PageInfo<CommentVo>> list(@RequestBody PageDateDto param) {
+    public Result list(@RequestBody PageDateDto param) {
         return entityService.search(param, null);
     }
 
@@ -57,14 +54,14 @@ public class CommentController  {
     @ApiOperation("是否显示")
     @GetMapping("display/{id}/{display}")
     public Result display(@PathVariable Long id, @PathVariable Integer display) {
-        CommentEntity entity = entityService.findById(id);
+        CommentEntity entity = entityService.getById(id);
         if (entity == null) {
             log.error("对象id不存在 ： {}", id);
             return Result.failure("对象id不存在");
         }
 
         entity.setDisplay(display);
-        entityService.update(entity);
+        entityService.updateById(entity);
         return Result.success();
     }
 

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

@@ -1,6 +1,5 @@
 package com.gis.cms.controller;
 
-import com.gis.cms.entity.dto.ContentDto;
 import com.gis.cms.entity.dto.SensitiveDto;
 import com.gis.common.base.aop.WebControllerLog;
 import com.gis.common.base.entity.dto.PageDto;
@@ -10,7 +9,6 @@ import com.gis.cms.service.SensitiveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -16,6 +16,9 @@ public class TypePageDateDto extends PageDateDto {
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "是否显示，1：显示， 0：不显示, 默认显示", notes = "后端使用")
+    private Integer display;
+
 
 
 

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

@@ -2,7 +2,6 @@ package com.gis.cms.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.AuditLogEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;

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

@@ -3,19 +3,14 @@ package com.gis.cms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gis.admin.entity.po.SysRoleEntity;
 import com.gis.cms.entity.po.BarrageEntity;
 import com.gis.cms.mapper.provider.BarrageProvider;
-import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.base.entity.dto.PageDto;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.vo.BarrageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 @Component
 @Mapper
 public interface BarrageMapper extends BaseMapper<BarrageEntity> {

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

@@ -3,7 +3,6 @@ package com.gis.cms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.common.base.entity.dto.PageDateDto;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.CommentEntity;
 import com.gis.cms.entity.vo.CommentVo;
 import com.gis.cms.mapper.provider.CommentProvider;

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

@@ -3,7 +3,6 @@ package com.gis.cms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.cms.entity.po.FileEntity;
-import com.gis.common.base.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;

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

@@ -2,16 +2,15 @@ package com.gis.cms.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gis.cms.entity.po.GoodsEntity;
 import com.gis.cms.mapper.provider.GoodsProvider;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.dto.TypePageDateDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 @Component
 @Mapper
 public interface GoodsMapper extends BaseMapper<GoodsEntity> {
@@ -19,7 +18,8 @@ public interface GoodsMapper extends BaseMapper<GoodsEntity> {
 
 
     @SelectProvider(type = GoodsProvider.class, method = "search")
-    List<GoodsEntity> search(TypePageDateDto param, Integer display);
+//    List<GoodsEntity> search(TypePageDateDto param, Integer display);
+    Page<GoodsEntity> search(TypePageDateDto param, IPage page);
 
 
 

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

@@ -2,7 +2,6 @@ package com.gis.cms.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.MartyrEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Update;

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

@@ -2,10 +2,11 @@ package com.gis.cms.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gis.cms.entity.vo.MournVo;
 import com.gis.cms.mapper.provider.MournProvider;
 import com.gis.common.base.entity.dto.PageDateDto;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.MournEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
@@ -20,7 +21,8 @@ import java.util.List;
 public interface MournMapper extends BaseMapper<MournEntity> {
 
     @SelectProvider(type = MournProvider.class, method = "search")
-    List<MournVo> search(PageDateDto param, Integer display);
+//    List<MournVo> search(PageDateDto param, Integer display);
+    Page<MournVo> search(PageDateDto param, Integer display, IPage page);
 
     @Select("select a.*, b.unit, b.real_name, b.nick_name " +
             "from tb_mourn a left join sys_user b on b.id=a.user_id " +

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

@@ -3,7 +3,6 @@ package com.gis.cms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.cms.entity.po.FileEntity;
-import com.gis.common.base.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.CacheNamespace;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

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

@@ -2,7 +2,6 @@ package com.gis.cms.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.NewsEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Update;

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

@@ -2,7 +2,6 @@ package com.gis.cms.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.QuestionAnswerEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

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

@@ -3,7 +3,6 @@ package com.gis.cms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.cms.entity.po.QuestionGroupEntity;
-import com.gis.common.base.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

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

@@ -2,7 +2,6 @@ package com.gis.cms.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.QuestionUserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

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

@@ -3,7 +3,6 @@ package com.gis.cms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.cms.entity.po.RaceEntity;
-import com.gis.common.base.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;

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

@@ -2,7 +2,6 @@ package com.gis.cms.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.SensitiveEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

gis_cms/src/main/java/com/gis/cms/mapper/provider/GoodsProvider.java

@@ -12,7 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 public class GoodsProvider {
 
 
-    public String search(TypePageDateDto param, Integer display) {
+    public String search(TypePageDateDto param) {
         StringBuffer sql = new StringBuffer(
                 "select * from tb_goods where is_delete = '0' ");
 
@@ -28,6 +28,7 @@ public class GoodsProvider {
             sql.append(" and ( name like '%").append(searchKey).append("%' )");
         }
 
+        Integer display = param.getDisplay();
         if (display != null) {
             sql.append(" and  display = ").append(display);
         }

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

@@ -32,8 +32,7 @@ public class AuditLogServiceImpl extends ServiceImpl<AuditLogMapper, AuditLogEnt
 
 
 
-    @Resource
-    HttpServletRequest request;
+
 
     @Autowired
     FileService fileService;
@@ -131,14 +130,15 @@ public class AuditLogServiceImpl extends ServiceImpl<AuditLogMapper, AuditLogEnt
 
     @Override
     public Result remove(Long id) {
-        AuditLogEntity entity = this.getById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        // db数据软删除， 物理数据真删除
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.updateById(entity);
+//        AuditLogEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        // db数据软删除， 物理数据真删除
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+        this.removeById(id);
         return  Result.success();
     }
 

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

@@ -74,14 +74,15 @@ public class BarrageServiceImpl extends ServiceImpl<BarrageMapper, BarrageEntity
 
     @Override
     public Result remove(Long id) {
-        BarrageEntity entity = this.getById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        // db数据软删除， 物理数据真删除
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.updateById(entity);
+//        BarrageEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        // db数据软删除， 物理数据真删除
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+        this.removeById(id);
         return Result.success();
     }
 

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

@@ -14,12 +14,10 @@ import com.gis.cms.service.SensitiveService;
 import com.gis.cms.tree.CommentTreeUtil;
 import com.gis.cms.tree.vo.CommentTree;
 import com.gis.common.base.entity.dto.PageDateDto;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.common.base.service.IBaseService;
 import com.gis.common.constant.TypeCode;
 import com.gis.common.util.BaseUtil;
 import com.gis.common.util.Result;
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,14 +89,15 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, CommentEntity
 
     @Override
     public Result remove(Long id) {
-        CommentEntity entity = this.getById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        // db数据软删除， 物理数据真删除
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.updateById(entity);
+//        CommentEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        // db数据软删除， 物理数据真删除
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+        this.removeById(id);
         return Result.success();
     }
 
@@ -127,8 +126,10 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, CommentEntity
         CommentTreeUtil commentTreeUtil = new CommentTreeUtil(search, filterKey);
         List<CommentTree> commentTrees = commentTreeUtil.buildTree();
 
-        PageInfo<CommentTree> page = new PageInfo<>(commentTrees);
-        return Result.success(page);
+//        PageInfo<CommentTree> page = new PageInfo<>(commentTrees);
+//        return Result.success(page);
+        // todo 2022-08-12
+        return Result.success();
     }
 
     @Override

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

@@ -2,10 +2,12 @@ package com.gis.cms.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.cms.entity.po.FileEntity;
 import com.gis.cms.mapper.FileMapper;
 import com.gis.common.base.exception.BaseRuntimeException;
-import com.gis.common.base.mapper.IBaseMapper;
+import com.gis.common.constant.ConfigConstant;
+import com.gis.common.util.FileUtils;
 import com.gis.common.util.RegexUtil;
 import com.gis.cms.service.FileService;
 import lombok.extern.slf4j.Slf4j;
@@ -26,28 +28,25 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-public class FileServiceImpl extends ServiceImpl<FileEntity, Long> implements FileService {
+public class FileServiceImpl extends ServiceImpl<FileMapper, FileEntity> implements FileService {
 
-    @Autowired
-    private FileMapper entityMapper;
-
-    @Override
-    public IBaseMapper<FileEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
 
+    @Autowired
+    FileUtils fileUtils;
 
+    @Autowired
+    ConfigConstant configConstant;
 
 
     @Override
     public void indexDisable(Long moduleId, String module) {
-        entityMapper.indexDisable(moduleId, module);
+        baseMapper.indexDisable(moduleId, module);
 
     }
 
     @Override
     public void indexEnabled(Long fileId) {
-        entityMapper.indexEnabled(fileId);
+        baseMapper.indexEnabled(fileId);
     }
 
     @Override
@@ -57,17 +56,17 @@ public class FileServiceImpl extends ServiceImpl<FileEntity, Long> implements Fi
         }
         // 去除特殊符号，防止sql注入
         fileIds = RegexUtil.specificSymbol(fileIds);
-        entityMapper.addModuleIdToFile(fileIds, moduleId, module);
+        baseMapper.addModuleIdToFile(fileIds, moduleId, module);
     }
 
     @Override
     public List<FileEntity> findIndexByModule(Long moduleId, String module) {
-        return entityMapper.findIndexByModule(moduleId, module);
+        return baseMapper.findIndexByModule(moduleId, module);
     }
 
     @Override
     public List<FileEntity> findByModuleId(Long moduleId, String module) {
-        return entityMapper.findByModuleId(moduleId, module);
+        return baseMapper.findByModuleId(moduleId, module);
     }
 
     /**

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

@@ -2,6 +2,9 @@ package com.gis.cms.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
+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.AuditDto;
 import com.gis.cms.entity.dto.GoodsDto;
 import com.gis.cms.entity.dto.TypePageDateDto;
@@ -10,15 +13,17 @@ import com.gis.cms.entity.po.FileEntity;
 import com.gis.cms.entity.po.GoodsEntity;
 import com.gis.cms.mapper.GoodsMapper;
 import com.gis.common.base.exception.BaseRuntimeException;
-import com.gis.common.base.mapper.IBaseMapper;
+import com.gis.common.base.service.IBaseService;
+import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.MsgCode;
 import com.gis.common.constant.TypeCode;
+import com.gis.common.util.BaseUtil;
+import com.gis.common.util.FileUtils;
 import com.gis.common.util.RegexUtil;
 import com.gis.common.util.Result;
 import com.gis.cms.service.AuditLogService;
 import com.gis.cms.service.FileService;
 import com.gis.cms.service.GoodsService;
-import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -26,8 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -40,13 +43,10 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-public class GoodsServiceImpl extends ServiceImpl<GoodsEntity, Long> implements GoodsService {
+public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> implements GoodsService {
+
 
-    @Autowired
-    private GoodsMapper entityMapper;
 
-    @Resource
-    HttpServletRequest request;
 
     @Autowired
     FileService fileService;
@@ -54,18 +54,26 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsEntity, Long> implements
     @Autowired
     AuditLogService auditLogService;
 
+    @Autowired
+    FileUtils fileUtils;
 
+    @Autowired
+    IBaseService iBaseService;
 
-    @Override
-    public IBaseMapper<GoodsEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
+    @Autowired
+    ConfigConstant configConstant;
 
 
     @Override
     public Result<GoodsEntity> search(TypePageDateDto param, Integer display) {
-        startPage(param);
-        return Result.success(new PageInfo<>(entityMapper.search(param, display)));
+//        startPage(param);
+////        return Result.success(new PageInfo<>(entityMapper.search(param, display)));
+
+        BaseUtil.startPage(param);
+        IPage<GoodsEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
+        param.setDisplay(display);
+        return Result.success(baseMapper.search(param, page));
+
     }
 
     @Override
@@ -75,16 +83,16 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsEntity, Long> implements
         if (id == null) {
             entity = new GoodsEntity();
             BeanUtils.copyProperties(param, entity);
-            entity.setUserName(getTokenUserName());
+            entity.setUserName(iBaseService.getUserName());
             this.save(entity);
         } else {
-            entity = this.findById(id);
+            entity = this.getById(id);
             if (entity == null) {
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
             entity.setUpdateTime(LocalDateTime.now());
-            this.update(entity);
+            this.updateById(entity);
         }
 
         // 图片类型img,  将模块id绑定到文件表
@@ -103,54 +111,40 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsEntity, Long> implements
         return Result.success(entity);
     }
 
-//    /**
-//     * 设置首张图片
-//     * @param fileIds 文件id
-//     * @param moduleId 模块id
-//     */
-//    private void setIndex(String fileIds, Long moduleId){
-//        List<FileEntity> entities = fileService.findIndexByModule(moduleId, TypeCode.MODULE_GOODS);
-//        if (entities.size() == 0) {
-//            // 初始页面不存在，设置第一张为初始页面
-//            String[] split = fileIds.split(",");
-//            Long indexId = Long.valueOf(split[0]);
-//            fileService.indexEnabled(indexId);
-//            // 设置缩略图
-//            FileEntity fileEntity = fileService.findById(indexId);
-//            setThumbByIndex(moduleId, fileEntity.getFilePath());
-//        }
-//    }
+
 
     @Override
     public Result remove(Long id) {
-        GoodsEntity entity = this.findById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+//        GoodsEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+        this.removeById(id);
 
         return Result.success();
     }
 
     @Override
     public Result removeFile(Long fileId) {
-        FileEntity entity = fileService.findById(fileId);
-        if (entity == null){
-            return Result.success();
-        }
-
-        entity.setIsDelete(1);
-        entity.setIsIndex(0);
-        entity.setUpdateTime(LocalDateTime.now());
-        fileService.update(entity);
+//        FileEntity entity = fileService.getById(fileId);
+//        if (entity == null){
+//            return Result.success();
+//        }
+//
+//        entity.setIsDelete(1);
+//        entity.setIsIndex(0);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        fileService.updateById(entity);
+        this.removeById(fileId);
         return Result.success();
     }
 
     @Override
     public Result setIndex(Long fileId) {
-        FileEntity entity = fileService.findById(fileId);
+        FileEntity entity = fileService.getById(fileId);
         if (entity == null) {
             return Result.failure("对象不存在： " + fileId);
         }
@@ -168,19 +162,16 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsEntity, Long> implements
         fileService.indexDisable(goodId, module);
         fileService.indexEnabled(fileId);
 
-        // 设置缩略图
-//        setThumbByIndex(goodId, entity.getFilePath());
-
     }
 
     /**
      * 将封面图更新为缩略图
      */
     private void setThumbByIndex(Long goodId, String thumb){
-        GoodsEntity entity = this.findById(goodId);
+        GoodsEntity entity = this.getById(goodId);
         entity.setThumb(thumb);
         entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+        this.updateById(entity);
     }
 
     @Override
@@ -208,7 +199,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsEntity, Long> implements
 
     @Override
     public Result detail(Long id) {
-        GoodsEntity entity = this.findById(id);
+        GoodsEntity entity = this.getById(id);
         if (entity == null) {
             return Result.failure(MsgCode.e3001,"对象不存在，id: " + id);
         }
@@ -256,25 +247,25 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsEntity, Long> implements
 
     @Override
     public Result display(Long id, Integer display) {
-        GoodsEntity entity = this.findById(id);
+        GoodsEntity entity = this.getById(id);
         if (entity == null) {
             log.error("对象id不存在 ： {}", id);
             return Result.failure("对象id不存在");
         }
 
         entity.setDisplay(display);
-        this.update(entity);
+        this.updateById(entity);
         return Result.success(entity);
     }
 
     private void updateStatus(Long id, Integer status){
-        GoodsEntity entity = this.findById(id);
+        GoodsEntity entity = this.getById(id);
         if (entity == null) {
             throw new BaseRuntimeException(MsgCode.e3001, "对象不存在");
         }
         entity.setStatus(status);
         entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+        this.updateById(entity);
     }
 
 

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

@@ -1,5 +1,9 @@
 package com.gis.cms.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.cms.entity.dto.AuditDto;
 import com.gis.cms.entity.dto.MartyrDto;
 import com.gis.cms.entity.dto.StatusPageDataDto;
@@ -8,20 +12,21 @@ import com.gis.cms.entity.po.MartyrEntity;
 import com.gis.cms.mapper.MartyrMapper;
 import com.gis.cms.service.AuditLogService;
 import com.gis.common.base.exception.BaseRuntimeException;
-import com.gis.common.base.mapper.IBaseMapper;
+import com.gis.common.base.service.IBaseService;
+import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.MsgCode;
 import com.gis.common.constant.TypeCode;
+import com.gis.common.util.BaseUtil;
+import com.gis.common.util.FileUtils;
 import com.gis.common.util.Result;
 import com.gis.cms.service.FileService;
 import com.gis.cms.service.MartyrService;
-import com.github.pagehelper.PageInfo;
 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 tk.mybatis.mapper.entity.Condition;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -32,14 +37,9 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class MartyrServiceImpl extends ServiceImpl<MartyrEntity, Long> implements MartyrService {
+public class MartyrServiceImpl extends ServiceImpl<MartyrMapper, MartyrEntity> implements MartyrService {
 
-    @Autowired
-    private MartyrMapper entityMapper;
 
-//
-//    @Resource
-//    public HttpServletRequest request;
 
     @Autowired
     FileService fileService;
@@ -47,38 +47,67 @@ public class MartyrServiceImpl extends ServiceImpl<MartyrEntity, Long> implement
     @Autowired
     AuditLogService auditLogService;
 
-    @Override
-    public IBaseMapper<MartyrEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
+    @Autowired
+    FileUtils fileUtils;
+
+    @Autowired
+    IBaseService iBaseService;
+
+    @Autowired
+    ConfigConstant configConstant;
+
+//    @Override
+//    public Result<MartyrEntity> search(StatusPageDataDto param, Integer display) {
+//        startPage(param);
+//        Condition condition = new Condition(MartyrEntity.class);
+//        String searchKey = param.getSearchKey();
+//        if (StringUtils.isNotBlank(searchKey)) {
+//            searchKey = StringUtils.trim(searchKey);
+//            condition.and().orLike("realName", "%" + searchKey + "%");
+////                    .orLike("userName", "%" + searchKey + "%");
+//        }
+//        String startTime = param.getStartTime();
+//        String endTime = param.getEndTime();
+//        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) ) {
+//            condition.and().andBetween("createTime", startTime, endTime);
+//        }
+//        Integer status = param.getStatus();
+//        if (status != null) {
+//            condition.and().andEqualTo("status", status);
+//        }
+//
+//        if (display != null) {
+//            condition.and().andEqualTo("display", display);
+//        }
+//
+//        condition.orderBy("createTime").desc();
+//        PageInfo<MartyrEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
+//        return Result.success(pageInfo);
+//
+//    }
 
     @Override
     public Result<MartyrEntity> search(StatusPageDataDto param, Integer display) {
-        startPage(param);
-        Condition condition = new Condition(MartyrEntity.class);
+        BaseUtil.startPage(param);
+        LambdaQueryWrapper<MartyrEntity> wrapper = new LambdaQueryWrapper<>();
         String searchKey = param.getSearchKey();
-        if (StringUtils.isNotBlank(searchKey)) {
-            searchKey = StringUtils.trim(searchKey);
-            condition.and().orLike("realName", "%" + searchKey + "%");
-//                    .orLike("userName", "%" + searchKey + "%");
-        }
+        wrapper.like(StrUtil.isNotBlank(searchKey), MartyrEntity::getRealName, searchKey);
+
         String startTime = param.getStartTime();
         String endTime = param.getEndTime();
-        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) ) {
-            condition.and().andBetween("createTime", startTime, endTime);
+        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)){
+            wrapper.between(MartyrEntity::getCreateTime, startTime, endTime);
         }
+
         Integer status = param.getStatus();
-        if (status != null) {
-            condition.and().andEqualTo("status", status);
-        }
+        wrapper.eq(status!= null, MartyrEntity::getStatus, status);
+        wrapper.eq(display!= null, MartyrEntity::getDisplay, display);
 
-        if (display != null) {
-            condition.and().andEqualTo("display", display);
-        }
+        wrapper.orderByDesc(MartyrEntity::getCreateTime);
+
+        Page<MartyrEntity> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
 
-        condition.orderBy("createTime").desc();
-        PageInfo<MartyrEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
-        return Result.success(pageInfo);
+        return Result.success(page);
 
     }
 
@@ -117,31 +146,31 @@ public class MartyrServiceImpl extends ServiceImpl<MartyrEntity, Long> implement
 
     @Override
     public Result display(Long id, Integer display) {
-        MartyrEntity entity = this.findById(id);
+        MartyrEntity entity = this.getById(id);
         if (entity == null) {
             log.error("对象id不存在 ： {}", id);
             return Result.failure("对象id不存在");
         }
 
         entity.setDisplay(display);
-        this.update(entity);
+        this.updateById(entity);
         return Result.success(entity);
     }
 
     @Override
     public void addVisit(Long id) {
-        entityMapper.addVisit(id);
+        baseMapper.addVisit(id);
     }
 
 
     private void updateStatus(Long id, Integer status){
-        MartyrEntity entity = this.findById(id);
+        MartyrEntity entity = this.getById(id);
         if (entity == null) {
             throw new BaseRuntimeException(MsgCode.e3001, "对象不存在");
         }
         entity.setStatus(status);
         entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+        this.updateById(entity);
     }
 
     @Override
@@ -151,16 +180,17 @@ public class MartyrServiceImpl extends ServiceImpl<MartyrEntity, Long> implement
         if (id == null) {
             entity = new MartyrEntity();
             BeanUtils.copyProperties(param, entity);
-            entity.setUserName(getTokenUserName());
+//            entity.setUserName(getTokenUserName());
+            entity.setUserName(iBaseService.getUserName());
             this.save(entity);
         } else {
-            entity = this.findById(id);
+            entity = this.getById(id);
             if (entity == null) {
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
             entity.setUpdateTime(LocalDateTime.now());
-            this.update(entity);
+            this.updateById(entity);
         }
 
         return Result.success(entity);
@@ -168,20 +198,21 @@ public class MartyrServiceImpl extends ServiceImpl<MartyrEntity, Long> implement
 
     @Override
     public Result remove(Long id) {
-        MartyrEntity entity = this.findById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        // db数据软删除， 物理数据真删除
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+//        MartyrEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        // db数据软删除， 物理数据真删除
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+        this.removeById(id);
         return  Result.success();
     }
 
     @Override
     public Result<MartyrEntity> detail(Long id) {
-        MartyrEntity entity = this.findById(id);
+        MartyrEntity entity = this.getById(id);
         if (entity == null) {
             return Result.failure("对象不存在");
         }

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

@@ -1,5 +1,8 @@
 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.admin.service.IntegralService;
 import com.gis.cms.entity.dto.MournDto;
 import com.gis.cms.entity.po.MournEntity;
@@ -8,13 +11,15 @@ import com.gis.cms.mapper.MournMapper;
 import com.gis.cms.service.SensitiveService;
 import com.gis.common.base.exception.BaseRuntimeException;
 import com.gis.common.base.entity.dto.PageDateDto;
-import com.gis.common.base.mapper.IBaseMapper;
+import com.gis.common.base.service.IBaseService;
+import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.MsgCode;
 import com.gis.common.constant.TypeCode;
+import com.gis.common.util.BaseUtil;
+import com.gis.common.util.FileUtils;
 import com.gis.common.util.MyStrUtil;
 import com.gis.common.util.Result;
 import com.gis.cms.service.MournService;
-import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,10 +33,9 @@ import java.util.Set;
  * Created by owen on 2020/3/11 0011 16:16
  */
 @Service
-public class MournServiceImpl extends ServiceImpl<MournEntity, Long> implements MournService {
+public class MournServiceImpl extends ServiceImpl<MournMapper, MournEntity> implements MournService {
+
 
-    @Autowired
-    private MournMapper entityMapper;
 
 
     @Autowired
@@ -40,35 +44,41 @@ public class MournServiceImpl extends ServiceImpl<MournEntity, Long> implements
     @Autowired
     IntegralService integralService;
 
-    @Override
-    public IBaseMapper<MournEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
+    @Autowired
+    FileUtils fileUtils;
+
+    @Autowired
+    IBaseService iBaseService;
+
+    @Autowired
+    ConfigConstant configConstant;
+
 
 
     @Override
     public Result<MournVo> search(PageDateDto param, Integer display) {
-        startPage(param);
-        List<MournVo> list = entityMapper.search(param, display);
-        PageInfo<MournVo> pageInfo = new PageInfo<>(list);
-        return Result.success(pageInfo);
+        BaseUtil.startPage(param);
+        IPage<MournEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
+        return Result.success(baseMapper.search(param, display, page));
+//        List<MournVo> list = baseMapper.search(param, display, page);
+//        return Result.success(pageInfo);
     }
 
     @Override
     public Result updateDisplay(Long id, Integer display) {
-        MournEntity entity = this.findById(id);
+        MournEntity entity = this.getById(id);
         if (entity == null) {
             throw new BaseRuntimeException(MsgCode.e3001, "对象不存在");
         }
         entity.setDisplay(display);
         entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+        this.updateById(entity);
         return Result.success();
     }
 
     @Override
     public Result mournComment(Long martyrId) {
-       List<MournVo> list = entityMapper.findByMartyrIdMapper(martyrId);
+       List<MournVo> list = baseMapper.findByMartyrIdMapper(martyrId);
 
        // 处理敏感词
         Set<Object> filterKey = sensitiveService.getFilterKey();
@@ -84,7 +94,7 @@ public class MournServiceImpl extends ServiceImpl<MournEntity, Long> implements
 
     @Override
     public void addVisit(Long id) {
-        entityMapper.addVisit(id);
+        baseMapper.addVisit(id);
     }
 
 
@@ -92,7 +102,7 @@ public class MournServiceImpl extends ServiceImpl<MournEntity, Long> implements
     public Result saveEntity(MournDto param) {
         MournEntity entity = new MournEntity();
         BeanUtils.copyProperties(param, entity);
-        entity.setUserId(getTokenUserId());
+        entity.setUserId(iBaseService.getUserId());
         this.save(entity);
 
         // 添加积分
@@ -102,20 +112,21 @@ public class MournServiceImpl extends ServiceImpl<MournEntity, Long> implements
 
     @Override
     public Result remove(Long id) {
-        MournEntity entity = this.findById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        // db数据软删除， 物理数据真删除
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+//        MournEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        // db数据软删除， 物理数据真删除
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+        this.removeById(id);
         return Result.success();
     }
 
     @Override
     public Result<MournVo> detail(Long id) {
-        MournVo entity = entityMapper.mapperFindById(id);
+        MournVo entity = baseMapper.mapperFindById(id);
         if (entity == null) {
             return Result.failure("对象不存在");
         }

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

@@ -2,6 +2,10 @@ package com.gis.cms.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.cms.entity.dto.AuditDto;
 import com.gis.cms.entity.dto.NewsDto;
 import com.gis.cms.entity.dto.NewsPageDataDto;
@@ -10,21 +14,22 @@ import com.gis.cms.entity.po.NewsEntity;
 import com.gis.cms.mapper.NewsMapper;
 import com.gis.cms.service.AuditLogService;
 import com.gis.common.base.exception.BaseRuntimeException;
-import com.gis.common.base.mapper.IBaseMapper;
+import com.gis.common.base.service.IBaseService;
+import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.MsgCode;
 import com.gis.common.constant.TypeCode;
+import com.gis.common.util.BaseUtil;
+import com.gis.common.util.FileUtils;
 import com.gis.common.util.RegexUtil;
 import com.gis.common.util.Result;
 import com.gis.cms.service.FileService;
 import com.gis.cms.service.NewsService;
-import com.github.pagehelper.PageInfo;
 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 tk.mybatis.mapper.entity.Condition;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -37,10 +42,9 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class NewsServiceImpl extends ServiceImpl<NewsEntity, Long> implements NewsService {
+public class NewsServiceImpl extends ServiceImpl<NewsMapper, NewsEntity> implements NewsService {
+
 
-    @Autowired
-    private NewsMapper entityMapper;
 
 
     @Autowired
@@ -49,46 +53,74 @@ public class NewsServiceImpl extends ServiceImpl<NewsEntity, Long> implements Ne
     @Autowired
     AuditLogService auditLogService;
 
-    @Override
-    public IBaseMapper<NewsEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
-
-    @Override
-    public Result<NewsEntity> search(NewsPageDataDto param, Integer display) {
-        startPage(param);
-        Condition condition = new Condition(NewsEntity.class);
-
-        Integer status = param.getStatus();
-        if (status != null) {
-            condition.and().andEqualTo("status", status);
-        }
+    @Autowired
+    FileUtils fileUtils;
 
-        String type = param.getType();
-        if (StringUtils.isNotBlank(type)) {
-            condition.and().andEqualTo("type", type);
-        }
+    @Autowired
+    IBaseService iBaseService;
 
-        if (display != null){
-            condition.and().andEqualTo("display", display);
-        }
+    @Autowired
+    ConfigConstant configConstant;
+
+//    @Override
+//    public Result<NewsEntity> search(NewsPageDataDto param, Integer display) {
+//        startPage(param);
+//        Condition condition = new Condition(NewsEntity.class);
+//
+//        Integer status = param.getStatus();
+//        if (status != null) {
+//            condition.and().andEqualTo("status", status);
+//        }
+//
+//        String type = param.getType();
+//        if (StringUtils.isNotBlank(type)) {
+//            condition.and().andEqualTo("type", type);
+//        }
+//
+//        if (display != null){
+//            condition.and().andEqualTo("display", display);
+//        }
+//
+//        String searchKey = param.getSearchKey();
+//        if (StringUtils.isNotBlank(searchKey)) {
+//            searchKey = StringUtils.trim(searchKey);
+//            condition.and().orLike("name", "%" + searchKey + "%");
+////                    .orLike("description", "%" + searchKey + "%");
+//        }
+//        String startTime = param.getStartTime();
+//        String endTime = param.getEndTime();
+//        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) ) {
+//            condition.and().andBetween("createTime", startTime, endTime);
+//        }
+//
+//
+//        condition.orderBy("createTime").desc();
+//        PageInfo<NewsEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
+//        return Result.success(pageInfo);
+//
+//    }
 
+    @Override
+    public Result<NewsEntity> search(NewsPageDataDto param, Integer display) {
+        BaseUtil.startPage(param);
+        LambdaQueryWrapper<NewsEntity> wrapper = new LambdaQueryWrapper<>();
         String searchKey = param.getSearchKey();
-        if (StringUtils.isNotBlank(searchKey)) {
-            searchKey = StringUtils.trim(searchKey);
-            condition.and().orLike("name", "%" + searchKey + "%");
-//                    .orLike("description", "%" + searchKey + "%");
-        }
+        wrapper.like(StrUtil.isNotBlank(searchKey), NewsEntity::getName, searchKey);
+
         String startTime = param.getStartTime();
         String endTime = param.getEndTime();
-        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) ) {
-            condition.and().andBetween("createTime", startTime, endTime);
+        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)){
+            wrapper.between(NewsEntity::getCreateTime, startTime, endTime);
         }
 
-
-        condition.orderBy("createTime").desc();
-        PageInfo<NewsEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
-        return Result.success(pageInfo);
+        Integer status = param.getStatus();
+        wrapper.eq(status!= null, NewsEntity::getStatus, status);
+        wrapper.eq(display!= null, NewsEntity::getDisplay, display);
+        String type = param.getType();
+        wrapper.eq(type!= null, NewsEntity::getType, type);
+        wrapper.orderByDesc(NewsEntity::getCreateTime);
+        Page<NewsEntity> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        return Result.success(page);
 
     }
 
@@ -127,20 +159,20 @@ public class NewsServiceImpl extends ServiceImpl<NewsEntity, Long> implements Ne
 
     @Override
     public Result updateDisplay(Long id, Integer display) {
-        NewsEntity entity = this.findById(id);
+        NewsEntity entity = this.getById(id);
         if (entity == null) {
             log.error("对象id不存在 ： {}", id);
             return Result.failure("对象id不存在");
         }
 
         entity.setDisplay(display);
-        this.update(entity);
+        this.updateById(entity);
         return Result.success(entity);
     }
 
     @Override
     public void addVisit(Long id) {
-        entityMapper.addVisit(id);
+        baseMapper.addVisit(id);
     }
 
     @Override
@@ -188,13 +220,13 @@ public class NewsServiceImpl extends ServiceImpl<NewsEntity, Long> implements Ne
 
 
     private void updateStatus(Long id, Integer status){
-        NewsEntity entity = this.findById(id);
+        NewsEntity entity = this.getById(id);
         if (entity == null) {
             throw new BaseRuntimeException(MsgCode.e3001, "对象不存在");
         }
         entity.setStatus(status);
         entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+        this.updateById(entity);
     }
 
     @Override
@@ -204,16 +236,16 @@ public class NewsServiceImpl extends ServiceImpl<NewsEntity, Long> implements Ne
         if (id == null) {
             entity = new NewsEntity();
             BeanUtils.copyProperties(param, entity);
-            entity.setUserName(getTokenUserName());
+            entity.setUserName(iBaseService.getUserName());
             this.save(entity);
         } else {
-            entity = this.findById(id);
+            entity = this.getById(id);
             if (entity == null) {
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
             entity.setUpdateTime(LocalDateTime.now());
-            this.update(entity);
+            this.updateById(entity);
         }
 
         return Result.success(entity);
@@ -221,20 +253,21 @@ public class NewsServiceImpl extends ServiceImpl<NewsEntity, Long> implements Ne
 
     @Override
     public Result remove(Long id) {
-        NewsEntity entity = this.findById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        // db数据软删除， 物理数据真删除
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+//        NewsEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        // db数据软删除， 物理数据真删除
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+        this.removeById(id);
         return  Result.success();
     }
 
     @Override
     public Result<NewsEntity> detail(Long id) {
-        NewsEntity entity = this.findById(id);
+        NewsEntity entity = this.getById(id);
         if (entity == null) {
             return Result.failure("对象不存在");
         }

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

@@ -1,12 +1,15 @@
 package com.gis.cms.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.cms.entity.dto.AnswerDto;
 import com.gis.cms.entity.dto.QuestionAnswerDto;
 import com.gis.cms.entity.po.QuestionAnswerEntity;
 import com.gis.cms.mapper.QuestionAnswerMapper;
 import com.gis.cms.mapper.RaceMapper;
-import com.gis.common.base.mapper.IBaseMapper;
+import com.gis.common.base.service.IBaseService;
+import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.MsgCode;
+import com.gis.common.util.FileUtils;
 import com.gis.common.util.Result;
 import com.gis.cms.service.AuditLogService;
 import com.gis.cms.service.FileService;
@@ -26,10 +29,8 @@ import java.util.List;
  * Created by owen on 2020/3/11 0011 16:16
  */
 @Service
-public class QuestionAnswerServiceImpl extends ServiceImpl<QuestionAnswerEntity, Long> implements QuestionAnswerService {
+public class QuestionAnswerServiceImpl extends ServiceImpl<QuestionAnswerMapper, QuestionAnswerEntity> implements QuestionAnswerService {
 
-    @Autowired
-    private QuestionAnswerMapper entityMapper;
 
     @Autowired
     FileService fileService;
@@ -40,10 +41,14 @@ public class QuestionAnswerServiceImpl extends ServiceImpl<QuestionAnswerEntity,
     @Autowired
     RaceMapper raceMapper;
 
-    @Override
-    public IBaseMapper<QuestionAnswerEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
+    @Autowired
+    FileUtils fileUtils;
+
+    @Autowired
+    IBaseService iBaseService;
+
+    @Autowired
+    ConfigConstant configConstant;
 
     @Override
     public Result saveEntitys(AnswerDto param) {
@@ -59,7 +64,7 @@ public class QuestionAnswerServiceImpl extends ServiceImpl<QuestionAnswerEntity,
 
     @Override
     public void removeByQuestionGroupId(Long questionGroupId) {
-        entityMapper.removeByQuestionGroupId(questionGroupId);
+        baseMapper.removeByQuestionGroupId(questionGroupId);
     }
 
     @Override
@@ -69,18 +74,18 @@ public class QuestionAnswerServiceImpl extends ServiceImpl<QuestionAnswerEntity,
 
     @Override
     public List<QuestionAnswerEntity> findByQuestionGroupId(Long questionGroupId) {
-        return entityMapper.findByQuestionGroupId(questionGroupId);
+        return baseMapper.findByQuestionGroupId(questionGroupId);
     }
 
     @Override
     public void updateQuestionGroupId(Long questionGroupId, String answerIds) {
         answerIds = StringUtils.trim(answerIds);
-        entityMapper.updateQuestionGroupId(questionGroupId, answerIds);
+        baseMapper.updateQuestionGroupId(questionGroupId, answerIds);
     }
 
     @Override
     public void disableByQuestionGroupId(Long groupId) {
-        entityMapper.disableByQuestionGroupId(groupId);
+        baseMapper.disableByQuestionGroupId(groupId);
     }
 
     /**
@@ -90,14 +95,14 @@ public class QuestionAnswerServiceImpl extends ServiceImpl<QuestionAnswerEntity,
      */
     @Override
     public Result random(Integer size) {
-        Long userId = getTokenUserId();
+        Long userId = iBaseService.getUserId();
         LocalDate now = LocalDate.now();
         List<Long> list = raceMapper.findByUserIdAndDate(userId, now);
         if (list.size() > 0) {
             return Result.failure(MsgCode.e3006, "每天只能参与一次竞赛答题");
         }
 
-        List<QuestionAnswerEntity> random = entityMapper.random(size);
+        List<QuestionAnswerEntity> random = baseMapper.random(size);
         return Result.success(random);
     }
 
@@ -111,33 +116,34 @@ public class QuestionAnswerServiceImpl extends ServiceImpl<QuestionAnswerEntity,
             BeanUtils.copyProperties(param, entity);
             this.save(entity);
         } else {
-            entity = this.findById(id);
+            entity = this.getById(id);
             if (entity == null) {
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
             entity.setUpdateTime(LocalDateTime.now());
-            this.update(entity);
+            this.updateById(entity);
         }
         return Result.success(entity.getId());
     }
 
     @Override
     public Result remove(Long id) {
-        QuestionAnswerEntity entity = this.findById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        // db数据软删除， 物理数据真删除
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+//        QuestionAnswerEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        // db数据软删除， 物理数据真删除
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+        this.removeById(id);
         return  Result.success();
     }
 
     @Override
     public Result<QuestionAnswerEntity> detail(Long id) {
-        QuestionAnswerEntity entity = this.findById(id);
+        QuestionAnswerEntity entity = this.getById(id);
         if (entity == null) {
             return Result.failure("对象不存在");
         }

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

@@ -1,9 +1,14 @@
 package com.gis.cms.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.cms.entity.dto.AuditDto;
 import com.gis.cms.entity.dto.QuestionGroupDto;
 import com.gis.cms.entity.dto.StatusPageDataDto;
 import com.gis.cms.entity.po.AuditLogEntity;
+import com.gis.cms.entity.po.NewsEntity;
 import com.gis.cms.entity.po.QuestionAnswerEntity;
 import com.gis.cms.entity.po.QuestionGroupEntity;
 import com.gis.cms.mapper.QuestionGroupMapper;
@@ -11,17 +16,18 @@ import com.gis.cms.service.AuditLogService;
 import com.gis.cms.service.QuestionAnswerService;
 import com.gis.cms.service.QuestionGroupService;
 import com.gis.common.base.exception.BaseRuntimeException;
-import com.gis.common.base.mapper.IBaseMapper;
+import com.gis.common.base.service.IBaseService;
+import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.MsgCode;
 import com.gis.common.constant.TypeCode;
+import com.gis.common.util.BaseUtil;
+import com.gis.common.util.FileUtils;
 import com.gis.common.util.Result;
 import com.gis.cms.service.FileService;
-import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.entity.Condition;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -34,11 +40,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class QuestionGroupServiceImpl extends ServiceImpl<QuestionGroupEntity, Long> implements QuestionGroupService {
-
-    @Autowired
-    private QuestionGroupMapper entityMapper;
-
+public class QuestionGroupServiceImpl extends ServiceImpl<QuestionGroupMapper, QuestionGroupEntity> implements QuestionGroupService {
 
     @Autowired
     FileService fileService;
@@ -49,51 +51,91 @@ public class QuestionGroupServiceImpl extends ServiceImpl<QuestionGroupEntity, L
     @Autowired
     QuestionAnswerService questionAnswerService;
 
-    @Override
-    public IBaseMapper<QuestionGroupEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
+    @Autowired
+    FileUtils fileUtils;
+
+    @Autowired
+    IBaseService iBaseService;
+
+    @Autowired
+    ConfigConstant configConstant;
+
+
+
+//    @Override
+//    public Result<QuestionGroupEntity> search(StatusPageDataDto param, Integer display) {
+//        startPage(param);
+//        Condition condition = new Condition(QuestionGroupEntity.class);
+//        String searchKey = param.getSearchKey();
+//        if (StringUtils.isNotBlank(searchKey)) {
+//            searchKey = StringUtils.trim(searchKey);
+//            condition.and().orLike("name", "%" + searchKey + "%");
+//        }
+//        String startTime = param.getStartTime();
+//        String endTime = param.getEndTime();
+//        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) ) {
+//            condition.and().andBetween("createTime", startTime, endTime);
+//        }
+//        Integer status = param.getStatus();
+//        if (status != null) {
+//            condition.and().andEqualTo("status", status);
+//        }
+//
+//        if (display != null) {
+//            condition.and().andEqualTo("display", display);
+//        }
+//        condition.orderBy("createTime").desc();
+//
+//        PageInfo<QuestionGroupEntity> pageInfo = findAll(condition, param.getPageNum(), param.getPageSize());
+//        List<QuestionGroupEntity> list = pageInfo.getList();
+//
+//        List<QuestionGroupEntity> result = new ArrayList<>();
+//
+//        for (QuestionGroupEntity q : list) {
+//            Integer count = getQuesitongCount(q.getId());
+//            q.setQuestionCount(count);
+//            result.add(q);
+//        }
+//
+//        pageInfo.setList(result);
+//
+//        return Result.success(pageInfo);
+//
+//
+//    }
+
 
     @Override
     public Result<QuestionGroupEntity> search(StatusPageDataDto param, Integer display) {
-        startPage(param);
-        Condition condition = new Condition(QuestionGroupEntity.class);
+
+        BaseUtil.startPage(param);
+        LambdaQueryWrapper<QuestionGroupEntity> wrapper = new LambdaQueryWrapper<>();
         String searchKey = param.getSearchKey();
-        if (StringUtils.isNotBlank(searchKey)) {
-            searchKey = StringUtils.trim(searchKey);
-            condition.and().orLike("name", "%" + searchKey + "%");
-//                    .orLike("userName", "%" + searchKey + "%");
-        }
+        wrapper.like(StrUtil.isNotBlank(searchKey), QuestionGroupEntity::getName, searchKey);
+
         String startTime = param.getStartTime();
         String endTime = param.getEndTime();
-        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) ) {
-            condition.and().andBetween("createTime", startTime, endTime);
-        }
-        Integer status = param.getStatus();
-        if (status != null) {
-            condition.and().andEqualTo("status", status);
-        }
-
-        if (display != null) {
-            condition.and().andEqualTo("display", display);
+        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)){
+            wrapper.between(QuestionGroupEntity::getCreateTime, startTime, endTime);
         }
-        condition.orderBy("createTime").desc();
 
-        PageInfo<QuestionGroupEntity> pageInfo = findAll(condition, param.getPageNum(), param.getPageSize());
-        List<QuestionGroupEntity> list = pageInfo.getList();
+        Integer status = param.getStatus();
+        wrapper.eq(status!= null, QuestionGroupEntity::getStatus, status);
+        wrapper.eq(display!= null, QuestionGroupEntity::getDisplay, display);
+        wrapper.orderByDesc(QuestionGroupEntity::getCreateTime);
+        Page<QuestionGroupEntity> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
 
+        List<QuestionGroupEntity> records = page.getRecords();
         List<QuestionGroupEntity> result = new ArrayList<>();
 
-        for (QuestionGroupEntity q : list) {
+        for (QuestionGroupEntity q : records) {
             Integer count = getQuesitongCount(q.getId());
             q.setQuestionCount(count);
             result.add(q);
         }
 
-        pageInfo.setList(result);
-
-        return Result.success(pageInfo);
-
+        page.setRecords(result);
+        return Result.success(page);
 
     }
 
@@ -137,7 +179,7 @@ public class QuestionGroupServiceImpl extends ServiceImpl<QuestionGroupEntity, L
 
     @Override
     public Result updateDisplay(Long id, Integer display) {
-        QuestionGroupEntity entity = this.findById(id);
+        QuestionGroupEntity entity = this.getById(id);
         if (entity == null) {
             log.error("对象id不存在 ： {}", id);
             return Result.failure("对象id不存在");
@@ -150,19 +192,19 @@ public class QuestionGroupServiceImpl extends ServiceImpl<QuestionGroupEntity, L
         }
 
         entity.setDisplay(display);
-        this.update(entity);
+        this.updateById(entity);
         return Result.success(entity);
     }
 
 
     private void updateStatus(Long id, Integer status){
-        QuestionGroupEntity entity = this.findById(id);
+        QuestionGroupEntity entity = this.getById(id);
         if (entity == null) {
             throw new BaseRuntimeException(MsgCode.e3001, "对象不存在");
         }
         entity.setStatus(status);
         entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+        this.updateById(entity);
     }
 
     @Override
@@ -173,16 +215,16 @@ public class QuestionGroupServiceImpl extends ServiceImpl<QuestionGroupEntity, L
             entity = new QuestionGroupEntity();
 //            entity.setDisplay(1);
             entity.setName(param.getName());
-            entity.setUserName(getTokenUserName());
+            entity.setUserName(iBaseService.getUserName());
             this.save(entity);
         } else {
-            entity = this.findById(id);
+            entity = this.getById(id);
             if (entity == null) {
                 return Result.failure("对象不存在： " + id);
             }
             entity.setName(param.getName());
             entity.setUpdateTime(LocalDateTime.now());
-            this.update(entity);
+            this.updateById(entity);
         }
 
         Long groupId = entity.getId();
@@ -201,14 +243,15 @@ public class QuestionGroupServiceImpl extends ServiceImpl<QuestionGroupEntity, L
 
     @Override
     public Result remove(Long id) {
-        QuestionGroupEntity entity = this.findById(id);
-        if (entity == null) {
-            return Result.success();
-        }
+//        QuestionGroupEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
         // db数据软删除， 物理数据真删除
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+        this.removeById(id);
         // 相应的答案删除
         questionAnswerService.removeByQuestionGroupId(id);
 
@@ -217,7 +260,7 @@ public class QuestionGroupServiceImpl extends ServiceImpl<QuestionGroupEntity, L
 
     @Override
     public Result<QuestionGroupEntity> detail(Long id) {
-        QuestionGroupEntity entity = this.findById(id);
+        QuestionGroupEntity entity = this.getById(id);
         if (entity == null) {
             return Result.failure("对象不存在");
         }

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

@@ -1,12 +1,11 @@
 package com.gis.cms.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.admin.service.IntegralService;
 import com.gis.cms.entity.dto.CountAnswerDto;
 import com.gis.cms.entity.po.QuestionUserEntity;
 import com.gis.cms.mapper.QuestionUserMapper;
-import com.gis.cms.service.QuestionAnswerService;
 import com.gis.cms.service.QuestionUserService;
-import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.common.constant.TypeCode;
 import com.gis.common.util.Result;
 import org.springframework.beans.BeanUtils;
@@ -20,27 +19,19 @@ import java.util.List;
  * Created by owen on 2021/6/28 0011 16:16
  */
 @Service
-public class QuestionUserServiceImpl extends ServiceImpl<QuestionUserEntity, Long> implements QuestionUserService {
+public class QuestionUserServiceImpl extends ServiceImpl<QuestionUserMapper, QuestionUserEntity> implements QuestionUserService {
 
-    @Autowired
-    private QuestionUserMapper entityMapper;
-    
-    @Autowired
-    QuestionAnswerService questionAnswerService;
 
     @Autowired
     IntegralService integralService;
 
 
-    @Override
-    public IBaseMapper<QuestionUserEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
+
 
 
     @Override
     public Result ranking(Long questionGroupId) {
-        List<QuestionUserEntity> list = entityMapper.ranking(questionGroupId);
+        List<QuestionUserEntity> list = baseMapper.ranking(questionGroupId);
         return Result.success(list);
     }
 
@@ -52,7 +43,7 @@ public class QuestionUserServiceImpl extends ServiceImpl<QuestionUserEntity, Lon
             this.save(userEntity);
 
             // 保存答题次数
-            entityMapper.addVisit(param.getQuestionGroupId());
+        baseMapper.addVisit(param.getQuestionGroupId());
 
             // 保存积分
             integralService.addGrade(TypeCode.INTEGRAL_ANSWER);

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

@@ -1,13 +1,17 @@
 package com.gis.cms.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.admin.service.IntegralService;
 import com.gis.cms.entity.dto.CountRaceDto;
 import com.gis.cms.entity.po.RaceEntity;
 import com.gis.cms.mapper.RaceMapper;
 import com.gis.cms.service.RaceService;
-import com.gis.common.base.mapper.IBaseMapper;
+import com.gis.common.base.service.IBaseService;
+import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.MsgCode;
 import com.gis.common.constant.TypeCode;
+import com.gis.common.util.FileUtils;
+import com.gis.common.util.RedisUtil;
 import com.gis.common.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -24,14 +28,23 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class RaceServiceImpl extends ServiceImpl<RaceEntity, Long> implements RaceService {
+public class RaceServiceImpl extends ServiceImpl<RaceMapper, RaceEntity> implements RaceService {
 
 
     @Autowired
-    RaceMapper entityMapper;
+    IntegralService integralService;
 
     @Autowired
-    IntegralService integralService;
+    FileUtils fileUtils;
+
+    @Autowired
+    IBaseService iBaseService;
+
+    @Autowired
+    ConfigConstant configConstant;
+
+    @Autowired
+    RedisUtil redisUtil;
 
 
 
@@ -57,17 +70,14 @@ public class RaceServiceImpl extends ServiceImpl<RaceEntity, Long> implements Ra
 
 
     }
-    @Override
-    public IBaseMapper<RaceEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
+
 
 
     @Override
     public Result saveEntity(CountRaceDto param) {
-        Long userId = getTokenUserId();
+        Long userId = iBaseService.getUserId();
         LocalDate now = LocalDate.now();
-        List<Long> list = entityMapper.findByUserIdAndDate(userId, now);
+        List<Long> list = baseMapper.findByUserIdAndDate(userId, now);
         if (list.size() > 0) {
             return Result.failure(MsgCode.e3006, "每天只能参与一次竞赛答题");
         }
@@ -91,13 +101,13 @@ public class RaceServiceImpl extends ServiceImpl<RaceEntity, Long> implements Ra
             String month = monthMap.get(now.getMonthValue());
             String date = now.getYear()+month;
 
-            list = entityMapper.getRankingByMonth(size, date);
+            list = baseMapper.getRankingByMonth(size, date);
             // 当月排名前山的添加积分， 每月1号添加积分
             if (now.getDayOfMonth() == 1){
                 addGrade(list);
             }
         } else {
-           list = entityMapper.getRanking(size);
+           list = baseMapper.getRanking(size);
         }
         return Result.success(list);
     }

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

@@ -1,20 +1,25 @@
 package com.gis.cms.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.cms.entity.dto.SensitiveDto;
 import com.gis.cms.entity.po.SensitiveEntity;
 import com.gis.cms.mapper.SensitiveMapper;
 import com.gis.common.base.entity.dto.PageDto;
-import com.gis.common.base.mapper.IBaseMapper;
+import com.gis.common.base.service.IBaseService;
+import com.gis.common.constant.ConfigConstant;
+import com.gis.common.util.BaseUtil;
+import com.gis.common.util.FileUtils;
+import com.gis.common.util.RedisUtil;
 import com.gis.common.util.Result;
 import com.gis.cms.service.SensitiveService;
-import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.entity.Condition;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -27,30 +32,48 @@ import java.util.Set;
  */
 @Slf4j
 @Service
-public class SensitiveServiceImpl extends ServiceImpl<SensitiveEntity, Long> implements SensitiveService {
+public class SensitiveServiceImpl extends ServiceImpl<SensitiveMapper, SensitiveEntity> implements SensitiveService {
 
     @Autowired
-    private SensitiveMapper entityMapper;
+    FileUtils fileUtils;
+
+    @Autowired
+    IBaseService iBaseService;
+
+    @Autowired
+    ConfigConstant configConstant;
+
+
+    @Autowired
+    RedisUtil redisUtil;
 
     static String REDIS_FILTER = "filter";
 
-    @Override
-    public IBaseMapper<SensitiveEntity, Long> getBaseMapper() {
-        return this.entityMapper;
-    }
+
 
     @Override
     public Result<SensitiveEntity> search(PageDto param) {
-        startPage(param);
-        Condition condition = new Condition(SensitiveEntity.class);
+//        startPage(param);
+//        Condition condition = new Condition(SensitiveEntity.class);
+//        String searchKey = param.getSearchKey();
+//        if (StringUtils.isNotBlank(searchKey)) {
+//            searchKey = StringUtils.trim(searchKey);
+//            condition.and().orLike("name", "%" + searchKey + "%");
+//        }
+//        condition.orderBy("createTime").desc();
+//        PageInfo<SensitiveEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
+
+
+        BaseUtil.startPage(param);
+        LambdaQueryWrapper<SensitiveEntity> wrapper = new LambdaQueryWrapper<>();
         String searchKey = param.getSearchKey();
-        if (StringUtils.isNotBlank(searchKey)) {
-            searchKey = StringUtils.trim(searchKey);
-            condition.and().orLike("name", "%" + searchKey + "%");
-        }
-        condition.orderBy("createTime").desc();
-        PageInfo<SensitiveEntity> pageInfo = this.findAll(condition, param.getPageNum(), param.getPageSize());
-        return Result.success(pageInfo);
+        wrapper.like(StrUtil.isNotBlank(searchKey), SensitiveEntity::getName, searchKey);
+
+
+
+        wrapper.orderByDesc(SensitiveEntity::getCreateTime);
+        Page<SensitiveEntity> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        return Result.success(page);
 
     }
 
@@ -62,16 +85,16 @@ public class SensitiveServiceImpl extends ServiceImpl<SensitiveEntity, Long> imp
         if (id == null) {
             entity = new SensitiveEntity();
             BeanUtils.copyProperties(param, entity);
-            entity.setUserName(getTokenUserName());
+            entity.setUserName(iBaseService.getUserName());
             this.save(entity);
         } else {
-            entity = this.findById(id);
+            entity = this.getById(id);
             if (entity == null) {
                 return Result.failure("对象不存在： " + id);
             }
             BeanUtils.copyProperties(param, entity);
             entity.setUpdateTime(LocalDateTime.now());
-            this.update(entity);
+            this.updateById(entity);
         }
         redisUtil.del(getRedisFilterKey());
         return Result.success(entity);
@@ -79,21 +102,22 @@ public class SensitiveServiceImpl extends ServiceImpl<SensitiveEntity, Long> imp
 
     @Override
     public Result remove(Long id) {
-        SensitiveEntity entity = this.findById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        // db数据软删除， 物理数据真删除
-        entity.setIsDelete(1);
-        entity.setUpdateTime(LocalDateTime.now());
-        this.update(entity);
+//        SensitiveEntity entity = this.getById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        // db数据软删除， 物理数据真删除
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(LocalDateTime.now());
+//        this.updateById(entity);
+        this.removeById(id);
         redisUtil.del(getRedisFilterKey());
         return  Result.success();
     }
 
     @Override
     public Result<SensitiveEntity> detail(Long id) {
-        SensitiveEntity entity = this.findById(id);
+        SensitiveEntity entity = this.getById(id);
         if (entity == null) {
             return Result.failure("对象不存在");
         }
@@ -106,7 +130,7 @@ public class SensitiveServiceImpl extends ServiceImpl<SensitiveEntity, Long> imp
         Set<Object> filterKey = redisUtil.getJsonSet(redisFilterKey);
         if (filterKey == null) {
             log.info("走数据库");
-            filterKey = entityMapper.getName();
+            filterKey = baseMapper.getName();
             // 86400s-> 24H
             redisUtil.setObjectToJson(redisFilterKey, filterKey, 86400);
         }

gis_common/src/main/java/com/gis/common/base/exception/BaseRuntimeException.java

@@ -1,6 +1,7 @@
 package com.gis.common.base.exception;
 
 import cn.hutool.core.util.StrUtil;
+import com.gis.common.constant.ErrorEnum;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
@@ -28,7 +29,10 @@ public class BaseRuntimeException extends RuntimeException{
         this.msg = msg;
     }
 
-
+    public BaseRuntimeException(ErrorEnum errorEnum){
+        this.code = errorEnum.code();
+        this.msg = errorEnum.message();
+    }
 
     public Integer getCode() {
         return code;
@@ -64,7 +68,35 @@ public class BaseRuntimeException extends RuntimeException{
 
     }
 
+    public static void isNull(Object obj, ErrorEnum errorEnum){
+        if (obj == null){
+            getExc(errorEnum.code(), errorEnum.message());
+        }
+    }
+
+    public static void isBlank(Object obj, ErrorEnum errorEnum){
+        Integer code = errorEnum.code();
+        String msg = errorEnum.message();
+        if (obj == null){
+            getExc(code, msg);
+        }
+
+        if (obj instanceof String && StrUtil.isBlank(obj.toString())){
+            getExc(code, msg);
+        }
+
+    }
 
+    /**
+     *
+     * @param obj true 存在抛异常
+     * @param errorEnum
+     */
+    public static void isTrue(boolean obj, ErrorEnum errorEnum){
+        if (obj){
+            getExc(errorEnum.code(), errorEnum.message());
+        }
+    }
 
     /**
      *
@@ -82,7 +114,16 @@ public class BaseRuntimeException extends RuntimeException{
         throw new BaseRuntimeException(code, msg);
     }
 
-
+    /**
+     *
+     * @param obj 集合
+     * @param errorEnum
+     */
+    public static void isEmpty(List obj, ErrorEnum errorEnum){
+        if (CollectionUtils.isEmpty(obj)){
+            getExc(errorEnum.code(), errorEnum.message());
+        }
+    }
 
     public static void isEmpty(List obj, Integer code, String msg){
         if (CollectionUtils.isEmpty(obj)){

gis_common/src/main/java/com/gis/common/base/mapper/IBaseMapper.java

@@ -1,17 +0,0 @@
-package com.gis.common.base.mapper;
-
-import com.gis.common.base.entity.po.BaseEntity;
-import tk.mybatis.mapper.common.BaseMapper;
-import tk.mybatis.mapper.common.ConditionMapper;
-import tk.mybatis.mapper.common.IdsMapper;
-import tk.mybatis.mapper.common.special.InsertListMapper;
-
-import java.io.Serializable;
-
-/**
- * Created by owen on 2021/6/28 0018 11:27
- */
-
-public interface IBaseMapper<T extends BaseEntity, ID extends Serializable> extends BaseMapper<T>,
-        ConditionMapper<T>, IdsMapper<T>, InsertListMapper<T> {
-}

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

@@ -0,0 +1,55 @@
+package com.gis.common.constant;
+
+/**
+ * Created by owen on 2022/3/10 0010 14:47
+ *
+ *
+ * #1000～1999 区间表示参数错误
+ * #2000～2999 区间表示用户错误
+ * #3000～3999 区间表示接口异常
+ */
+public enum ErrorEnum {
+
+    FAILURE_SYS_2001(2001, "对象不存在"),
+
+    FAILURE_CODE_3001(3001, "缺少必要参数"),
+    FAILURE_CODE_3002(3002, "访问异常!"),
+    FAILURE_CODE_3003(3003, "非法访问!"),
+    FAILURE_CODE_3004(3004, "用户未登录"),
+    FAILURE_CODE_3005(3005, "验证码已过期"),
+    FAILURE_CODE_3006(3006, "验证码错误"),
+    FAILURE_CODE_3007(3007, "昵称已存在"),
+    FAILURE_CODE_3008(3008, "该手机已被注册"),
+    FAILURE_CODE_3009(3009, "两次输入的密码不一致"),
+    FAILURE_CODE_3010(3010, "昵称长度错误"),
+    FAILURE_CODE_3011(3011, "密码需要包含英文大小写、数字，长度8-16字符"),
+    FAILURE_CODE_3012(3012, "昵称包含敏感词"),
+    FAILURE_CODE_3013(3013, "手机号码格式错误"),
+    FAILURE_CODE_3014(3014, "账号或密码不正确"),
+    FAILURE_CODE_3015(3015, "用户不存在"),
+    FAILURE_CODE_3016(3016, "登录失败，账号无权访问"),
+    FAILURE_CODE_3017(3017, "空文件"),
+    FAILURE_CODE_3018(3018, "需要上传或使用的文件不存在"),
+
+    ;
+
+    private Integer code;
+    private String message;
+
+    private ErrorEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+
+    public String formatMessage(Object... args){
+        return String.format(message, args);
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.gis.common.constant;
+
+/**
+ * Created by owen on 2022/3/15 0015 16:20
+ */
+public class RedisConstant {
+
+    /**作品id*/
+    public static final String WORK_ID = "workId:";
+
+    /**作品编辑*/
+    public static final String WORK_ID_EDIT = "workId:edit:";
+
+    /**定时删除空作品Key*/
+    public static final String WORK_DEL = "workDel";
+}

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

@@ -0,0 +1,56 @@
+package com.gis.common.util;
+
+import cn.hutool.core.date.DateUtil;
+import org.junit.Test;
+
+import java.time.LocalDateTime;
+
+/**
+ * Created by owen on 2022/4/8 0008 14:32
+ */
+public class DateUtils extends DateUtil {
+
+    private static String YYYY_MM = "yyyy-MM";
+
+
+    private static String YYYYMM = "yyyyMM";
+
+    private static String YYYY_MM_DD = "yyyy-MM-dd";
+
+    private static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+    private static String YYYYMMDD_HHMMSSSSS = "yyyyMMdd_HHmmssSSS";
+
+    private static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+
+    /**
+     * 获取当前月
+     * @return
+     */
+    public static String getMonth(){
+        return format(LocalDateTime.now(), YYYYMM);
+    }
+
+    /**
+     * 获取当前月份的前几个月
+     * @param month
+     * @return
+     */
+    public static String minusMonths(int month){
+        return format(LocalDateTime.now().minusMonths(month), YYYYMM);
+    }
+
+    /**
+     * 获取当前时间戳
+     * @return
+     */
+    public static String getDateTime(){
+        return format(LocalDateTime.now(), YYYYMMDD_HHMMSSSSS);
+    }
+
+    @Test
+    public void test(){
+        System.out.println(getDateTime());
+    }
+}

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

@@ -1,11 +1,22 @@
 package com.gis.common.util;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.img.ImgUtil;
+import cn.hutool.core.io.FileUtil;
+import com.gis.common.base.exception.BaseRuntimeException;
 import com.gis.common.constant.ConfigConstant;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
 
 /**
  * Created by owen on 2020/5/12 0012 17:21
@@ -17,24 +28,152 @@ public class FileUtils {
     @Autowired
     ConfigConstant configConstant;
 
+    // 确保同一时间上传文件的唯一性
+    private static final AtomicInteger ATOMIC_INTEGER = new AtomicInteger();
+
     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){
-            log.info("文件流为空不可上传");
+            log.error("文件流为空不可上传");
             return false;
         }
         String fileName = file.getOriginalFilename();
+        log.info("文件名： {}", fileName);
         String suffix = fileName.substring(fileName.lastIndexOf(".")
                 + 1, fileName.length());
         if (suffixList.contains(suffix.trim().toLowerCase())) {
-            log.info("无非法参数可以放行！！！");
             return true;
         }
-        log.info("存在非法参数不能放行！请核对上传文件格式，重新刷新页面再次上传！");
+        log.error("存在非法参数不能放行！请核对上传文件格式，重新刷新页面再次上传！");
         return false;
     }
 
+    /**
+     * 真删除文件
+     * @param path 参数是相对地址
+     */
+    public void del(String path){
+        if (StringUtils.isNotBlank(path)){
+            String delPath = configConstant.serverBasePath + path;
+            FileUtil.del(delPath);
+            log.info("真删除文件： {}", delPath);
+        }
+
+    }
+
+    /**
+     *
+     * @param file
+     * @param isPinYinRename false:时间戳重命名， true：用拼音重名文件
+     * @param savePath 保存地址(前面有斜杠， 后面没有)，没有文件名
+     * @return map
+     */
+    public Map<String, Object> uploadMap(MultipartFile file, String savePath, boolean isPinYinRename) {
+        String newName = this.upload(file, savePath, isPinYinRename);
+        HashMap<String, Object> result = new HashMap<>();
+        result.put("fileName", file.getOriginalFilename());
+        result.put("filePath", savePath + "/" + newName);
+        return result;
+
+    }
+
+
+    /**
+     * 上传文件且按比例压缩
+     * @param file
+     * @param savePath
+     * @param isPinYinRename
+     * @return
+     */
+    public Map<String, Object> imgUploadMapAndCompress(MultipartFile file, String savePath, boolean isPinYinRename) {
+        String newName = this.upload(file, savePath, isPinYinRename);
+        String filePath = savePath + "/" + newName;
+        long size = file.getSize();
+        size = size/1000;
+        log.info("文件大小：" + size + "kb");
+        if (size > 1024){
+            String inPath = configConstant.serverBasePath + savePath + "/" + newName;
+            String outPath = configConstant.serverBasePath + savePath + "/cp_" + newName;
+
+//            ImgUtil.compress(new File(inPath), new File(outPath), 0.5f);
+            ImgUtil.compress(new File(inPath), new File(outPath), getQuality(size));
+            log.info("压缩图片位置： {}", outPath);
+            filePath = savePath + "/cp_" + newName;
+            this.del(inPath);
+        }
+
+
+
+        HashMap<String, Object> result = new HashMap<>();
+        result.put("fileName", file.getOriginalFilename());
+        result.put("filePath", filePath);
+
+        return result;
+
+    }
+
+    /**
+     * 通过图片大小计算压缩比例
+     * @param size 单位是KB
+     * @return
+     */
+    private  float getQuality(long size){
+        // 单位用m
+        double n = size/1024;
+
+        // 压缩比例，2M以内使用0.5压缩
+        double quality = 0.5;
+        // 大于2M 按计算比例压缩
+        if (n > 2) {
+            quality = 1 / n;
+        }
+        log.info("压缩比例： {}", quality);
+        Float aFloat = Float.valueOf(quality + "");
+        return aFloat;
+
+    }
+
+
+
+    /**
+     *
+     * @param file
+     * @param isPinYinRename false:时间戳重命名， true：用拼音重名文件
+     * @param savePath 保存地址(前面有斜杠， 后面没有)，没有文件名
+     * @return 文件名
+     */
+    public String upload(MultipartFile file, String savePath, boolean isPinYinRename) {
+
+        // 检查非法文件上传
+        boolean checkFile = this.checkFile(file);
+        if (!checkFile) {
+            throw new BaseRuntimeException("上传文件格式有误, 请重新上传");
+        }
+
+
+        // 文件目录
+        String fileName = file.getOriginalFilename();
+        String newName;
+        if (isPinYinRename){
+            newName = RegexUtil.getPinyinName(fileName);
+        } else {
+            String suffix = StringUtils.substringAfterLast(fileName, ".");
+            newName =  DateUtils.getDateTime() + ATOMIC_INTEGER.incrementAndGet() + "." + suffix;
+        }
+
+        savePath = configConstant.serverBasePath + savePath + "/" + newName;
+        log.info("保存文件地址：{}", savePath);
+
+        try {
+            FileUtil.writeFromStream(file.getInputStream(), savePath);
+
+            return newName;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 }

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

@@ -46,6 +46,20 @@ public class RedisUtil {
         }
     }
 
+    public boolean set(String key, Object value, long time, TimeUnit unit) {
+        try {
+            if (time > 0) {
+                redisTemplate.opsForValue().set(key, value, time, unit);
+            } else {
+                set(key, value);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
 
 
     /**
@@ -147,4 +161,13 @@ public class RedisUtil {
         }
         return null;
     }
+
+    /**
+     * 判断redis key是否存在
+     * @param key
+     * @return true:存在
+     */
+    public Boolean hasKey(String key){
+        return redisTemplate.hasKey(key);
+    }
 }

gis_pano/src/main/java/com/gis/cms/service/impl/FodderServiceImpl.java

@@ -11,6 +11,7 @@ import com.gis.cms.service.FodderService;
 import com.gis.cms.service.WorkService;
 import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.base.exception.BaseRuntimeException;
+import com.gis.common.base.service.IBaseService;
 import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.ErrorEnum;
 import com.gis.common.util.BaseUtil;
@@ -62,7 +63,7 @@ public class FodderServiceImpl extends ServiceImpl<FodderMapper, FodderEntity> i
         BaseUtil.startPage(param);
         IPage<FodderEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
         LambdaQueryWrapper<FodderEntity> wrapper = new LambdaQueryWrapper<> ();
-        wrapper.eq(FodderEntity::getCreatorId, iBaseService.getUserId());
+//        wrapper.eq(FodderEntity::getCreatorId, iBaseService.getUserId());
         String searchKey = param.getSearchKey();
         if (StringUtils.isNotBlank(searchKey)){
             wrapper.like(FodderEntity::getFileName, searchKey);
@@ -78,7 +79,7 @@ public class FodderServiceImpl extends ServiceImpl<FodderMapper, FodderEntity> i
             FodderEntity entity = this.getById(id);
             // 检查场景是否被引用
             boolean exist = workService.existBySceneCode(entity.getSceneCode());
-            BaseRuntimeException.isHas(exist, null, "此场景被作品使用中，不能删除");
+            BaseRuntimeException.isTrue(exist, null, "此场景被作品使用中，不能删除");
             // 真删除目录
             fileUtils.del(entity.getFilePath());
             this.removeById(id);

gis_pano/src/main/java/com/gis/cms/service/impl/WorkServiceImpl.java

@@ -15,6 +15,7 @@ import com.gis.cms.mapper.WorkMapper;
 import com.gis.cms.service.WorkService;
 import com.gis.common.base.entity.dto.PageDto;
 import com.gis.common.base.exception.BaseRuntimeException;
+import com.gis.common.base.service.IBaseService;
 import com.gis.common.constant.ConfigConstant;
 import com.gis.common.constant.ErrorEnum;
 import com.gis.common.constant.RedisConstant;
@@ -110,7 +111,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, WorkEntity> impleme
         // 创建someData; 如someData作出修改，记得把代码里的someData 跟服务器里的someData都修改
         String baseSomeDataPath = configConstant.serverBasePath + "/baseData/someData.json";
         log.info("服务器base someData.json path: {}", baseSomeDataPath);
-        BaseRuntimeException.isHas(!FileUtil.isFile(baseSomeDataPath), null, "服务器someData.json模板不存在");
+        BaseRuntimeException.isTrue(!FileUtil.isFile(baseSomeDataPath), null, "服务器someData.json模板不存在");
         String content = FileUtil.readUtf8String(baseSomeDataPath);
 
         JSONObject jsonObject = JSONObject.parseObject(content);
@@ -294,7 +295,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, WorkEntity> impleme
     @Override
     public Result uploadFix(MultipartFile file, String sceneCode) {
         // 检查非法文件上传
-        BaseRuntimeException.isHas(!fileUtils.checkFile(file), null, "上传文件格式有误, 请重新上传");
+        BaseRuntimeException.isTrue(!fileUtils.checkFile(file), null, "上传文件格式有误, 请重新上传");
         Map<String, Object> uploadMap = fileUtils.uploadMap(file, "/pano/" + sceneCode, true);
         return Result.success(uploadMap);
     }
@@ -303,7 +304,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, WorkEntity> impleme
     @Override
     public Result upload(MultipartFile file, String sceneCode) {
         // 检查非法文件上传
-        BaseRuntimeException.isHas(!fileUtils.checkFile(file), null, "上传文件格式有误, 请重新上传");
+        BaseRuntimeException.isTrue(!fileUtils.checkFile(file), null, "上传文件格式有误, 请重新上传");
         Map<String, Object> uploadMap = fileUtils.uploadMap(file, "/pano/" + sceneCode + "/edit", false);
         return Result.success(uploadMap);
     }
@@ -311,7 +312,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, WorkEntity> impleme
     @Override
     public Result uploadFixByWork(MultipartFile file, String workId) {
         // 检查非法文件上传
-        BaseRuntimeException.isHas(!fileUtils.checkFile(file), null, "上传文件格式有误, 请重新上传");
+        BaseRuntimeException.isTrue(!fileUtils.checkFile(file), null, "上传文件格式有误, 请重新上传");
         Map<String, Object> uploadMap = fileUtils.uploadMap(file, "/work/" + workId, true);
         return Result.success(uploadMap);
     }