update lianlian

jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java

@@ -311,5 +311,10 @@ public class LianLianController extends BaseController {
         return response;
     }
 
-
+    /**
+     * 获取token接口
+     */
+    public String queryToken() {
+        return null;
+    }
 }

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -10,11 +10,9 @@ import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.ykc.OrderStatusEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.*;
-import com.jsowell.common.util.http.HttpUtils;
 import com.jsowell.common.util.id.SnUtils;
 import com.jsowell.common.util.id.SnowflakeIdWorker;
 import com.jsowell.common.util.ip.AddressUtils;
-import com.jsowell.common.util.lianlian.LianLianUtils;
 import com.jsowell.netty.command.ykc.IssueQRCodeCommand;
 import com.jsowell.netty.command.ykc.ProofreadTimeCommand;
 import com.jsowell.netty.handler.HeartbeatRequestHandler;
@@ -45,7 +43,6 @@ import com.jsowell.service.MemberService;
 import com.jsowell.service.OrderService;
 import com.jsowell.service.PileRemoteService;
 import com.jsowell.service.PileService;
-import com.jsowell.thirdparty.domain.StationInfo;
 import com.jsowell.thirdparty.service.LianLianService;
 import com.jsowell.wxpay.common.WeChatPayParameter;
 import com.jsowell.wxpay.dto.AppletTemplateMessageSendDTO;

jsowell-common/src/main/java/com/jsowell/common/lianlian/Cryptos.java

@@ -1,6 +1,6 @@
 /**
  */
-package com.jsowell.common.util.lianlian;
+package com.jsowell.common.lianlian;
 
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;

jsowell-common/src/main/java/com/jsowell/common/lianlian/Digests.java

@@ -1,6 +1,6 @@
 /**
  */
-package com.jsowell.common.util.lianlian;
+package com.jsowell.common.lianlian;
 
 import org.apache.commons.lang3.Validate;
 

jsowell-common/src/main/java/com/jsowell/common/lianlian/Encodes.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2005-2012 springside.org.cn
  */
-package com.jsowell.common.util.lianlian;
+package com.jsowell.common.lianlian;
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Base64;

jsowell-common/src/main/java/com/jsowell/common/lianlian/Exceptions.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.util.lianlian;
+package com.jsowell.common.lianlian;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

jsowell-common/src/main/java/com/jsowell/common/lianlian/GBSignUtils.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.util.lianlian;
+package com.jsowell.common.lianlian;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

jsowell-common/src/main/java/com/jsowell/common/lianlian/HttpRequestUtil.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.util.lianlian;
+package com.jsowell.common.lianlian;
 
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson2.JSON;

jsowell-common/src/main/java/com/jsowell/common/lianlian/LianLianUtils.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.util.lianlian;
+package com.jsowell.common.lianlian;
 
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.util.BytesUtil;

jsowell-common/src/main/java/com/jsowell/common/lianlian/SignUtils.java

@@ -1,4 +1,4 @@
-package com.jsowell.common.util.lianlian;
+package com.jsowell.common.lianlian;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

jsowell-common/src/main/java/com/jsowell/common/lianlian/common/CommonResult.java

@@ -0,0 +1,144 @@
+package com.jsowell.common.lianlian.common;
+
+
+import com.jsowell.common.lianlian.common.enums.ResultCode;
+
+/**
+ * 接口返回类
+ *
+ * @author 联联充电
+ */
+public class CommonResult<T> {
+
+    /**
+     * 状态码
+     */
+    private long ret;
+
+    /**
+     * 响应信息
+     */
+    private String msg;
+
+    /**
+     * 返回数据
+     */
+    private T data;
+
+    private String sig;
+
+    protected CommonResult() {
+
+    }
+
+    protected CommonResult(long ret, String msg, T data, String sig) {
+        this.ret = ret;
+        this.msg = msg;
+        this.data = data;
+        this.sig = sig;
+    }
+
+    /**
+     * 成功返回结果
+     *
+     * @param data 获取的数据
+     * @param <T>
+     * @return
+     */
+    public static <T> CommonResult<T> success(T data) {
+        return new CommonResult<T>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMsg(), data, null);
+    }
+
+    /**
+     * 成功返回结果
+     *
+     * @param data    获取的数据
+     * @param message 提示的信息
+     * @param <T>
+     * @return
+     */
+    public static <T> CommonResult<T> success(T data, String message) {
+        return new CommonResult<T>(ResultCode.SUCCESS.getCode(), message, data, null);
+    }
+
+    public static <T> CommonResult<T> success(Integer ret, String msg, T data, String sig) {
+        return new CommonResult<T>(ret, msg, data, sig);
+    }
+
+    /**
+     * 失败返回结果
+     *
+     * @param resultCode 错误码
+     * @param <T>
+     * @return
+     */
+    public static <T> CommonResult<T> failed(ResultCode resultCode) {
+        return new CommonResult<T>(resultCode.getCode(), resultCode.getMsg(), null, null);
+    }
+
+    /**
+     * 失败返回
+     *
+     * @param code 错误码
+     * @param msg  提示信息
+     * @param <T>
+     * @return
+     */
+    public static <T> CommonResult<T> failed(long code, String msg) {
+        return new CommonResult<T>(code, msg, null, null);
+    }
+
+    /**
+     * 失败返回结果
+     *
+     * @param msg 提示信息
+     * @param <T>
+     * @return
+     */
+    public static <T> CommonResult<T> failed(String msg) {
+        return failed(ResultCode.ERROR.getCode(), msg);
+    }
+
+    /**
+     * 失败返回结果
+     *
+     * @param <T>
+     * @return
+     */
+    public static <T> CommonResult<T> failed() {
+        return failed(ResultCode.ERROR);
+    }
+
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public long getRet() {
+        return ret;
+    }
+
+    public void setRet(long ret) {
+        this.ret = ret;
+    }
+
+    public String getSig() {
+        return sig;
+    }
+
+    public void setSig(String sig) {
+        this.sig = sig;
+    }
+}

jsowell-common/src/main/java/com/jsowell/common/lianlian/common/enums/ResultCode.java

@@ -0,0 +1,30 @@
+package com.jsowell.common.lianlian.common.enums;
+
+/**
+ * 返回结果枚举
+ */
+public enum ResultCode {
+
+    /**
+     * 接口返回枚举
+     */
+    SUCCESS(200, "成功"),
+    ERROR(-1, "失败");
+
+    private int code;
+
+    private String msg;
+
+    ResultCode(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java

@@ -12,10 +12,18 @@ import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.enums.lianlian.LianLianPileStatusEnum;
 import com.jsowell.common.enums.lianlian.PayChannelEnum;
 import com.jsowell.common.enums.lianlian.StationPaymentEnum;
-import com.jsowell.common.enums.ykc.*;
+import com.jsowell.common.enums.ykc.OrderPayModeEnum;
+import com.jsowell.common.enums.ykc.OrderStatusEnum;
+import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum;
+import com.jsowell.common.enums.ykc.PileStatusEnum;
 import com.jsowell.common.exception.BusinessException;
-import com.jsowell.common.util.*;
-import com.jsowell.common.util.lianlian.*;
+import com.jsowell.common.lianlian.Cryptos;
+import com.jsowell.common.lianlian.Encodes;
+import com.jsowell.common.lianlian.GBSignUtils;
+import com.jsowell.common.lianlian.HttpRequestUtil;
+import com.jsowell.common.util.DateUtils;
+import com.jsowell.common.util.PageUtils;
+import com.jsowell.common.util.StringUtils;
 import com.jsowell.netty.command.ykc.StartChargingCommand;
 import com.jsowell.netty.command.ykc.StopChargingCommand;
 import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService;