合并分支并处理冲突

4 years ago · f0f742a4e3
6 changed files with 321 additions and 208 deletions
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@ -233,6 +233,8 @@
                <!--问卷服务-->
                <gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>
                <!--<gateway.routes.tduck-api.url>http://localhost:8116</gateway.routes.tduck-api.url>-->
+                <!-- 插件：数字底座动力主轴 -->
+                <gateway.routes.plugin.power-base-server.url>lb://pli-power-base-server</gateway.routes.plugin.power-base-server.url>
                <!--钉钉 机器人地址-->
                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
@ -371,6 +373,8 @@
                <!--宣传服务-->
                <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
                <!--<gateway.routes.epmet-openapi-adv-server.url>http://localhost:8115</gateway.routes.epmet-openapi-adv-server.url>-->
+                <!-- 插件：数字底座动力主轴 -->
+                <gateway.routes.plugin.power-base-server.url>lb://pli-power-base-server</gateway.routes.plugin.power-base-server.url>
                <!--问卷服务-->
                <gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>
                <!--<gateway.routes.tduck-api.url>http://localhost:8116</gateway.routes.tduck-api.url>-->
@ -481,6 +485,8 @@

                <!--宣传服务-->
                <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
+                <!-- 插件：数字底座动力主轴 -->
+                <gateway.routes.plugin.power-base-server.url>lb://pli-power-base-server</gateway.routes.plugin.power-base-server.url>
                <!--钉钉 机器人地址-->
                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
@ -584,6 +590,8 @@

                <!--宣传服务-->
                <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
+                <!-- 插件：数字底座动力主轴 -->
+                <gateway.routes.plugin.power-base-server.url>lb://pli-power-base-server</gateway.routes.plugin.power-base-server.url>
                <!--问卷服务-->
                <gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>
                <!--生产钉钉 机器人地址-->
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@ -360,6 +360,15 @@ spring:
          filters:
            - StripPrefix=1
            - CpAuth=true
+        #数字底座动力主轴
+        - id: pli-power-base-server
+          uri: @gateway.routes.plugin.power-base-server.url@
+          order: 39
+          predicates:
+            - Path=${server.servlet.context-path}/pli/power/**
+          filters:
+            - StripPrefix=1
+            - CpAuth=true

    nacos:
      discovery:
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeUserBriefResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeUserBriefResultDTO.java
@ -0,0 +1,24 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/11/1 10:47
+ */
+@Data
+public class HomeUserBriefResultDTO implements Serializable {
+    private static final long serialVersionUID = 7747977114455488862L;
+    private String id;
+    private String homeId;
+    private String name;
+    private String isParty;
+    private String gender;
+    private String yhzgx;
+    private String mobile;
+    private String idCard;
+    private String birthday;
+}
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@ -60,7 +60,6 @@ import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcResiUserImportService;
 import com.epmet.service.IcResiUserService;
 import feign.RequestInterceptor;
-import jodd.io.FileUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
@ -70,9 +69,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

@ -255,6 +251,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 根据ic_resi_user找家属
+     *
     * @param icResiUserId
     * @return
     */
@ -594,10 +591,10 @@ public class IcResiUserController implements ResultDataResolver {
    }

    /**
-     * @LoginUser TokenDto tokenDto,
-     * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列表
     * @param formDTO
     * @return
+     * @LoginUser TokenDto tokenDto,
+     * 新增需求，需求人列表：展示当前工作人员所属组织+页面已选择所属网格 下的居民列表
     */
    @PostMapping("demandusers")
    public Result<List<DemandUserResDTO>> queryDemandUsers(@RequestBody DemandUserFormDTO formDTO) {
@ -607,6 +604,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 下载ic居民信息导入excel模板
+     *
     * @return
     */
    @PostMapping("import/download-template")
@ -637,6 +635,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 党员年龄范围统计
+     *
     * @Param formDTO
     * @Return {@link Result< List<  OptionDataResultDTO >>}
     * @Author zhaoqifeng
@ -650,6 +649,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 党员年龄列表
+     *
     * @Param formDTO
     * @Return {@link Result< PageData< PartyMemberEducationResultDTO>>}
     * @Author zhaoqifeng
@ -713,6 +713,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 党员学历统计
+     *
     * @Param formDTO
     * @Return {@link Result< List< OptionDataResultDTO>>}
     * @Author zhaoqifeng
@ -726,6 +727,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 党员学历列表
+     *
     * @Param formDTO
     * @Return {@link Result< PageData< PartyMemberEducationResultDTO>>}
     * @Author zhaoqifeng
@ -795,6 +797,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 根据居民id查询居民信息简介
+     *
     * @param resiUserId
     * @return
     */
@ -807,6 +810,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 获取ic_resi_user
+     *
     * @param icResiUserId
     * @return
     */
@ -820,6 +824,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * 【社区查询】搜索居民们
+     *
     * @param input
     * @return
     */
@ -848,9 +853,9 @@ public class IcResiUserController implements ResultDataResolver {
    }

    /**
-     * @Description 【社区查询】人员预警右侧列表
     * @param formDTO
     * @param tokenDto
+     * @Description 【社区查询】人员预警右侧列表
     * @author zxc
     * @date 2022/1/17 4:25 下午
     */
@ -862,6 +867,7 @@ public class IcResiUserController implements ResultDataResolver {

    /**
     * Desc: 根据房屋IDs查询房屋下是否有存在居民的
+     *
     * @param ids
     * @author zxc
     * @date 2022/3/2 10:32 上午
@ -888,4 +894,20 @@ public class IcResiUserController implements ResultDataResolver {
        });
        return new Result();
    }
+
+    /**
+     * 根据房屋主键查询户内家庭成员简信息
+     *
+     * @param houseId   房屋主键
+     * @param loginUser 登录用户
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.HomeUserBriefResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2022/4/21/0021 15:00
+     */
+    @PostMapping("listhomeuserbrief/{houseId}")
+    public Result<List<HomeUserBriefResultDTO>> listHomeUserBrief(@PathVariable("houseId") String houseId, @LoginUser TokenDto loginUser) {
+        String customerId = loginUser.getCustomerId();
+        List<HomeUserBriefResultDTO> r = icResiUserService.listHomeUserBrief(houseId, customerId);
+        return new Result().ok(r);
+    }
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
@ -68,6 +68,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
    List<HomeUserResultDTO> getPeopleByRoom(String homeId);

    PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO);
+
    /**
     * 编辑页面，显示居民信息详情
     *
@ -79,7 +80,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
    Map queryIcResiDetail(IcResiDetailFormDTO pageFormDTO);


-
    List<Map<String, Object>> dynamicQuery(String customerId,
                                           String formCode,
                                           String resultTableName,
@ -88,15 +88,14 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
                                           String staffOrgPath);

    /**
-     * @Description  查询个人数据
     * @param formDTO
+     * @Description 查询个人数据
     * @author zxc
     * @date 2021/11/3 9:21 上午
     */
    PersonDataResultDTO personData(PersonDataFormDTO formDTO);

    /**
-     * @Description  根据名字搜索
     * @param formDTO
     * @author zxc
     * @date 2021/11/3 1:42 下午
@ -156,6 +155,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 党员年龄范围统计
+     *
     * @Param formDTO
     * @Return {@link List<  OptionDataResultDTO >}
     * @Author zhaoqifeng
@ -165,6 +165,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 获取年龄范围内党员列表
+     *
     * @Param formDTO
     * @Return {@link PageData< PartyMemberAgeResultDTO>}
     * @Author zhaoqifeng
@ -174,6 +175,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 党员文化程度统计
+     *
     * @Param formDTO
     * @Return {@link List< OptionDataResultDTO>}
     * @Author zhaoqifeng
@ -183,6 +185,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 按教育程度获取党员列表
+     *
     * @Param formDTO
     * @Return {@link PageData< PartyMemberEducationResultDTO>}
     * @Author zhaoqifeng
@ -194,15 +197,16 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 获取居民主表记录
+     *
     * @param icResiUserId
     * @return
     */
    IcResiUserDTO get(String icResiUserId);

    /**
-     * @Description 【社区查询】人员预警右侧列表
     * @param formDTO
     * @param tokenDto
+     * @Description 【社区查询】人员预警右侧列表
     * @author zxc
     * @date 2022/1/17 4:25 下午
     */
@ -210,6 +214,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * Desc: 根据房屋IDs查询房屋下是否有存在居民的
+     *
     * @param ids
     * @author zxc
     * @date 2022/3/2 10:32 上午
@ -225,10 +230,12 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     * @Date 2022/3/29 14:27
     */
    PageData<EpidemicPreventionResultDTO> epidemicPreventionList(EpidemicPreventionFormDTO formDTO);
+
    PageData<EpidemicPreventionResultDTO> userList(EpidemicPreventionFormDTO formDTO);

    /**
     * 居民防疫信息详情
+     *
     * @Param formDTO
     * @Return {@link EpidemicPreventionResultDTO}
     * @Author zhaoqifeng
@ -238,10 +245,22 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {

    /**
     * 居民防疫信息详情:核酸，疫苗，行程
+     *
     * @Param formDTO
     * @Return {@link EpidemicPreventionInfoDTO}
     * @Author zhaoqifeng
     * @Date 2022/3/29 16:25
     */
    EpidemicPreventionInfoDTO getEpidemicPreventionInfo(EpidemicPreventionFormDTO formDTO);
+
+    /**
+     * 根据房屋主键查询户内家庭成员简信息
+     *
+     * @param houseId    房屋主键
+     * @param customerId 客户ID
+     * @return java.util.List<com.epmet.dto.result.HomeUserBriefResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2022/4/21/0021 15:02
+     */
+    List<HomeUserBriefResultDTO> listHomeUserBrief(String houseId, String customerId);
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@ -18,6 +18,7 @@
 package com.epmet.service.impl;

 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.bean.ResiExportBaseInfoData;
@ -66,6 +67,7 @@ import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@ -515,8 +517,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }


-
-
    @Override
    public PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO) {
        CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
@ -732,6 +732,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi

    /**
     * desc:动态查询 某表的所有字段值
+     *
     * @param customerId
     * @param formCode
     * @param resultTableName
@ -774,8 +775,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }

    /**
-     * @Description  查询个人数据
     * @param formDTO
+     * @Description 查询个人数据
     * @author zxc
     * @date 2021/11/3 9:21 上午
     */
@ -862,7 +863,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }

    /**
-     * @Description  根据名字搜索
     * @param formDTO
     * @author zxc
     * @date 2021/11/3 1:42 下午
@ -910,7 +910,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    /**
     * desc:条件导出
     *
-     *
     * @param formItemMap   key 表名 value formItem
     * @param baseTableName
     * @return
@ -982,6 +981,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     * key:itemId,value: key:columnName,中文
     */
    private static Map<String, Cache<String, String>> remoteOptionCacheMap = new HashMap<>();
+
    private void putRemoteValue(Set<FormItemResult> conditionItemSet, String currentStaffAgencyId, Map<String, Object> map, Map<String, Object> originalConditionMap, FormItemResult e, String columnName, String vauleStr) {
        try {
            Map<String, IcResiUserImportServiceImpl.ColumnWrapper> columnWrappers = new HashMap<>();
@ -1198,9 +1198,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }

    /**
-     * @Description 【社区查询】人员预警右侧列表
     * @param formDTO
     * @param tokenDto
+     * @Description 【社区查询】人员预警右侧列表
     * @author zxc
     * @date 2022/1/17 4:25 下午
     */
@ -1256,6 +1256,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi

    /**
     * Desc: 根据房屋IDs查询房屋下是否有存在居民的
+     *
     * @param ids
     * @author zxc
     * @date 2022/3/2 10:32 上午
@ -1402,9 +1403,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
    }

    /**
-     * @Description  居民分类 和 网格名 处理
     * @param list
     * @param configList
+     * @Description 居民分类 和 网格名 处理
     * @author zxc
     * @date 2022/1/18 3:22 下午
     */
@ -1437,6 +1438,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi

    /**
     * 查询志愿者类别options
+     *
     * @param customerId
     * @return
     */
@ -1594,4 +1596,33 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
        return new PageData<>(list, null == list ? NumConstant.ZERO : list.size());

    }
+
+    @Override
+    public List<HomeUserBriefResultDTO> listHomeUserBrief(String houseId, String customerId) {
+        LambdaQueryWrapper<IcResiUserEntity> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(IcResiUserEntity::getCustomerId, customerId)
+                .eq(IcResiUserEntity::getHomeId, houseId)
+                .select(
+                        IcResiUserEntity::getId,
+                        IcResiUserEntity::getHomeId,
+                        IcResiUserEntity::getName,
+                        IcResiUserEntity::getIsParty,
+                        IcResiUserEntity::getYhzgx,
+                        IcResiUserEntity::getGender,
+                        IcResiUserEntity::getMobile,
+                        IcResiUserEntity::getIdCard,
+                        IcResiUserEntity::getBirthday
+                )
+                .orderByAsc(IcResiUserEntity::getYhzgx, IcResiUserEntity::getCreatedTime, IcResiUserEntity::getId);
+
+        List<IcResiUserEntity> homeUserList = baseDao.selectList(lqw);
+        if (CollUtil.isEmpty(homeUserList)) {
+            return Lists.newArrayList();
+        }
+        homeUserList.forEach(
+                item -> item.setYhzgx(RelationshipEnum.getEnum(item.getYhzgx()).getName())
+        );
+
+        return ConvertUtils.sourceToTarget(homeUserList, HomeUserBriefResultDTO.class);
+    }
 }