From a8e5281d5662385f06910f4283ffcd0e954115b9 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 22 Nov 2023 09:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E7=BD=91=E6=A0=BC=E4=B8=AA=E5=88=AB?= =?UTF-8?q?=20=20=E4=BB=A5=E5=8F=8A=20=20=20=E6=9C=8D=E5=8A=A1=E8=B5=B7?= =?UTF-8?q?=E4=B8=8D=E6=9D=A5=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/HouseAddMicroGridFormDTO.java | 25 +++++++++++++++++++ epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../com/epmet/controller/HouseController.java | 13 ++++++++++ .../main/java/com/epmet/dao/IcHouseDao.java | 1 + .../java/com/epmet/entity/IcHouseEntity.java | 2 ++ .../java/com/epmet/service/HouseService.java | 4 +++ .../epmet/service/impl/HouseServiceImpl.java | 16 ++++++++++++ .../db/migration/V0.0.42__add_work_log.sql | 2 +- .../src/main/resources/mapper/IcHouseDao.xml | 6 +++++ 9 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseAddMicroGridFormDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseAddMicroGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseAddMicroGridFormDTO.java new file mode 100644 index 0000000000..b4944e5916 --- /dev/null +++ b/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; +} diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 40a1f3743b..b3a71fa610 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -366,7 +366,7 @@ 5 192.168.203.30 - 10052 + 6379 Elink833066 true diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 0be889c93d..2850985e9a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/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> getMicroGridHouseList(String microGridId) { + List 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)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 3ae10791bf..bec6fadb30 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -201,4 +201,5 @@ public interface IcHouseDao extends BaseDao { */ IcHouseInfoCollectResultDTO getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO); + List getMicroGridHouseList(@Param("microGridId") String microGridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index 96e993c865..b8f499eba8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/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; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 225c28405a..a36e2ebcfb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -193,4 +193,8 @@ public interface HouseService { * @return */ Result getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO); + + List getMicroGridHouseList(String microGridId); + + boolean addMicroGridHouse(HouseAddMicroGridFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index f7c5713e7a..c684de89b7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/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().ok(icHouseInfoCollectResultDTO); } + + @Override + public List 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; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.42__add_work_log.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.42__add_work_log.sql index 7468944cf5..611985c76e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.42__add_work_log.sql +++ b/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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 8b900c90dd..6919f860d8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/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} +