From af9a3d2c2a437cd28083765dad3d541ba1cdbb39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Thu, 5 Sep 2019 19:11:49 +0800 Subject: [PATCH 1/2] no message --- .../modules/events/service/impl/EpdcEventsServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index d708e93ab..586730771 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -81,10 +81,16 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl getWrapper(Map params){ String startTime = (String)params.get("startTime"); String endTime = (String)params.get("endTime"); + String streetId = (String)params.get("streetId"); + String communityId = (String)params.get("communityId"); + String gridId = (String)params.get("gridId"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.between(StringUtils.isNotBlank(startTime), Constant.CREATED_TIME, startTime, endTime); wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value()); + wrapper.eq(StringUtils.isNotBlank(streetId),"STREET_ID",streetId); + wrapper.eq(StringUtils.isNotBlank(communityId),"COMMUNITY_ID",communityId); + wrapper.eq(StringUtils.isNotBlank(gridId),"GRID_ID",gridId); return wrapper; } From 45e975490238d6ef3330f8a448b2f436b0bb0741 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Thu, 5 Sep 2019 19:56:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NewsCategoryController.java | 5 ++++ .../esua/epdc/controller/NewsController.java | 7 +++++ .../elink/esua/epdc/dao/NewsCategoryDao.java | 3 ++ .../epdc/service/NewsCategoryService.java | 7 +++++ .../elink/esua/epdc/service/NewsService.java | 8 +++++ .../service/impl/NewsCategoryServiceImpl.java | 6 ++++ .../epdc/service/impl/NewsServiceImpl.java | 29 ++++++++++++++++--- .../main/resources/mapper/NewsCategoryDao.xml | 3 ++ 8 files changed, 64 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java index 48014f406..77da47f34 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java @@ -109,4 +109,9 @@ public class NewsCategoryController { ExcelUtils.exportExcelToTarget(response, null, list, NewsCategoryExcel.class); } + @GetMapping("category") + public Result>> listCategory(){ + List> maps = newsCategoryService.listCategory(); + return new Result>>().ok(maps); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java index 3551e9a71..8749b8164 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java @@ -91,4 +91,11 @@ public class NewsController { ExcelUtils.exportExcelToTarget(response, null, list, NewsExcel.class); } + @PostMapping("modifyOnLine") + public Result modifyOnLine(@RequestBody Map parmas){ + newsService.modifyOnLine(parmas); + return new Result(); + } + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java index 4068cfd71..488499506 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.NewsCategoryEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; import java.util.Map; /** @@ -36,4 +37,6 @@ public interface NewsCategoryDao extends BaseDao { int selectNameCount(String categoryName,String id); + List> selectListCategory(); + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsCategoryService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsCategoryService.java index 39a79c09d..3a9e2b5a5 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsCategoryService.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsCategoryService.java @@ -107,4 +107,11 @@ public interface NewsCategoryService extends BaseService { * 检查标签下是否存在新闻 */ boolean checkIsExist(String id); + + + /** + * 查出所有类别 + */ + + List> listCategory(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java index d239e8905..edff695be 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java @@ -99,4 +99,12 @@ public interface NewsService extends BaseService { */ int checkCountByCategoryId(String categoryId); + + /** + * 上线下线 + */ + void modifyOnLine(Map parmas); + + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java index 77af30885..4fa1de739 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java @@ -122,4 +122,10 @@ public class NewsCategoryServiceImpl extends BaseServiceImpl0?true:false; } + @Override + public List> listCategory() { + List> maps = baseDao.selectListCategory(); + return maps; + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index 037865242..878c0ce96 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java @@ -66,11 +66,22 @@ public class NewsServiceImpl extends BaseServiceImpl implem } private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - + String streetId=(String) params.get("streetId"); + String communityId=(String) params.get("communityId"); + String gridId=(String) params.get("gridId"); + String startTime=(String) params.get("startTime"); + String endTime=(String) params.get("endTime"); + String category=(String) params.get("category"); + String keyword=(String) params.get("keyword"); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - + wrapper.eq(StringUtils.isNotBlank(streetId),"STREET_ID",streetId); + wrapper.eq(StringUtils.isNotBlank(communityId),"COMMUNITY_ID",communityId); + wrapper.eq(StringUtils.isNotBlank(gridId),"GRID_ID",gridId); + wrapper.ge(StringUtils.isNotBlank(startTime),"CREATED_TIME",startTime); + wrapper.lt(StringUtils.isNotBlank(endTime),"CREATED_TIME",endTime); + wrapper.eq(StringUtils.isNotBlank(category),"NEWS_CATERORY_ID",category); + wrapper.eq(StringUtils.isNotBlank(keyword),"NEWS_TITLE",keyword); + wrapper.orderByDesc("CREATED_TIME"); return wrapper; } @@ -107,4 +118,14 @@ public class NewsServiceImpl extends BaseServiceImpl implem return baseDao.selectCountByCategoryId(categoryId); } + @Override + public void modifyOnLine(Map parmas) { + String id=parmas.get("id"); + String onLineState=parmas.get("onLineState"); + NewsDTO newsDTO = get(id); + newsDTO.setNewsUpDownState(onLineState); + NewsEntity entity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class); + updateById(entity); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml index 6fbfb2c89..646c16cf4 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml @@ -38,4 +38,7 @@ AND id != #{id} + \ No newline at end of file