diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java index 4903c4f..56fede1 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/NewsController.java @@ -1,8 +1,16 @@ package com.kening.vordm.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.kening.vordm.entity.Contact; +import com.kening.vordm.entity.DisasterInfo; import com.kening.vordm.entity.News; import com.kening.vordm.service.NewsService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -48,4 +56,31 @@ public class NewsController { public void export(Long disasterId,Integer type,HttpServletRequest request, HttpServletResponse response){ newsService.export(disasterId,type,request,response); } + @ApiOperationSupport(order = 1) + @ApiOperation(value = "分页", notes = "News") + @ApiImplicitParams({ + @ApiImplicitParam(name = "current", value = "当前页", paramType = "query", dataType = "int"), + @ApiImplicitParam(name = "size", value = "分页大小", paramType = "query", dataType = "int") + }) + @GetMapping("/list") + public R> list(News news, Query query) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(news); + queryWrapper.orderByDesc("contact_date"); + IPage pages = newsService.page(Condition.getPage(query), Condition.getQueryWrapper(news)); + return R.data(pages); + } + @PostMapping("review") + public R review(String ids ,Integer status){ + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.set("status",status); + String [] id = ids.split(","); + //将id String 数组转为Long数组 + Long [] idLong = new Long[id.length]; + for (int i = 0; i < id.length; i++) { + idLong[i] = Long.parseLong(id[i]); + } + updateWrapper.in("id",idLong); + Boolean flag=newsService.update(updateWrapper); + return R.data(flag); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java index 601f9f3..395878d 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/SocialMediaController.java @@ -1,6 +1,9 @@ package com.kening.vordm.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kening.vordm.entity.News; import com.kening.vordm.entity.SocialMedia; import com.kening.vordm.entity.Tweets; import com.kening.vordm.service.SocialMediaService; @@ -8,10 +11,7 @@ import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -61,4 +61,23 @@ public class SocialMediaController { public void export(Long disasterId, HttpServletRequest request, HttpServletResponse response){ service.export(disasterId,request,response); } + @GetMapping("/list") + public R> list(SocialMedia socialMedia, Query query) { + IPage pages = service.page(Condition.getPage(query), Condition.getQueryWrapper(socialMedia)); + return R.data(pages); + } + @PostMapping("review") + public R review(String ids ,Integer status){ + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.set("status",status); + String [] id = ids.split(","); + //将id String 数组转为Long数组 + Long [] idLong = new Long[id.length]; + for (int i = 0; i < id.length; i++) { + idLong[i] = Long.parseLong(id[i]); + } + updateWrapper.in("id",idLong); + Boolean flag=service.update(updateWrapper); + return R.data(flag); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index f253c31..32ae215 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -152,9 +152,12 @@ d.respond_status = 1 or d.respond_status = 0 - + d.respond_status = 2 + + d.respond_status = 2 or d.respond_status = 3 + order by d.upload_time desc