Merge branch 'dev_power_axis' of http://121.42.41.42:7070/r/epmet-plugins into dev_power_axis

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;
+}

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;
+}

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<PowerAxisServiceStationResultDTO> list = powerServiceStationService.getListPosition(form);
+        return ResultDTO.success("成功",list,powerServiceStationService.queryTotal(form));
+    }
+
+}

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;
+
 /**
  * 动力主轴党群服务站
  *
@@ -14,4 +18,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface PowerServiceStationDao extends BaseDao<PowerServiceStationEntity> {
 
+    List<PowerAxisServiceStationResultDTO> getListPosition(PowerAxisServiceStationFormDTO form);
+
+    long queryTotal(PowerAxisServiceStationFormDTO form);
 }

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<PowerServiceStat
      * @date 2022-04-18
      */
     void delete(String[] ids);
+
+    List<PowerAxisServiceStationResultDTO> getListPosition(PowerAxisServiceStationFormDTO form);
+
+    long queryTotal(PowerAxisServiceStationFormDTO form);
 }

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<PowerService
     @Autowired
     private PowerServiceStationRedis powerServiceStationRedis;
 
+    @Autowired
+    private LoginUserUtil loginUser;
+
     @Override
     public PageData<PowerServiceStationDTO> page(Map<String, Object> params) {
         IPage<PowerServiceStationEntity> page = baseDao.selectPage(
@@ -71,6 +78,7 @@ public class PowerServiceStationServiceImpl extends BaseServiceImpl<PowerService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PowerServiceStationDTO dto) {
+        dto.setCustomerId(loginUser.getLoginUserCustomerId());
         PowerServiceStationEntity entity = ConvertUtils.sourceToTarget(dto, PowerServiceStationEntity.class);
         insert(entity);
     }
@@ -89,4 +97,18 @@ public class PowerServiceStationServiceImpl extends BaseServiceImpl<PowerService
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<PowerAxisServiceStationResultDTO> getListPosition(PowerAxisServiceStationFormDTO form) {
+        form.setCustomerId(loginUser.getLoginUserCustomerId());
+        List<PowerAxisServiceStationResultDTO> list = baseDao.getListPosition(form);
+        return list;
+    }
+
+    @Override
+    public long queryTotal(PowerAxisServiceStationFormDTO form) {
+        form.setCustomerId(loginUser.getLoginUserCustomerId());
+        long total = baseDao.queryTotal(form);
+        return total;
+    }
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -141,7 +141,7 @@
                 <when test="agencyId != null and agencyId != ''">AND s.AGENCY_ID = #{agencyId}</when>
                 <otherwise>
                     <if test="pid != null and pid != '' and pid != '0'">
-                        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})
                     </if>
                 </otherwise>
             </choose>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml

@@ -19,6 +19,31 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="getListPosition"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisServiceStationResultDTO">
+        SELECT
+            id AS stationId,
+            longitude,
+            latitude,
+            address
+        FROM
+            pli_power_service_station
+        WHERE
+	        STRUCT_REFERENCE_ID = #{axisStructId}
+	    and
+	        CUSTOMER_ID = #{customerId}
+	    limit #{limit}
+    </select>
+    <select id="queryTotal" resultType="java.lang.Long">
+        SELECT
+            count(*)
+        FROM
+            pli_power_service_station
+        WHERE
+            STRUCT_REFERENCE_ID = #{axisStructId}
+	    AND
+	        CUSTOMER_ID = #{customerId}
+    </select>
 
 
 </mapper>