微网格个别 以及 服务起不来配置修改

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/6/28 15:06
+ */
+@Data
+public class HouseAddMicroGridFormDTO extends PageFormDTO implements Serializable {
+
+    public interface HouseAddMicroGrid {
+    }
+
+    @NotNull(message = "microGridId不可为空",groups = HouseAddMicroGridFormDTO.HouseAddMicroGrid.class)
+    private String microGridId;
+    @NotNull(message = "houseId不可为空",groups = HouseAddMicroGridFormDTO.HouseAddMicroGrid.class)
+    private String houseId;
+}

epmet-module/gov-org/gov-org-server/pom.xml

@@ -366,7 +366,7 @@
                 <!-- redis配置 -->
                 <spring.redis.index>5</spring.redis.index>
                 <spring.redis.host>192.168.203.30</spring.redis.host>
-                <spring.redis.port>10052</spring.redis.port>
+                <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>Elink833066</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>

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

@@ -51,6 +51,7 @@ import com.epmet.dao.IcHouseDao;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerOrgParameterEntity;
+import com.epmet.entity.IcHouseEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -615,4 +616,16 @@ public class HouseController implements ResultDataResolver {
         return new Result();
     }
 
+    @GetMapping("getMicroGridHouseList")
+    public Result<List<HouseInfoDTO>> getMicroGridHouseList(String microGridId) {
+        List<HouseInfoDTO> result = houseService.getMicroGridHouseList(microGridId);
+        return new Result().ok(result);
+    }
+
+    @PostMapping("addMicroGridHouse")
+    public Result addMicroGridHouse(@RequestBody HouseAddMicroGridFormDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        return new Result().ok(houseService.addMicroGridHouse(dto));
+    }
+
 }

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

@@ -201,4 +201,5 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      */
     IcHouseInfoCollectResultDTO getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO);
 
+    List<HouseInfoDTO> getMicroGridHouseList(@Param("microGridId") String microGridId);
 }

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

@@ -136,4 +136,6 @@ public class IcHouseEntity extends BaseEpmetEntity {
 	 * 房屋可编辑编码
 	 */
 	private String coding;
+
+	private String microGridId;
 }

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

@@ -193,4 +193,8 @@ public interface HouseService {
      * @return
      */
     Result<IcHouseInfoCollectResultDTO> getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO);
+
+    List<HouseInfoDTO> getMicroGridHouseList(String microGridId);
+
+    boolean addMicroGridHouse(HouseAddMicroGridFormDTO dto);
 }

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

@@ -1310,4 +1310,20 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
         return new Result<IcHouseInfoCollectResultDTO>().ok(icHouseInfoCollectResultDTO);
     }
+
+    @Override
+    public List<HouseInfoDTO> getMicroGridHouseList(String microGridId) {
+        return icHouseDao.getMicroGridHouseList(microGridId);
+    }
+
+    @Override
+    public boolean addMicroGridHouse(HouseAddMicroGridFormDTO dto) {
+
+        IcHouseEntity icHouseEntity = icHouseDao.selectById(dto.getHouseId());
+
+        icHouseEntity.setMicroGridId(dto.getMicroGridId());
+        icHouseDao.updateById(icHouseEntity);
+
+        return true;
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.42__add_work_log.sql

@@ -4,7 +4,7 @@
  Source Server         : epmet_cloud_dev_gov
  Source Server Type    : MySQL
  Source Server Version : 50726
- Source Host           : 47.104.92.53:10059
+ Source Host           : 192.168.1.140:3306
  Source Schema         : epmet_gov_org
 
  Target Server Type    : MySQL

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

@@ -548,6 +548,12 @@
         and BUILDING_UNIT_ID = #{buildingUnitId}
         and DOOR_NAME = #{doorName}
     </select>
+    <select id="getMicroGridHouseList" resultType="com.epmet.dto.result.HouseInfoDTO">
+        select *
+        from ic_house
+        where del_flag = '0'
+         and MICRO_GRID_ID = #{microGridId}
+    </select>
 
 
 </mapper>