Merge remote-tracking branch 'origin/房屋tree_yzm' into dev

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -101,7 +101,8 @@ public interface StrConstant {
     String PY_ROOT_AGENCY = "53613e1c5de6ed473467f0159a10b135";
     //磐石街道客户Id
     String PS_CUSTOMER_ID = "1580460084738760705";
-
+    //小寨子客户id
+    String XIAOZHAIZI_CUSTOMER_ID="1536638904600752130";
     /**
      * 单位积分,积分上限，积分说明，积分事件
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -119,6 +119,7 @@ public interface EpmetHeartOpenFeignClient {
 
     /**
      * Desc: 获取联建单位名字
+     * 查询项目处理进展时调用
      * @param formDTO
      * @author zxc
      * @date 2022/5/17 17:53

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@@ -239,7 +239,7 @@ public class IcPartyUnitController implements ResultDataResolver {
     }
 
     /**
-     * @Description 按类型统计单位数量
+     * @Description 按类型统计单位数量、可视化平台-社区党建-联建单位分析-饼图展示分类下的联建单位数量
      * @Param dto
      * @Return {@link Result< List< OptionDataResultDTO>>}
      * @Author zhaoqifeng
@@ -248,7 +248,7 @@ public class IcPartyUnitController implements ResultDataResolver {
     @PostMapping("typestatistics")
     public Result<List<OptionDataResultDTO>> typeStatistics(@RequestBody PartyActivityFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return new Result<List<OptionDataResultDTO>>().ok(icPartyUnitService.typeStatistics(formDTO));
+        return new Result<List<OptionDataResultDTO>>().ok(icPartyUnitService.typeStatistics(formDTO.getAgencyId()));
     }
 
     /**
@@ -265,7 +265,8 @@ public class IcPartyUnitController implements ResultDataResolver {
     }
 
     /**
-     * 联建单位-简要信息列表
+     * 可视化平台-社区党建-联建单位分析
+     * 联建单位-简要信息列表展示：单位名称、单位类型
      *
      * @param form
      * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData>
@@ -298,7 +299,7 @@ public class IcPartyUnitController implements ResultDataResolver {
 
     /**
      * 计算区域化党建单位的群众满意度
-     *
+     * 服务完成后，会发mq
      * @param formDTO
      * @return
      */
@@ -311,6 +312,7 @@ public class IcPartyUnitController implements ResultDataResolver {
 
     /**
      * Desc: 获取联建单位名字
+     * 查询项目处理进展时调用
      * @param formDTO
      * @author zxc
      * @date 2022/5/17 17:53
@@ -321,7 +323,8 @@ public class IcPartyUnitController implements ResultDataResolver {
     }
 
     /**
-     * Desc: 协办单位列表
+     * Desc: 协办单位列表、本来是前端调用，后面需求升级，联建单位+社区自组织同步到了部门中
+     * 此接口已弃用
      * @param tokenDto
      * @author zxc
      * @date 2022/5/18 13:37

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java

@@ -106,13 +106,13 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
     List<OptionDTO> options(IcPartyUnitDTO dto);
 
     /**
-     * @Description 按类型统计单位数量
+     * @Description 按类型统计单位数量、可视化平台-社区党建-联建单位分析-饼图展示分类下的联建单位数量
-     * @Param formDTO
+     * @Param agencyId
      * @Return {@link List< OptionDataResultDTO>}
      * @Author zhaoqifeng
      * @Date 2021/12/8 14:56
      */
-    List<OptionDataResultDTO> typeStatistics(PartyActivityFormDTO formDTO);
+    List<OptionDataResultDTO> typeStatistics(String agencyId);
 
     /**
      * 联建单位分布
@@ -135,6 +135,7 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
 
     /**
      * Desc: 获取联建单位名字
+     * 查询项目处理进展时调用
      * @param formDTO
      * @author zxc
      * @date 2022/5/17 17:53
@@ -151,7 +152,8 @@ public interface IcPartyUnitService extends BaseService<IcPartyUnitEntity> {
 
 
     /**
-     * 联建单位-简要信息列表
+     * 可视化平台-社区党建-联建单位分析
+     * 联建单位-简要信息列表展示：单位名称、单位类型
      *
      * @param form
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -377,15 +377,15 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
     }
 
     /**
-     * @param formDTO
+     * @param agencyId
-     * @Description 按类型统计单位数量
+     * @Description 按类型统计单位数量、可视化平台-社区党建-联建单位分析-饼图展示分类下的联建单位数量
      * @Param formDTO
      * @Return {@link List<OptionDataResultDTO>}
      * @Author zhaoqifeng
      * @Date 2021/12/8 14:56
      */
     @Override
-    public List<OptionDataResultDTO> typeStatistics(PartyActivityFormDTO formDTO) {
+    public List<OptionDataResultDTO> typeStatistics(String agencyId) {
         DictListFormDTO dictFromDTO = new DictListFormDTO();
         dictFromDTO.setDictType(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
         Result<List<DictListResultDTO>> dictResult = epmetAdminOpenFeignClient.dictList(dictFromDTO);
@@ -393,7 +393,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
             throw new EpmetException(dictResult.getCode());
         }
 
-        List<OptionDataResultDTO> list = baseDao.getTypeStatistics(formDTO.getAgencyId());
+        List<OptionDataResultDTO> list = baseDao.getTypeStatistics(agencyId);
         Map<String, String> map = list.stream().collect(Collectors.toMap(OptionDataResultDTO::getCode, OptionDataResultDTO::getValue));
 
         return dictResult.getData().stream().map(item -> {
@@ -456,6 +456,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
 
     /**
      * Desc: 获取联建单位名字
+     * 查询项目处理进展时调用
      * @param formDTO
      * @author zxc
      * @date 2022/5/17 17:53
@@ -491,6 +492,12 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         return baseDao.getAssistanceUnitList(staffInfo.getAgencyId(),agencyInfo.getPid());
     }
 
+    /**
+     * 可视化平台-社区党建-联建单位分析
+     * 联建单位-简要信息列表展示：单位名称、单位类型
+     *
+     * @param form
+     */
     @Override
     public PageData getListbrief(PartyUnitListbriefFormDTO form) {
         Result<Map<String, String>> unitTypeMap = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());

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

@@ -169,6 +169,14 @@ public class HouseController implements ResultDataResolver {
         return new Result<PageData<IcHouseListResultDTO>>().ok(houseService.getHouseList(formDTO));
     }
 
+    /**
+     * 房屋管理-新增房屋
+     *
+     * @param tokenDTO
+     * @param formDTO
+     * @return
+     * @throws Exception
+     */
     @NoRepeatSubmit
     @PostMapping("houseadd")
     public Result houseAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseAddFormDTO formDTO) throws Exception {

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

@@ -254,6 +254,7 @@ public class HouseInformationController {
 
     /**
     * @describe: 【双实录入】获取小区编码
+     * 生成小区编码
     * @author wangtong
     * @date 2022/6/29 9:59
     * @params [tokenDTO, gridId]

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

@@ -77,6 +77,12 @@ public class NeighborHoodController {
 
     }
 
+    /**
+     * 房屋管理-新增小区
+     * @param tokenDTO
+     * @param formDTO
+     * @return
+     */
     @NoRepeatSubmit
     @PostMapping("neighborhoodadd")
     public Result neighborhoodadd(@LoginUser TokenDto tokenDTO, @RequestBody IcNeighborHoodAddFormDTO formDTO){

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

@@ -38,7 +38,12 @@ import java.util.Set;
  */
 public interface HouseService {
 
-
+    /**
+     * 房屋管理-新增房屋
+     *
+     * @param customerId
+     * @param formDTO
+     */
     void addHouse(String customerId, IcHouseAddFormDTO formDTO);
 
 

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

@@ -33,7 +33,12 @@ import javax.servlet.http.HttpServletResponse;
  * @since v1.0.0 2021-10-25
  */
 public interface NeighborHoodService{
-
+    /**
+     * 房屋管理-新增小区
+     *
+     * @param customerId
+     * @param formDTO
+     */
     void addNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO);
 
     PageData<IcNeighborHoodResultDTO> listNeighborhood(IcNeighborHoodListFormDTO formDTO);

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

@@ -8,7 +8,6 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.HouseQrcodeEnum;
@@ -35,17 +34,14 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.*;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
-import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.enums.*;
 import com.epmet.feign.*;
 import com.epmet.model.HouseInfoModel;
 import com.epmet.model.ImportHouseInfoListener;
-import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.redis.IcHouseRedis;
 import com.epmet.service.*;
-import com.epmet.stats.UserHouseStatsResultDTO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.cache.Cache;
@@ -69,7 +65,6 @@ import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URLEncoder;
 import java.text.NumberFormat;
-import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -137,7 +132,12 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     @Autowired
     private DataReportOpenFeignClient dataReportOpenFeignClient;
 
-
+    /**
+     * 房屋管理-新增房屋
+     *
+     * @param customerId
+     * @param formDTO
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addHouse(String customerId, IcHouseAddFormDTO formDTO) {
@@ -1155,6 +1155,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         if (null == house) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息");
         }
+        // 市北区-智慧社区:  1623486671774978060 23.2月为了方便社区的同事们演示系统，新建的一个客户id
+        if("1623486671774978060".equals(house.getCustomerId())){
+            return StrConstant.EPMETY_STR;
+        }
         //url组成:小程序地址?房屋编码
         CustomerOrgParameterEntity codePre = icHouseDao.selectByCustomerId(house.getCustomerId(), HouseQrcodeEnum.PREFIX_KEY.getCode());
         if(null == codePre){

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.enums.CollectUrlEnum;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -82,7 +83,12 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
     @Autowired
     private CustomerAgencyDao customerAgencyDao;
 
-
+    /**
+     * 房屋管理-新增小区
+     *
+     * @param customerId
+     * @param formDTO
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO) {
@@ -140,6 +146,10 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
     * @return java.lang.String
     */
     private String createNeiQrcodeUrl(IcNeighborHoodEntity entity) throws Exception {
+        // 市北区-智慧社区:  1623486671774978060 23.2月为了方便社区的同事们演示系统，新建的一个客户id
+        if ("1623486671774978060".equals(entity.getCustomerId())) {
+            return StrConstant.EPMETY_STR;
+        }
         if (null == entity) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "小区不可为空", "小区不可为空");
         }
@@ -338,6 +348,10 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
 
     @Override
     public Result createBatchNeiQrUrl(String customerId) {
+        // 市北区-智慧社区:  1623486671774978060 23.2月为了方便社区的同事们演示系统，新建的一个客户id
+        if ("1623486671774978060".equals(customerId)) {
+            return new Result();
+        }
         //查询该客户下没有二维码的小区
         QueryWrapper<IcNeighborHoodEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(IcNeighborHoodEntity::getCustomerId,customerId)

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

@@ -1,8 +1,10 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -20,10 +22,16 @@ public class CommonArticleListFormDTO implements Serializable {
      * */
     public interface ArticleBannerInternalGroup{}
 
+    /**
+     * 烟台需求：周边疫情   就业服务   警民互动   物业通知   党务公开  居务公开  财务公开     以上标签在实时动态里写死吧
+     *
+     */
+    public interface YanTaiShowGroup extends CustomerClientShowGroup {
+    }
     /**
      * 网格Id
      * */
-    @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class})
+    @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class,YanTaiShowGroup.class})
     private String gridId;
 
     /**
@@ -34,6 +42,7 @@ public class CommonArticleListFormDTO implements Serializable {
     /**
      * 标签名称(高级配置里的参数)
      * */
+    @NotNull(message = "标签名称不能为空",groups = YanTaiShowGroup.class)
     private String tagName;
     /**
      * 排除的标签名称(高级配置里的参数)
@@ -44,4 +53,8 @@ public class CommonArticleListFormDTO implements Serializable {
      */
     private Integer isTop;
 
+    @NotNull(message = "pageNo不能为空", groups = YanTaiShowGroup.class)
+    private Integer pageNo;
+    @NotNull(message = "pageSize不能为空", groups = YanTaiShowGroup.class)
+    private Integer pageSize;
 }

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

@@ -331,6 +331,21 @@ public class ArticleController {
 		return new Result<List<ArticleLatestResultDTO>>().ok(articleService.getLatestArticleList(commonArticleListFormDTO));
 	}
 
+	/**
+	 * @param formDTO
+	 * @return 烟台钉钉应用：实时动态周边疫情   就业服务   警民互动   物业通知   党务公开  居务公开  财务公开     以上标签在实时动态里写死吧
+	 * 包括最新活动
+	 */
+	@PostMapping("article-list-ytding")
+	public Result<PageData<ArticleLatestResultDTO>> pageArticleListByTagName(@RequestBody CommonArticleListFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, CommonArticleListFormDTO.YanTaiShowGroup.class);
+		return new Result<PageData<ArticleLatestResultDTO>>().ok(articleService.pageArticleListByTagName(formDTO.getPageNo(),
+				formDTO.getPageSize(),
+				formDTO.getGridId(),
+				formDTO.getTagName()));
+	}
+
+
 	/**
 	 * @param articlePageFormDTO
 	 * @return List<ArticleListResultDTO>

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java

@@ -167,4 +167,15 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
 	List<SubjectListResultDTO> subjectList(@Param("pidList")List<String> pidList);
 
     List<PublishedListResultDTO> selectAllArticle(ArticleListFormDTO formDTO);
+
+	/**
+	 * 根据标签名，查询文章列表
+	 * @param gridId
+	 * @param tagName
+	 * @param customerId
+	 * @return
+	 */
+	List<ArticleLatestResultDTO> pageArticleListByTagName(@Param("gridId")String gridId,
+														  @Param("tagName")String tagName,
+														  @Param("customerId")String customerId);
 }

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

@@ -278,4 +278,18 @@ public interface ArticleService extends BaseService<ArticleEntity> {
 	 * @param currentOperUserId
 	 */
 	void delete(List<String> articleIds,String customerId,String currentOperUserId);
+
+	/**
+	 * 烟台钉钉居民端：需求来源：烟台钉钉应用：实时动态周边疫情   就业服务   警民互动   物业通知   党务公开  居务公开  财务公开     以上标签在实时动态里写死吧
+	 *
+	 * @param pageNo
+	 * @param pageSize
+	 * @param gridId
+	 * @param tagName
+	 * @return
+	 */
+	PageData<ArticleLatestResultDTO> pageArticleListByTagName(Integer pageNo,
+															  Integer pageSize,
+															  String gridId,
+															  String tagName);
 }

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

@@ -42,10 +42,7 @@ import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.*;
-import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.*;
 import com.epmet.dao.*;
@@ -2007,5 +2004,23 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 	}
 
-
+	/**
+	 * 烟台钉钉居民端：需求来源：烟台钉钉应用：实时动态周边疫情   就业服务   警民互动   物业通知   党务公开  居务公开  财务公开     以上标签在实时动态里写死吧
+	 *
+	 * @param pageNo
+	 * @param pageSize
+	 * @param gridId
+	 * @param tagName
+	 * @return
+	 */
+	@Override
+	public PageData<ArticleLatestResultDTO> pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, String tagName) {
+		PageHelper.startPage(pageNo, pageSize);
+		List<ArticleLatestResultDTO> list = baseDao.pageArticleListByTagName(
+				gridId,
+				tagName,
+				EpmetRequestHolder.getLoginUserCustomerId());
+		PageInfo<ArticleLatestResultDTO> pageInfo = new PageInfo<>(list);
+		return new PageData<>(list, pageInfo.getTotal());
+	}
 }

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

@@ -506,4 +506,36 @@
         ORDER BY a.publish_date DESC, a.updated_time DESC
     </select>
 
+    <!--    根据标签名，查询文章列表 -->
+    <select id="pageArticleListByTagName" parameterType="map" resultType="com.epmet.dto.result.ArticleLatestResultDTO">
+        SELECT
+            distinct art.id as articleId,
+             art.TITLE as articleTitle,
+             art.PUBLISHER_NAME as publishName,
+             art.PUBLISH_DATE as publishDate,
+             (
+                 select ac.IMG_URL from article_cover ac
+                 where ac.ARTICLE_ID=art.id
+                   and ac.DEL_FLAG='0'
+                   and ac.AUDIT_STATUS='pass'
+                 limit 1
+            )as articleCoverImg
+        FROM
+            article art
+            LEFT JOIN article_tags t
+        ON ( art.id = t.ARTICLE_ID
+            AND t.DEL_FLAG = '0' )
+            left join article_publish_range apr
+            on(art.ID=apr.ARTICLE_ID
+            and apr.DEL_FLAG='0'
+            and apr.PUBLISH_STATUS='published')
+        WHERE
+            art.DEL_FLAG = '0'
+          AND art.CUSTOMER_ID = #{customerId}
+          AND t.TAG_NAME LIKE concat ( '%', #{tagName}, '%' )
+          and apr.GRID_ID=#{gridId}
+        ORDER BY
+            art.PUBLISH_DATE DESC,
+            art.CREATED_TIME DESC
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java

@@ -186,7 +186,8 @@ public class IcTripReportRecordController implements ResultDataResolver {
         //磐石客户
         if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){
             ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.PsAdd.class);
-        }else {
+        }else if(StrConstant.XIAOZHAIZI_CUSTOMER_ID.equals(formDTO.getCustomerId())) {
+            //小寨子客户id
             ValidatorUtils.validateEntity(formDTO,IcTripReportFormDTO.XzzAdd.class);
         }
         //校验参数