diff --git a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java index bcfd0c605..e85857937 100644 --- a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java +++ b/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; + } } diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 8eb74c65d..60250b61d 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/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; diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Cryptos.java b/jsowell-common/src/main/java/com/jsowell/common/lianlian/Cryptos.java similarity index 99% rename from jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Cryptos.java rename to jsowell-common/src/main/java/com/jsowell/common/lianlian/Cryptos.java index 9e4da21f2..68e6da379 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Cryptos.java +++ b/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; diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Digests.java b/jsowell-common/src/main/java/com/jsowell/common/lianlian/Digests.java similarity index 98% rename from jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Digests.java rename to jsowell-common/src/main/java/com/jsowell/common/lianlian/Digests.java index 32d885051..775545aba 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Digests.java +++ b/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; diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Encodes.java b/jsowell-common/src/main/java/com/jsowell/common/lianlian/Encodes.java similarity index 98% rename from jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Encodes.java rename to jsowell-common/src/main/java/com/jsowell/common/lianlian/Encodes.java index 7f37dfdb3..539fd0055 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Encodes.java +++ b/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; diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Exceptions.java b/jsowell-common/src/main/java/com/jsowell/common/lianlian/Exceptions.java similarity index 97% rename from jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Exceptions.java rename to jsowell-common/src/main/java/com/jsowell/common/lianlian/Exceptions.java index 02ce6e0af..0b22d89e5 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/Exceptions.java +++ b/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; diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/GBSignUtils.java b/jsowell-common/src/main/java/com/jsowell/common/lianlian/GBSignUtils.java similarity index 97% rename from jsowell-common/src/main/java/com/jsowell/common/util/lianlian/GBSignUtils.java rename to jsowell-common/src/main/java/com/jsowell/common/lianlian/GBSignUtils.java index 1dace0d68..e9b472db3 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/GBSignUtils.java +++ b/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; diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/HttpRequestUtil.java b/jsowell-common/src/main/java/com/jsowell/common/lianlian/HttpRequestUtil.java similarity index 99% rename from jsowell-common/src/main/java/com/jsowell/common/util/lianlian/HttpRequestUtil.java rename to jsowell-common/src/main/java/com/jsowell/common/lianlian/HttpRequestUtil.java index 99cfc28a4..044cc7be1 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/HttpRequestUtil.java +++ b/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; diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/LianLianUtils.java b/jsowell-common/src/main/java/com/jsowell/common/lianlian/LianLianUtils.java similarity index 96% rename from jsowell-common/src/main/java/com/jsowell/common/util/lianlian/LianLianUtils.java rename to jsowell-common/src/main/java/com/jsowell/common/lianlian/LianLianUtils.java index 8379cfb50..6b98347ef 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/LianLianUtils.java +++ b/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; diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/SignUtils.java b/jsowell-common/src/main/java/com/jsowell/common/lianlian/SignUtils.java similarity index 98% rename from jsowell-common/src/main/java/com/jsowell/common/util/lianlian/SignUtils.java rename to jsowell-common/src/main/java/com/jsowell/common/lianlian/SignUtils.java index e92ae8008..b2f882dd1 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/lianlian/SignUtils.java +++ b/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; diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/common/CommonResult.java b/jsowell-common/src/main/java/com/jsowell/common/lianlian/common/CommonResult.java new file mode 100644 index 000000000..5a4256aee --- /dev/null +++ b/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 { + + /** + * 状态码 + */ + 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 + * @return + */ + public static CommonResult success(T data) { + return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMsg(), data, null); + } + + /** + * 成功返回结果 + * + * @param data 获取的数据 + * @param message 提示的信息 + * @param + * @return + */ + public static CommonResult success(T data, String message) { + return new CommonResult(ResultCode.SUCCESS.getCode(), message, data, null); + } + + public static CommonResult success(Integer ret, String msg, T data, String sig) { + return new CommonResult(ret, msg, data, sig); + } + + /** + * 失败返回结果 + * + * @param resultCode 错误码 + * @param + * @return + */ + public static CommonResult failed(ResultCode resultCode) { + return new CommonResult(resultCode.getCode(), resultCode.getMsg(), null, null); + } + + /** + * 失败返回 + * + * @param code 错误码 + * @param msg 提示信息 + * @param + * @return + */ + public static CommonResult failed(long code, String msg) { + return new CommonResult(code, msg, null, null); + } + + /** + * 失败返回结果 + * + * @param msg 提示信息 + * @param + * @return + */ + public static CommonResult failed(String msg) { + return failed(ResultCode.ERROR.getCode(), msg); + } + + /** + * 失败返回结果 + * + * @param + * @return + */ + public static CommonResult 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; + } +} diff --git a/jsowell-common/src/main/java/com/jsowell/common/lianlian/common/enums/ResultCode.java b/jsowell-common/src/main/java/com/jsowell/common/lianlian/common/enums/ResultCode.java new file mode 100644 index 000000000..e0fb80202 --- /dev/null +++ b/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; + } +} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java index 1ad6705c7..b13493071 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/service/impl/LianLianServiceImpl.java +++ b/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;