Merge branch 'dev' into HuiFu

# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/test/java/SpringBootTestController.java

jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java

@@ -91,7 +91,9 @@ public interface IPileConnectorInfoService {
      */
     int updateConnectorStatus(String connectorCode, String status);
 
-    /**
+	String pushConnectorStatus(String pileConnectorCode, String status);
+
+	/**
      * 通过桩编号修改枪口状态
      * 仅用于登录逻辑使用
      * @param pileSn 桩编号

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java

@@ -439,6 +439,11 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
 		return response;
 	}
 
+	@Override
+	public String pushConnectorStatus(String pileConnectorCode, String status) {
+		return null;
+	}
+
 	/**
 	 * 查询充电枪口的实时数据
 	 */
@@ -527,6 +532,9 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
 			num = pileConnectorInfoMapper.updateConnectorStatus(pileConnectorCode, status);
 			deleteRedisByPileSn(pileSn);
 			redisCache.setCacheObject(redisKey, status);
+
+			// 推送联联平台 设备状态变化推送接口  ConnectorStatusInfo
+
 		}
 		return num;
 	}