微网格更新

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

@@ -54,7 +54,7 @@ public class CustomerMicroGridDTO implements Serializable {
     /**
      * 网格id
      */
-	private Integer gridId;
+	private String gridId;
 
     /**
      * 所属组织机构ID

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

@@ -20,6 +20,11 @@ public class HouseAddMicroGridFormDTO extends PageFormDTO implements Serializabl
 
     @NotNull(message = "microGridId不可为空",groups = HouseAddMicroGridFormDTO.HouseAddMicroGrid.class)
     private String microGridId;
-    @NotNull(message = "houseId不可为空",groups = HouseAddMicroGridFormDTO.HouseAddMicroGrid.class)
+//    @NotNull(message = "houseId不可为空",groups = HouseAddMicroGridFormDTO.HouseAddMicroGrid.class)
     private String houseIds;
+
+    private String unitIds;
+
+    private String buildingIds;
+
 }

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

@@ -31,6 +31,7 @@ public class CustomerMicroGridPageResultDTO implements Serializable {
 
     private String gridName;
 
+    private String gridId;
 
     /**
      * 微网格名称

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

@@ -51,7 +51,7 @@ public class CustomerMicroGridController {
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody CustomerMicroGridDTO dto){
+    public Result save(@RequestBody CustomerMicroGridDTO dto) throws Exception {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         customerMicroGridService.save(dto);

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

@@ -615,23 +615,55 @@ public class HouseController implements ResultDataResolver {
         houseService.orgIdPathInit();
         return new Result();
     }
-
+    /**
+     * @Description: 获取微网格列表
+     * @param microGridId:
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.HouseInfoDTO>>
+     * @Author: lichao
+     * @Date: 2023/11/23 16:57
+     */
     @GetMapping("getMicroGridHouseList")
     public Result<List<HouseInfoDTO>> getMicroGridHouseList(String microGridId) {
         List<HouseInfoDTO> result = houseService.getMicroGridHouseList(microGridId);
         return new Result().ok(result);
     }
-
+    /**
+     * @Description: 新增微网格房屋关联
+     * @param dto:
+     * @Return com.epmet.commons.tools.utils.Result
+     * @Author: lichao
+     * @Date: 2023/11/23 16:58
+     */
     @PostMapping("addMicroGridHouse")
     public Result addMicroGridHouse(@RequestBody HouseAddMicroGridFormDTO dto) {
         ValidatorUtils.validateEntity(dto);
         return new Result().ok(houseService.addMicroGridHouse(dto));
     }
-
+    /**
+     * @Description: 删除微网格房屋关联
+     * @param dto:
+     * @Return com.epmet.commons.tools.utils.Result
+     * @Author: lichao
+     * @Date: 2023/11/23 16:58
+     */
     @PostMapping("removeMicroGridHouse")
     public Result removeMicroGridHouse(@RequestBody HouseRemoveMicroGridFormDTO dto) {
         ValidatorUtils.validateEntity(dto);
         return new Result().ok(houseService.removeMicroGridHouse(dto));
     }
 
+    /**
+     * @Description: 获取当前微网格组织名称
+     * @param levelId:
+     * @param level:
+     * @Return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @Author: lichao
+     * @Date: 2023/11/23 16:59
+     */
+    @GetMapping("getMicroGridHouseName")
+    public Result<String> getMicroGridHouseName(String levelId,String level) {
+        String result = houseService.getMicroGridHouseName(levelId,level);
+        return new Result().ok(result);
+    }
+
 }

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

@@ -224,4 +224,5 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
     IcBuildingEntity selectByCoding(@Param("coding") String coding,
                                     @Param("id") String id);
 
+    String getMicroGridBuildingName(@Param("buildingId")String levelId);
 }

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

@@ -78,4 +78,6 @@ public interface IcBuildingUnitDao extends BaseDao<IcBuildingUnitEntity> {
     * @return com.epmet.dto.result.OrganizationCommunityDTO
     */
     OrganizationCommunityDTO selectCommunityByUnitId(@Param("unitId") String unitId);
+
+    String getMicroGridUnitName(@Param("unitId")String levelId);
 }

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

@@ -202,4 +202,6 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     IcHouseInfoCollectResultDTO getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO);
 
     List<HouseInfoDTO> getMicroGridHouseList(@Param("microGridId") String microGridId);
+
+    String getMicroGridHouseName(@Param("id") String levelId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerMicroGridEntity.java

@@ -1,5 +1,7 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -24,6 +26,7 @@ public class CustomerMicroGridEntity extends BaseEpmetEntity {
     /**
      * 客户ID
      */
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
     /**
@@ -54,7 +57,7 @@ public class CustomerMicroGridEntity extends BaseEpmetEntity {
     /**
      * 网格id
      */
-	private Integer gridId;
+	private String gridId;
 
     /**
      * 所属组织机构ID

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

@@ -58,7 +58,7 @@ public interface CustomerMicroGridService extends BaseService<CustomerMicroGridE
      * @author generator
      * @date 2023-11-07
      */
-    void save(CustomerMicroGridDTO dto);
+    void save(CustomerMicroGridDTO dto) throws Exception;
 
     /**
      * 默认更新

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

@@ -199,4 +199,6 @@ public interface HouseService {
     boolean addMicroGridHouse(HouseAddMicroGridFormDTO dto);
 
     boolean removeMicroGridHouse(HouseRemoveMicroGridFormDTO dto);
+
+    String getMicroGridHouseName(String levelId, String level);
 }

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

@@ -88,12 +88,15 @@ public class CustomerMicroGridServiceImpl extends BaseServiceImpl<CustomerMicroG
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(CustomerMicroGridDTO dto) {
+    public void save(CustomerMicroGridDTO dto) throws Exception {
         CustomerGridEntity customerGridEntity = customerGridDao.selectById(dto.getGridId());
+        if (customerGridEntity == null){
+            throw new Exception("网格不存在");
+        }
         dto.setAgencyId(customerGridEntity.getPid());
         dto.setAgencyPids(customerGridEntity.getPids());
         CustomerMicroGridEntity entity = ConvertUtils.sourceToTarget(dto, CustomerMicroGridEntity.class);
-        insert(entity);
+        saveOrUpdate(entity);
     }
 
     @Override

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

@@ -1320,10 +1320,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     @Override
     public boolean addMicroGridHouse(HouseAddMicroGridFormDTO dto) {
 
-        String [] ids = dto.getHouseIds().split(",");
+        String [] houseIds = dto.getHouseIds().split(",");
+        String [] unitIds = dto.getUnitIds().split(",");
+        String [] buildingIds = dto.getBuildingIds().split(",");
 
         QueryWrapper<IcHouseEntity> houseEntityQueryWrapper = new QueryWrapper<>();
-        houseEntityQueryWrapper.in("id",ids);
+        houseEntityQueryWrapper.in("ID",houseIds).or().in("BUILDING_ID",buildingIds)
+                .or().in("BUILDING_UNIT_ID",unitIds);
 
         List<IcHouseEntity> houseEntities = icHouseDao.selectList(houseEntityQueryWrapper);
         houseEntities.forEach(house->{
@@ -1340,4 +1343,21 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         icHouseDao.updateById(icHouseEntity);
         return true;
     }
+
+    @Override
+    public String getMicroGridHouseName(String levelId, String level) {
+
+        String result = "";
+
+        if (level.equals("house")){
+
+            result = icHouseDao.getMicroGridHouseName(levelId);
+
+        }else if (level.equals("unit")){
+            result = icBuildingUnitDao.getMicroGridUnitName(levelId);
+        }else if (level.equals("building")){
+            result = icBuildingDao.getMicroGridBuildingName(levelId);
+        }
+        return result;
+    }
 }

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

@@ -30,7 +30,7 @@
     <select id="selectPageList" resultType="com.epmet.dto.result.CustomerMicroGridPageResultDTO">
 
         select micgrid.ID as id, agency.ORGANIZATION_NAME as communityName,grid.GRID_NAME as gridName,
-               micgrid.CONTACTS as contacts,micgrid.MICROGRID_NAME as microgridName
+               micgrid.CONTACTS as contacts,micgrid.MICROGRID_NAME as microgridName,micgrid.GRID_ID as gridId
             from customer_micro_grid micgrid
             left join customer_agency agency on agency.ID = micgrid.AGENCY_ID
             left join customer_grid grid on grid.ID = micgrid.GRID_ID
@@ -72,7 +72,8 @@
                micgrid.CONTACTS as contacts,
                micgrid.SEX as sex,
                micgrid.MOBILE as mobile,
-               micgrid.ADDRESS as address
+               micgrid.ADDRESS as address,
+               micgrid.MICROGRID_NAME as microgridName
         from customer_micro_grid micgrid
                  left join customer_agency agency on agency.ID = micgrid.AGENCY_ID
                  left join customer_grid grid on grid.ID = micgrid.GRID_ID

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

@@ -449,5 +449,13 @@
                 and id != #{id}
             </if>
     </select>
+    <select id="getMicroGridBuildingName" resultType="java.lang.String">
+
+        select concat(h.NEIGHBOR_HOOD_NAME,"-",b.BUILDING_NAME)
+        from ic_building b
+                 INNER JOIN ic_neighbor_hood h ON (h.ID = b.NEIGHBOR_HOOD_ID AND h.DEL_FLAG = '0')
+        where b.id=#{buildingId}
+
+    </select>
 
 </mapper>

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

@@ -58,6 +58,15 @@
         where u.del_flag = '0'
                     and u.id=#{unitId}
     </select>
+    <select id="getMicroGridUnitName" resultType="java.lang.String">
+
+        select concat(h.NEIGHBOR_HOOD_NAME,"-",b.BUILDING_NAME,"-",u.UNIT_NAME)
+        from ic_building_unit u
+                 INNER JOIN ic_building b ON (b.ID = u.BUILDING_ID AND b.DEL_FLAG = '0')
+                 INNER JOIN ic_neighbor_hood h ON (h.ID = b.NEIGHBOR_HOOD_ID AND h.DEL_FLAG = '0')
+        where u.id=#{unitId}
+
+    </select>
 
 
 </mapper>

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

@@ -554,6 +554,19 @@
         where del_flag = '0'
          and MICRO_GRID_ID = #{microGridId}
     </select>
+    <select id="getMicroGridHouseName" resultType="java.lang.String">
+
+
+        select concat(hood.NEIGHBOR_HOOD_NAME,"-",building.BUILDING_NAME,"-",unit.UNIT_NAME,"-",house.DOOR_NAME)
+            from
+                ic_house house
+            left join ic_neighbor_hood hood on hood.ID = house.NEIGHBOR_HOOD_ID
+            left join ic_building building on building.ID = house.BUILDING_ID
+            left join ic_building_unit unit on unit.ID = house.BUILDING_UNIT_ID
+        where
+            house.id = #{id}
+
+    </select>
 
 
 </mapper>