diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java index 5c9caf7..7c48708 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java @@ -29,7 +29,7 @@ public class PowerAxiskernelHouseholdViewController { */ @PostMapping("/list") public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form){ - PowerKernelHouseHoldViewListResultDTO dto = powerKernelHouseholdService.getList(form); + List dto = powerKernelHouseholdService.getList(form); return ResultDTO.success("查询成功",dto,powerKernelHouseholdService.getTotal(form)); } /** 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 8ae80ea..1fc4ade 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 @@ -21,6 +21,7 @@ import com.epmet.plugin.power.modules.axis.excel.PowerKernelHouseholdExcel; import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService; import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -115,14 +116,22 @@ public class PowerKernelHouseholdController { IcHouseDTO houseDto = icHouseDTOResult.getData(); entity = new PowerKernelHouseholdEntity(); entity.setHouseId(houseInfo.getHomeId()); - entity.setLongitude(new BigDecimal(houseInfo.getBuildingLongitude())); - entity.setLatitude(new BigDecimal(houseInfo.getBuildingLatitude())); + + if(!StringUtils.isEmpty(houseInfo.getBuildingLatitude()) && !StringUtils.isEmpty(houseInfo.getBuildingLongitude())){ + entity.setLatitude(new BigDecimal(houseInfo.getBuildingLatitude())); + entity.setLongitude(new BigDecimal(houseInfo.getBuildingLongitude())); + } else { + entity.setLatitude(BigDecimal.ZERO); + entity.setLongitude(BigDecimal.ZERO); + } entity.setAddress(houseInfo.getAllName()); entity.setCustomerId(loginUserUtil.getLoginUserCustomerId()); entity.setOwnerPhone(houseDto.getOwnerPhone()); entity.setOwnerIdCard(houseDto.getOwnerIdCard()); entity.setOwnerName(houseDto.getOwnerName()); + + entity.setStructReferenceId(form.getAxisStructId()); 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 2a50189..4444184 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 @@ -23,7 +23,7 @@ import java.util.List; public interface PowerKernelHouseholdDao extends BaseDao { - PowerKernelHouseHoldViewListResultDTO getList(PowerKernelHouseHoldViewListFormDTO form); + List getList(PowerKernelHouseHoldViewListFormDTO form); long getTotal(PowerKernelHouseHoldViewListFormDTO form); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisLeaderEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisLeaderEntity.java index 50f9293..0a2ae0f 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisLeaderEntity.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisLeaderEntity.java @@ -51,4 +51,5 @@ public class PowerAxisLeaderEntity extends BaseEpmetEntity { */ private String avatar; + } 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 7109d9e..04b363e 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 @@ -86,7 +86,7 @@ public interface PowerKernelHouseholdService extends BaseService getList(PowerKernelHouseHoldViewListFormDTO form); long getTotal(PowerKernelHouseHoldViewListFormDTO form); /** diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java index 1f2834c..c65b9bb 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java @@ -56,9 +56,11 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); + String axisStructId = (String)params.get("axisStructId"); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) + .eq(StringUtils.isNotBlank(axisStructId), "STRUCT_REFERENCE_ID", axisStructId); return wrapper; } @@ -94,9 +96,9 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl getList(PowerKernelHouseHoldViewListFormDTO form) { form.setPageNo((form.getPageNo() - 1) * form.getPageSize()); - PowerKernelHouseHoldViewListResultDTO dto = baseDao.getList(form); + List dto = baseDao.getList(form); return dto; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml index c6953b0..a43d55d 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml @@ -38,18 +38,22 @@ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml index 98f20a4..81620ed 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml @@ -20,19 +20,7 @@ - + + \ No newline at end of file