数据排序

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

@@ -20,6 +20,7 @@ import javax.validation.ConstraintViolationException;
 import javax.validation.ValidationException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Objects;
 
 /**
  * 统一捕捉异常，自定义返回参数
@@ -92,7 +93,9 @@ public class ExceptionController {
      */
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public Result handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
-        return Result.failure(60001, e.getBindingResult().getFieldError().getDefaultMessage());
+        String message = Objects.requireNonNull(e.getBindingResult().getFieldError()).getDefaultMessage();
+        log.error("请求参数有误： {}", message);
+        return Result.failure(60001, message);
     }
 
     /**

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

@@ -20,6 +20,8 @@ public interface SysUserService extends IService<SysUserEntity> {
 
     SysUserEntity findByUserName(String userName);
 
+    SysUserEntity cacheByUserName(String userName);
+
     Result saveEntity(UserDto param);
 
     Result removes(String ids);

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

@@ -62,12 +62,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
 
     @Override
     public SysUserEntity findByUserName(String userName) {
+        LambdaQueryWrapper<SysUserEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysUserEntity::getUserName, userName);
+        return this.getOne(wrapper);
+    }
+
+    @Override
+    public SysUserEntity cacheByUserName(String userName) {
         SysUserEntity entity;
         String userKey = USER_NAME_KEY + userName;
         if (redisUtil.hasKey(userKey)){
             entity =  redisUtil.getCacheObject(userKey);
         } else {
-            entity =  baseMapper.findByUserName(userName);
+            entity = this.findByUserName(userName);
             redisUtil.setCacheObject(userKey, entity, 5, TimeUnit.MINUTES);
         }
         return entity;

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

@@ -135,7 +135,7 @@ public class ShiroRealm extends AuthorizingRealm {
             throw new JwtAuthenticationException(5001, "token invalid");
         }
 
-        SysUserEntity userEntity = sysUserService.findByUserName(username);
+        SysUserEntity userEntity = sysUserService.cacheByUserName(username);
         if (userEntity == null) {
             log.error("error token userEntity");
             throw new JwtAuthenticationException(5001, "User didn't existed!");

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

@@ -95,7 +95,8 @@ public class GoodsController {
     @ApiOperation(value = "是否显示", notes = "display, 0:不显示， 1：显示")
     @GetMapping("display/{id}/{display}")
     public Result updateDisplay(@PathVariable Long id, @PathVariable Integer display) {
-        return entityService.display(id, display);
+        entityService.setDisplay(id, display);
+        return Result.success();
     }
 
     @ApiOperation(value = "排序", notes = "sort: 序号")

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

@@ -40,45 +40,59 @@ public class WebController {
     @Autowired
     BbsService bbsService;
 
+    @Autowired
+    NewsService newsService;
 
+    @Autowired
+    ModuleService moduleService;
 
     @Autowired
     CommentService commentService;
 
 
-
+    @ApiOperation(value = "模块-列表", notes = "goods:精品典藏， news:教育基地")
+    @GetMapping("/moduleList/{module}")
+    public Result search(@PathVariable String module) {
+        return moduleService.search(module);
+    }
 
 
     @ApiOperation(value = "文物列表")
-    @PostMapping("goodList")
+    @PostMapping("/goodList")
     public Result goodList(@Valid @RequestBody GoodsPageDateDto param) {
         param.setDisplay(1);
         return goodsService.search(param);
     }
 
-    @ApiOperation(value = "v0.1-保存模块访问量", notes = "type:模块类型, goods:典藏， 领导:leader, id:相应模块id")
-    @GetMapping("visit/{type}/{id}")
-    public Result saveVisit(@PathVariable String type, @PathVariable Long id) {
-        return webService.saveVisit(type, id);
-    }
-
     @ApiOperation("详情")
-    @GetMapping("goodDetail/{id}")
+    @GetMapping("/goodDetail/{id}")
     public Result<GoodsEntity> goodDetail(@PathVariable Long id) {
         return goodsService.detail(id);
     }
 
+    @ApiOperation(value = "保存模块访问量", notes = "type:模块类型, goods:典藏 | leader:领导 | news:教育基地 id:相应模块id")
+    @GetMapping("/visit/{type}/{id}")
+    public Result saveVisit(@PathVariable String type, @PathVariable Long id) {
+        return webService.saveVisit(type, id);
+    }
+
+    @ApiOperation(value = "校验基地-列表")
+    @PostMapping("/newsList")
+    public Result newsList(@Valid @RequestBody NewsPageDataDto param) {
+        param.setDisplay(1);
+        return newsService.search(param);
+    }
 
 
     @ApiOperation(value = "荣誉列表")
-    @PostMapping("leaderList")
+    @PostMapping("/leaderList")
     public Result leaderList(@RequestBody LeaderPageDto param) {
         param.setDisplay(1);
         return leaderService.search(param);
     }
 
     @ApiOperation(value = "论坛-发帖列表")
-    @PostMapping("bbs/list")
+    @PostMapping("/bbs/list")
     public Result bbsList(@RequestBody BbsPageDto param) {
         // 审核通过
         param.setStatus(2);
@@ -86,26 +100,26 @@ public class WebController {
     }
 
     @ApiOperation(value = "v0.1-论坛-发帖/留言")
-    @PostMapping("bbs/save")
+    @PostMapping("/bbs/save")
     public Result bbsSave(@Valid @RequestBody BbsDto param) {
         return bbsService.saveEntity(param);
     }
 
     @ApiOperation(value = "论坛-上传图片")
-    @PostMapping("bbs/upload")
+    @PostMapping("/bbs/upload")
     public Result bbsUpload(MultipartFile file) {
         return bbsService.upload(file);
     }
 
     @ApiOperation(value = "论坛-保存帖子浏览量")
-    @GetMapping("bbs/visit/{id}")
+    @GetMapping("/bbs/visit/{id}")
     public Result bbsVisit(@PathVariable Long id) {
          bbsService.addVisit(id);
         return Result.success();
     }
 
     @ApiOperation(value = "v0.1-论坛-发帖留言详情")
-    @PostMapping("bbs/message/list")
+    @PostMapping("/bbs/message/list")
     public Result bbsMessageList(@RequestBody BbsMessagePageDto param) {
         return bbsService.bbsMessageList(param);
     }
@@ -113,7 +127,7 @@ public class WebController {
 
 
     @ApiOperation(value = "v0.1-论坛-点赞/踩", notes = "类型, upVote:点赞， unVote:踩")
-    @PostMapping("bbs/like/{type}/{id}")
+    @PostMapping("/bbs/like/{type}/{id}")
     public Result bbsLike(@PathVariable String type, @PathVariable Long id) {
         List<String> list = Arrays.asList("upVote", "unVote");
         if (!list.contains(type)){
@@ -134,13 +148,13 @@ public class WebController {
 
     @WebControllerLog(description = "展示页-留言评论")
     @ApiOperation(value = "留言-评论")
-    @PostMapping("comment/save")
+    @PostMapping("/comment/save")
     public Result commentSave(@Valid @RequestBody CommentDto param) {
         return commentService.saveEntity(param);
     }
 
     @ApiOperation(value = "留言-列表")
-    @PostMapping("comment/list")
+    @PostMapping("/comment/list")
     public Result commentList(@RequestBody CommentPageDto param) {
         param.setStatus(2);
         return commentService.search(param);

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

@@ -13,16 +13,11 @@ import javax.validation.constraints.NotNull;
 @Data
 public class GoodsPageDateDto extends PageDateDto {
 
-//    @ApiModelProperty(value = "状态")
-//    private Integer status;
 
     @NotNull(message = "模块id不能为空")
     @ApiModelProperty(value = "模块id", required = true)
     private Long moduleId;
 
-//    @NotBlank(message = "排序类型不能为空")
-//    @ApiModelProperty(value = "排序类型, time:时间, vote:投票, like:点赞", required = true)
-//    private String sortType;
 
     @ApiModelProperty(value = "(后端)显示：0：不显示，1：显示", notes = "后端使用")
     private Integer display;

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

@@ -15,8 +15,7 @@ import org.springframework.stereotype.Component;
 public interface GoodsMapper extends BaseMapper<GoodsEntity> {
 
 
-//    @SelectProvider(type = GoodsProvider.class, method = "search")
-//    IPage<GoodsEntity> search(GoodsPageDateDto param, IPage<GoodsEntity> page);
+
 
     @Update("update tb_goods set display = #{display} , update_time = NOW() where is_delete=0 and id = #{id} ")
     void setDisplay(Long id, Integer display);
@@ -30,9 +29,6 @@ public interface GoodsMapper extends BaseMapper<GoodsEntity> {
     @Update("update tb_goods set visit = visit+1 , update_time = NOW() where is_delete=0 and id = #{id} ")
     void setVisit(Long id);
 
-    @SelectProvider(type = BaseProvider.class, method = "selectSql")
-    IPage<GoodsEntity> pageSearchSql(String sql, IPage<GoodsEntity> page);
-
     @Update("update tb_goods set is_delete = 1 , update_time = NOW() where is_delete = 0  and module_id = #{modelId}")
     void delByModelId(Long modelId);
 }

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

@@ -34,7 +34,7 @@ public interface GoodsService extends IService<GoodsEntity> {
 
     Result removeFile(Long fileId);
 
-    Result display(Long id, Integer display);
+//    Result display(Long id, Integer display);
 
     void delByModelId(Long id);
 }

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

@@ -31,14 +31,11 @@ public interface NewsService extends IService<NewsEntity> {
 
     Result updateDisplay(Long id, Integer display);
 
-    void addVisit(Long id);
+    void setVisit(Long id);
 
     Result upload(MultipartFile file, String type);
 
     void setSort(Long id, Integer sort);
 
 
-
-
-
 }

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

@@ -67,6 +67,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> impl
         }
         String searchKey = param.getSearchKey();
         wrapper.like(StringUtils.isNotBlank(searchKey), GoodsEntity::getName, searchKey);
+        wrapper.orderByDesc(GoodsEntity::getSort);
         wrapper.orderByDesc(GoodsEntity::getCreateTime);
 
         return Result.success(this.page(page, wrapper));
@@ -118,18 +119,18 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, GoodsEntity> impl
         return Result.success();
     }
 
-    @Override
-    public Result display(Long id, Integer display) {
-        GoodsEntity entity = this.getById(id);
-        if (entity == null) {
-            log.error("对象id不存在 ： {}", id);
-            return Result.failure("对象id不存在");
-        }
-
-        entity.setDisplay(display);
-        this.updateById(entity);
-        return Result.success(entity);
-    }
+//    @Override
+//    public Result display(Long id, Integer display) {
+//        GoodsEntity entity = this.getById(id);
+//        if (entity == null) {
+//            log.error("对象id不存在 ： {}", id);
+//            return Result.failure("对象id不存在");
+//        }
+//
+//        entity.setDisplay(display);
+//        this.updateById(entity);
+//        return Result.success(entity);
+//    }
 
     @Override
     public void delByModelId(Long goodsModelId) {

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.cms.entity.dto.LeaderDto;
 import com.gis.cms.entity.dto.LeaderPageDto;
+import com.gis.cms.entity.po.GoodsEntity;
 import com.gis.cms.entity.po.LeaderEntity;
 import com.gis.cms.mapper.LeaderMapper;
 import com.gis.cms.service.LeaderService;
@@ -45,6 +46,7 @@ public class LeaderServiceImpl extends ServiceImpl<LeaderMapper, LeaderEntity> i
 
         LambdaQueryWrapper<LeaderEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(param.getDisplay()!=null, LeaderEntity::getDisplay, param.getDisplay());
+        wrapper.orderByDesc(LeaderEntity::getSort);
         wrapper.orderByDesc(LeaderEntity::getCreateTime);
         IPage<LeaderEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
         return Result.success(this.page(page, wrapper));

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

@@ -62,6 +62,7 @@ public class NewsServiceImpl extends ServiceImpl<NewsMapper, NewsEntity> impleme
         }
         String searchKey = param.getSearchKey();
         wrapper.like(StringUtils.isNotBlank(searchKey), NewsEntity::getName, searchKey);
+        wrapper.orderByDesc(NewsEntity::getSort);
         wrapper.orderByDesc(NewsEntity::getCreateTime);
 
         IPage<NewsEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
@@ -87,7 +88,7 @@ public class NewsServiceImpl extends ServiceImpl<NewsMapper, NewsEntity> impleme
     }
 
     @Override
-    public void addVisit(Long id) {
+    public void setVisit(Long id) {
         baseMapper.addVisit(id);
     }
 

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

@@ -26,6 +26,9 @@ public class WebServiceImpl implements WebService {
     GoodsService goodsService;
 
     @Autowired
+    NewsService newsService;
+
+    @Autowired
     RedisUtil redisCache;
 
     // 缓存key
@@ -60,7 +63,7 @@ public class WebServiceImpl implements WebService {
 
     @Override
     public Result saveVisit(String type, Long id) {
-        List<String> list = Arrays.asList("goods", "leader","student", "video", "img", "music");
+        List<String> list = Arrays.asList("goods", "leader","news");
         if (!list.contains(type)){
             return Result.failure("非法类型");
         }
@@ -73,6 +76,10 @@ public class WebServiceImpl implements WebService {
             case "leader":
                 leaderService.setVisit(id);
                 break;
+
+            case "news":
+                newsService.setVisit(id);
+                break;
                 
         }