Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MyPartIssuesResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -34,4 +35,7 @@ public class MyPartIssuesResultDTO implements Serializable {
      * 发表网格名称
      */
     private String topicReleaseGridName;
+
+    @JsonIgnore
+    private String gridId;
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -1,9 +1,16 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.MyPartIssuesFormDTO;
+import com.epmet.dto.result.MyPartIssuesResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -12,5 +19,16 @@ import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack;
  * @date 2020/6/4 13:37
  */
 @FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class)
+//@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class,url = "localhost:8101")
 public interface GovIssueOpenFeignClient {
+
+    /**
+     * @Description  个人中心-我参与的议题列表
+     * @Param myPartIssuesFormDTO
+     * @author zxc
+     * @date 2020/11/10 10:01 上午
+     */
+    @PostMapping("/gov/issue/issuevotestatistical/mypartissues")
+    Result<List<MyPartIssuesResultDTO>> myPartIssues(@RequestBody MyPartIssuesFormDTO myPartIssuesFormDTO);
+
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -1,8 +1,15 @@
 package com.epmet.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.form.MyPartIssuesFormDTO;
+import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
@@ -11,4 +18,8 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient {
+    @Override
+    public Result<List<MyPartIssuesResultDTO>> myPartIssues(MyPartIssuesFormDTO myPartIssuesFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER,"myPartIssues",myPartIssuesFormDTO);
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java

@@ -93,4 +93,6 @@ public interface IssueConstant {
     String BEIJING_TIME_ZONE = "+8";
 
     String REVIEW_ISSUE = "议题评论失败，评论内容为：%s";
+
+    String GRID = "grid";
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java

@@ -29,6 +29,8 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IssueVoteStatisticalDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.form.MyPartIssuesFormDTO;
+import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.dto.result.VoteResultDTO;
 import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.excel.IssueVoteStatisticalExcel;
@@ -145,4 +147,16 @@ public class IssueVoteStatisticalController {
         return new Result();
     }
 
+    /**
+     * @Description  个人中心-我参与的议题列表
+     * @Param myPartIssuesFormDTO
+     * @author zxc
+     * @date 2020/11/10 10:01 上午
+     */
+    @PostMapping("mypartissues")
+    public Result<List<MyPartIssuesResultDTO>> myPartIssues(@RequestBody MyPartIssuesFormDTO myPartIssuesFormDTO){
+        ValidatorUtils.validateEntity(myPartIssuesFormDTO, MyPartIssuesFormDTO.MyPartIssues.class);
+        return new Result<List<MyPartIssuesResultDTO>>().ok(issueVoteStatisticalService.myPartIssues(myPartIssuesFormDTO));
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.VoteFormDTO;
 import com.epmet.dto.result.IssueAttitudeCountResultDTO;
+import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.entity.IssueVoteDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -73,4 +74,12 @@ public interface IssueVoteDetailDao extends BaseDao<IssueVoteDetailEntity> {
     List<IssueAttitudeCountResultDTO> getVotingCountList(@Param("ids")Set<String> ids, @Param("attitude")String attitude);
 
     List<IssueAttitudeCountResultDTO> getVotingSummaryList(@Param("ids")Set<String> ids);
+
+    /**
+     * @Description  个人中心-我参与的议题列表
+     * @Param myPartIssuesFormDTO
+     * @author zxc
+     * @date 2020/11/10 10:01 上午
+     */
+    List<MyPartIssuesResultDTO> myPartIssues(@Param("userId")String userId);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java

@@ -23,7 +23,9 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IssueVoteStatisticalDTO;
 import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.form.MyPartIssuesFormDTO;
 import com.epmet.dto.result.EvaluationListResultDTO;
+import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.dto.result.VoteResultDTO;
 import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.entity.IssueVoteStatisticalEntity;
@@ -159,4 +161,12 @@ public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatis
      * @date 2020.05.21 09:09
      **/
     void syncVotingCacheToDbByParams(String issueId,String gridId,String statisticalId);
+
+    /**
+     * @Description  个人中心-我参与的议题列表
+     * @Param myPartIssuesFormDTO
+     * @author zxc
+     * @date 2020/11/10 10:01 上午
+     */
+    List<MyPartIssuesResultDTO> myPartIssues(MyPartIssuesFormDTO myPartIssuesFormDTO);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -40,6 +40,7 @@ import com.epmet.dto.result.*;
 import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueVoteStatisticalEntity;
 import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.redis.IssueVoteStatisticalRedis;
@@ -51,6 +52,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -86,6 +88,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     private ResiGroupFeignClient resiGroupFeignClient;
     @Autowired
     private IssueVoteDetailService issueVoteDetailService;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
     @Override
     public PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params) {
@@ -532,4 +536,28 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
 
     }
 
+    /**
+     * @Description  个人中心-我参与的议题列表
+     * @Param myPartIssuesFormDTO
+     * @author zxc
+     * @date 2020/11/10 10:01 上午
+     */
+    @Override
+    public List<MyPartIssuesResultDTO> myPartIssues(MyPartIssuesFormDTO myPartIssuesFormDTO) {
+        List<MyPartIssuesResultDTO> myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId());
+        if (CollectionUtils.isEmpty(myPartIssuesResult)){
+            return new ArrayList<>();
+        }
+        List<String> orgIds = myPartIssuesResult.stream().map(m -> m.getGridId()).collect(Collectors.toList());
+        OrgInfoFormDTO form = new OrgInfoFormDTO();
+        form.setOrgIds(orgIds);
+        form.setOrgType(IssueConstant.GRID);
+        Result<List<OrgInfoResultDTO>> listResult = govOrgOpenFeignClient.selectOrgInfo(form);
+        if (!listResult.success()){
+            throw new RenException("查询议题来源网格名称失败......");
+        }
+        myPartIssuesResult.forEach(m -> listResult.getData().stream().filter(l -> m.getGridId().equals(l.getOrgId())).forEach(l -> m.setTopicReleaseGridName(l.getOrgName())));
+        return myPartIssuesResult;
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml

@@ -71,4 +71,19 @@
             issue_id,
             attitude
     </select>
+
+    <!-- 个人中心-我参与的议题列表 -->
+    <select id="myPartIssues" resultType="com.epmet.dto.result.MyPartIssuesResultDTO">
+        SELECT
+            vd.ISSUE_ID,
+            i.SUGGESTION,
+            i.ISSUE_TITLE,
+            i.GRID_ID AS gridId,
+            UNIX_TIMESTAMP(i.CREATED_TIME) AS shiftIssueTime
+        FROM issue_vote_detail vd
+        LEFT JOIN issue i ON i.ID = vd.ISSUE_ID
+        WHERE i.DEL_FLAG = '0'
+              AND vd.DEL_FLAG = '0'
+              AND vd.CREATED_BY = #{userId}
+    </select>
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/OrgInfoFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/10 2:13 下午
+ */
+@Data
+public class OrgInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 4480485864711053393L;
+
+    /**
+     * org的类型 agency：机关，grid：网格，dept：部门
+     */
+    private String orgType;
+
+    /**
+     * orgId集合
+     */
+    private List<String> orgIds;
+
+}

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

@@ -0,0 +1,34 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/10 2:15 下午
+ */
+@Data
+public class OrgInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7478605833438304330L;
+
+    private String orgId;
+
+    private String orgName;
+
+    /**
+     * orgType 为空时，此字段为空
+     */
+    private String agencyId;
+
+    private String pid;
+
+    private String pids;
+
+    private String allParentName;
+
+    private String organizationName;
+
+    private String level;
+}

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

@@ -275,4 +275,13 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/customeragency/organizetree/{agencyId}")
     Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId);
+
+    /**
+     * @Description  查询org信息
+     * @Param orgInfoFormDTO
+     * @author zxc
+     * @date 2020/11/10 2:55 下午
+     */
+    @PostMapping("/gov/org/grid/selectorginfo")
+    Result<List<OrgInfoResultDTO>> selectOrgInfo(@RequestBody OrgInfoFormDTO orgInfoFormDTO);
 }

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

@@ -161,4 +161,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<OrganizeTreeResultDTO> organizeTree(String agencyId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "organizeTree", agencyId);
     }
+
+    @Override
+    public Result<List<OrgInfoResultDTO>> selectOrgInfo(OrgInfoFormDTO orgInfoFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectOrgInfo", orgInfoFormDTO);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerGridConstant.java

@@ -10,4 +10,10 @@ public interface CustomerGridConstant {
 	 * 根据网格Id未查询到网格信息
 	 */
 	String SELECT_EXCEPTION = "根据网格Id未查询到网格信息";
+
+	String AGENCY = "agency";
+
+	String DEPT = "dept";
+
+	String GRID = "grid";
 }

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

@@ -154,4 +154,15 @@ public class GridController {
         List<GridByStaffResultDTO> grids = customerGridService.listGridsbystaffid(staffId);
         return new Result<List<GridByStaffResultDTO>>().ok(grids);
     }
+
+    /**
+     * @Description  查询org信息
+     * @Param orgInfoFormDTO
+     * @author zxc
+     * @date 2020/11/10 2:55 下午
+     */
+    @PostMapping("selectorginfo")
+    public Result<List<OrgInfoResultDTO>> selectOrgInfo(@RequestBody OrgInfoFormDTO orgInfoFormDTO){
+        return new Result<List<OrgInfoResultDTO>>().ok(customerGridService.selectOrgInfo(orgInfoFormDTO));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -242,4 +242,8 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @return java.util.List<com.epmet.entity.CustomerGridEntity>
      */
     List<CustomerGridEntity> selectGridByStaff(@Param("staffId") String staffId);
+
+    List<OrgInfoResultDTO> selectOrgInfoByAgency(@Param("orgIds")List<String> orgIds);
+    List<OrgInfoResultDTO> selectOrgInfoByGrid(@Param("orgIds")List<String> orgIds);
+    List<OrgInfoResultDTO> selectOrgInfoByDept(@Param("orgIds")List<String> orgIds);
 }

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

@@ -33,6 +33,7 @@ import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerGridEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -268,4 +269,12 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @return void
      */
     void updateGrid(String staffId);
+
+    /**
+     * @Description  查询org信息
+     * @Param orgInfoFormDTO
+     * @author zxc
+     * @date 2020/11/10 2:55 下午
+     */
+    List<OrgInfoResultDTO> selectOrgInfo(OrgInfoFormDTO orgInfoFormDTO);
 }

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

@@ -666,4 +666,26 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         }
     }
 
+    /**
+     * @Description  查询org信息
+     * @Param orgInfoFormDTO
+     * @author zxc
+     * @date 2020/11/10 2:55 下午
+     */
+    @Override
+    public List<OrgInfoResultDTO> selectOrgInfo(OrgInfoFormDTO orgInfoFormDTO) {
+        List<OrgInfoResultDTO> result;
+        if (orgInfoFormDTO.getOrgType().equals(CustomerGridConstant.AGENCY)){
+            // 机关
+            result = baseDao.selectOrgInfoByAgency(orgInfoFormDTO.getOrgIds());
+        }else if (orgInfoFormDTO.getOrgType().equals(CustomerGridConstant.GRID)){
+            //网格
+            result = baseDao.selectOrgInfoByGrid(orgInfoFormDTO.getOrgIds());
+        }else {
+            // 部门
+            result = baseDao.selectOrgInfoByDept(orgInfoFormDTO.getOrgIds());
+        }
+        return result;
+    }
+
 }

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

@@ -490,4 +490,55 @@
           AND g.DEL_FLAG = '0'
           AND sg.USER_ID = #{staffId}
     </select>
+
+    <select id="selectOrgInfoByDept" resultType="com.epmet.dto.result.OrgInfoResultDTO">
+        SELECT
+            cd.ID AS orgId,
+            cd.DEPARTMENT_NAME AS orgName,
+            cd.AGENCY_ID AS agencyId,
+            ca.PID,
+            ca.PIDS,
+            ca.ORGANIZATION_NAME
+        FROM customer_department cd
+                 LEFT JOIN customer_agency ca ON ca.ID = cd.AGENCY_ID
+        WHERE cd.DEL_FLAG = '0'
+            AND ca.DEL_FLAG = '0'
+            AND
+            <foreach collection="orgIds" item="orgId" separator=" OR ">
+                cd.ID = #{orgId}
+            </foreach>
+    </select>
+    <select id="selectOrgInfoByGrid" resultType="com.epmet.dto.result.OrgInfoResultDTO">
+        SELECT
+            cg.ID AS orgId,
+            cg.GRID_NAME AS orgName,
+            cg.PID AS agencyId,
+            ca.PID,
+            ca.PIDS,
+            ca.ORGANIZATION_NAME
+        FROM customer_grid cg
+                 LEFT JOIN customer_agency ca ON ca.ID = cg.PID
+        WHERE cg.DEL_FLAG = '0'
+            AND ca.DEL_FLAG = '0'
+            AND
+            <foreach collection="orgIds" item="orgId" separator=" OR ">
+                cg.ID = #{orgId}
+            </foreach>
+    </select>
+    <select id="selectOrgInfoByAgency" resultType="com.epmet.dto.result.OrgInfoResultDTO">
+        SELECT
+            ID AS orgId,
+            ORGANIZATION_NAME AS orgName,
+            PID,
+            PIDS,
+            ALL_PARENT_NAME,
+            ORGANIZATION_NAME,
+            `LEVEL`
+        FROM customer_agency
+        WHERE DEL_FLAG = '0'
+            AND
+            <foreach collection="orgIds" item="orgId" separator=" OR ">
+                ID = #{orgId}
+            </foreach>
+    </select>
 </mapper>

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/IssueServiceImpl.java

@@ -1,12 +1,18 @@
 package com.epmet.modules.person.service.impl;
 
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.MyPartIssuesFormDTO;
 import com.epmet.dto.result.MyPartIssuesResultDTO;
+import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.modules.person.service.IssueService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -17,6 +23,9 @@ import java.util.List;
 @Slf4j
 public class IssueServiceImpl implements IssueService {
 
+    @Autowired
+    private GovIssueOpenFeignClient issueOpenFeignClient;
+
     /**
      * @Description  个人中心-我参与的议题列表
      * @Param tokenDto
@@ -27,6 +36,13 @@ public class IssueServiceImpl implements IssueService {
     public List<MyPartIssuesResultDTO> myPartIssues(TokenDto tokenDto) {
         MyPartIssuesFormDTO form = new MyPartIssuesFormDTO();
         form.setUserId(tokenDto.getUserId());
-        return null;
+        Result<List<MyPartIssuesResultDTO>> listResult = issueOpenFeignClient.myPartIssues(form);
+        if (!listResult.success()){
+            throw new RenException("查询我参与的议题列表失败......");
+        }
+        if (CollectionUtils.isEmpty(listResult.getData())){
+            return new ArrayList<>();
+        }
+        return listResult.getData();
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -132,6 +132,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result authBadgeRecord(CertificationAddFormDTO certificationAddFormDTO) {
+        log.info(JSON.toJSONString(certificationAddFormDTO));
         if (StringUtils.isNotBlank(certificationAddFormDTO.getMobile())){
             String smsCode = userBadgeRedis.getBadgeSmsCode(certificationAddFormDTO.getMobile());
             if (!StringUtils.isNotBlank(smsCode)){
@@ -150,6 +151,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         form.setIdNum(certificationAddFormDTO.getIdcard());
         form.setCertificationImg(certificationAddFormDTO.getCertificationImg());
         form.setSurname(certificationAddFormDTO.getSurname());
+        log.info(JSON.toJSONString(form));
         userBadgeDao.insertUserBadgeCertificateRecord(form);
 
         //TODO 站内信发送  您好，您的xxx徽章因认证失败未成功点亮，请查看