Merge branch 'feature/yujt_points' into feature/phaseOne

# Conflicts:
#	epdc-cloud-news/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java
#	epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "epdc-cloud-commons-yushan"]
 	path = epdc-cloud-commons-yushan
 	url = http://121.42.41.42:7070/r/epdc-cloud-commons-yushan.git
-[submodule "epdc-cloud-gateway-yushan"]
-	path = epdc-cloud-gateway-yushan
-	url = http://121.42.41.42:7070/r/epdc-cloud-gateway-yushan.git
 [submodule "epdc-cloud-parent-yushan"]
 	path = epdc-cloud-parent-yushan
 	url = http://121.42.41.42:7070/r/epdc-cloud-parent-yushan.git

epdc-cloud-gateway-yushan

@@ -1 +0,0 @@
-Subproject commit 29307425ebc6c065fa5c2559dd4aa1013a8a7a77

epdc-cloud-news/Dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM openjdk:8u242-jdk-buster
+FROM openjdk:8u252
 # 作者
 MAINTAINER rongchao@elink-cn.com
 # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值

epdc-cloud-news/pom.xml

@@ -158,7 +158,7 @@
                 <spring.profiles.active>test</spring.profiles.active>
                 <docker.tag>test</docker.tag>
 
-                <server.port>10011</server.port>
+                <server.port>17027</server.port>
 
                 <spring.redis.index>8</spring.redis.index>
                 <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
@@ -177,7 +177,7 @@
                 <nacos.namespace>8831513c-2f72-42e8-899f-eb6c2c5ae110</nacos.namespace>
 
                 <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.name.server>47.104.85.99:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
             </properties>
             <!--properties>

epdc-cloud-news/src/main/java/com/elink/esua/epdc/controller/NoticeController.java

@@ -55,6 +55,12 @@ public class NoticeController {
         return new Result<PageData<NoticeDTO>>().ok(page);
     }
 
+    @GetMapping("extendPage")
+    public Result<PageData<NoticeDTO>> extendPage(@RequestParam Map<String, Object> params) {
+        PageData<NoticeDTO> page = noticeService.extendPage(params);
+        return new Result<PageData<NoticeDTO>>().ok(page);
+    }
+
     @GetMapping("pageForReadOnly")
     public Result<PageData<NoticeDTO>> pageForReadOnly(@RequestParam Map<String, Object> params) {
         PageData<NoticeDTO> page = noticeService.pageForReadOnly(params);

epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/NoticeService.java

@@ -49,6 +49,16 @@ public interface NoticeService extends BaseService<NoticeEntity> {
      */
     PageData<NoticeDTO> page(Map<String, Object> params);
 
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<NoticeDTO>
+     * @author
+     * @date
+     */
+    PageData<NoticeDTO> extendPage(Map<String, Object> params);
+
     /**
      * 默认查询
      *
@@ -150,11 +160,10 @@ public interface NoticeService extends BaseService<NoticeEntity> {
     PageData<NoticeDTO> pageForReadOnly(Map<String, Object> params);
 
     /**
-     *
      * 修改组织机构信息
      *
-     * @params [dto]
      * @return void
+     * @params [dto]
      * @author liuchuang
      * @since 2020/3/7 1:23
      */

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

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -45,6 +46,7 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.NoticeDepartmentService;
 import com.elink.esua.epdc.service.NoticeService;
 import com.elink.esua.epdc.util.NewsUtils;
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -75,23 +77,32 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
     @Override
     public PageData<NoticeDTO> page(Map<String, Object> params) {
-//        String noticeTitle = (String) params.get("noticeTitle");
-//        params.put("noticeTitle", noticeTitle.trim());
-//        QueryWrapper<NoticeEntity> wrapper = this.getWrapper(params)
-//                .eq(FieldConstant.CREATED_BY, SecurityUser.getUserId());
-//
-//        IPage<NoticeEntity> page = baseDao.selectPage(
-//                getPage(params, FieldConstant.CREATED_TIME, false),
-//                wrapper
-//        );
-//        return getPageData(page, NoticeDTO.class);
+        String noticeTitle = (String) params.get("noticeTitle");
+        params.put("noticeTitle", noticeTitle.trim());
+        QueryWrapper<NoticeEntity> wrapper = this.getWrapper(params)
+                .eq(FieldConstant.CREATED_BY, SecurityUser.getUserId())
+                .eq("EXTEND_FLAG", NumConstant.ZERO_L);
+
+        IPage<NoticeEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                wrapper
+        );
+        return getPageData(page, NoticeDTO.class);
+    }
 
-        params.put("createdBy", SecurityUser.getUserId());
+    @Override
+    public PageData<NoticeDTO> extendPage(Map<String, Object> params) {
+        String noticeTitle = (String) params.get("noticeTitle");
+        params.put("noticeTitle", noticeTitle.trim());
 
-        IPage<NoticeDTO> page = getPage(params);
-        List<NoticeDTO> list = baseDao.getModulePageList(params);
-        return new PageData<>(list, page.getTotal());
+        QueryWrapper<NoticeEntity> wrapper = this.getWrapper(params)
+                .ne("EXTEND_FLAG", NumConstant.ZERO_L);
 
+        IPage<NoticeEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                wrapper
+        );
+        return getPageData(page, NoticeDTO.class);
     }
 
     @Override
@@ -221,7 +232,10 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
             entity.setParentDeptNames(deptDTO.getParentDeptNames());
         }
 
-        List<Long> noticeGridList = NewsUtils.getAllGridId(dto.getAllDeptIdsShow());
+        List<Long> noticeGridList = Lists.newArrayList();
+        if (NumConstant.ZERO_STR.equals(dto.getExtendFlag())) {
+            noticeGridList = NewsUtils.getAllGridId(dto.getAllDeptIdsShow());
+        }
 
         boolean isSave = true;
         if (StringUtils.isNotBlank(dto.getId())) {
@@ -238,7 +252,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
             noticeDepartmentService.deleteByNoticeId(entity.getId());
         }
 
-        this.noticeDepartmentService.save(entity.getId(), noticeGridList);
+        if (CollUtil.isNotEmpty(noticeGridList)) {
+            this.noticeDepartmentService.save(entity.getId(), noticeGridList);
+        }
     }
 
     @Override

pom.xml

@@ -16,7 +16,6 @@
         <module>epdc-cloud-news</module>
         <module>epdc-cloud-client-yushan</module>
         <module>epdc-cloud-commons-yushan</module>
-        <module>epdc-cloud-gateway-yushan</module>
         <module>epdc-cloud-parent-yushan</module>
     </modules>