diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseFormDTO.java new file mode 100644 index 0000000..907b360 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelHouseFormDTO.java @@ -0,0 +1,9 @@ +package com.epmet.plugin.power.dto.axis.form; + +import lombok.Data; + +@Data +public class PowerKernelHouseFormDTO { + private String axisStructId; + private String[] houseIdList; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java index f3ce6cf..3b70a01 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java @@ -11,16 +11,20 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.IcHouseDTO; +import com.epmet.dto.result.HouseInfoDTO; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.plugin.power.dto.axis.PowerKernelHouseholdDTO; +import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFormDTO; +import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import com.epmet.plugin.power.modules.axis.excel.PowerKernelHouseholdExcel; import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; +import java.math.BigDecimal; +import java.util.*; /** @@ -86,5 +90,29 @@ public class PowerKernelHouseholdController { ExcelUtils.exportExcelToTarget(response, null, list, PowerKernelHouseholdExcel.class); } + /** + * 为节点绑定党员中心户 + */ + @PostMapping("/bind") + public Result Bind(@RequestBody PowerKernelHouseFormDTO form){ + String customerId = loginUserUtil.getLoginUserCustomerId(); + Set houseIds = new HashSet<>(); + Collections.addAll(houseIds,form.getHouseIdList()); + Result> listResult = govOrgOpenFeignClient.queryListHouseInfo(houseIds, customerId); + +// Result icHouseDTOResult = govOrgOpenFeignClient.get(form.getAxisStructId()); + + for (HouseInfoDTO dto: listResult.getData()) { + PowerKernelHouseholdEntity entity = new PowerKernelHouseholdEntity(); + entity.setCustomerId(dto.getCustomerId()); + BigDecimal Latitude = new BigDecimal(dto.getBuildingLatitude()); + BigDecimal Longitude = new BigDecimal(dto.getBuildingLongitude()); + entity.setLatitude(Latitude); + entity.setLongitude(Longitude); + entity.setAddress(dto.getAllName()); + powerKernelHouseholdService.insert(entity); + } + return new Result(); + } } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java index 999e137..5d59217 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java @@ -3,6 +3,7 @@ package com.epmet.plugin.power.modules.axis.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFormDTO; import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import org.apache.ibatis.annotations.Mapper; @@ -14,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PowerKernelHouseholdDao extends BaseDao { - + + } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java index ab23319..2269a4e 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java @@ -5,6 +5,7 @@ package com.epmet.plugin.power.modules.axis.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.plugin.power.dto.axis.PowerKernelHouseholdDTO; +import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFormDTO; import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import java.util.List; @@ -77,4 +78,6 @@ public interface PowerKernelHouseholdService extends BaseService + \ No newline at end of file