diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisServiceStationFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisServiceStationFormDTO.java new file mode 100644 index 0000000..e5a8626 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisServiceStationFormDTO.java @@ -0,0 +1,10 @@ +package com.epmet.plugin.power.dto.axis.form; + +import lombok.Data; + +@Data +public class PowerAxisServiceStationFormDTO { + private String axisStructId; + private int limit; + private String customerId; +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisServiceStationResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisServiceStationResultDTO.java new file mode 100644 index 0000000..d2aedcf --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisServiceStationResultDTO.java @@ -0,0 +1,11 @@ +package com.epmet.plugin.power.dto.axis.result; + +import lombok.Data; + +@Data +public class PowerAxisServiceStationResultDTO { + private String stationId; + private String longitude; + private String 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/PowerViewServiceStationController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java new file mode 100644 index 0000000..1b01759 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerViewServiceStationController.java @@ -0,0 +1,30 @@ +package com.epmet.plugin.power.modules.axis.ViewController; + +import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.GBaseDialect; +import com.epmet.plugin.power.dto.axis.ResultDTO; +import com.epmet.plugin.power.dto.axis.form.PowerAxisServiceStationFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisServiceStationResultDTO; +import com.epmet.plugin.power.modules.axis.service.PowerServiceStationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.xml.transform.Result; +import java.util.List; + +@RestController +@RequestMapping("/data/serviceStation") +public class PowerViewServiceStationController { + + @Autowired + private PowerServiceStationService powerServiceStationService; + + @PostMapping("/listPosition") + public ResultDTO getListPostition(@RequestBody PowerAxisServiceStationFormDTO form){ + List list = powerServiceStationService.getListPosition(form); + return ResultDTO.success("成功",list,powerServiceStationService.queryTotal(form)); + } + +} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java index 2caa14d..b20c58b 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java @@ -2,9 +2,13 @@ package com.epmet.plugin.power.modules.axis.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.plugin.power.dto.axis.form.PowerAxisServiceStationFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisServiceStationResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerServiceStationEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 动力主轴党群服务站 * @@ -13,5 +17,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PowerServiceStationDao extends BaseDao { - + + List getListPosition(PowerAxisServiceStationFormDTO form); + + long queryTotal(PowerAxisServiceStationFormDTO 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/PowerServiceStationService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerServiceStationService.java index 75eacd3..e503ba4 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerServiceStationService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerServiceStationService.java @@ -5,6 +5,8 @@ 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.PowerServiceStationDTO; +import com.epmet.plugin.power.dto.axis.form.PowerAxisServiceStationFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisServiceStationResultDTO; import com.epmet.plugin.power.modules.axis.entity.PowerServiceStationEntity; import java.util.List; @@ -77,4 +79,8 @@ public interface PowerServiceStationService extends BaseService getListPosition(PowerAxisServiceStationFormDTO form); + + long queryTotal(PowerAxisServiceStationFormDTO 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/PowerServiceStationServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java index 5143eef..ad2c5ef 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java @@ -4,10 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.plugin.power.dto.axis.PowerServiceStationDTO; +import com.epmet.plugin.power.dto.axis.form.PowerAxisServiceStationFormDTO; +import com.epmet.plugin.power.dto.axis.result.PowerAxisServiceStationResultDTO; import com.epmet.plugin.power.modules.axis.dao.PowerServiceStationDao; import com.epmet.plugin.power.modules.axis.entity.PowerServiceStationEntity; import com.epmet.plugin.power.modules.axis.redis.PowerServiceStationRedis; @@ -33,6 +37,9 @@ public class PowerServiceStationServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -71,6 +78,7 @@ public class PowerServiceStationServiceImpl extends BaseServiceImpl getListPosition(PowerAxisServiceStationFormDTO form) { + form.setCustomerId(loginUser.getLoginUserCustomerId()); + List list = baseDao.getListPosition(form); + return list; + } + + @Override + public long queryTotal(PowerAxisServiceStationFormDTO form) { + form.setCustomerId(loginUser.getLoginUserCustomerId()); + long total = baseDao.queryTotal(form); + return total; + } + } \ No newline at end of file diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index f70bb55..1745806 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml @@ -141,7 +141,7 @@ AND s.AGENCY_ID = #{agencyId} - AND s.AGENCY_ID = (SELECT t.agency_id FROM pli_power_axis_struct t WHERE t.ID = '1517392376018866178') + AND s.AGENCY_ID = (SELECT t.agency_id FROM pli_power_axis_struct t WHERE t.ID = #{pid}) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml index 8cafa10..2d81185 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml @@ -19,6 +19,31 @@ + + \ No newline at end of file