异常订单分页

pom.xml

@@ -20,7 +20,7 @@
         <spring-boot.version>2.5.1</spring-boot.version>
         <spring-cloud.version>2020.0.3</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
-        <alibaba.nacos.version>2.0.2</alibaba.nacos.version>
+        <alibaba.nacos.version>1.1.0</alibaba.nacos.version>
         <spring-boot-admin.version>2.4.1</spring-boot-admin.version>
         <spring-boot.mybatis>2.1.4</spring-boot.mybatis>
         <swagger.fox.version>3.0.0</swagger.fox.version>

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/HxpcChargeOrderController.java

@@ -2,6 +2,7 @@ package com.xhpc.order.controller;
 
 import com.xhpc.common.core.web.controller.BaseController;
 import com.xhpc.common.core.web.domain.AjaxResult;
+import com.xhpc.common.core.web.page.TableDataInfo;
 import com.xhpc.order.service.IHxpcChargeOrderService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author yuyang
  * @date 2021/8/4 9:59
@@ -35,9 +39,11 @@ public class HxpcChargeOrderController extends BaseController {
      * 异常订单
      */
     @GetMapping("/getHistotyChargeOrderStatusList")
-    public AjaxResult getHistotyChargeOrderStatusList(@RequestParam Long userId)
+    public TableDataInfo getHistotyChargeOrderStatusList(@RequestParam Long userId)
     {
-        return iHxpcChargeOrderService.getHistotyChargeOrderStatusList(userId);
+        startPage();
+        List<Map<String, Object>> list = iHxpcChargeOrderService.getHistotyChargeOrderStatusList(userId);
+        return getDataTable(list);
     }
 
 

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java

@@ -1,10 +1,18 @@
 package com.xhpc.order.controller;
 
 import com.xhpc.common.core.web.controller.BaseController;
+import com.xhpc.common.core.web.page.TableDataInfo;
+import com.xhpc.order.service.IXhpcRealTimeOrderService;
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author yuyang
  * @date 2021/8/9 21:15
@@ -14,4 +22,30 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "实时订单接口", tags = "实时订单接口")
 public class XhpcRealTimeOrderController extends BaseController {
 
+
+    @Autowired
+    private IXhpcRealTimeOrderService xhpcRealTimeOrderService;
+
+
+    /**
+     * 实时订单接口
+     * @param phone                       用户账号
+     * @param transactionNumber           订单编号
+     * @param source                      用户类型  0C端用户 1流量用户
+     * @param chargingStationName         电站名称
+     * @param name                        运营商\流量方
+     * @param startTime                   订单开始时间
+     * @param endTime                     订单结束时间
+     * @return
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(String phone,String transactionNumber,Integer source,String chargingStationName,String name,String startTime,String endTime)
+    {
+        startPage();
+        List<Map<String,Object>> list = xhpcRealTimeOrderService.list(phone, transactionNumber, source, chargingStationName, name, startTime, endTime);
+        return getDataTable(list);
+    }
+
+
+
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcRealTimeOrderMapper.java

@@ -3,6 +3,9 @@ package com.xhpc.order.mapper;
 import com.xhpc.order.domain.XhpcChargeOrderSoc;
 import com.xhpc.order.domain.XhpcRealTimeOrder;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author yuyang
  * @date 2021/8/7 15:09
@@ -25,4 +28,17 @@ public interface XhpcRealTimeOrderMapper {
     int addSOC(XhpcChargeOrderSoc xhpcChargeOrderSoc);
 
 
+    /**
+     * 实时订单接口
+     * @param phone                       用户账号
+     * @param transactionNumber           订单编号
+     * @param source                      用户类型  0C端用户 1流量用户
+     * @param chargingStationName         电站名称
+     * @param type                        1 运营商  2流量方
+     * @param id                          运营商或流量方   id
+     * @param startTime                   订单开始时间
+     * @param endTime                     订单结束时间
+     * @return
+     */
+    List<Map<String,Object>> list(String phone, String transactionNumber, Integer source, String chargingStationName, String type,Long id, String startTime, String endTime);
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IHxpcChargeOrderService.java

@@ -2,6 +2,9 @@ package com.xhpc.order.service;
 
 import com.xhpc.common.core.web.domain.AjaxResult;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author yuyang
  * @date 2021/8/4 9:54
@@ -20,7 +23,7 @@ public interface IHxpcChargeOrderService {
      * @param userId
      * @return
      */
-    AjaxResult getHistotyChargeOrderStatusList(Long userId);
+    List<Map<String, Object>> getHistotyChargeOrderStatusList(Long userId);
 
     /**
      * 启动充电

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java

@@ -1,5 +1,8 @@
 package com.xhpc.order.service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author yuyang
  * @date 2021/8/7 15:07
@@ -13,4 +16,19 @@ public interface IXhpcRealTimeOrderService {
      */
     public void addXhpcRealTimeOrder(String orderNo,Integer status);
 
+
+    /**
+     * 实时订单接口
+     * @param phone
+     * @param transactionNumber
+     * @param source
+     * @param chargingStationName
+     * @param name
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<Map<String,Object>> list(String phone,String transactionNumber,Integer source,String chargingStationName,String name,String startTime,String endTime);
+
+
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
@@ -49,8 +50,8 @@ public class HxpcChargeOrderServiceImpl implements IHxpcChargeOrderService {
     }
 
     @Override
-    public AjaxResult getHistotyChargeOrderStatusList(Long userId) {
+    public List<Map<String, Object>> getHistotyChargeOrderStatusList(Long userId) {
-        return AjaxResult.success(hxpcChargeOrderMapper.getHistotyChargeOrderStatusList(userId));
+        return hxpcChargeOrderMapper.getHistotyChargeOrderStatusList(userId);
     }
 
     @Override

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java

@@ -5,6 +5,9 @@ import com.xhpc.order.service.IXhpcRealTimeOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author yuyang
  * @date 2021/8/7 15:07
@@ -38,4 +41,19 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
 
     }
 
+    @Override
+    public List<Map<String, Object>> list(String phone, String transactionNumber, Integer source, String chargingStationName, String name, String startTime, String endTime) {
+
+        //当name不为空时，解析
+        if(!"".equals(name) && name !=null){
+
+        }
+
+
+
+
+
+        return null;
+    }
+
 }

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml

@@ -197,7 +197,10 @@
                 #{chargingStationId}
             </if>
         </trim>
-
-
     </insert>
+
+
+    <select id="list" resultType="map">
+        select * from xhpc_real_time_order
+    </select>
 </mapper>