订单，油站管理设计到的接口

YijiaRestful/src/main/java/com/platform/yijia/controller/PayOrderController.java

@@ -0,0 +1,92 @@
+package com.platform.yijia.controller;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
+import com.platform.yijia.param.request.PayOrderRequest;
+import com.platform.yijia.pojo.AppUserInfo;
+import com.platform.yijia.pojo.PayOrder;
+import com.platform.yijia.service.AppUserInfoService;
+import com.platform.yijia.service.PayOrderService;
+import com.platform.yijia.utils.CodeMsg;
+import com.platform.yijia.utils.ResultData;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.util.List;
+
+@Controller
+@RequestMapping("/api")
+public class PayOrderController {
+    private static Logger logger =(Logger) LoggerFactory.getLogger(PayOrderController.class);
+    @Resource
+    private PayOrderService payOrderService;
+    @Resource
+    private AppUserInfoService appUserInfoService;
+
+    //一键支付，生成订单
+    @RequestMapping(value = "/AddPayOrderInfo", consumes = "application/json", method = RequestMethod.POST)
+    @ResponseBody
+    public String  AddPayOrderInfo(@RequestBody PayOrderRequest payOrderRequest){
+        Gson gson =new Gson();
+        ResultData resultData =null;
+        //根据token 和登录类型 身份验证
+        AppUserInfo appUserInfo =new AppUserInfo();
+        //订单类型 是小程序还是公众号
+        appUserInfo.setUserType(payOrderRequest.getUserType());
+        if(payOrderRequest.getUserType().equals("1")){
+            //1 是公众号
+            appUserInfo.setBlogToken(payOrderRequest.getToken());
+        }else if(payOrderRequest.getUserType().equals("2")){
+            //2是小程序
+            appUserInfo.setMinaToken(payOrderRequest.getToken());
+        }
+        List<AppUserInfo> appUserInfoList =appUserInfoService.Authentication(appUserInfo);
+        JSONObject resp = new JSONObject();
+        //判断登录人员是否验证成功
+        if(appUserInfoList!=null&&appUserInfoList.size()>0){
+            PayOrder payOrder=new PayOrder();
+            //payOrder.setStatus("0");//创建订单 未支付状态 0
+            payOrder.setAmt(payOrderRequest.getAmt());//金额
+            payOrder.setOilGun(payOrderRequest.getOilGun());//油枪
+            payOrder.setOilName(payOrderRequest.getOilName());//油品名称
+            payOrder.setStationId(payOrderRequest.getStationId());//油站id
+            payOrder.setConsumer(appUserInfoList.get(0).getBlogNickName());//昵称
+            payOrder.setConsumerId(appUserInfoList.get(0).getUserId());//用户id
+            //添加订单信息，返回订单号
+            String ordNo =payOrderService.AddPayOrderInfo(payOrder);
+            resultData=ResultData.success(ordNo);
+        }else{
+            //登录人验证失败
+            resultData=ResultData.error(CodeMsg.USER_NOT_EXSIST);
+        }
+        return gson.toJson(resultData);
+    }
+    /**
+     * 根据订单号获取订单信息
+     * produces="application/json;charset=UTF-8",consumes = "application/json",
+     * @RequestBody String orderno
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/getPayOrderList", method = RequestMethod.GET)
+    @ResponseBody
+    public String getPayOrderList(@RequestParam String orderno){
+        Gson gson =new Gson();
+        ResultData resultData =null;
+        if(orderno!=null){
+            if(StringUtils.isNotBlank(orderno)){
+                PayOrderRequest payOrderRequest =new PayOrderRequest();
+                payOrderRequest.setOrderNo(orderno);
+                List<PayOrder> payOrderList = payOrderService.getPayOrderList(payOrderRequest.getOrderNo());
+                resultData=ResultData.success(payOrderList);
+            }else {
+                resultData=ResultData.error(CodeMsg.SEARCH_FAIL);
+            }
+        }else{
+            resultData=ResultData.error(CodeMsg.USER_NOT_EXSIST);
+        }
+        return gson.toJson(resultData);
+    }
+}

YijiaRestful/src/main/java/com/platform/yijia/controller/StationController.java

@@ -1,60 +1,240 @@
 package com.platform.yijia.controller;
-
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
+import com.platform.yijia.param.request.StationRequest;
+import com.platform.yijia.param.response.StationInfoVo;
+import com.platform.yijia.pojo.AppUserInfo;
 import com.platform.yijia.pojo.StationInfo;
-import com.platform.yijia.pojo.StationInfoExample;
+import com.platform.yijia.pojo.StationNoticeManage;
+import com.platform.yijia.pojo.StationOilGun;
+import com.platform.yijia.service.AppUserInfoService;
+import com.platform.yijia.service.StationNoticeManageService;
+import com.platform.yijia.service.StationOilGunService;
 import com.platform.yijia.service.StationService;
+import com.platform.yijia.utils.CodeMsg;
+import com.platform.yijia.utils.ResultData;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
+
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/api")
 public class StationController {
     @Resource
     private StationService stationService;
+
+    @Resource
+    private StationNoticeManageService stationNoticeManageService;
+    @Resource
+    private StationOilGunService stationOilGunService;
+    @Resource
+    private AppUserInfoService appUserInfoService;
     /**
-     * 获取油站列表
+     * 根据坐标获取油站列表
      */
     @RequestMapping(value = "/getStationInfoList", method = RequestMethod.GET)
     @ResponseBody
-    public void getStationInfoList(HttpServletRequest request, HttpServletResponse response){
-        JSONObject req = new JSONObject();
-        //获取当前用户坐标
-        String zuobiao=request.getParameter("zuobiao");
+     public String getStationInfoList(@RequestParam String stationLongitude,String stationLatitude,Integer pageNum,Integer pageSize){
         Gson gson =new Gson();
-        if(zuobiao!=null){
-            if(zuobiao==""){
-                StationInfo stationInfo=new StationInfo();
-
+        //返回结果集
+        ResultData resultData=null;
+        if(stationLongitude!=null && stationLatitude !=null){
+            if(StringUtils.isNotBlank(stationLongitude)&&StringUtils.isNotBlank(stationLatitude)){
+                StationRequest stationRequest=new StationRequest();
+                stationRequest.setStationLatitude(stationLatitude);
+                stationRequest.setStationLongitude(stationLongitude);
+                stationRequest.setPageNum(pageNum);
+                stationRequest.setPageSize(pageSize);
                 //调用接口 根据坐标筛选距离最近的加油站
-                List<StationInfo> stationInfoList = stationService.stationInfoList(stationInfo);
-                req.put("code","000");
-                req.put("msg","请求成功");
-                req.put("data","");
+                StationInfoVo stationInfoVo = stationService.stationInfoList(stationRequest);
+                 resultData=ResultData.success(stationInfoVo);
             }else{
-                req.put("code","002");
-                req.put("msg","获取坐标失败");
+                resultData=ResultData.error(CodeMsg.REQUEST_FAIL);
             }
         }else{
-            req.put("code","001");
-            req.put("msg","坐标未传参数");
-        }
-        try {
-            response.setContentType("application/json; charset=UTF-8");
-            response.setCharacterEncoding("UTF-8");
-            response.getWriter().print(req);
-            response.getWriter().flush();
-            response.getWriter().close();
+            resultData=ResultData.error(CodeMsg.REQUEST_FAIL);
+        }
+        return gson.toJson(resultData);
+    }
+    /**
+     * 获取油站列表信息
+     */
+    @RequestMapping(value = "/getStationList", method = RequestMethod.GET)
+    @ResponseBody
+    public String getStationList(@RequestParam StationRequest request){
+        Gson gson =new Gson();
+        StationInfo stationInfo =new StationInfo();
+        List<StationInfo> stationInfoList = stationService.getStationList(stationInfo);
+        return gson.toJson(stationInfoList);
+    }
+    /**
+     * 获取油站列表信息
+     */
+    @RequestMapping(value = "/addStationInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public String addStationInfo(@RequestParam StationRequest request){
+        Gson gson =new Gson();
+        ResultData resultData=null;
+        StationInfo stationInfo =new StationInfo();
+        if(request.getStationId()!=null){
+            stationInfo.setStationId(request.getStationId());
+        }
+        if(StringUtils.isNotBlank(request.getStationName())){
+            stationInfo.setStationName(request.getStationName());
+        }
+        if(StringUtils.isNotBlank(request.getContacts())){
+            stationInfo.setContacts(request.getContacts());
+        }
+        if(StringUtils.isNotBlank(request.getPhone())){
+            stationInfo.setPhone(request.getPhone());
+        }
+        if(StringUtils.isNotBlank(request.getStationAddress())){
+            stationInfo.setStationAddress(request.getStationAddress());
+        }
+        if(request.getStationGroupId()!=null){
+            stationInfo.setStationGroupId(request.getStationGroupId());
+        }
+        if(request.getStationGroupName()!=null){
+            stationInfo.setStationGroupName(request.getStationGroupName());
+        }
+        if(request.getContacts()!=null){
+            stationInfo.setContacts(request.getContacts());
+        }
+
+        try{
+            stationService.AddStationInfo(stationInfo);
+            resultData=ResultData.success(CodeMsg.SUCCESS);
         }catch (Exception e){
+            resultData=ResultData.error(CodeMsg.INSERT_FAIL);
             e.printStackTrace();
         }
+        return gson.toJson(resultData);
+    }
+
+    /**
+     * 修改油站信息
+     */
+    @RequestMapping(value = "/updateStationInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public String updateStationInfo(@RequestBody StationInfo stationInfo){
+        Gson gson=new Gson();
+        ResultData resultData=null;
+        try{
+            stationService.updateStationInfo(stationInfo);
+            resultData=ResultData.success(CodeMsg.SUCCESS);
+        }catch (Exception e){
+            resultData=ResultData.error(CodeMsg.UPDATE_FAIL);
+            e.printStackTrace();
+        }
+        return gson.toJson(resultData);
+    }
+    /**
+     * 删除油站信息
+     */
+    @RequestMapping(value = "/deleteStationInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public String deleteStationInfo(@RequestBody StationInfo stationInfo){
+        Gson gson=new Gson();
+        ResultData resultData=null;
+        try{
+            stationService.deleteStationInfo(stationInfo);
+            resultData=ResultData.success(CodeMsg.SUCCESS);
+        }catch (Exception e){
+            resultData=ResultData.error(CodeMsg.DELETE_FAIL);
+            e.printStackTrace();
+        }
+        return gson.toJson(resultData);
+    }
+    /**
+     * 油站设备管理查询
+     */
+    @RequestMapping(value = "/getStationNoticeManageList", method = RequestMethod.GET)
+    @ResponseBody
+    public String getStationNoticeManageList(@RequestParam StationRequest request){
+        Gson gson=new Gson();
+        ResultData resultData=null;
+        try{
+            StationNoticeManage stationNoticeManage =new StationNoticeManage();
+            List<StationNoticeManage> stationNoticeManageList = stationNoticeManageService.getStationNoticeManageList(stationNoticeManage);
+            resultData=ResultData.success(stationNoticeManageList);
+        }catch (Exception e){
+            resultData=ResultData.error(CodeMsg.SEARCH_FAIL);
+            e.printStackTrace();
+        }
+        return gson.toJson(resultData);
+    }
+    /**
+     *修改油站设备管理
+     */
+    @RequestMapping(value = "/updateStationNoticeManage", method = RequestMethod.POST)
+    @ResponseBody
+    public String updateStationNoticeManage(@RequestBody StationNoticeManage stationNoticeManage){
+        Gson gson=new Gson();
+        ResultData resultData=null;
+        try{
+            stationNoticeManageService.updateStationNoticeManage(stationNoticeManage);
+            resultData=ResultData.success(CodeMsg.SUCCESS);
+        }catch (Exception e){
+            resultData=ResultData.success(CodeMsg.UPDATE_FAIL);
+            e.printStackTrace();
+        }
+        return gson.toJson(resultData);
+    }
+    /**
+     * 删除油站设备信息
+     */
+    @RequestMapping(value = "/deleteStationNoticeManage", method = RequestMethod.POST)
+    @ResponseBody
+    public String deleteStationNoticeManage(@RequestBody StationNoticeManage stationNoticeManage){
+        Gson gson=new Gson();
+        ResultData resultData=null;
+        try{
+            stationNoticeManageService.deleteStationNoticeManage(stationNoticeManage);
+             resultData=ResultData.success(CodeMsg.SUCCESS);
+        }catch (Exception e){
+            resultData=ResultData.success(CodeMsg.DELETE_FAIL);
+            e.printStackTrace();
+        }
+        return gson.toJson(resultData);
+    }
+
+    /**
+     * 油枪管理
+     */
+    @RequestMapping(value = "/stationOilGunList", method = RequestMethod.GET)
+    @ResponseBody
+   // public void stationOilGunList(@RequestParam StationRequest request,HttpServletResponse response){
+    public String stationOilGunList(@RequestParam String userType,String token,Integer stationId){
+        Gson gson =new Gson();
+        StationOilGun stationOilGun =new StationOilGun();
+        //查询登录人是否存在
+        AppUserInfo appUserInfo =new AppUserInfo();
+        //订单类型 是小程序还是公众号
+        appUserInfo.setUserType(userType);
+        if(userType.equals("1")){
+            //1 是公众号
+            appUserInfo.setBlogToken(token);
+        }else if(userType.equals("2")){
+            //2是小程序
+            appUserInfo.setMinaToken(token);
+        }
+        List<AppUserInfo> appUserInfoList =appUserInfoService.Authentication(appUserInfo);
+        if(appUserInfoList!=null&&appUserInfoList.size()>0){
+            //获取油站id根据油站号查询油站对应的所有油枪信息
+            stationOilGun.setStationId(stationId);
+            List<StationOilGun> stationOilGunList = stationOilGunService.stationOilGunList(stationOilGun);
+            ResultData resultData=ResultData.success(stationOilGunList);
+            return gson.toJson(resultData);
+        }else {
+            ResultData resultData=ResultData.error(CodeMsg.USER_NOT_EXSIST);
+            return gson.toJson(resultData);
+        }
     }
 }

YijiaRestful/src/main/java/com/platform/yijia/service/AppUserInfoService.java

@@ -0,0 +1,12 @@
+package com.platform.yijia.service;
+
+import com.platform.yijia.pojo.AppUserInfo;
+
+import java.util.List;
+
+
+public interface AppUserInfoService {
+
+    //验证身份
+    List<AppUserInfo> Authentication(AppUserInfo appUserInfo);
+}

YijiaRestful/src/main/java/com/platform/yijia/service/StationNoticeManageService.java

@@ -0,0 +1,15 @@
+package com.platform.yijia.service;
+
+import com.platform.yijia.pojo.StationNoticeManage;
+
+import java.util.List;
+
+public interface StationNoticeManageService {
+    //油站设备管理
+    List<StationNoticeManage> getStationNoticeManageList(StationNoticeManage stationNoticeManage);
+    //修改油站设备管理
+    void updateStationNoticeManage(StationNoticeManage stationNoticeManage);
+    //删除油站设备
+    void deleteStationNoticeManage(StationNoticeManage stationNoticeManage);
+
+}

YijiaRestful/src/main/java/com/platform/yijia/service/StationOilGunService.java

@@ -0,0 +1,10 @@
+package com.platform.yijia.service;
+
+import com.platform.yijia.pojo.StationOilGun;
+
+import java.util.List;
+
+public interface StationOilGunService {
+    //油枪管理
+    List<StationOilGun> stationOilGunList(StationOilGun stationOilGun);
+}

YijiaRestful/src/main/java/com/platform/yijia/service/StationService.java

@@ -1,11 +1,22 @@
 package com.platform.yijia.service;
 
+import com.platform.yijia.param.request.StationRequest;
+import com.platform.yijia.param.response.StationInfoResponse;
+import com.platform.yijia.param.response.StationInfoVo;
 import com.platform.yijia.pojo.StationInfo;
 
 import java.util.List;
 
 public interface StationService {
 
+    //跟据油站插叙有站列表 查询油站列表
+    StationInfoVo stationInfoList(StationRequest stationRequest);
     //查询油站列表
-    List<StationInfo> stationInfoList(StationInfo stationInfo);
+    List<StationInfo> getStationList(StationInfo stationInfo);
+    //添加油站信息
+    void AddStationInfo(StationInfo stationInfo);
+    //修改油站信息
+    void updateStationInfo(StationInfo stationInfo);
+    //删除油站信息
+    void deleteStationInfo(StationInfo stationInfo);
 }

YijiaRestful/src/main/java/com/platform/yijia/service/impl/AppUserInfoServiceImpl.java

@@ -0,0 +1,30 @@
+package com.platform.yijia.service.impl;
+
+import com.platform.yijia.dao.AppUserInfoMapper;
+import com.platform.yijia.pojo.AppUserInfo;
+import com.platform.yijia.pojo.AppUserInfoExample;
+import com.platform.yijia.service.AppUserInfoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+@Service("appUserInfoService")
+public class AppUserInfoServiceImpl implements AppUserInfoService {
+    @Resource
+    private AppUserInfoMapper appUserInfoMapper;
+    /**
+     * 用户信息
+     */
+    @Override
+    public List<AppUserInfo> Authentication(AppUserInfo appUserInfo) {
+        AppUserInfoExample example =new AppUserInfoExample();
+        example.or().andUserTypeEqualTo(appUserInfo.getUserType());
+        if(appUserInfo.getUserType().equals("1")){
+            example.or().andBlogTokenEqualTo(appUserInfo.getBlogToken());
+        }else if(appUserInfo.getUserType().equals("2")){
+            example.or().andMinaTokenEqualTo(appUserInfo.getBlogToken());
+        }
+        List<AppUserInfo> list= appUserInfoMapper.selectByExample(example);
+        return list;
+    }
+}

YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationNoticeManageServiceImpl.java

@@ -0,0 +1,43 @@
+package com.platform.yijia.service.impl;
+
+import com.platform.yijia.dao.StationNoticeManageMapper;
+import com.platform.yijia.pojo.StationNoticeManage;
+import com.platform.yijia.pojo.StationNoticeManageExample;
+import com.platform.yijia.service.StationNoticeManageService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service("StationNoticeManageService")
+public class StationNoticeManageServiceImpl implements StationNoticeManageService {
+    @Resource
+    private StationNoticeManageMapper stationNoticeManageMapper;
+    /**
+     * 油站设备管理查询
+     * @param stationNoticeManage
+     * @return
+     */
+    @Override
+    public List<StationNoticeManage> getStationNoticeManageList(StationNoticeManage stationNoticeManage) {
+        StationNoticeManageExample example = new StationNoticeManageExample();
+        List<StationNoticeManage> stationNoticeManagelist = stationNoticeManageMapper.selectByExample(example);
+        return stationNoticeManagelist;
+    }
+
+    /**
+     * 修改油站设备信息
+     * @param stationNoticeManage
+     */
+    @Override
+    public void updateStationNoticeManage(StationNoticeManage stationNoticeManage) {
+        StationNoticeManageExample example = new StationNoticeManageExample();
+        stationNoticeManageMapper.updateByExample(stationNoticeManage,example);
+    }
+
+    @Override
+    public void deleteStationNoticeManage(StationNoticeManage stationNoticeManage) {
+        StationNoticeManageExample example = new StationNoticeManageExample();
+        stationNoticeManageMapper.deleteByExample(example);
+    }
+}

YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationOilGunServiceImpl.java

@@ -0,0 +1,23 @@
+package com.platform.yijia.service.impl;
+
+import com.platform.yijia.dao.StationOilGunMapper;
+import com.platform.yijia.pojo.StationOilGun;
+import com.platform.yijia.pojo.StationOilGunExample;
+import com.platform.yijia.service.StationOilGunService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service("stationOilGunService")
+public class StationOilGunServiceImpl implements StationOilGunService {
+    @Resource
+    private StationOilGunMapper stationOilGunMapper;
+    @Override
+    public List<StationOilGun> stationOilGunList(StationOilGun stationOilGun) {
+        StationOilGunExample example = new StationOilGunExample();
+        List<StationOilGun> stationInfolist = stationOilGunMapper.selectByExample(example);
+        return stationInfolist;
+
+    }
+}

YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationServiceImpl.java

@@ -1,9 +1,13 @@
 package com.platform.yijia.service.impl;
 import com.platform.yijia.dao.StationInfoMapper;
+import com.platform.yijia.param.request.StationRequest;
+import com.platform.yijia.param.response.StationInfoResponse;
+import com.platform.yijia.param.response.StationInfoVo;
 import com.platform.yijia.pojo.StationInfo;
 import com.platform.yijia.pojo.StationInfoExample;
 import com.platform.yijia.service.StationService;
 import com.platform.yijia.utils.MapHelper;
+import com.platform.yijia.utils.PageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -17,39 +21,73 @@ public class StationServiceImpl implements StationService {
     @Resource
     private StationInfoMapper stationInfoMapper;
     @Override
-    public List<StationInfo> stationInfoList(StationInfo stationInfo) {
+    public StationInfoVo stationInfoList(StationRequest stationRequest) {
         //根据传过来的坐标查询数据
-        List<StationInfo> distanceAndResidueSeat = new ArrayList<>();
+        List<StationInfoResponse> distanceAndResidueSeat = new ArrayList<>();
         StationInfoExample example=new StationInfoExample();
+        if(StringUtils.isNotBlank(stationRequest.getStationName())){
+            example.or().andStationNameLike(stationRequest.getStationName());
+        }
         // 数据库查询门店数据
         List<StationInfo> stationInfolist = stationInfoMapper.selectByExample(example);
         // 入参坐标拼接
-        String coordinate = stationInfo.getStationLatitude()+","+stationInfo.getStationLongitude();
-        if(StringUtils.isNotBlank(stationInfo.getStationLatitude()) && StringUtils.isNotBlank(stationInfo.getStationLongitude())){
+        String coordinate = stationRequest.getStationLatitude()+","+stationRequest.getStationLongitude();
+        if(StringUtils.isNotBlank(stationRequest.getStationLatitude()) && StringUtils.isNotBlank(stationRequest.getStationLongitude())){
             //根据地址坐标计算距离
-            List<StationInfo> stationInfos = computeDistance(coordinate, stationInfolist);
+            List<StationInfoResponse> stationInfos = computeDistance(coordinate, stationInfolist);
             //根据距离排序
             distanceAndResidueSeat = getDistanceAndResidueSeat(stationInfos);
         }
-        return distanceAndResidueSeat;
+        StationInfoVo stationInfoVo=new StationInfoVo();
+        if(stationRequest.getPageSize()==0){
+            stationInfoVo.setPageSize(10);
+        }else{
+            stationInfoVo.setPageSize(stationRequest.getPageSize());
+        }
+        stationInfoVo.setPageNum(stationRequest.getPageNum());
+        if(distanceAndResidueSeat!=null&&distanceAndResidueSeat.size()>0){
+            if( distanceAndResidueSeat.size()<=stationInfoVo.getPageNum()*stationInfoVo.getPageSize() || distanceAndResidueSeat.size()>stationInfoVo.getPageNum()*stationInfoVo.getPageSize()){
+                List<StationInfoResponse> ss= PageUtil.splitList(distanceAndResidueSeat,stationRequest.getPageSize(),stationRequest.getPageNum());
+                stationInfoVo.setStationInfoResponseList(ss);
+                stationInfoVo.setTotal(ss.size());
+            }
+        }
+        return stationInfoVo;
     }
+
+
     /**
      * 根据地址坐标计算距离
      * @return
      */
-    public List<StationInfo> computeDistance(String coordinate, List<StationInfo> stationInfos){
-        List<StationInfo> stationInfoList = new ArrayList<>();
+    public List<StationInfoResponse> computeDistance(String coordinate, List<StationInfo> stationInfos){
+        List<StationInfoResponse> stationInfoList = new ArrayList<>();
         if(stationInfos!=null && stationInfos.size() > 0){
             for (StationInfo stationInfo : stationInfos) {
+                StationInfoResponse stationInfoResponse =new StationInfoResponse();
                 String longitude = stationInfo.getStationLongitude();
                 String latitude = stationInfo.getStationLatitude();
                 if(StringUtils.isNotBlank(longitude) && StringUtils.isNotBlank(latitude) && StringUtils.isNotBlank(coordinate)){
                     String distanceData = latitude+","+longitude;
                     double distance = MapHelper.GetPointDistance(coordinate, distanceData);
                     Double format = Double.parseDouble(String.format("%.1f", distance));
-                    //计算距离
-                   // stationInfo.setDistance(format);
-                    stationInfoList.add(stationInfo);
+                    //计算距离 展示距离小于5公里以内的站
+                    if(format<=5){
+                        stationInfoResponse.setStationId(stationInfo.getStationId());
+                        stationInfoResponse.setStationName(stationInfo.getStationName());
+                        stationInfoResponse.setStationAddress(stationInfo.getStationAddress());
+                        stationInfoResponse.setOilGunNum(stationInfo.getOilGunNum());
+                        stationInfoResponse.setContacts(stationInfo.getContacts());
+                        stationInfoResponse.setPhone(stationInfo.getPhone());
+                        stationInfoResponse.setStationGroupId(stationInfo.getStationGroupId());
+                        stationInfoResponse.setStationGroupName(stationInfo.getStationGroupName());
+                        stationInfoResponse.setStationPic(stationInfo.getStationPic());
+                        stationInfoResponse.setStationLatitude(stationInfo.getStationLatitude());
+                        stationInfoResponse.setStationLongitude(stationInfo.getStationLongitude());
+                        stationInfoResponse.setDistance(format);
+                        stationInfoList.add(stationInfoResponse);
+                    }
+
                 }
             }
         }
@@ -60,22 +98,63 @@ public class StationServiceImpl implements StationService {
      * 根据距离排序
      * @return
      */
-    public static List<StationInfo> getDistanceAndResidueSeat(List<StationInfo> list) {
-        StationInfo stationInfo = null;
+    public static List<StationInfoResponse> getDistanceAndResidueSeat(List<StationInfoResponse> list) {
         boolean exchange = false;
         for (int i = 0; i < list.size(); i++) {
             for (int j = list.size() - 2; j >= i; j--) {
                 //循环根据距离进行排序
-//                if (list.get(j + 1).getDistance() < list.get(j).getDistance()) {
-//                    tDept = list.get(j + 1);
-//                    list.set(j + 1, list.get(j));
-//                    list.set(j, tDept);
-//                    exchange = true;
-//                }
+                if (list.get(j + 1).getDistance() < list.get(j).getDistance()) {
+                    StationInfoResponse stationInfoResponse = list.get(j + 1);
+                    list.set(j + 1, list.get(j));
+                    list.set(j, stationInfoResponse);
+                    exchange = true;
+                }
             }
             if (!exchange)
                 break;
         }
         return list;
     }
+
+    /**
+     * 查询油站列表
+     * @param stationInfo
+     * @return
+     */
+    @Override
+    public List<StationInfo> getStationList(StationInfo stationInfo) {
+        StationInfoExample example = new StationInfoExample();
+        List<StationInfo> stationInfolist = stationInfoMapper.selectByExample(example);
+        return stationInfolist;
+    }
+
+    /**
+     * 添加油站信息
+     */
+    @Override
+    public void AddStationInfo(StationInfo stationInfo) {
+        stationInfoMapper.insert(stationInfo);
+    }
+
+    /**
+     * 修改油站信息
+     * @param stationInfo
+     */
+    @Override
+    public void updateStationInfo(StationInfo stationInfo) {
+        StationInfoExample example = new StationInfoExample();
+        stationInfoMapper.updateByExample(stationInfo,example);
+    }
+
+    /**
+     * 删除油站信息
+     * @param stationInfo
+     */
+    @Override
+    public void deleteStationInfo(StationInfo stationInfo) {
+        StationInfoExample example = new StationInfoExample();
+        example.or().andStationIdEqualTo(stationInfo.getStationId());
+        stationInfoMapper.deleteByExample(example);
+    }
+
 }