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

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

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/2 9:13 上午
+ * @DESC
+ */
+@Data
+public class BaseInfoFamilyBuildingFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2009866136409462441L;
+
+    public interface BaseInfoFamilyBuildingForm{}
+
+    @NotBlank(message = "neighborHoodId不能为空",groups = BaseInfoFamilyBuildingForm.class)
+    private String neighborHoodId;
+}

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

@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/2 9:15 上午
+ * @DESC
+ */
+@Data
+public class BaseInfoFamilyBuildingResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6084090841200733630L;
+
+    /**
+     * 楼栋ID
+     */
+    private String buildingId;
+
+    /**
+     * 楼栋名字
+     */
+    private String buildingName;
+}

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

@@ -290,4 +290,16 @@ public class AgencyController {
         return new Result<MapOrgResultDTO>().ok(agencyService.mapOrg(formDTO,tokenDto));
     }
 
+    /**
+     * @Description  查询楼栋信息
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/2 9:18 上午
+     */
+    @PostMapping("baseinfofamilybuilding")
+    public Result<List<BaseInfoFamilyBuildingResultDTO>> baseInfoFamilyBuilding(@RequestBody BaseInfoFamilyBuildingFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, BaseInfoFamilyBuildingFormDTO.BaseInfoFamilyBuildingForm.class);
+        return new Result<List<BaseInfoFamilyBuildingResultDTO>>().ok(agencyService.baseInfoFamilyBuilding(formDTO));
+    }
+
 }

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.IcBuildingEntity;
 import com.epmet.entity.IcHouseEntity;
@@ -60,4 +61,12 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
     List<Map<String, Object>> selectListByName(@Param("neighborNameList")ArrayList<String> strings,
                                                @Param("buildingNameList") ArrayList<String> strings1,
                                                @Param("buildingUnitList") ArrayList<Integer> integers);
+
+    /**
+     * @Description  根据neighborHoodId查询楼
+     * @param neighborHoodId
+     * @author zxc
+     * @date 2021/11/2 9:25 上午
+     */
+    List<BaseInfoFamilyBuildingResultDTO> baseInfoFamilyBuilding(@Param("neighborHoodId")String neighborHoodId);
 }

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

@@ -139,4 +139,13 @@ public interface AgencyService {
      * @date 2021/10/25 10:50 上午
      */
     MapOrgResultDTO mapOrg(MapOrgFormDTO formDTO, TokenDto tokenDto);
+
+    /**
+     * @Description  查询楼栋信息
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/2 9:18 上午
+     */
+    List<BaseInfoFamilyBuildingResultDTO> baseInfoFamilyBuilding(BaseInfoFamilyBuildingFormDTO formDTO);
+
 }

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

@@ -35,6 +35,7 @@ import com.epmet.constant.OrgInfoConstant;
 import com.epmet.constant.RoleKeyConstants;
 import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dao.CustomerGridDao;
+import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.*;
@@ -92,6 +93,8 @@ public class AgencyServiceImpl implements AgencyService {
     private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private IcBuildingDao icBuildingDao;
 
 
     /**
@@ -644,6 +647,21 @@ public class AgencyServiceImpl implements AgencyService {
         return result;
     }
 
+    /**
+     * @Description  查询楼栋信息
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/2 9:18 上午
+     */
+    @Override
+    public List<BaseInfoFamilyBuildingResultDTO> baseInfoFamilyBuilding(BaseInfoFamilyBuildingFormDTO formDTO) {
+        List<BaseInfoFamilyBuildingResultDTO> result = icBuildingDao.baseInfoFamilyBuilding(formDTO.getNeighborHoodId());
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        return result;
+    }
+
     private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) {
         CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
         insertEntity.setOrganizationName(formDTO.getAgencyName());

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

@@ -289,5 +289,15 @@
         </foreach>
     </select>
 
+    <!-- 根据neighborHoodId查询楼 -->
+    <select id="baseInfoFamilyBuilding" resultType="com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO">
+        SELECT
+            id AS buildingId,
+            BUILDING_NAME
+        FROM ic_building
+        WHERE DEL_FLAG  = '0'
+          AND NEIGHBOR_HOOD_ID = #{neighborHoodId}
+    </select>
+
 
 </mapper>