Merge remote-tracking branch 'origin/dev_0814' into dev_0814

# Conflicts:
#	esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

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<List<Map<String,String>>> listCategory(){
+        List<Map<String, String>> maps = newsCategoryService.listCategory();
+        return new Result<List<Map<String,String>>>().ok(maps);
+    }
 }

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<String,String> parmas){
+        newsService.modifyOnLine(parmas);
+        return new Result();
+    }
+
+
 }

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<NewsCategoryEntity> {
 
     int selectNameCount(String categoryName,String id);
 
+    List<Map<String,String>> selectListCategory();
+
 }

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<NewsCategoryEntity> {
      * 检查标签下是否存在新闻
      */
     boolean checkIsExist(String id);
+
+
+    /**
+     * 查出所有类别
+     */
+
+    List<Map<String,String>> listCategory();
 }

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<NewsEntity> {
      */
     int checkCountByCategoryId(String categoryId);
 
+
+    /**
+     * 上线下线
+     */
+    void modifyOnLine(Map<String,String> parmas);
+
+
+
 }

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 BaseServiceImpl<NewsCategoryDao, Ne
         return newsService.checkCountByCategoryId(id)>0?true:false;
     }
 
+    @Override
+    public List<Map<String, String>> listCategory() {
+        List<Map<String, String>> maps = baseDao.selectListCategory();
+        return maps;
+    }
+
 }

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<NewsDao, NewsEntity> implem
     }
 
     private QueryWrapper<NewsEntity> getWrapper(Map<String, Object> 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<NewsEntity> 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<NewsDao, NewsEntity> implem
         return baseDao.selectCountByCategoryId(categoryId);
     }
 
+    @Override
+    public void modifyOnLine(Map<String,String> 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);
+    }
+
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml

@@ -38,4 +38,7 @@
             AND id != #{id}
         </if>
     </select>
+    <select id="selectListCategory" resultType="Map">
+        SELECT ID as id,CATEGORY_NAME as name FROM esua_epdc_news.epdc_news_category where DEL_FLAG= '0'
+    </select>
 </mapper>