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

epmet-module/gov-org/gov-org-client/pom.xml

@@ -32,6 +32,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-voice-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/feign/GovOrgSelfFeignClient.java

@@ -2,14 +2,15 @@ package com.epmet.dto.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.feign.fallback.GovOrgSelfFeignClientFallBack;
+import com.epmet.dto.form.PublishGridListFormDTO;
 import com.epmet.dto.result.ArticleGridResultDTO;
 import com.epmet.dto.result.PublishAgencyListResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @Description gov-org服务
@@ -36,12 +37,4 @@ public interface GovOrgSelfFeignClient {
     @PostMapping(value = "gov/org/customeragency/getpublishagencylist/{staffId}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<PublishAgencyListResultDTO> getPublishAgencyList(@PathVariable("staffId") String staffId);
 
-    /**
-     * @param staffId
-     * @return
-     * @Author sun
-     * @Description 根据工作人员Id查询对应的组织信息
-     **/
-    @PostMapping(value = "gov/org/customeragency/getagencybystaffId/{staffId}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result<CustomerAgencyDTO> getAgencyByStaffId(@PathVariable("staffId") String staffId);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/feign/fallback/GovOrgSelfFeignClientFallBack.java

@@ -3,8 +3,8 @@ package com.epmet.dto.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.feign.GovOrgSelfFeignClient;
+import com.epmet.dto.form.PublishGridListFormDTO;
 import com.epmet.dto.result.ArticleGridResultDTO;
 import com.epmet.dto.result.PublishAgencyListResultDTO;
 import org.springframework.stereotype.Component;
@@ -26,8 +26,4 @@ public class GovOrgSelfFeignClientFallBack implements GovOrgSelfFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getPublishAgencyList", staffId);
     }
 
-    @Override
-    public Result<CustomerAgencyDTO> getAgencyByStaffId(String staffId) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyByStaffId", staffId);
-    }
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ArticleGridResultDTO.java

@@ -24,7 +24,7 @@ import java.util.List;
 
 
 /**
- * 党建声音-可选发布范围-接口返参
+ * 党建声音-可选发布范围、可下线网格列表-接口返参
  *
  * @author sun
  */
@@ -50,8 +50,16 @@ public class ArticleGridResultDTO implements Serializable {
      */
     private List<ArticleGridResultDTO> subAgencyGridList;
     /**
-     * 所有上级机关Ids
+     * 上级组织机构ID
+     */
+    private String pid = "";
+    /**
+     * 所有上级组织机构ID(以英文:隔开)
      */
     private String pids = "";
+    /**
+     * 所有上级名称,以-连接
+     */
+    private String allParentName = "";
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -26,10 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.form.AgencyDeptGridFormDTO;
-import com.epmet.dto.form.CanTickStaffListFormDTO;
-import com.epmet.dto.form.StaffOrgFormDTO;
-import com.epmet.dto.form.TransferOptionalStaffListFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.excel.CustomerAgencyExcel;
 import com.epmet.service.CustomerAgencyService;
@@ -178,22 +175,10 @@ public class CustomerAgencyController {
      * @param staffId
      * @return
      * @Author sun
-     * @Description 党建声音-政府端-可选发布范围接口调用-根据人员角色查询对应的不同发布范围
+     * @Description 党建声音-政府端-可选发布单位接口调用-根据人员角色查询对应的不同发布单位
      **/
     @PostMapping("getpublishagencylist/{staffId}")
     public Result<PublishAgencyListResultDTO> getPublishAgencyList(@PathVariable("staffId") String staffId) {
         return new Result<PublishAgencyListResultDTO>().ok(customerAgencyService.getPublishAgencyList(staffId));
     }
-
-    /**
-     * @param staffId
-     * @return
-     * @Author sun
-     * @Description 根据工作人员Id查询对应的组织信息
-     **/
-    @PostMapping("getagencybystaffId/{staffId}")
-    public Result<CustomerAgencyDTO> getAgencyByStaffId(@PathVariable("staffId") String staffId) {
-        return new Result<CustomerAgencyDTO>().ok(customerAgencyService.getAgencyByStaffId(staffId));
-    }
-
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.form.AgencyDeptGridFormDTO;
-import com.epmet.dto.form.CanTickStaffListFormDTO;
-import com.epmet.dto.form.StaffOrgFormDTO;
-import com.epmet.dto.form.TransferOptionalStaffListFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 
@@ -172,12 +169,4 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Description 党建声音-政府端-可选发布单位接口调用-根据人员角色查询对应的不同发布单位
      **/
     PublishAgencyListResultDTO getPublishAgencyList(String staffId);
-
-    /**
-     * @param staffId
-     * @return
-     * @Author sun
-     * @Description 根据工作人员Id查询对应的组织信息
-     **/
-    CustomerAgencyDTO getAgencyByStaffId(String staffId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -806,21 +806,5 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return returnDTO;
     }
 
-    /**
-     * @param staffId
-     * @return
-     * @Author sun
-     * @Description 根据工作人员Id查询对应的组织信息
-     **/
-    @Override
-    public CustomerAgencyDTO getAgencyByStaffId(String staffId) {
-        //调用现有方法查询工作人员对应组织信息
-        CustomerStaffAgencyDTO staffAgencyDTO = new CustomerStaffAgencyDTO();
-        staffAgencyDTO.setUserId(staffId);
-        staffAgencyDTO = customerStaffAgencyDao.selectByStaffId(staffAgencyDTO);
-        CustomerAgencyEntity entity = baseDao.selectById(staffAgencyDTO.getAgencyId());
-        CustomerAgencyDTO dto = ConvertUtils.sourceToTarget(entity, CustomerAgencyDTO.class);
-        return dto;
-    }
 
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -160,7 +160,9 @@
         SELECT
             id AS "agencyId",
             organization_name AS "agencyName",
-            pids AS "pids"
+            pid AS "pid",
+            pids AS "pids",
+            all_parent_name AS "allParentName"
         FROM customer_agency
         WHERE del_flag = '0'
         AND pids = #{subAgencyPids}

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticlePublishRangeDTO.java

@@ -59,6 +59,21 @@ public class ArticlePublishRangeDTO implements Serializable {
 	 */
 	private String agencyGridName;
 
+	/**
+	 * 组织ID
+	 */
+	private String agencyId;
+
+	/**
+	 * 所有上级组织机构ID 以英文:隔开
+	 */
+	private String pids;
+
+	/**
+	 * 所有上级名称 以横杠隔开
+	 */
+	private String allParentName;
+
     /**
      * 下线时间
      */

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/DraftPublishRangeDTO.java

@@ -59,6 +59,21 @@ public class DraftPublishRangeDTO implements Serializable {
 	 */
 	private String agencyGridName;
 
+	/**
+	 * 组织ID
+	 */
+	private String agencyId;
+
+	/**
+	 * 所有上级组织机构ID 以英文:隔开
+	 */
+	private String pids;
+
+	/**
+	 * 所有上级名称 以横杠隔开
+	 */
+	private String allParentName;
+
     /**
      * 下线时间
      */

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/OffLineArticleFormDTO.java

@@ -28,8 +28,6 @@ public class OffLineArticleFormDTO implements Serializable {
     @Size(min = 1, message = "项目人员关联Id不能为空", groups = {AddUserInternalGroup.class})
     private List<String> gridIdList;
 
-    private String customerId;
-
     private String staffId;
 }
 

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishGridListFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 党建声音-可下线网格列表-接口入参
+ *
+ * @author sun
+ */
+@Data
+public class PublishGridListFormDTO implements Serializable {
+    private static final long serialVersionUID = -6659391832410565077L;
+
+    public interface AddUserInternalGroup {}
+
+    /**
+     * 文章Id
+     */
+    @NotBlank(message = "文章id不能为空", groups = {PublishGridListFormDTO.AddUserInternalGroup.class})
+    private String articleId;
+}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java

@@ -36,7 +36,7 @@ public interface ArticleConstant {
      */
     String SELECT_AGRNCY_EXCEPTION = "获取用户组织信息失败";
     /**
-     * 下线文章(用于拼接操作表字段值)
+     * 下线文章操作记录表文案
      */
-    String OFF_LINE_ARTICLE = "下线文章";
+    String OFF_LINE_ARTICLE_MSG = "%s-%s下线文章【%s】";
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java

@@ -30,4 +30,15 @@ public interface DraftConstant {
      * 审核中：auditing
      */
     String AUDITING = "auditing";
+
+    //是否置顶
+    /**
+     * 置顶：1
+     */
+    Integer TOP = 1;
+
+   /**
+     * 不置顶：0
+     */
+    Integer UN_TOP = 0;
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@@ -210,7 +210,6 @@ public class ArticleController {
      **/
     @PostMapping("offlinearticle")
     public Result offLineArticle(@LoginUser TokenDto tokenDTO, @RequestBody OffLineArticleFormDTO formDTO) {
-        formDTO.setCustomerId(tokenDTO.getCustomerId());
         formDTO.setStaffId(tokenDTO.getUserId());
         ValidatorUtils.validateEntity(formDTO, OffLineArticleFormDTO.AddUserInternalGroup.class);
         articleService.offLineArticle(formDTO);
@@ -327,4 +326,17 @@ public class ArticleController {
         ValidatorUtils.validateEntity(articlePageFormDTO,ArticlePageFormDTO.ArticlePageInternalGroup.class);
         return new Result<List<ArticleListResultDTO>>().ok(articleService.getArticleList(articlePageFormDTO));
     }
+
+    /**
+     * @param tokenDTO formDTO
+     * @return
+     * @Author sun
+     * @Description 党建声音-政府端-可下线网格列表
+     **/
+    @PostMapping("publishgridlist")
+    public Result<ArticleGridResultDTO> publishGridList(@LoginUser TokenDto tokenDTO, @RequestBody PublishGridListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PublishGridListFormDTO.AddUserInternalGroup.class);
+        return new Result<ArticleGridResultDTO>().ok(articleService.publishGridList(formDTO));
+    }
+
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticlePublishRangeEntity.java

@@ -58,6 +58,21 @@ public class ArticlePublishRangeEntity extends BaseEpmetEntity {
 	 */
 	private String agencyGridName;
 
+	/**
+	 * 组织ID
+	 */
+	private String agencyId;
+
+	/**
+	 * 所有上级组织机构ID 以英文:隔开
+	 */
+	private String pids;
+
+	/**
+	 * 所有上级名称 以横杠隔开
+	 */
+	private String allParentName;
+
     /**
      * 下线时间
      */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftPublishRangeEntity.java

@@ -58,6 +58,21 @@ public class DraftPublishRangeEntity extends BaseEpmetEntity {
 	 */
 	private String agencyGridName;
 
+	/**
+	 * 组织ID
+	 */
+	private String agencyId;
+
+	/**
+	 * 所有上级组织机构ID 以英文:隔开
+	 */
+	private String pids;
+
+	/**
+	 * 所有上级名称 以横杠隔开
+	 */
+	private String allParentName;
+
     /**
      * 下线时间
      */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java

@@ -218,4 +218,12 @@ public interface ArticleService extends BaseService<ArticleEntity> {
      * @date 2020.06.03 14:19
      **/
     List<ArticleListResultDTO> getArticleList(ArticlePageFormDTO articlePageFormDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 党建声音-政府端-可下线网格列表
+     **/
+    ArticleGridResultDTO publishGridList(PublishGridListFormDTO formDTO);
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -536,18 +536,14 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			throw new RenException(ArticleConstant.SELECT_STAFF_EXCEPTION);
 		}
 		CustomerStaffDTO staffDTO = resultStaff.getData();
-		//4.2:调用gov-org服务，查询当前人员所属组织机构信息
-		Result<CustomerAgencyDTO> resultAgency = govOrgSelfFeignClient.getAgencyByStaffId(formDTO.getStaffId());
-		if (null == resultAgency.getData()) {
-			throw new RenException(ArticleConstant.SELECT_AGRNCY_EXCEPTION);
-		}
-		CustomerAgencyDTO agencyDTO = resultAgency.getData();
+		//4.2:查询文章表数据
+		ArticleEntity articleEntity = baseDao.selectById(formDTO.getArticleId());
 		//4.3:新增操作表数据
 		ArticleOperateRecordEntity recordEntity = new ArticleOperateRecordEntity();
-		recordEntity.setCustomerId(formDTO.getCustomerId());
+		recordEntity.setCustomerId(articleEntity.getCustomerId());
 		recordEntity.setArticleId(formDTO.getArticleId());
-		recordEntity.setOpUser(agencyDTO.getOrganizationName() + "-" + staffDTO.getRealName());
-		recordEntity.setContent(recordEntity.getOpUser() + ArticleConstant.OFF_LINE_ARTICLE);
+		recordEntity.setOpUser(articleEntity.getPublisherName() + "-" + staffDTO.getRealName());
+		recordEntity.setContent(String.format(ArticleConstant.OFF_LINE_ARTICLE_MSG, articleEntity.getPublisherName(), staffDTO.getRealName(), articleEntity.getTitle()));
 		recordEntity.setOpType(ArticleConstant.OFFLINE);
 		recordEntity.setOpTime(date);
 		articleOperateRecordService.insert(recordEntity);
@@ -641,4 +637,25 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
         return baseDao.selectArticleList(articlePageFormDTO.getGridId(),articlePageFormDTO.getTagIdList());
     }
 
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Author sun
+	 * @Description 党建声音-政府端-可下线网格列表
+	 **/
+	@Override
+	public ArticleGridResultDTO publishGridList(PublishGridListFormDTO formDTO) {
+		/*//1:查询当前文章发布范围内还未下线网格列表
+		ArticlePublishRangeEntity rangeEntity = new ArticlePublishRangeEntity();
+		rangeEntity.setArticleId(formDTO.getArticleId());
+		rangeEntity.setPublishStatus(ArticleConstant.PUBLISHED);
+		List<ArticlePublishRangeEntity> rangeEntityList = articlePublishRangeDao.selectByArticleId(rangeEntity);
+		if(null==rangeEntityList||rangeEntityList.size()<NumConstant.ONE){
+			return new ArticleGridResultDTO();
+		}
+		List<String> gridIdList = rangeEntityList.stream().map(ArticlePublishRangeEntity::getGridId).collect(Collectors.toList());
+		formDTO.setGridIdList(gridIdList);*/
+
+		return null;
+	}
 }

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticlePublishRangeDao.xml

@@ -10,7 +10,12 @@
             article_publish_range
         WHERE
             del_flag = '0'
+        <if test="articleId != null and articleId.trim() != ''">
             AND article_id = #{articleId}
+        </if>
+        <if test="publishStatus != null and publishStatus.trim() != ''">
+            AND publish_status = #{publishStatus}
+        </if>
         ORDER BY created_time ASC
     </select>
 </mapper>

epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql

@@ -75,13 +75,13 @@ CREATE TABLE draft(
     TITLE VARCHAR(128) NOT NULL   COMMENT '文章标题' ,
     PREVIEW_CONTENT VARCHAR(512) NOT NULL   COMMENT '文章内容 精简内容' ,
     IS_TOP INT NOT NULL   COMMENT '是否置顶 1是；0否；' ,
-    PUBLISH_RANGE_DESC VARCHAR(512) NOT NULL   COMMENT '发布范围描述 所有发布范围集合,顿号隔开' ,
-    PUBLISHER_ID VARCHAR(64) NOT NULL   COMMENT '发布单位ID' ,
-    PUBLISHER_NAME VARCHAR(128) NOT NULL   COMMENT '发布单位名称' ,
-    PUBLISHER_TYPE VARCHAR(32) NOT NULL   COMMENT '发布单位类型 机关:agency；部门：department；网格：grid' ,
-    PUBLISH_DATE DATE NOT NULL   COMMENT '发布时间' ,
+    PUBLISH_RANGE_DESC VARCHAR(512)    COMMENT '发布范围描述 所有发布范围集合,顿号隔开' ,
+    PUBLISHER_ID VARCHAR(64)    COMMENT '发布单位ID' ,
+    PUBLISHER_NAME VARCHAR(128)    COMMENT '发布单位名称' ,
+    PUBLISHER_TYPE VARCHAR(32)    COMMENT '发布单位类型 机关:agency；部门：department；网格：grid' ,
+    PUBLISH_DATE DATE    COMMENT '发布时间' ,
     STATUS_FLAG VARCHAR(32) NOT NULL   COMMENT '发布状态 未发布：unpublish ；已发布:published，审核中：auditing；审核失败：auditfail' ,
-    TAGS VARCHAR(512) NOT NULL   COMMENT '文章标签串 竖杠分割的标签名称' ,
+    TAGS VARCHAR(512)    COMMENT '文章标签串 竖杠分割的标签名称' ,
     ORG_ID VARCHAR(64)    COMMENT '组织ID' ,
     ORG_ID_PATH VARCHAR(512)    COMMENT '组织ID路径 eg：字段为def:abc' ,
     GRID_ID VARCHAR(64)    COMMENT '网格ID 数据权限使用' ,
@@ -121,6 +121,9 @@ CREATE TABLE draft_publish_range(
     DRAFT_ID VARCHAR(64) NOT NULL   COMMENT 'ID草稿' ,
     GRID_ID VARCHAR(64) NOT NULL   COMMENT '网格ID' ,
     AGENCY_GRID_NAME VARCHAR(64) NOT NULL   COMMENT '组织-网格名称' ,
+    AGENCY_ID VARCHAR(64) NOT NULL   COMMENT '组织ID' ,
+    PIDS VARCHAR(1024) NOT NULL   COMMENT '所有上级组织机构ID 以英文:隔开' ,
+    ALL_PARENT_NAME VARCHAR(1024) NOT NULL   COMMENT '所有上级名称 以横杠隔开' ,
     OFF_LINE_TIME DATETIME    COMMENT '下线时间' ,
     PUBLISH_STATUS VARCHAR(32) NOT NULL   COMMENT '发布状态 未发布：unpublish ；已发布:published' ,
     DEL_FLAG INT NOT NULL  DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' ,
@@ -221,6 +224,9 @@ CREATE TABLE article_publish_range(
     ARTICLE_ID VARCHAR(64) NOT NULL   COMMENT '文章ID' ,
     GRID_ID VARCHAR(64) NOT NULL   COMMENT '网格ID' ,
     AGENCY_GRID_NAME VARCHAR(64) NOT NULL   COMMENT '组织-网格名称' ,
+    AGENCY_ID VARCHAR(64) NOT NULL   COMMENT '组织ID' ,
+    PIDS VARCHAR(1024) NOT NULL   COMMENT '所有上级组织机构ID 以英文:隔开' ,
+    ALL_PARENT_NAME VARCHAR(1024) NOT NULL   COMMENT '所有上级名称 以横杠隔开' ,
     OFF_LINE_TIME DATETIME    COMMENT '下线时间' ,
     PUBLISH_STATUS VARCHAR(32) NOT NULL   COMMENT '发布状态 已发布:published;已下线：offline' ,
     DEL_FLAG INT NOT NULL  DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' ,
@@ -269,3 +275,4 @@ CREATE TABLE article_visit_record(
 
 ALTER TABLE article_visit_record ADD UNIQUE UNX_INDEX(ARTICLE_ID,GRID_ID,USER_ID);
 ALTER TABLE article_visit_record COMMENT '文章访问记录表';
+