ic_resi_demand_dict迁移到heart,查询分类名称

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandNameQueryFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.form.demand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.Set;
+
+@Data
+public class UserDemandNameQueryFormDTO implements Serializable {
+    private static final long serialVersionUID = 1562457999313501989L;
+
+    public interface AddUserInternalGroup {}
+
+    @NotBlank(message = "客户idbu不能为空",groups =AddUserInternalGroup.class)
+    private String customerId;
+
+    @NotEmpty(message = "分类编码不能为空",groups =AddUserInternalGroup.class)
+    private Set<String> codeSet;
+}

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

@@ -5,7 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
-import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallback;
+import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -53,4 +53,7 @@ public interface EpmetHeartOpenFeignClient {
      **/
     @PostMapping("/heart/resi/volunteer/queryuservolunteerinfo/{userId}")
     Result<VolunteerInfoDTO> queryUserVolunteerInfo(@PathVariable("userId") String userId);
+
+    @PostMapping("/heart/icresidemanddict/demangnames")
+    Result<String> queryDemandNames(@RequestBody UserDemandNameQueryFormDTO formDTO);
 }

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

@@ -6,8 +6,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.CommonCustomerFormDTO;
+import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -48,4 +48,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result<VolunteerInfoDTO> queryUserVolunteerInfo(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryUserVolunteerInfo", userId);
     }
+
+    @Override
+    public Result<String> queryDemandNames(UserDemandNameQueryFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryDemandNames", formDTO);
+    }
 }

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

@@ -28,6 +28,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.IcResiDemandDictDTO;
+import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.service.IcResiDemandDictService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -90,4 +91,15 @@ public class IcResiDemandDictController {
         return new Result<List<OptionResultDTO>>().ok(icResiDemandDictService.getDemandOptions(tokenDto.getCustomerId()));
     }
 
+
+    /**
+     * 居民信息列表需要展示分类名称，单独开出来这个接口，供user查询
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("demangnames")
+    public Result<String> queryDemandNames(@RequestBody UserDemandNameQueryFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,UserDemandNameQueryFormDTO.AddUserInternalGroup.class);
+        return icResiDemandDictService.queryDemandNames(formDTO);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcResiDemandDictDao.java

@@ -24,6 +24,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 居民需求字典表 
@@ -35,4 +36,6 @@ import java.util.List;
 public interface IcResiDemandDictDao extends BaseDao<IcResiDemandDictEntity> {
     List<OptionResultDTO> selectDemandOptions(@Param("customerId") String customerId);
     List<OptionResultDTO> selectChildDemands(@Param("customerId")String customerId, @Param("parentCode") String parentCode);
+
+    String selectCategoryNames(@Param("customerId") String customerId,@Param("codeSet") Set<String> codeSet);
 }

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

@@ -20,7 +20,9 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcResiDemandDictDTO;
+import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.entity.IcResiDemandDictEntity;
 
 import java.util.List;
@@ -103,4 +105,10 @@ public interface IcResiDemandDictService extends BaseService<IcResiDemandDictEnt
      */
     List<OptionResultDTO> getDemandOptions(String customerId);
 
+    /**
+     * 居民信息列表需要展示分类名称，单独开出来这个接口，供user查询
+     * @param formDTO
+     * @return
+     */
+    Result<String> queryDemandNames(UserDemandNameQueryFormDTO formDTO);
 }

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

@@ -24,8 +24,10 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiDemandDictDao;
 import com.epmet.dto.IcResiDemandDictDTO;
+import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.entity.IcResiDemandDictEntity;
 import com.epmet.service.IcResiDemandDictService;
 import org.apache.commons.lang3.StringUtils;
@@ -110,4 +112,9 @@ public class IcResiDemandDictServiceImpl extends BaseServiceImpl<IcResiDemandDic
         return baseDao.selectDemandOptions(customerId);
     }
 
+    @Override
+    public Result<String> queryDemandNames(UserDemandNameQueryFormDTO formDTO) {
+        return new Result<String>().ok(baseDao.selectCategoryNames(formDTO.getCustomerId(),formDTO.getCodeSet()));
+    }
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml

@@ -58,4 +58,20 @@
     </select>
 
 
+    <select id="selectCategoryNames" parameterType="map" resultType="java.lang.String">
+        SELECT
+        GROUP_CONCAT(m.CATEGORY_NAME)
+        FROM
+        ic_resi_demand_dict m
+        WHERE
+        m.DEL_FLAG = '0'
+        AND m.CUSTOMER_ID = #{customerId}
+        <if test="null != codeSet and codeSet.size() > 0">
+            AND m.CATEGORY_CODE IN
+            <foreach item="code" collection="codeSet" open="(" separator="," close=")">
+                #{code}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>

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

@@ -52,8 +52,10 @@ import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.form.*;
+import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
+import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
@@ -87,7 +89,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
     @Autowired
     private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
-
+    @Autowired
+    private EpmetHeartOpenFeignClient heartOpenFeignClient;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
@@ -430,7 +433,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 codeSet.add(codePath);
             }
         }
-        String demandName=baseDao.selectCategoryNames(customerId,codeSet);
+        String demandName="";
+//        String demandName=baseDao.selectCategoryNames(customerId,codeSet);
+        UserDemandNameQueryFormDTO userDemandNameQueryFormDTO=new UserDemandNameQueryFormDTO();
+        userDemandNameQueryFormDTO.setCustomerId(customerId);
+        userDemandNameQueryFormDTO.setCodeSet(codeSet);
+        Result<String> demandNameRes=heartOpenFeignClient.queryDemandNames(userDemandNameQueryFormDTO);
+        if(demandNameRes.success()){
+            demandName=demandNameRes.getData();
+        }
         return  demandName;
     }