diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerMicroGridExportFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerMicroGridExportFormDTO.java new file mode 100755 index 0000000000..3561e26c94 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerMicroGridExportFormDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 微网格表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-11-07 + */ +@Data +public class CustomerMicroGridExportFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + public interface CustomerMicroGridExport{} + + + + private String agencyId; + + + private String agencyPids; + + /** + * 微网格名称 + */ + private String microgridName; + + /** + * 微网格长 + */ + private String contacts; + +} \ No newline at end of file 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 index b4944e5916..2ba7025d21 100644 --- 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 @@ -21,5 +21,5 @@ public class HouseAddMicroGridFormDTO extends PageFormDTO implements Serializabl @NotNull(message = "microGridId不可为空",groups = HouseAddMicroGridFormDTO.HouseAddMicroGrid.class) private String microGridId; @NotNull(message = "houseId不可为空",groups = HouseAddMicroGridFormDTO.HouseAddMicroGrid.class) - private String houseId; + private String houseIds; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseRemoveMicroGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseRemoveMicroGridFormDTO.java new file mode 100644 index 0000000000..0323c0be63 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseRemoveMicroGridFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/28 15:06 + */ +@Data +public class HouseRemoveMicroGridFormDTO extends PageFormDTO implements Serializable { + + public interface HouseRemoveMicroGrid { + } + @NotNull(message = "houseId不可为空",groups = HouseRemoveMicroGridFormDTO.HouseRemoveMicroGrid.class) + private String houseId; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerMicroGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerMicroGridController.java index f87482ca86..60bb9f363b 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerMicroGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerMicroGridController.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.CustomerMicroGridDTO; +import com.epmet.dto.form.CustomerMicroGridExportFormDTO; import com.epmet.dto.form.CustomerMicroGridPageFormDTO; import com.epmet.dto.result.CustomerMicroGridDetailResultDTO; import com.epmet.dto.result.CustomerMicroGridPageResultDTO; @@ -75,7 +76,7 @@ public class CustomerMicroGridController { } @PostMapping("export") - public void export(@RequestBody CustomerMicroGridPageFormDTO dto, HttpServletResponse response) throws Exception { + public void export(@RequestBody CustomerMicroGridExportFormDTO dto, HttpServletResponse response) throws Exception { List list = customerMicroGridService.exportList(dto); ExcelUtils.exportExcelToTarget(response, null, list, CustomerMicroGridExcel.class); } 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 2850985e9a..34a270b1b3 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 @@ -628,4 +628,10 @@ public class HouseController implements ResultDataResolver { return new Result().ok(houseService.addMicroGridHouse(dto)); } + @PostMapping("removeMicroGridHouse") + public Result removeMicroGridHouse(@RequestBody HouseRemoveMicroGridFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return new Result().ok(houseService.removeMicroGridHouse(dto)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerMicroGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerMicroGridDao.java index fda95abeba..d909c67f6f 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerMicroGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerMicroGridDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.CustomerMicroGridExportFormDTO; import com.epmet.dto.form.CustomerMicroGridPageFormDTO; import com.epmet.dto.result.CustomerMicroGridDetailResultDTO; import com.epmet.dto.result.CustomerMicroGridPageResultDTO; @@ -21,5 +22,7 @@ public interface CustomerMicroGridDao extends BaseDao { List selectPageList(CustomerMicroGridPageFormDTO dto); + List selectExportList(CustomerMicroGridExportFormDTO dto); + CustomerMicroGridDetailResultDTO selectDetailById(@Param("id") String id); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerMicroGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerMicroGridService.java index fc20b13b9d..6a44a21698 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerMicroGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerMicroGridService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.CustomerMicroGridDTO; +import com.epmet.dto.form.CustomerMicroGridExportFormDTO; import com.epmet.dto.form.CustomerMicroGridPageFormDTO; import com.epmet.dto.result.CustomerMicroGridDetailResultDTO; import com.epmet.dto.result.CustomerMicroGridPageResultDTO; @@ -79,5 +80,5 @@ public interface CustomerMicroGridService extends BaseService exportList(CustomerMicroGridPageFormDTO dto); + List exportList(CustomerMicroGridExportFormDTO dto); } \ No newline at end of file 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 a36e2ebcfb..0484c2ee0b 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 @@ -197,4 +197,6 @@ public interface HouseService { List getMicroGridHouseList(String microGridId); boolean addMicroGridHouse(HouseAddMicroGridFormDTO dto); + + boolean removeMicroGridHouse(HouseRemoveMicroGridFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerMicroGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerMicroGridServiceImpl.java index 03b3143448..0b53386783 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerMicroGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerMicroGridServiceImpl.java @@ -8,13 +8,16 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.CustomerAgencyDao; +import com.epmet.dao.CustomerGridDao; import com.epmet.dao.CustomerMicroGridDao; import com.epmet.dto.CustomerMicroGridDTO; import com.epmet.dto.IcBirthRecordDTO; +import com.epmet.dto.form.CustomerMicroGridExportFormDTO; import com.epmet.dto.form.CustomerMicroGridPageFormDTO; import com.epmet.dto.result.CustomerMicroGridDetailResultDTO; import com.epmet.dto.result.CustomerMicroGridPageResultDTO; import com.epmet.entity.CustomerAgencyEntity; +import com.epmet.entity.CustomerGridEntity; import com.epmet.entity.CustomerMicroGridEntity; import com.epmet.redis.CustomerMicroGridRedis; import com.epmet.service.CustomerMicroGridService; @@ -42,6 +45,8 @@ public class CustomerMicroGridServiceImpl extends BaseServiceImpl page(CustomerMicroGridPageFormDTO dto) { @@ -84,6 +89,9 @@ public class CustomerMicroGridServiceImpl extends BaseServiceImpl exportList(CustomerMicroGridPageFormDTO dto) { + public List exportList(CustomerMicroGridExportFormDTO dto) { // 获取所有的pids if (StringUtils.isNotBlank(dto.getAgencyId())){ CustomerAgencyEntity customerAgencyEntity = customerAgencyDao.selectById(dto.getAgencyId()); dto.setAgencyPids(customerAgencyEntity.getPids().concat(":").concat(dto.getAgencyId())); } - - List entityList = baseDao.selectPageList(dto); + List entityList = baseDao.selectExportList(dto); return entityList; } 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 c684de89b7..2453f1c0d9 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 @@ -7,6 +7,7 @@ import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -1319,11 +1320,24 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Override public boolean addMicroGridHouse(HouseAddMicroGridFormDTO dto) { - IcHouseEntity icHouseEntity = icHouseDao.selectById(dto.getHouseId()); + String [] ids = dto.getHouseIds().split(","); - icHouseEntity.setMicroGridId(dto.getMicroGridId()); - icHouseDao.updateById(icHouseEntity); + QueryWrapper houseEntityQueryWrapper = new QueryWrapper<>(); + houseEntityQueryWrapper.in("id",ids); + List houseEntities = icHouseDao.selectList(houseEntityQueryWrapper); + houseEntities.forEach(house->{ + house.setMicroGridId(dto.getMicroGridId()); + icHouseDao.updateById(house); + }); + return true; + } + + @Override + public boolean removeMicroGridHouse(HouseRemoveMicroGridFormDTO dto) { + IcHouseEntity icHouseEntity = icHouseDao.selectById(dto.getHouseId()); + icHouseEntity.setMicroGridId(""); + icHouseDao.updateById(icHouseEntity); return true; } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerMicroGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerMicroGridDao.xml index af987fc615..67431f9133 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerMicroGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerMicroGridDao.xml @@ -30,7 +30,7 @@ + + + + +