移动Rabbitm 位置

xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java

@@ -61,8 +61,6 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
         if (count > 0) {
             return AjaxResult.error("桩编号重复");
         }
-
-
         //桩
         xhpcChargingPileMapper.addXhpcChargingPile(xhpcChargingPile);
         //终端

xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml

@@ -172,7 +172,10 @@
                 update_by,
             </if>
             <if test="null != remark and '' != remark">
-                remark
+                remark,
+            </if>
+            <if test="null != rateModelId">
+                rate_model_id
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -216,7 +219,10 @@
                 #{updateBy},
             </if>
             <if test="null != remark and '' != remark">
-                #{remark}
+                #{remark},
+            </if>
+            <if test="null != rateModelId">
+                #{rateModelId}
             </if>
         </trim>
     </insert>

xhpc-modules/xhpc-common/pom.xml

@@ -19,7 +19,11 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
     <dependencies>
-
+        <dependency>
+            <groupId>com.rabbitmq</groupId>
+            <artifactId>amqp-client</artifactId>
+            <version>5.7.1</version>
+        </dependency>
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-core</artifactId>

xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/ConnectionRabbitMQUtil.java

@@ -1,4 +1,4 @@
-package com.xhpc.order.util;
+package com.xhpc.common.util;
 
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;

xhpc-modules/xhpc-order/pom.xml

@@ -21,11 +21,7 @@
     </properties>
 
     <dependencies>
-        <dependency>
+
-            <groupId>com.rabbitmq</groupId>
-            <artifactId>amqp-client</artifactId>
-            <version>5.7.1</version>
-        </dependency>
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>

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

@@ -40,7 +40,7 @@ public interface XhpcRealTimeOrderMapper {
 
     /**
      * 添加订单实时电流
-     * @param XhpcChargeOrderVoltage
+     * @param xhpcChargeOrderVoltage
      * @return
      */
     int addVoltage(XhpcChargeOrderVoltage xhpcChargeOrderVoltage);

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/rabbitmq/RecvDemo.java

@@ -1,7 +1,7 @@
 package com.xhpc.order.rabbitmq;
 
 import com.rabbitmq.client.*;
-import com.xhpc.order.util.ConnectionRabbitMQUtil;
+import com.xhpc.common.util.ConnectionRabbitMQUtil;
 
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/rabbitmq/SendDemo.java

@@ -2,7 +2,7 @@ package com.xhpc.order.rabbitmq;
 
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
-import com.xhpc.order.util.ConnectionRabbitMQUtil;
+import com.xhpc.common.util.ConnectionRabbitMQUtil;
 
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;

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

@@ -45,7 +45,7 @@ public interface IHxpcChargeOrderService {
     /**
      * 桩回调接口
      * @param orderNo  订单编号
-     * @param status   订单状态 (启动状态 1成功 2失败 实时订单状态 3充电中 4 桩充电完成 5 用户停止充电 6桩异常停止充电 )
+     * @param status   订单状态 (启动状态 1成功 2失败 | 实时订单状态 3充电中 4 桩充电完成  6桩异常停止充电 )
      * @param remark   失败的备注
      */
     void pileStatus(String orderNo,Integer status,String remark);

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

@@ -15,7 +15,7 @@ import com.xhpc.order.domain.XhpcHistoryOrder;
 import com.xhpc.order.mapper.HxpcChargeOrderMapper;
 import com.xhpc.order.service.IHxpcChargeOrderService;
 import com.xhpc.order.service.IXhpcHistoryOrderService;
-import com.xhpc.order.util.ConnectionRabbitMQUtil;
+import com.xhpc.common.util.ConnectionRabbitMQUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +25,6 @@ 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;
 import java.util.regex.Pattern;
 
@@ -224,7 +223,8 @@ public class HxpcChargeOrderServiceImpl implements IHxpcChargeOrderService {
         if(type==4 ||type ==5){
             Date date = new Date();
             //获取实时订单
-            REDIS.getCacheObject(orderNo);
+            Map<String, Object> cacheMap = REDIS.getCacheMap("order:"+orderNo);
+            cacheMap.get("realtimeDataList");
 
             //用户第几次充电
             int count = hxpcChargeOrderMapper.getCount(userId);

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

@@ -199,7 +199,7 @@
         </trim>
     </insert>
 
-    <insert id="addSOC" parameterType="com.xhpc.order.domain.XhpcRealTimeOrder" useGeneratedKeys="true"
+    <insert id="addSOC" parameterType="com.xhpc.order.domain.XhpcChargeOrderSoc" useGeneratedKeys="true"
             keyProperty="chargeOrderSocId">
         insert into xhpc_charge_order_soc
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -256,7 +256,119 @@
         </trim>
     </insert>
 
+    <insert id="addCurrent" parameterType="com.xhpc.order.domain.XhpcChargeOrderCurrent" useGeneratedKeys="true"
+            keyProperty="chargeOrderCurrentId">
+        insert into xhpc_charge_order_current
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="null != chargeOrderId ">
+                charge_order_id,
+            </if>
+            <if test="null != current ">
+                current,
+            </if>
+            <if test="null != status ">
+                status,
+            </if>
+            <if test="null != createTime ">
+                create_time,
+            </if>
+            <if test="null != createBy ">
+                create_by,
+            </if>
+            <if test="null != updateTime ">
+                update_time,
+            </if>
+            <if test="null != updateBy ">
+                update_by,
+            </if>
+            <if test="null != remark ">
+                remark
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="null != chargeOrderId ">
+                #{chargeOrderId},
+            </if>
+            <if test="null != current ">
+                #{current},
+            </if>
+            <if test="null != status ">
+                #{status},
+            </if>
+            <if test="null != createTime ">
+                #{createTime},
+            </if>
+            <if test="null != createBy ">
+                #{createBy},
+            </if>
+            <if test="null != updateTime ">
+                #{updateTime},
+            </if>
+            <if test="null != updateBy ">
+                #{updateBy},
+            </if>
+            <if test="null != remark ">
+                #{remark}
+            </if>
+        </trim>
+    </insert>
 
+    <insert id="addVoltage" parameterType="com.xhpc.order.domain.XhpcChargeOrderVoltage" useGeneratedKeys="true"
+            keyProperty="chargeOrderVoltageId">
+        insert into xhpc_charge_order_voltage
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="null != chargeOrderId ">
+                charge_order_id,
+            </if>
+            <if test="null != voltage ">
+                voltage,
+            </if>
+            <if test="null != status ">
+                status,
+            </if>
+            <if test="null != createTime ">
+                create_time,
+            </if>
+            <if test="null != createBy ">
+                create_by,
+            </if>
+            <if test="null != updateTime ">
+                update_time,
+            </if>
+            <if test="null != updateBy ">
+                update_by,
+            </if>
+            <if test="null != remark ">
+                remark
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="null != chargeOrderId ">
+                #{chargeOrderId},
+            </if>
+            <if test="null != voltage ">
+                #{voltage},
+            </if>
+            <if test="null != status ">
+                #{status},
+            </if>
+            <if test="null != createTime ">
+                #{createTime},
+            </if>
+            <if test="null != createBy ">
+                #{createBy},
+            </if>
+            <if test="null != updateTime ">
+                #{updateTime},
+            </if>
+            <if test="null != updateBy ">
+                #{updateBy},
+            </if>
+            <if test="null != remark ">
+                #{remark}
+            </if>
+        </trim>
+    </insert>
 
     <select id="list" resultType="map">
         select

xhpc-modules/xhpc-wxma/src/main/java/com/xhpc/wxma/rabbitm/RabbitmConsumer.java

@@ -1,7 +1,7 @@
 package com.xhpc.wxma.rabbitm;
 
 import com.rabbitmq.client.*;
-import com.xhpc.order.util.ConnectionRabbitMQUtil;
+import com.xhpc.common.util.ConnectionRabbitMQUtil;
 import com.xhpc.wxma.socket.OrderNotificationWebSocket;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;