autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-14 20:30:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-04-06 16:09:14 +08:00
parent 597e8c5588 263970c1e0
commit 36ec9c9940
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java
View File

@@ -20,16 +20,16 @@ public class Constants {
public static final String SOCKET_IP = "127.0.0.1"; public static final String SOCKET_IP = "127.0.0.1";
public static final Integer SOCKET_PORT = 9011; public static final Integer SOCKET_PORT = 9011;
public static final String updateServerIP = "192.168.2.2"; public static final String updateServerIP = "47.103.124.69";
public static final int port = 0x21; public static final int port = 0x21;
public static final byte[] updateServerPort = new byte[]{port}; public static final byte[] updateServerPort = new byte[]{port};
public static final String updateServerUserName = "ftpuser"; public static final String updateServerUserName = "ftptest";
public static final String updateServerPassword = "ftp123456"; public static final String updateServerPassword = "js160829";
public static final String filePath = "/pile/test.bin"; public static final String filePath = "/update.bin";
public static final String partnerId = "1632405339"; // 商户号Id public static final String partnerId = "1632405339"; // 商户号Id

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -315,7 +315,8 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
@Override @Override
public PileInfoVO selectPileInfoBySn(String pileSn) { public PileInfoVO selectPileInfoBySn(String pileSn) {
PileBasicInfo basicInfo = pileBasicInfoMapper.selectPileBasicInfoBySn(pileSn); // TODO 换成缓存方法
PileBasicInfo basicInfo = selectPileBasicInfoBySN(pileSn);
if (basicInfo == null) { if (basicInfo == null) {
return null; return null;
} }