上传加入唯一性

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

@@ -23,7 +23,7 @@ import javax.validation.Valid;
  */
 @Api(tags = "sys-用户管理")
 @RestController
-@RequestMapping("sys/user")
+@RequestMapping("/sys/user")
 public class SysUserController {
 
     @Autowired
@@ -89,6 +89,12 @@ public class SysUserController {
         return userService.removes(ids);
     }
 
-
+//    @ApiOperation("test")
+//    @GetMapping("/test")
+//    public Result test() {
+//        SysUserEntity admin = userService.findByUserName1("admin");
+//        return Result.success(admin);
+//
+//    }
 }
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.admin.entity.po.SysUserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -14,7 +15,6 @@ import java.util.List;
 @Mapper
 public interface SysUserMapper extends BaseMapper<SysUserEntity> {
 
-
     @Select(value = "select * from sys_user where is_delete = '0' AND user_name= #{userName}")
     SysUserEntity findByUserName(String userName);
 

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

@@ -38,4 +38,6 @@ public interface SysUserService extends IService<SysUserEntity> {
 
     Result retrievePassword(ResetPasswordDto param);
 
+    SysUserEntity findByUserName1(String userName);
+
 }

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

@@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -38,8 +37,6 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity> implements SysUserService  {
 
-    @Autowired
-    private SysUserMapper entityMapper;
 
     @Autowired
     HttpServletRequest request;
@@ -62,7 +59,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
      * @param userName
      * @return
      */
-//    @Cacheable(value = "module", key = "#userName", condition = "true ")
+
     @Override
     public SysUserEntity findByUserName(String userName) {
         SysUserEntity entity;
@@ -70,12 +67,27 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
         if (redisUtil.hasKey(userKey)){
             entity =  redisUtil.getCacheObject(userKey);
         } else {
-            entity =  entityMapper.findByUserName(userName);
-            redisUtil.setCacheObject(userKey, entity, 1, TimeUnit.MINUTES);
+            entity =  baseMapper.findByUserName(userName);
+            redisUtil.setCacheObject(userKey, entity, 5, TimeUnit.MINUTES);
         }
         return entity;
     }
 
+
+    /**
+     * 测试用 2022-5-7
+     * 测试不通过
+     * @param userName
+     * @return
+     */
+    @Cacheable(value = "module", key = "aaaa")
+    @Override
+    public SysUserEntity findByUserName1(String userName) {
+        LambdaQueryWrapper<SysUserEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysUserEntity::getUserName, userName);
+        return this.getOne(wrapper);
+    }
+
 //    @CacheEvict(value="module", allEntries=true)
     @Override
     public Result saveEntity(UserDto param) {
@@ -156,20 +168,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
     }
 
 
-    private void updatePassword(PasswordDto param) {
-//        SysUserEntity user = this.findByUserName(JwtUtil.getUsername(getToken()));
-//
-//        // 验证原密码
-//        Boolean isBoolean = PasswordUtils.decrypt(user.getPassword(), param.getOldPassword(), PasswordUtils.getStaticSalt());
-//        if (!isBoolean) {
-//            log.error("原始密码错误");
-//            throw new BaseRuntimeException("原始密码错误");
-//        }
-//
-//        user.setPassword(PasswordUtils.encrypt(user.getUserName(), param.getNewPassword(), PasswordUtils.getStaticSalt()));
-//        user.setUpdateTime(LocalDateTime.now());
-//        this.update(user);
-    }
 
     @Override
     public Result updatePwd(PasswordDto param) {
@@ -284,7 +282,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
     @Override
     public Result retrievePassword(ResetPasswordDto param) {
         String userName = param.getUserName();
-        SysUserEntity entity = entityMapper.findByUserName(param.getUserName());
+        SysUserEntity entity = baseMapper.findByUserName(param.getUserName());
         if (entity == null) {
             return Result.success(false);
         }

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

@@ -50,67 +50,6 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> impl
     FileService fileService;
 
 
-
-//    @Override
-//    public Result search(GoodsPageDateDto param) {
-//        BaseUtil.startPage(param);
-//        IPage<GoodsEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
-//
-//        StringBuffer sql = new StringBuffer();
-//        // 使用了子查询
-//        sql.append("select a.*, b.countLike as countLike, b.countVote as countVote from tb_goods a left join " +
-//                "(SELECT id,goods_id, count(case when type='vote' then 1 end) countVote, " +
-//                "count(case when type='like' then 1 end) countLike " +
-//                "from tb_goods_vote WHERE is_delete=0 GROUP BY goods_id) b " +
-//                "on a.id=b.goods_id where a.is_delete=0");
-//        Integer display = param.getDisplay();
-//        if (display != null){
-//            sql.append(" and a.display=").append(display);
-//        }
-//
-//        Long goodsModuleId = param.getModuleId();
-//        if (goodsModuleId != null){
-//            sql.append(" and a.module_id=").append(goodsModuleId);
-//        }
-//
-//        Integer status = param.getStatus();
-//        if (status != null){
-//            sql.append(" and a.status=").append(status);
-//        }
-//
-//        if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
-//
-//            sql.append(" and a.create_time >= ").append("'").append(param.getStartTime()).append("'");
-//            sql.append(" and a.create_time <= ").append("'").append(param.getEndTime()).append("'");
-//        }
-//
-//
-//        String searchKey = param.getSearchKey();
-//        if (StringUtils.isNotBlank(searchKey)){
-//            searchKey = RegexUtil.sqlReplaceSpecialStr(searchKey);
-//            sql.append(" and a.name like '%").append(searchKey).append("%'");
-//        }
-//
-//        String sortType = param.getSortType();
-//        if (StringUtils.isNotBlank(sortType)){
-//
-//            if ("vote".equals(sortType)){
-//                sql.append(" order by b.countVote desc");
-//            } else if ("like".equals(sortType)){
-//                sql.append(" order by b.countLike desc");
-//            } else {
-//                sql.append(" order by a.create_time desc");
-//            }
-//        } else {
-//            sql.append(" order by a.create_time desc");
-//
-//        }
-//
-//
-//        IPage<GoodsEntity> result = getBaseMapper().pageSearchSql(sql.toString(), page);
-//        return Result.success(result);
-//    }
-
     @Override
     public Result search(GoodsPageDateDto param) {
         BaseUtil.startPage(param);
@@ -173,11 +112,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> impl
         if (entity == null){
             return Result.success();
         }
-
-        entity.setIsDelete(1);
-        entity.setIsIndex(0);
-        entity.setUpdateTime(LocalDateTime.now());
-        fileService.updateById(entity);
+        // 真删除图片
+        fileUtils.del(entity.getFilePath());
+        fileService.removeById(fileId);
         return Result.success();
     }
 

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,6 +1,5 @@
 package com.gis.common.util;
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import com.gis.common.base.exception.BaseRuntimeException;
 import com.gis.common.constant.ConfigConstant;
@@ -10,9 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 
 /**
@@ -25,6 +24,9 @@ public class FileUtils {
     @Autowired
     ConfigConstant configConstant;
 
+    // 确保同一时间上传文件的唯一性
+    private static final AtomicInteger ATOMIC_INTEGER = new AtomicInteger();
+
     public boolean checkFile(MultipartFile file) {
         //设置允许上传文件类型
         String suffixList = configConstant.serverFileFallow;
@@ -67,7 +69,7 @@ public class FileUtils {
              newName = RegexUtil.getPinyinName(fileName);
         } else {
             String suffix = StringUtils.substringAfterLast(fileName, ".");
-            newName = DateUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS") + "." + suffix;
+            newName =  DateUtils.getDateTime() + ATOMIC_INTEGER.incrementAndGet() + "." + suffix;
         }
 
         savePath = configConstant.serverBasePath + savePath + "/" + newName;