Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_0814

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java

@@ -59,4 +59,14 @@ public interface NewsDao extends BaseDao<NewsEntity> {
      * @date 2019/9/12 10:41
      */
     EpdcNewsDetailResultDTO selectOneAppNewsDetail(EpdcNewsDetailFormDTO formDto);
+
+    /**
+     * 根据ID修改新闻
+     *
+     * @param entity
+     * @return int
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 14:51
+     */
+    int updateNewsById(NewsEntity entity);
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java

@@ -65,4 +65,14 @@ public interface NoticeDao extends BaseDao<NoticeEntity> {
      * @date 2019/9/6 15:59
      */
     int updateReadingAmount(@Param("noticeId") String noticeId);
+
+    /**
+     * 按ID更新通知
+     *
+     * @param entity
+     * @return int
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 14:28
+     */
+    int updateNoticeById(NoticeEntity entity);
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -95,29 +95,31 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     private QueryWrapper<NewsEntity> getWrapper(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         String draft = (String) params.get("draft");
-        String streetId = (String) params.get("streetId");
+        String streetId = (String) params.get(FieldConstant.STREET_ID_HUMP);
-        String communityId = (String) params.get("communityId");
+        String communityId = (String) params.get(FieldConstant.COMMUNITY_ID_HUMP);
-        String gridId = (String) params.get("gridId");
+        String gridId = (String) params.get(FieldConstant.GRID_ID_HUMP);
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
         String category = (String) params.get("category");
-        String keyword = ((String) params.get("keyword")).trim();
+        String keyword = ((String) params.get("keyword"));
         QueryWrapper<NewsEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(streetId), "STREET_ID", streetId);
+        wrapper.eq(StringUtils.isNotBlank(streetId), FieldConstant.STREET_ID, streetId);
         wrapper.eq(StringUtils.isNotBlank(communityId), "COMMUNITY_ID", communityId);
-        wrapper.eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId);
+        wrapper.eq(StringUtils.isNotBlank(gridId), FieldConstant.GRID_ID, gridId);
-        wrapper.ge(StringUtils.isNotBlank(startTime), "CREATED_TIME", startTime);
+        wrapper.ge(StringUtils.isNotBlank(startTime), FieldConstant.CREATED_TIME, startTime);
-        wrapper.lt(StringUtils.isNotBlank(endTime), "CREATED_TIME", endTime);
+        wrapper.lt(StringUtils.isNotBlank(endTime), FieldConstant.CREATED_TIME, endTime);
         wrapper.eq(StringUtils.isNotBlank(category), "NEWS_CATERORY_ID", category);
-        wrapper.like(StringUtils.isNotBlank(keyword), "NEWS_TITLE", keyword);
+        if (StringUtils.isNotBlank(keyword)) {
-        wrapper.eq("CREATED_BY", user.getId());
+            wrapper.like("NEWS_TITLE", keyword.trim());
+        }
+        wrapper.eq(FieldConstant.CREATED_BY, user.getId());
         //draft 前端传上来的一个标志 有则代表是存草稿箱的 1
         if (StringUtils.isNotEmpty(draft)) {
             wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", YesOrNoEnum.YES.value());
         } else {
             wrapper.eq("NEWS_RELEASE_STATE", YesOrNoEnum.NO.value());
         }
-        wrapper.orderByDesc("CREATED_TIME");
+        wrapper.orderByDesc(FieldConstant.CREATED_TIME);
         return wrapper;
     }
 
@@ -239,7 +241,9 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
             if (isSave) {
                 insert(entity);
             } else {
-                updateById(entity);
+                entity.setUpdatedBy(user.getRealName());
+                entity.setUpdatedTime(new Date());
+                this.baseDao.updateNewsById(entity);
             }
         } else {
             if (CollUtil.isEmpty(newsGridList)) {
@@ -252,7 +256,9 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
             if (isSave) {
                 insert(entity);
             } else {
-                updateById(entity);
+                entity.setUpdatedBy(user.getRealName());
+                entity.setUpdatedTime(new Date());
+                this.baseDao.updateNewsById(entity);
                 newsDepartmentService.deleteByNewsId(entity.getId());
             }
             this.newsDepartmentService.save(entity.getId(), newsGridList);
@@ -272,8 +278,8 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     @Override
     public Result<EpdcNewsDetailResultDTO> getNewsDetail(EpdcNewsDetailFormDTO formDto) {
         EpdcNewsDetailResultDTO epdcNewsDetailResultDTO = baseDao.selectOneAppNewsDetail(formDto);
-        String oldContent=epdcNewsDetailResultDTO.getNewsContent();
+        String oldContent = epdcNewsDetailResultDTO.getNewsContent();
-        epdcNewsDetailResultDTO.setNewsContent("<div style=\"font-size:19px;line-height:31px\">"+oldContent+"</div>");
+        epdcNewsDetailResultDTO.setNewsContent("<div style=\"font-size:19px;line-height:31px\">" + oldContent + "</div>");
         return new Result().ok(epdcNewsDetailResultDTO);
     }
 

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

@@ -166,7 +166,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
             entity.setReadingAmount(NumConstant.ZERO);
             insert(entity);
         } else {
-            updateById(entity);
+            entity.setUpdatedBy(user.getRealName());
+            entity.setUpdatedTime(new Date());
+            this.baseDao.updateNoticeById(entity);
             noticeDepartmentService.deleteByNoticeId(entity.getId());
         }
 

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

@@ -59,6 +59,27 @@
         LEFT JOIN epdc_news_user_attitude nu on nu.EPDC_NEWS_ID = en.ID AND nu.USER_ID = #{userId} AND nu.DEL_FLAG = '0'
         WHERE
             en.ID = #{newsId}
-
     </select>
+
+    <update id="updateNewsById">
+        UPDATE epdc_news
+            SET
+            news_title = #{newsTitle},
+            news_content = #{newsContent},
+            news_caterory_id = #{newsCateroryId},
+            news_property = #{newsProperty},
+            news_image_url = #{newsImageUrl},
+            news_up_down_state = #{newsUpDownState},
+            news_release_start_time = #{newsReleaseStartTime},
+            news_release_end_time = #{newsReleaseEndTime},
+            street = #{street},
+            street_id = #{streetId},
+            community = #{community},
+            community_id = #{communityId},
+            grid = #{grid},
+            grid_id = #{gridId},
+            updated_by = #{updatedBy},
+            updated_time = #{updatedTime}
+        WHERE id = #{id} AND del_flag = '0';
+    </update>
 </mapper>

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

@@ -6,7 +6,6 @@
         UPDATE epdc_notice SET READING_AMOUNT = READING_AMOUNT + 1 WHERE id = #{noticeId}
     </update>
 
-
     <select id="selectListAppNotice" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO">
         SELECT
             en.ID AS id,
@@ -38,4 +37,20 @@
         WHERE
             n.ID = #{noticeId}
     </select>
+
+    <update id="updateNoticeById">
+        UPDATE epdc_notice
+        SET
+            notice_title = #{noticeTitle},
+            notice_content = #{noticeContent},
+            street = #{street},
+            street_id = #{streetId},
+            community = #{community},
+            community_id = #{communityId},
+            grid = #{grid},
+            grid_id = #{gridId},
+            updated_by = #{updatedBy},
+            updated_time = #{updatedTime}
+        WHERE id = #{id} AND del_flag = '0'
+    </update>
 </mapper>