From 4857c4482b8e8363b9a89195259cef57c8c1f287 Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 22 Apr 2022 09:33:49 +0800 Subject: [PATCH] =?UTF-8?q?message:=20=E5=85=9A=E5=91=98=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=88=B7=E5=9D=90=E6=A0=87=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/PowerKernelListPostitionFormDTO.java | 9 ++++++++ .../PowerKernelListPostitionResultDTO.java | 13 ++++++++++++ ...owerAxiskernelHouseholdViewController.java | 11 ++++++++++ .../axis/dao/PowerKernelHouseholdDao.java | 8 +++++++ .../service/PowerKernelHouseholdService.java | 8 +++++++ .../impl/PowerKernelHouseholdServiceImpl.java | 13 ++++++++++++ .../poweraxis/PowerKernelHouseholdDao.xml | 21 +++++++++++++++++++ 7 files changed, 83 insertions(+) create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerKernelListPostitionResultDTO.java diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java new file mode 100644 index 0000000..a6b2dbc --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java @@ -0,0 +1,9 @@ +package com.epmet.plugin.power.dto.axis.form; + +import lombok.Data; + +@Data +public class PowerKernelListPostitionFormDTO { + private String axisStructId; + private int limit; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerKernelListPostitionResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerKernelListPostitionResultDTO.java new file mode 100644 index 0000000..cbc81c7 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerKernelListPostitionResultDTO.java @@ -0,0 +1,13 @@ +package com.epmet.plugin.power.dto.axis.result; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class PowerKernelListPostitionResultDTO { + private String houseId; + private BigDecimal longitude; + private BigDecimal latitude; + private String address; +} 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 d639752..5c9caf7 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 @@ -3,7 +3,9 @@ package com.epmet.plugin.power.modules.axis.ViewController; import com.epmet.commons.tools.utils.Result; import com.epmet.plugin.power.dto.axis.ResultDTO; import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO; +import com.epmet.plugin.power.dto.axis.form.PowerKernelListPostitionFormDTO; import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO; +import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO; import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; @RestController @@ -29,4 +32,12 @@ public class PowerAxiskernelHouseholdViewController { PowerKernelHouseHoldViewListResultDTO dto = powerKernelHouseholdService.getList(form); return ResultDTO.success("查询成功",dto,powerKernelHouseholdService.getTotal(form)); } + /** + * 党员中心户坐标集合 + */ + @PostMapping("/listPosition") + public ResultDTO getListPosition(@RequestBody PowerKernelListPostitionFormDTO form){ + List dto = powerKernelHouseholdService.getListPosition(form); + return ResultDTO.success("成功",dto,powerKernelHouseholdService.getListTotal(form)); + } } 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 e17c6fe..2a50189 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 @@ -5,10 +5,14 @@ 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.dto.axis.form.PowerKernelHouseHoldViewListFormDTO; +import com.epmet.plugin.power.dto.axis.form.PowerKernelListPostitionFormDTO; import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO; +import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 动力主轴党员中心户 * @@ -22,4 +26,8 @@ public interface PowerKernelHouseholdDao extends BaseDao getListPosition(PowerKernelListPostitionFormDTO form); + + long getListTotal(PowerKernelListPostitionFormDTO form); } \ 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 5e17f31..7109d9e 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 @@ -7,7 +7,9 @@ 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.dto.axis.form.PowerKernelHouseHoldViewListFormDTO; +import com.epmet.plugin.power.dto.axis.form.PowerKernelListPostitionFormDTO; import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO; +import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import java.util.List; @@ -87,4 +89,10 @@ public interface PowerKernelHouseholdService extends BaseService getListPosition(PowerKernelListPostitionFormDTO form); + + long getListTotal(PowerKernelListPostitionFormDTO form); } \ 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/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 6f0d059..1f2834c 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 @@ -10,7 +10,9 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.plugin.power.dto.axis.PowerKernelHouseholdDTO; import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseFormDTO; import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO; +import com.epmet.plugin.power.dto.axis.form.PowerKernelListPostitionFormDTO; import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO; +import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO; import com.epmet.plugin.power.modules.axis.dao.PowerKernelHouseholdDao; import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import com.epmet.plugin.power.modules.axis.redis.PowerKernelHouseholdRedis; @@ -103,5 +105,16 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl getListPosition(PowerKernelListPostitionFormDTO form) { + List dto = baseDao.getListPosition(form); + return dto; + } + + @Override + public long getListTotal(PowerKernelListPostitionFormDTO form) { + return baseDao.getListTotal(form); + } + } \ No newline at end of file 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 f3afd2f..98f20a4 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 @@ -41,6 +41,27 @@ WHERE STRUCT_REFERENCE_ID = #{axisStructId} + + \ No newline at end of file