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

Merge branch 'dev' into feature-coupon

Browse Source 
# Conflicts:
#	jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
This commit is contained in:
Guoqs
2026-03-13 10:05:41 +08:00
parent d5e58ba64c a94a755805
commit 5541538b4e
35 changed files with 1532 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java vendored
View File

@@ -5,8 +5,7 @@ import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.dto.BatteryChargeReportDTO;
import com.jsowell.thirdparty.platform.service.impl.BatteryChargeReportService;
import com.jsowell.thirdparty.platform.service.impl.ChargeAlgorithmService;
import com.jsowell.pile.service.batteryreport.BatteryChargeReportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -21,9 +20,6 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/chargealgorithm")
public class ChargeAlgorithmController extends BaseController {
@Autowired
private ChargeAlgorithmService chargeAlgorithmService;
@Autowired
private BatteryChargeReportService batteryChargeReportService;
@@ -44,4 +40,18 @@ public class ChargeAlgorithmController extends BaseController {
}
return response;
}
@PostMapping("/getUrlByTaskId")
public RestApiResponse<?> getUrlByTaskId(@RequestBody BatteryChargeReportDTO dto) {
RestApiResponse<?> response = null;
try {
String url = batteryChargeReportService.getUrlByTaskId(dto.getTaskId(), dto.getReportType());
response = new RestApiResponse<>(url);
}catch (Exception e) {
logger.error("算法应用推送订单信息 error, ", e);
response = new RestApiResponse<>(e);
}
return response;
}
}

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
View File

@@ -22,7 +22,7 @@ import com.jsowell.pile.vo.uniapp.customer.ParkingOrderVO;
import com.jsowell.pile.vo.uniapp.customer.UniAppOrderVO;
import com.jsowell.service.OrderService;
import com.jsowell.pile.dto.BatteryChargeReportDTO;
import com.jsowell.thirdparty.platform.service.impl.BatteryChargeReportService;
import com.jsowell.pile.service.batteryreport.BatteryChargeReportService;
import com.jsowell.wxpay.dto.WechatSendMsgDTO;
import com.jsowell.wxpay.service.WxAppletRemoteService;
import org.springframework.beans.factory.annotation.Autowired;

5
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileSimInfoController.java
View File

@@ -150,4 +150,9 @@ public class PileSimInfoController extends BaseController {
// return result;
}
@PostMapping("/batchRechargeSimCard")
public AjaxResult batchRechargeSimCard(@RequestBody SimRenewDTO dto) {
return null;
}
}

12
jsowell-admin/src/main/resources/application-dev.yml
View File

@@ -36,11 +36,11 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_pre
# url: jdbc:mysql://192.168.2.46:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_prd_copy
password: Js@160829
# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_pre
url: jdbc:mysql://192.168.0.32:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_dev
password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
@@ -262,7 +262,7 @@ batteryChargeReport:
webDomainPrefix: https://wx.btiger.net/jeecg-boot
getTaskIdApi: /api/docking/api/evaluate
apiPrefix: /api/docking/report/
token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
token: MTc3MzAzODY1ODYwNy1sbjdiM3h3dHJi
mfrID: mfr8944567890598756
# dubbo配置

2
jsowell-admin/src/main/resources/application-prd.yml
View File

@@ -257,7 +257,7 @@ batteryChargeReport:
webDomainPrefix: https://wx.btiger.net/jeecg-boot
getTaskIdApi: /api/docking/api/evaluate
apiPrefix: /api/docking/report/
token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
token: MTc3MzAzODY1ODYwNy1sbjdiM3h3dHJi
mfrID: mfr8944567890598756
# dubbo配置

2
jsowell-admin/src/main/resources/application-pre.yml
View File

@@ -280,7 +280,7 @@ batteryChargeReport:
webDomainPrefix: https://wx.btiger.net/jeecg-boot
getTaskIdApi: /api/docking/api/evaluate
apiPrefix: /api/docking/report/
token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
token: MTc3MzAzODY1ODYwNy1sbjdiM3h3dHJi
mfrID: mfr8944567890598756
# dubbo配置

2
jsowell-admin/src/main/resources/application-sit.yml
View File

@@ -289,7 +289,7 @@ batteryChargeReport:
webDomainPrefix: https://wx.btiger.net/jeecg-boot
getTaskIdApi: /api/docking/api/evaluate
apiPrefix: /api/docking/report/
token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
token: MTc3MzAzODY1ODYwNy1sbjdiM3h3dHJi
mfrID: mfr8944567890598756
# dubbo配置

2
jsowell-admin/src/main/resources/application.yml
View File

@@ -156,7 +156,7 @@ batteryChargeReport:
webDomainPrefix: https://wx.btiger.net/jeecg-boot
getTaskIdApi: /api/docking/api/evaluate
apiPrefix: /api/docking/report/
token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
token: MTc3MzAzODY1ODYwNy1sbjdiM3h3dHJi
mfrID: mfr8944567890598756
# sms4j

3
jsowell-admin/src/test/java/PaymentTestController.java
View File

@@ -851,6 +851,9 @@ public class PaymentTestController {
}
/**
* 处理临时过度账户订单
*/
@Test
public void queryAdapayData() {
String startTime = "2025-01-01 00:00:00";

2
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -64,6 +64,7 @@ import com.jsowell.pile.dto.lutongyunting.BindCouponDTO;
import com.jsowell.pile.mapper.MemberBasicInfoMapper;
import com.jsowell.pile.mapper.PileBillingTemplateMapper;
import com.jsowell.pile.service.*;
import com.jsowell.pile.service.batteryreport.BatteryChargeReportService;
import com.jsowell.pile.service.programlogic.AbstractProgramLogic;
import com.jsowell.pile.service.programlogic.ProgramLogicFactory;
import com.jsowell.pile.thirdparty.CommonParamsDTO;
@@ -87,7 +88,6 @@ import com.jsowell.thirdparty.parking.common.bean.QcyunParkCouponDTO;
import com.jsowell.thirdparty.parking.service.LTYTService;
import com.jsowell.thirdparty.parking.service.QcyunsService;
import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
import com.jsowell.thirdparty.platform.service.impl.BatteryChargeReportService;
import com.jsowell.thirdparty.platform.util.Cryptos;
import com.jsowell.thirdparty.platform.util.Encodes;
import com.jsowell.thirdparty.platform.util.GBSignUtils;