diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/wrj/driver/server/constant/Constants.java b/src/main/java/com/wrj/driver/server/constant/Constants.java
index ca9b535..0857dc6 100644
--- a/src/main/java/com/wrj/driver/server/constant/Constants.java
+++ b/src/main/java/com/wrj/driver/server/constant/Constants.java
@@ -6,7 +6,7 @@ package com.wrj.driver.server.constant;
public class Constants {
- public static Integer DEFAULT_CARTYPE_ID = -1;
+ public static Integer DEFAULT_TYPE_ID = -1;
//租户id
public static String HEADER_TENANT_ID = "tenant-id";
diff --git a/src/main/java/com/wrj/driver/server/controller/AppletPayController.java b/src/main/java/com/wrj/driver/server/controller/AppletPayController.java
deleted file mode 100644
index 63bebb5..0000000
--- a/src/main/java/com/wrj/driver/server/controller/AppletPayController.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package com.wrj.driver.server.controller;
-
-import com.wrj.driver.server.constant.Constants;
-import com.wrj.driver.server.entity.OrderPayInfo;
-import com.wrj.driver.server.entity.TdTenantApplet;
-import com.wrj.driver.server.exception.BusinessException;
-import com.wrj.driver.server.interceptor.TenantContextHolder;
-import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.IOrderPayInfoService;
-import com.wrj.driver.server.service.ITdTenantAppletService;
-import com.wrj.driver.server.util.WechatPayUtil;
-import com.wrj.driver.server.vo.AppletPayVo;
-import com.wechat.pay.java.core.Config;
-import com.wechat.pay.java.core.RSAAutoCertificateConfig;
-import com.wechat.pay.java.core.RSAPublicKeyConfig;
-import com.wechat.pay.java.core.exception.ServiceException;
-import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
-import com.wechat.pay.java.service.payments.jsapi.model.*;
-import com.wechat.pay.java.service.payments.model.Transaction;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-
-/**
- * 微信支付小程序 接口
- */
-@Api(tags = "小程序支付")
-@RestController
-@RequestMapping("/applet/pay")
-@Slf4j
-public class AppletPayController {
-
- @Resource
-// private WechatPayConfig wechatPayConfig;
-
- @Autowired
- private IOrderPayInfoService orderPayInfoService;
-
- @Autowired
- private ITdTenantAppletService tdTenantAppletService;
-
- //生成预支付订单
- @ApiOperation("生成预支付订单")
- @PostMapping("/prepay")
- public BaseResponse createPrepay(@RequestBody AppletPayVo payDto){
- // 构建service
- log.info("payDto===================>{}",payDto);
- payDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId());
- //查询租户商户信息
- TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payDto.getTenantId());
- if (tdTenantApplet == null){
- throw new BusinessException( "商户信息不存在,请联系服务人员");
- }
-
- OrderPayInfo orderPayInfo = orderPayInfoService
- .createOrderPayInfo(payDto.getMoney(),payDto.getUserId(), payDto.getDescription(),
- payDto.getTradeType(), payDto.getOutTradeNo(),"applet",
- payDto.getDetailId(), payDto.getTenantId());
-
- JsapiServiceExtension service = null;
- if (tdTenantApplet.getIsNew()){
- //新支付
- service = createNewService(tdTenantApplet);
- } else {
- //老支付
- service = createService(tdTenantApplet);
-
- }
-
-// JsapiServiceExtension service = createService(tdTenantApplet);
-
-
- // 请求下单参数
- PrepayRequest request = new PrepayRequest();
- Amount amount = new Amount();
- amount.setTotal(Integer.valueOf((payDto.getMoney().multiply(new BigDecimal("100")).setScale(0).toString())+""));
- request.setAmount(amount);
- request.setAppid(tdTenantApplet.getAppId());
- request.setMchid(tdTenantApplet.getMchId());
- request.setDescription(payDto.getDescription());
- request.setNotifyUrl(tdTenantApplet.getPayNoticeUrl());
- request.setOutTradeNo(orderPayInfo.getPayId().toString());
-
- Payer payer = new Payer();
- payer.setOpenid(WechatPayUtil.getOpenId(tdTenantApplet.getAppId(), tdTenantApplet.getAppSecret(), payDto.getCode()));
- request.setPayer(payer);
- // 调用下单方法,得到应答
- PrepayWithRequestPaymentResponse response = service.prepayWithRequestPayment(request);
- // 使用微信扫描 code_url 对应的二维码,即可体验Native支付
- log.info("response=================>{}",response);
-// return BaseResponse.success();
- return BaseResponse.success(response);
-
-
-
- }
-
- private JsapiServiceExtension createNewService(TdTenantApplet tdTenantApplet) {
- //现代码
- Config config =
- new RSAPublicKeyConfig.Builder()
- .merchantId(tdTenantApplet.getMchId())
- .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath())
- .publicKeyFromPath(tdTenantApplet.getPubKeyPath())
- .publicKeyId(tdTenantApplet.getPubKeyId())
- .merchantSerialNumber(tdTenantApplet.getMchSerialNo())
- .apiV3Key(tdTenantApplet.getApiV3Key())
- .build();
- JsapiServiceExtension service = new JsapiServiceExtension.Builder().config(config).build();
-
- return service;
- }
-
-
- /** 构建service */
- private JsapiServiceExtension createService(TdTenantApplet tdTenantApplet) {
- Config config =
- new RSAAutoCertificateConfig.Builder()
- .merchantId(tdTenantApplet.getMchId())
-// .privateKey(PemUtil.loadPrivateKeyFromString(InputStreamUtil.getContentStr(tdTenantApplet.getPrivateKeyPath())))
- .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath())
- .merchantSerialNumber(tdTenantApplet.getMchSerialNo())
- .apiV3Key(tdTenantApplet.getApiV3Key())
- .build();
-
- JsapiServiceExtension service = new JsapiServiceExtension.Builder().config(config).build();
-
- return service;
- }
-
-
- //查询订单接口
- @ApiOperation("查询支付订单")
- @PostMapping("/queryOrder")
- public BaseResponse queryOrder(@RequestBody AppletPayVo payDto){
-
- payDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId());
- //查询租户商户信息
- TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payDto.getTenantId());
-
- if (tdTenantApplet == null){
- throw new BusinessException( "商户信息不存在,请联系服务人员");
- }
- //获取openId
- QueryOrderByOutTradeNoRequest queryRequest = new QueryOrderByOutTradeNoRequest();
- queryRequest.setMchid(tdTenantApplet.getMchId());
- //支付订单id
- queryRequest.setOutTradeNo(payDto.getOutTradeNo());
- JsapiServiceExtension service = null;
- if (tdTenantApplet.getIsNew()){
- //新支付
- service = createNewService(tdTenantApplet);
- } else {
- //老支付
- service = createService(tdTenantApplet);
-
- }
- try {
- Transaction result = service.queryOrderByOutTradeNo(queryRequest);
- System.out.println(result.getTradeState());
- return BaseResponse.success(result);
- } catch (ServiceException e) {
- // API返回失败, 例如ORDER_NOT_EXISTS
- System.out.printf("code=[%s], message=[%s]\n", e.getErrorCode(), e.getErrorMessage());
- System.out.printf("reponse body=[%s]\n", e.getResponseBody());
- return BaseResponse.fail(e.getErrorMessage());
- }
-
- }
-
- //关闭订单接口
- @ApiOperation("关闭支付订单")
- @PostMapping("/closeOrder")
- public BaseResponse closeOrder(@RequestBody AppletPayVo payDto){
- payDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId());
- //查询租户商户信息
- TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payDto.getTenantId());
-
- if (tdTenantApplet == null){
- throw new BusinessException( "商户信息不存在,请联系服务人员");
- }
-
- JsapiServiceExtension service = null;
- if (tdTenantApplet.getIsNew()){
- //新支付
- service = createNewService(tdTenantApplet);
- } else {
- //老支付
- service = createService(tdTenantApplet);
-
- }
- CloseOrderRequest closeRequest = new CloseOrderRequest();
- closeRequest.setMchid(tdTenantApplet.getMchId());
- closeRequest.setOutTradeNo(payDto.getOutTradeNo());
- // 方法没有返回值,意味着成功时API返回204 No Content
- service.closeOrder(closeRequest);
- return BaseResponse.success();
- }
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/H5PayController.java b/src/main/java/com/wrj/driver/server/controller/H5PayController.java
deleted file mode 100644
index 99e3901..0000000
--- a/src/main/java/com/wrj/driver/server/controller/H5PayController.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.wrj.driver.server.controller;
-
-import com.wrj.driver.server.config.WechatPayConfig;
-import com.wrj.driver.server.constant.Constants;
-import com.wrj.driver.server.entity.OrderPayInfo;
-import com.wrj.driver.server.entity.TdTenantApplet;
-import com.wrj.driver.server.exception.BusinessException;
-import com.wrj.driver.server.interceptor.TenantContextHolder;
-import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.IOrderPayInfoService;
-import com.wrj.driver.server.service.ITdTenantAppletService;
-import com.wrj.driver.server.util.InputStreamUtil;
-import com.wrj.driver.server.vo.H5PayVo;
-import com.wechat.pay.java.core.Config;
-import com.wechat.pay.java.core.RSAAutoCertificateConfig;
-import com.wechat.pay.java.core.exception.ServiceException;
-import com.wechat.pay.java.core.util.PemUtil;
-import com.wechat.pay.java.service.payments.h5.H5Service;
-import com.wechat.pay.java.service.payments.h5.model.*;
-import com.wechat.pay.java.service.payments.model.Transaction;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-
-/**
- * 微信支付小程序 接口
- */
-@Api(tags = "H5支付")
-@RestController
-@RequestMapping("/H5/pay")
-@Slf4j
-public class H5PayController {
-
- @Resource
- private WechatPayConfig tdTenantApplet;
-
- @Autowired
- private IOrderPayInfoService orderPayInfoService;
-
- @Autowired
- private ITdTenantAppletService tdTenantAppletService;
-
- //生成预支付订单
- @ApiOperation("生成预支付订单")
- @PostMapping("/prepay")
- public BaseResponse createPrepay(@RequestBody H5PayVo payVo){
- // 构建service
- payVo.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId());
- //查询租户商户信息
- TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payVo.getTenantId());
- if (tdTenantApplet == null){
- throw new BusinessException( "商户信息不存在,请联系服务人员");
- }
-
- H5Service service = createService(tdTenantApplet);
- //在order_pay_info里新增一条数据
- OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(payVo.getMoney(),payVo.getUserId(),payVo.getDescription(), payVo.getTradeType(), payVo.getOutTradeNo(), "h5", payVo.getDetailId(), payVo.getTenantId());
-
- // 请求下单参数
- PrepayRequest request = new PrepayRequest();
- Amount amount = new Amount();
- amount.setTotal(Integer.valueOf((payVo.getMoney().multiply(new BigDecimal("100")).setScale(0).toString())+""));
- request.setAmount(amount);
- request.setAppid(tdTenantApplet.getAppId());
- request.setMchid(tdTenantApplet.getMchId());
- request.setDescription(payVo.getDescription());
- request.setNotifyUrl(tdTenantApplet.getPayNoticeUrl());
- request.setOutTradeNo(orderPayInfo.getPayId().toString());
- //场景参数
- SceneInfo sceneInfo = new SceneInfo();
- sceneInfo.setPayerClientIp(payVo.getClientIp());
- request.setSceneInfo(sceneInfo);
-
- // 调用下单方法,得到应答
- PrepayResponse response = service.prepay(request);
- // 使用微信扫描 code_url 对应的二维码,即可体验Native支付
-// log.info(response);
- return BaseResponse.success(response);
- }
-
- private H5Service createService(TdTenantApplet tdTenantApplet) {
- Config config =
- new RSAAutoCertificateConfig.Builder()
- .merchantId(tdTenantApplet.getMchId())
- .privateKey(PemUtil.loadPrivateKeyFromString(InputStreamUtil.getContentStr(tdTenantApplet.getPrivateKeyPath())))
-// .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath())
- .merchantSerialNumber(tdTenantApplet.getMchSerialNo())
- .apiV3Key(tdTenantApplet.getApiV3Key())
- .build();
- H5Service service = new H5Service.Builder().config(config).build();
-
- return service;
- }
-
-
- //查询订单接口
- @ApiOperation("查询支付订单")
- @PostMapping("/queryOrder")
- public BaseResponse queryOrder(@RequestBody H5PayVo payVo){
- payVo.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId());
- //查询租户商户信息
- TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payVo.getTenantId());
- if (tdTenantApplet == null){
- throw new BusinessException( "商户信息不存在,请联系服务人员");
- }
- //获取openId
- QueryOrderByOutTradeNoRequest queryRequest = new QueryOrderByOutTradeNoRequest();
- queryRequest.setMchid(tdTenantApplet.getMchId());
- //支付订单id
- queryRequest.setOutTradeNo(payVo.getOutTradeNo());
- H5Service service = createService(tdTenantApplet);
-
- try {
- Transaction result = service.queryOrderByOutTradeNo(queryRequest);
- System.out.println(result.getTradeState());
- return BaseResponse.success(result);
- } catch (ServiceException e) {
- // API返回失败, 例如ORDER_NOT_EXISTS
- System.out.printf("code=[%s], message=[%s]\n", e.getErrorCode(), e.getErrorMessage());
- System.out.printf("reponse body=[%s]\n", e.getResponseBody());
- return BaseResponse.fail(e.getErrorMessage());
- }
-
- }
-
- //关闭订单接口
- @ApiOperation("关闭支付订单")
- @PostMapping("/closeOrder")
- public BaseResponse closeOrder(@RequestBody H5PayVo payVo){
- payVo.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId());
- //查询租户商户信息
- TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payVo.getTenantId());
- if (tdTenantApplet == null){
- throw new BusinessException( "商户信息不存在,请联系服务人员");
- }
- H5Service service = createService(tdTenantApplet);
- CloseOrderRequest closeRequest = new CloseOrderRequest();
- closeRequest.setMchid(tdTenantApplet.getMchId());
- closeRequest.setOutTradeNo(payVo.getOutTradeNo());
- // 方法没有返回值,意味着成功时API返回204 No Content
- service.closeOrder(closeRequest);
- return BaseResponse.success();
- }
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/OrderPayInfoController.java b/src/main/java/com/wrj/driver/server/controller/OrderPayInfoController.java
deleted file mode 100644
index 0aecea8..0000000
--- a/src/main/java/com/wrj/driver/server/controller/OrderPayInfoController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 支付表 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//orderPayInfo")
-public class OrderPayInfoController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/PayNoticeLogController.java b/src/main/java/com/wrj/driver/server/controller/PayNoticeLogController.java
deleted file mode 100644
index a95259e..0000000
--- a/src/main/java/com/wrj/driver/server/controller/PayNoticeLogController.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.wrj.driver.server.entity.OrderPayInfo;
-import com.wrj.driver.server.entity.TdTenantApplet;
-import com.wrj.driver.server.enums.PurchaseProductTypeEnum;
-import com.wrj.driver.server.exception.BusinessException;
-import com.wrj.driver.server.service.IOrderPayInfoService;
-import com.wrj.driver.server.service.ITdSysUserMemberService;
-import com.wrj.driver.server.service.ITdTenantAppletService;
-import com.wrj.driver.server.util.InputStreamUtil;
-import com.wechat.pay.java.core.RSAAutoCertificateConfig;
-import com.wechat.pay.java.core.RSAPublicKeyConfig;
-import com.wechat.pay.java.core.notification.NotificationConfig;
-import com.wechat.pay.java.core.notification.NotificationParser;
-import com.wechat.pay.java.core.notification.RequestParam;
-import com.wechat.pay.java.core.util.PemUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- *
- * 支付回调日志表 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Api(tags = "支付回调")
-@RestController
-@RequestMapping("/payNoticeLog")
-@Slf4j
-public class PayNoticeLogController {
-// @Resource
-// private WechatPayConfig tdTenantApplet;
-
- @Autowired
- private ITdSysUserMemberService userMemberService;
-
- @Autowired
- private IOrderPayInfoService payInfoService;
-
- @Autowired
- private ITdTenantAppletService tdTenantAppletService;
-
- /**
- * 寻驾小程序 支付回调接口 本接口不能做验证
- * @param wechatPayCertificateSerialNumber
- * @param signature
- * @param timstamp
- * @param nonce
- * @param requestBody
- * @return
- */
- @ApiOperation("支付回调接口")
- @PostMapping("/{tenantId}")
- public JSONObject payNotice(@RequestHeader("Wechatpay-Serial") String wechatPayCertificateSerialNumber,
- @RequestHeader("Wechatpay-Signature") String signature,
- @RequestHeader("Wechatpay-Timestamp") String timstamp,
- @RequestHeader("Wechatpay-Nonce") String nonce,
- @RequestBody String requestBody,
- @PathVariable("tenantId") Long tenantId){
- log.info("支付回调信息==============》{}",requestBody);
- log.info("支付回调信息==============》tenantId{}",tenantId);
-
- //查询租户id
- TdTenantApplet tdTenantApplet = null;
- if (tenantId != null){
- //查询租户商户信息
- tdTenantApplet = tdTenantAppletService.getById(tenantId);
- }
-
- if (tdTenantApplet == null){
- log.info("支付回调==============》商户信息不存在");
- throw new BusinessException( "商户信息不存在,请联系服务人员");
- }
-
- NotificationConfig config = null;
- if (tdTenantApplet.getIsNew()){
- //新支付
- config = new RSAPublicKeyConfig.Builder()
- .merchantId(tdTenantApplet.getMchId())
- .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath())
- .publicKeyFromPath(tdTenantApplet.getPubKeyPath())
- .publicKeyId(tdTenantApplet.getPubKeyId())
- .merchantSerialNumber(tdTenantApplet.getMchSerialNo())
- .apiV3Key(tdTenantApplet.getApiV3Key())
- .build();
- } else {
- //老支付
- config = new RSAAutoCertificateConfig.Builder()
- .merchantId(tdTenantApplet.getMchId())
-// .privateKey(PemUtil.loadPrivateKeyFromString(InputStreamUtil.getContentStr(tdTenantApplet.getPrivateKeyPath())))
- .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath())
- .merchantSerialNumber(tdTenantApplet.getMchSerialNo())
- .apiV3Key(tdTenantApplet.getApiV3Key())
- .build();
-
- }
-
- RequestParam requestParam = new RequestParam.Builder()
- .serialNumber(wechatPayCertificateSerialNumber)
- .nonce(nonce)
- .signature(signature)
- .timestamp(timstamp)
- // 若未设置signType,默认值为 WECHATPAY2-SHA256-RSA2048
- .body(requestBody)
- .build();
-
- // 初始化 NotificationParser
- NotificationParser parser = new NotificationParser(config);
-
-
- // 验签并解密报文
- JSONObject decryptObject = parser.parse(requestParam,JSONObject.class);
- System.out.println("decryptObject="+decryptObject.toJSONString());
-
- String trade_state=decryptObject.getString("trade_state");
- //取业务id
- String outTradeNo = decryptObject.getString("out_trade_no");
- JSONObject jsonResponse = new JSONObject();
- OrderPayInfo payInfo = payInfoService.getById(Long.parseLong(outTradeNo));
- if(trade_state.equals("SUCCESS")) {
- //各种业务逻辑
- //1.订单详情表里修改数据
- payInfoService.payNotice(payInfo,Boolean.TRUE);
- //2.如果购买商品是会员则冲会员,其余的则不做操作
- if (StrUtil.equals(payInfo.getPurchaseProductType(), PurchaseProductTypeEnum.MEMBER.getValue())){
- userMemberService.purchaseMember(payInfo);
- }
- }else{
- //还是各种业务逻辑
- //1.订单详情表里修改数据
- payInfoService.payNotice(payInfo,Boolean.FALSE);
- }
- jsonResponse.put("code", "SUCCESS");
- jsonResponse.put("message", "成功");
- return jsonResponse;
- }
-
-
- @ApiOperation("通关考支付回调接口")
- @PostMapping("/tgk")
- public JSONObject tGKPayNotice(@RequestHeader("Wechatpay-Serial") String wechatPayCertificateSerialNumber,
- @RequestHeader("Wechatpay-Signature") String signature,
- @RequestHeader("Wechatpay-Timestamp") String timstamp,
- @RequestHeader("Wechatpay-Nonce") String nonce,
- @RequestBody String requestBody){
- log.info("支付回调信息==============》{}",requestBody);
- //查询租户id
- Long tenantId = 51710003l;
- TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(tenantId);
-
- if (tdTenantApplet == null){
- throw new BusinessException( "商户信息不存在,请联系服务人员");
- }
-
- NotificationConfig config = new RSAAutoCertificateConfig.Builder()
- .merchantId(tdTenantApplet.getMchId())
- .privateKey(PemUtil.loadPrivateKeyFromString(InputStreamUtil.getContentStr(tdTenantApplet.getPrivateKeyPath())))
-// .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath())
- .merchantSerialNumber(tdTenantApplet.getMchSerialNo())
- .apiV3Key(tdTenantApplet.getApiV3Key())
- .build();
- RequestParam requestParam = new RequestParam.Builder()
- .serialNumber(wechatPayCertificateSerialNumber)
- .nonce(nonce)
- .signature(signature)
- .timestamp(timstamp)
- // 若未设置signType,默认值为 WECHATPAY2-SHA256-RSA2048
-
- .body(requestBody)
- .build();
-
- // 初始化 NotificationParser
- NotificationParser parser = new NotificationParser(config);
-
- // 验签并解密报文
- JSONObject decryptObject = parser.parse(requestParam,JSONObject.class);
- System.out.println("decryptObject="+decryptObject.toJSONString());
-
- String trade_state=decryptObject.getString("trade_state");
- //取业务id
- String outTradeNo = decryptObject.getString("out_trade_no");
- JSONObject jsonResponse = new JSONObject();
- OrderPayInfo payInfo = payInfoService.getById(Long.parseLong(outTradeNo));
- if(trade_state.equals("SUCCESS")) {
- //各种业务逻辑
- //1.订单详情表里修改数据
- payInfoService.payNotice(payInfo,Boolean.TRUE);
- //2.如果购买商品是会员则冲会员,其余的则不做操作
- if (StrUtil.equals(payInfo.getPurchaseProductType(), PurchaseProductTypeEnum.MEMBER.getValue())){
- userMemberService.purchaseMember(payInfo);
- }
- }else{
- //还是各种业务逻辑
- //1.订单详情表里修改数据
- payInfoService.payNotice(payInfo,Boolean.FALSE);
- }
- jsonResponse.put("code", "SUCCESS");
- jsonResponse.put("message", "成功");
- return jsonResponse;
- }
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/PayPrepayController.java b/src/main/java/com/wrj/driver/server/controller/PayPrepayController.java
deleted file mode 100644
index 060143d..0000000
--- a/src/main/java/com/wrj/driver/server/controller/PayPrepayController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 预支付表 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@RestController
-@RequestMapping("/payPrepay")
-public class PayPrepayController {
-
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/PayPrepayResultController.java b/src/main/java/com/wrj/driver/server/controller/PayPrepayResultController.java
deleted file mode 100644
index b278c8b..0000000
--- a/src/main/java/com/wrj/driver/server/controller/PayPrepayResultController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 支付结果表 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//payPrepayResult")
-public class PayPrepayResultController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/PayRefundController.java b/src/main/java/com/wrj/driver/server/controller/PayRefundController.java
deleted file mode 100644
index 2a227dd..0000000
--- a/src/main/java/com/wrj/driver/server/controller/PayRefundController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 申请退款表 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//payRefund")
-public class PayRefundController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/PayRefundResultController.java b/src/main/java/com/wrj/driver/server/controller/PayRefundResultController.java
deleted file mode 100644
index 80acae6..0000000
--- a/src/main/java/com/wrj/driver/server/controller/PayRefundResultController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 退款结果表 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//payRefundResult")
-public class PayRefundResultController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdSysUserController.java b/src/main/java/com/wrj/driver/server/controller/SysUserController.java
similarity index 69%
rename from src/main/java/com/wrj/driver/server/controller/TdSysUserController.java
rename to src/main/java/com/wrj/driver/server/controller/SysUserController.java
index 8df6aed..3b820b6 100644
--- a/src/main/java/com/wrj/driver/server/controller/TdSysUserController.java
+++ b/src/main/java/com/wrj/driver/server/controller/SysUserController.java
@@ -3,12 +3,10 @@ package com.wrj.driver.server.controller;
import com.alibaba.fastjson.JSONObject;
import com.wrj.driver.server.constant.Constants;
-import com.wrj.driver.server.dto.DriverSchoolDto;
import com.wrj.driver.server.dto.LoginUserDto;
-import com.wrj.driver.server.interceptor.TenantContextHolder;
import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdSysUserLogService;
-import com.wrj.driver.server.service.ITdSysUserService;
+import com.wrj.driver.server.service.ISysUserLogService;
+import com.wrj.driver.server.service.ISysUserService;
import com.wrj.driver.server.vo.LoginUserVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,15 +27,15 @@ import java.time.LocalDateTime;
*/
@RestController
@Api(tags = "用户管理")
-@RequestMapping("/tdSysUser")
+@RequestMapping("/sysUser")
@Slf4j
-public class TdSysUserController {
+public class SysUserController {
@Autowired
- private ITdSysUserService userService;
+ private ISysUserService userService;
@Autowired
- private ITdSysUserLogService userLogService;
+ private ISysUserLogService userLogService;
@ApiOperation("获取验证码")
@GetMapping("/code")
@@ -50,9 +48,8 @@ public class TdSysUserController {
@PostMapping("/login")
public BaseResponse login(@RequestBody @Valid LoginUserDto loginUserDto) {
log.info("用户登录======>loginUserDto:{}", loginUserDto);
- loginUserDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId());
LoginUserVo userVo = userService.login(loginUserDto);
- userLogService.saveLog("用户登录", 4, loginUserDto.getDevice(), 1, userVo.getUserId(), JSONObject.toJSONString(loginUserDto), JSONObject.toJSONString(userVo), 0, LocalDateTime.now(), loginUserDto.getTenantId());
+ userLogService.saveLog("用户登录", 4, loginUserDto.getDevice(), 1, userVo.getUserId(), JSONObject.toJSONString(loginUserDto), JSONObject.toJSONString(userVo), 0, LocalDateTime.now());
return BaseResponse.success(userVo);
}
@@ -61,7 +58,7 @@ public class TdSysUserController {
public BaseResponse loginOut(){
log.info("用户登出======>{}", LocalDateTime.now());
Long userId = userService.loginOut();
- userLogService.saveLog("用户登出", 5, null, 1, userId, null, null, 0, LocalDateTime.now(), null);
+ userLogService.saveLog("用户登出", 5, null, 1, userId, null, null, 0, LocalDateTime.now());
return BaseResponse.success(userId);
}
@@ -72,13 +69,4 @@ public class TdSysUserController {
log.info("获取用户信息======>");
return BaseResponse.success(userService.queryUserMessage());
}
-
- @ApiOperation("用户绑定驾校")
- @PostMapping("/bindSchool")
- public BaseResponse bindSchool(@RequestBody @Valid DriverSchoolDto schoolDto) {
- log.info("用户绑定驾校信息======>schoolDto{}",schoolDto);
- return BaseResponse.success(userService.bindSchool(schoolDto));
- }
-
-
}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdCarouselImageController.java b/src/main/java/com/wrj/driver/server/controller/TdCarouselImageController.java
deleted file mode 100644
index 70c7ce8..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdCarouselImageController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.wrj.driver.server.controller;
-
-import com.wrj.driver.server.interceptor.TenantContextHolder;
-import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdCarouselImageService;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/tdCarouselImage")
-@Slf4j
-public class TdCarouselImageController {
-
- @Resource
- private ITdCarouselImageService carouselImageService;
-
- //查询轮播图信息
-
- @ApiOperation("根据车型和科目查询章节")
- @PostMapping("/queryList")
- public BaseResponse queryList() {
- log.info("获取轮播图======>queryDto:{}");
- return BaseResponse.success(carouselImageService.queryList(TenantContextHolder.getTenantId()));
- }
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdCategoryQuestionController.java b/src/main/java/com/wrj/driver/server/controller/TdCategoryQuestionController.java
deleted file mode 100644
index 34e54ea..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdCategoryQuestionController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 题型题目表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//tdCategoryQuestion")
-public class TdCategoryQuestionController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomController.java b/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomController.java
deleted file mode 100644
index cda3a8f..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 考场信息表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//tdExaminationRoom")
-public class TdExaminationRoomController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomRoadController.java b/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomRoadController.java
deleted file mode 100644
index 9c23902..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomRoadController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 考场线路表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//tdExaminationRoomRoad")
-public class TdExaminationRoomRoadController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdMemberController.java b/src/main/java/com/wrj/driver/server/controller/TdMemberController.java
deleted file mode 100644
index 5953dab..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdMemberController.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import com.wrj.driver.server.dto.MemberQueryDto;
-import com.wrj.driver.server.interceptor.TenantContextHolder;
-import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdMemberService;
-import com.wrj.driver.server.util.SecurityUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * 会员类型表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Api(tags = "会员")
-@RestController
-@RequestMapping("/tdMember")
-@Slf4j
-public class TdMemberController {
-
- @Autowired
- private ITdMemberService memberService;
-
- @ApiOperation("查询会员列表")
- @PostMapping("/queryMember")
- public BaseResponse queryMember(@RequestBody MemberQueryDto queryDto) {
- log.info("获取会员列表======>queryDto:{}", queryDto);
- queryDto.setTenantId(TenantContextHolder.getTenantId());
- return BaseResponse.success(memberService.queryMember(queryDto));
- }
-
-
- @ApiOperation("查询用户开通的会员")
- @PostMapping("/queryUserMember")
- public BaseResponse queryUserMember(@RequestBody MemberQueryDto queryDto) {
- log.info("获取用户会员列表======>queryDto:{}", queryDto);
- queryDto.setTenantId(TenantContextHolder.getTenantId());
- return BaseResponse.success(memberService.queryUserMember(queryDto, SecurityUtil.getUserId()));
- }
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdModuleQuestionController.java b/src/main/java/com/wrj/driver/server/controller/TdModuleQuestionController.java
deleted file mode 100644
index 77babc6..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdModuleQuestionController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 模块题目表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//tdModuleQuestion")
-public class TdModuleQuestionController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdPointQuestionController.java b/src/main/java/com/wrj/driver/server/controller/TdPointQuestionController.java
deleted file mode 100644
index 7e5dc84..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdPointQuestionController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 考点题目表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//tdPointQuestion")
-public class TdPointQuestionController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdProjectController.java b/src/main/java/com/wrj/driver/server/controller/TdProjectController.java
deleted file mode 100644
index b5988ad..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdProjectController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import com.wrj.driver.server.dto.ProjectDto;
-import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdProjectService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- *
- * 考试项目表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Api(tags = "考试项目")
-@RestController
-@RequestMapping("/tdTestProject")
-@Slf4j
-public class TdProjectController {
-
- @Autowired
- private ITdProjectService projectService;
-
- @ApiOperation("获取项目列表 (考试项目和基础操作)")
- @PostMapping("/queryProjectList")
- public BaseResponse list(@RequestBody ProjectDto projectDto) {
- log.info("获取考试项目=========》projectDto{}",projectDto);
- return BaseResponse.success(projectService.queryProjectList(projectDto));
- }
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdQuestionJxController.java b/src/main/java/com/wrj/driver/server/controller/TdQuestionJxController.java
deleted file mode 100644
index 1a4212e..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdQuestionJxController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import com.wrj.driver.server.dto.QuestionJxQueryDto;
-import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdQuestionJxService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- *
- * 题库; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Api(tags = "精选题库")
-@RestController
-@RequestMapping("/tdQuestionJx")
-@Slf4j
-public class TdQuestionJxController {
-
- @Autowired
- private ITdQuestionJxService tdQuestionJxService;
-
- @ApiOperation("查询精选题库id")
- @PostMapping("/queryJXQuestionIds")
- public BaseResponse queryJXQuestionIds(@RequestBody QuestionJxQueryDto queryDto) {
- log.info("获取精选题型======>queryDto:{}", queryDto);
- return BaseResponse.success(tdQuestionJxService.queryJXQuestionIds(queryDto));
- }
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdQuestionVersionController.java b/src/main/java/com/wrj/driver/server/controller/TdQuestionVersionController.java
deleted file mode 100644
index 02f4c0a..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdQuestionVersionController.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import com.wrj.driver.server.entity.TdQuestionVersion;
-import com.wrj.driver.server.exception.BusinessException;
-import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdQuestionVersionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Objects;
-
-/**
- *
- * 题库版本表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-09-03
- */
-@Api(tags = "题库版本")
-@RestController
-@RequestMapping("/tdQuestionVersion")
-@Slf4j
-public class TdQuestionVersionController {
-
- @Autowired
- private ITdQuestionVersionService versionService;
-
- @ApiOperation("获取题库当前版本")
- @GetMapping("/currentVersion")
- public BaseResponse testSubmit(@RequestParam Integer carTypeId) {
- log.info("获取题库当前版本======>carTypeId:{}", carTypeId);
- return BaseResponse.success(versionService.currentVersion(carTypeId));
- }
-
-
- @ApiOperation("题库版本更新")
- @PostMapping("/addVersion")
- public BaseResponse addVersion(@RequestBody TdQuestionVersion versionDto) {
- log.info("题库版本更新======>versionDto:{}", versionDto);
- if (Objects.isNull(versionDto.getCarTypeId())){
- throw new BusinessException("缺少必要参数");
- }
-
- return BaseResponse.success(versionService.addVersion(versionDto));
- }
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdSecretController.java b/src/main/java/com/wrj/driver/server/controller/TdSecretController.java
deleted file mode 100644
index 5ecd545..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdSecretController.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.wrj.driver.server.controller;
-
-import com.wrj.driver.server.dto.BaseQueryDto;
-import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdSecretService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * 密卷
- */
-@RestController
-@RequestMapping("/tdSecret")
-@Slf4j
-public class TdSecretController {
-
- @Resource
- private ITdSecretService secretService;
-
- //查询
- @PostMapping("/querySecretIds")
- public BaseResponse querySecretIds(@RequestBody BaseQueryDto queryDto) {
- log.info("获取密卷ids======>queryDto:{}", queryDto);
- return BaseResponse.success(secretService.querySecretIds(queryDto));
- }
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdSecretQuestionController.java b/src/main/java/com/wrj/driver/server/controller/TdSecretQuestionController.java
deleted file mode 100644
index 271a97b..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdSecretQuestionController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.wrj.driver.server.controller;
-
-import com.wrj.driver.server.dto.SecretQueryDto;
-import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdSecretQuestionService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/tdSecretQuestion")
-@Slf4j
-public class TdSecretQuestionController {
-
- @Resource
- private ITdSecretQuestionService secretQuestionService;
-
- //查询
- @PostMapping("/querySecretQuestionIds")
- public BaseResponse querySecretQuestionIds(@RequestBody SecretQueryDto queryDto) {
- log.info("获取密卷明细ids======>queryDto:{}", queryDto);
- return BaseResponse.success(secretQuestionService.querySecretQuestionIds(queryDto));
- }
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdSysUserMemberController.java b/src/main/java/com/wrj/driver/server/controller/TdSysUserMemberController.java
deleted file mode 100644
index d5a49ae..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdSysUserMemberController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.wrj.driver.server.dto.MemberQueryDto;
-import com.wrj.driver.server.dto.UserMemberDto;
-import com.wrj.driver.server.entity.TdMember;
-import com.wrj.driver.server.entity.TdSysUser;
-import com.wrj.driver.server.entity.TdSysUserMember;
-import com.wrj.driver.server.service.ITdCarService;
-import com.wrj.driver.server.service.ITdMemberService;
-import com.wrj.driver.server.service.ITdSysUserMemberService;
-import com.wrj.driver.server.service.ITdSysUserService;
-import com.wrj.driver.server.vo.UserMemberVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * 用户会员表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@RestController
-@RequestMapping("/tdSysUserMember")
-@Slf4j
-@Api(tags = "用户会员")
-public class TdSysUserMemberController {
-
- @Resource
- private ITdMemberService memberService;
- @Resource
- private ITdSysUserMemberService userMemberService;
- @Resource
- private ITdCarService tdCarService;
- @Resource
- private ITdSysUserService userService;
-
-
- /**
- * 查询会员列表
- * */
- @ApiOperation("查询车型列表")
- @GetMapping("/duima/car/list")
- public Map getCarList(){
- Map result = new HashMap<>();
- result.put("code", 200);
- result.put("data", tdCarService.list());
- return result;
- }
-
-
- /**
- * 查询会员列表
- * */
- @ApiOperation("查询会员类型列表")
- @GetMapping("/duima/member/list")
- public Map getMemberList(MemberQueryDto memberQueryDto){
- Map result = new HashMap<>();
- result.put("code", 200);
- result.put("data", memberService.queryMember(memberQueryDto));
- return result;
- }
-
- //查询用户会员列表
- @ApiOperation("查询会员用户列表")
- @GetMapping("/duima/user/member/list")
- public Map getUserMemberList(UserMemberDto userMemberDto){
- Map result = new HashMap<>();
- result.put("code", 200);
- result.put("data", userMemberService.queryUserMemberList(userMemberDto));
- return result;
- }
-
-
- //新增会员
-
- @ApiOperation("新增用户会员")
- @PostMapping("/duima/user/member")
- public Map addUserMember(@RequestBody UserMemberVo userMemberVo){
- Map result = new HashMap<>();
-
- final LocalDateTime nowTime = LocalDateTime.now();
-
- //跟进手机号查询用户
- LambdaQueryWrapper cond = new LambdaQueryWrapper()
- .eq(TdSysUser::getPhone,userMemberVo.getPhone());
- TdSysUser user = userService.getOne(cond);
- if(user == null){
- result.put("code", 500);
- result.put("msg", "用户不存在");
- return result;
- }
- //查询会员信息
- TdMember member = memberService.getById(userMemberVo.getMemberId());
- if (member == null){
- result.put("code", 500);
- result.put("msg", "会员信息不存在");
- return result;
- }
-
-
- TdSysUserMember userMember = new TdSysUserMember()
- .setMemberId(userMemberVo.getMemberId())
- .setUserId(user.getUserId())
- .setCreateTime(nowTime)
- .setUpdateTime(nowTime)
- .setStartDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN));
- //会员有效期
- if ("1".equals(member.getUnit())){
- //日
- userMember.setEndDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusDays(member.getDuration()).minusSeconds(1));
- } else if ("2".equals(member.getUnit())){
- //月
- userMember.setEndDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusMonths(member.getDuration()).minusSeconds(1));
- } else if ("3".equals(member.getUnit())){
- //年
- userMember.setEndDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusYears(member.getDuration()).minusSeconds(1));
- }
- result.put("code", 200);
- result.put("data", userMemberService.saveOrUpdate(userMember));
- return result;
- }
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdTenantCarController.java b/src/main/java/com/wrj/driver/server/controller/TdTenantCarController.java
deleted file mode 100644
index bbc7d15..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdTenantCarController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.wrj.driver.server.controller;
-
-import com.wrj.driver.server.interceptor.TenantContextHolder;
-import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdTenantCarService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@Api(tags = "租户车型")
-@RequestMapping("/tdTenantCar")
-@Slf4j
-public class TdTenantCarController {
-
- @Resource
- private ITdTenantCarService tdTenantCarService;
-
- //查询租户车型信息
- @ApiOperation("查询租户车型信息")
- @PostMapping("/list")
- public BaseResponse queryList() {
- log.info("获取租户车型信息======>tenantId:{}", TenantContextHolder.getTenantId());
- return BaseResponse.success(tdTenantCarService.queryList(TenantContextHolder.getTenantId()));
- }
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdTrafficSignCategoryController.java b/src/main/java/com/wrj/driver/server/controller/TdTrafficSignCategoryController.java
deleted file mode 100644
index 9bf7223..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdTrafficSignCategoryController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 图标分类表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//tdTrafficSignCategory")
-public class TdTrafficSignCategoryController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdTrafficSignQuestionController.java b/src/main/java/com/wrj/driver/server/controller/TdTrafficSignQuestionController.java
deleted file mode 100644
index e8f993e..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdTrafficSignQuestionController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 图标分类相关题目表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@Controller
-@RequestMapping("//tdTrafficSignQuestion")
-public class TdTrafficSignQuestionController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdVideosController.java b/src/main/java/com/wrj/driver/server/controller/TdVideosController.java
deleted file mode 100644
index fd5b1fd..0000000
--- a/src/main/java/com/wrj/driver/server/controller/TdVideosController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 视频标识表; 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-20
- */
-@Controller
-@RequestMapping("//tdVideos")
-public class TdVideosController {
-
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/VoiceController.java b/src/main/java/com/wrj/driver/server/controller/VoiceController.java
deleted file mode 100644
index 43a1a38..0000000
--- a/src/main/java/com/wrj/driver/server/controller/VoiceController.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.wrj.driver.server.controller;
-
-
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.sound.sampled.*;
-import java.io.File;
-import java.io.IOException;
-
-/**
- *
- * 支付表 前端控制器
- *
- *
- * @author Automated procedures
- * @since 2023-08-10
- */
-@RestController
-@RequestMapping("/voice")
-@Slf4j
-public class VoiceController {
- @ApiOperation("文字转语音")
- @GetMapping("/contentToAudio")
- public void contentToAudio(@RequestParam String content) {
- log.info("文字转语音======>content:{}", content);
- final AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
-
- DataLine.Info dataLineInfo = new DataLine.Info(TargetDataLine.class, format);
-
- if (!AudioSystem.isLineSupported(dataLineInfo)) {
- return;
- }
-
- TargetDataLine targetDataLine;
- try {
- targetDataLine = (TargetDataLine) AudioSystem.getLine(dataLineInfo);
- targetDataLine.open(format);
- targetDataLine.start();
-
- // Record audio
- AudioInputStream audioInputStream = new AudioInputStream(targetDataLine);
-
- // Save audio to file
- File audioFile = new File("recorded_audio.wav");
- AudioSystem.write(audioInputStream, AudioFileFormat.Type.WAVE, audioFile);
- targetDataLine.close();
- } catch (LineUnavailableException | IOException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdChapterController.java b/src/main/java/com/wrj/driver/server/controller/WrjChapterController.java
similarity index 69%
rename from src/main/java/com/wrj/driver/server/controller/TdChapterController.java
rename to src/main/java/com/wrj/driver/server/controller/WrjChapterController.java
index 188add7..cf33094 100644
--- a/src/main/java/com/wrj/driver/server/controller/TdChapterController.java
+++ b/src/main/java/com/wrj/driver/server/controller/WrjChapterController.java
@@ -3,7 +3,7 @@ package com.wrj.driver.server.controller;
import com.wrj.driver.server.dto.ChapterQueryDto;
import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdChapterService;
+import com.wrj.driver.server.service.IWrjChapterService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -20,18 +20,18 @@ import org.springframework.web.bind.annotation.*;
*/
@Api(tags = "章节")
@RestController
-@RequestMapping("/tdChapter")
+@RequestMapping("/wrjChapter")
@Slf4j
-public class TdChapterController {
+public class WrjChapterController {
@Autowired
- private ITdChapterService tdChapterService;
+ private IWrjChapterService wrjChapterService;
- @ApiOperation("根据车型和科目查询章节")
+ @ApiOperation("根据驾驶员类型查询章节")
@PostMapping("/queryChapter")
public BaseResponse queryChapter(@RequestBody ChapterQueryDto queryDto) {
log.info("获取章节======>queryDto:{}", queryDto);
- return BaseResponse.success(tdChapterService.queryChapter(queryDto));
+ return BaseResponse.success(wrjChapterService.queryChapter(queryDto));
}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdCarController.java b/src/main/java/com/wrj/driver/server/controller/WrjDriverTypeController.java
similarity index 60%
rename from src/main/java/com/wrj/driver/server/controller/TdCarController.java
rename to src/main/java/com/wrj/driver/server/controller/WrjDriverTypeController.java
index b8950ec..205e665 100644
--- a/src/main/java/com/wrj/driver/server/controller/TdCarController.java
+++ b/src/main/java/com/wrj/driver/server/controller/WrjDriverTypeController.java
@@ -2,9 +2,9 @@ package com.wrj.driver.server.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.wrj.driver.server.entity.TdCar;
+import com.wrj.driver.server.entity.WrjDriverType;
import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdCarService;
+import com.wrj.driver.server.service.IWrjDriverTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -22,20 +22,20 @@ import org.springframework.web.bind.annotation.RestController;
* @author Automated procedures
* @since 2023-08-10
*/
-@Api(tags = "车型")
+@Api(tags = "无人记驾驶员类型")
@RestController
-@RequestMapping("/tdCar")
+@RequestMapping("/wrjDriverType")
@Slf4j
-public class TdCarController {
+public class WrjDriverTypeController {
@Autowired
- private ITdCarService carService;
+ private IWrjDriverTypeService driverTypeService;
- @ApiOperation("获取车型列表")
+ @ApiOperation("获取无人机驾驶员类型列表")
@GetMapping("/list")
public BaseResponse list() {
- return BaseResponse.success(carService.list(new LambdaQueryWrapper()
- .eq(TdCar::getIsActive, "0")));
+ return BaseResponse.success(driverTypeService.list(new LambdaQueryWrapper()
+ .eq(WrjDriverType::getIsActive, "0")));
}
}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdQuestionController.java b/src/main/java/com/wrj/driver/server/controller/WrjQuestionController.java
similarity index 65%
rename from src/main/java/com/wrj/driver/server/controller/TdQuestionController.java
rename to src/main/java/com/wrj/driver/server/controller/WrjQuestionController.java
index 1c3adbc..f5ae0f7 100644
--- a/src/main/java/com/wrj/driver/server/controller/TdQuestionController.java
+++ b/src/main/java/com/wrj/driver/server/controller/WrjQuestionController.java
@@ -6,7 +6,7 @@ import com.wrj.driver.server.dto.QuestionAddDto;
import com.wrj.driver.server.dto.QuestionQueryDto;
import com.wrj.driver.server.exception.BusinessException;
import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdQuestionService;
+import com.wrj.driver.server.service.IWrjQuestionService;
import com.wrj.driver.server.vo.QuestionVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -30,74 +30,55 @@ import java.util.Objects;
*/
@Api(tags = "考试题库")
@RestController
-@RequestMapping("/tdQuestion")
+@RequestMapping("/wrjQuestion")
@Slf4j
-public class TdQuestionController {
+public class WrjQuestionController {
@Autowired
- private ITdQuestionService tdQuestionService;
+ private IWrjQuestionService questionService;
@ApiOperation("根据id获取题目")
@PostMapping("/queryQuestionById")
public BaseResponse queryQuestionById(@RequestBody QuestionQueryDto queryDto) {
log.info("获取题型======>queryDto:{}", queryDto);
- return BaseResponse.success(tdQuestionService.queryQuestionById(queryDto));
+ return BaseResponse.success(questionService.queryQuestionById(queryDto));
}
@ApiOperation("根据id列表获取题目")
@PostMapping("/queryQuestionByIdList")
public BaseResponse queryQuestionByIdList(@RequestBody QuestionQueryDto queryDto) {
log.info("获取题型======>queryDto:{}", queryDto);
- return BaseResponse.success(tdQuestionService.queryQuestionByIdList(queryDto));
+ return BaseResponse.success(questionService.queryQuestionByIdList(queryDto));
}
@ApiOperation("根据查询条件获取题目")
@PostMapping("/queryQuestion")
public BaseResponse queryQuestion(@RequestBody QuestionQueryDto queryDto) {
log.info("根据查询条件获取题目======>queryDto:{}", queryDto);
- return BaseResponse.success(tdQuestionService.queryQuestion(queryDto));
+ return BaseResponse.success(questionService.queryQuestion(queryDto));
}
@ApiOperation("根据查询条件获取题目Id")
@PostMapping("/queryQuestionId")
public BaseResponse queryQuestionId(@RequestBody QuestionQueryDto queryDto) {
log.info("根据查询条件获取题目Id======>queryDto:{}", queryDto);
- return BaseResponse.success(tdQuestionService.queryQuestionId(queryDto));
+ return BaseResponse.success(questionService.queryQuestionId(queryDto));
}
@ApiOperation("获取模拟考试题目")
@PostMapping("/getTestQuestion")
public BaseResponse getTestQuestion(@RequestBody QuestionQueryDto queryDto) {
log.info("获取模拟考试题目======>queryDto:{}", queryDto);
- if (Objects.isNull(queryDto.getCarTypeId()) && Objects.isNull(queryDto.getSubject())){
- throw new BusinessException("缺少必要参数");
- }
- return BaseResponse.success(tdQuestionService.getTestQuestion(queryDto));
+ return BaseResponse.success(questionService.getTestQuestion(queryDto));
}
@ApiOperation("获取模拟考试题目Id")
@PostMapping("/getTestQuestionId")
public BaseResponse getTestQuestionId(@RequestBody QuestionQueryDto queryDto) {
log.info("根据查询条件获取题目Id======>queryDto:{}", queryDto);
- return BaseResponse.success(tdQuestionService.getTestQuestionId(queryDto));
+ return BaseResponse.success(questionService.getTestQuestionId(queryDto));
}
-// @ApiOperation("获取资格证模拟考试题目Id")
-// @PostMapping("/zgz/getTestQuestionId")
-// public BaseResponse getZgzTestQuestionId(@RequestBody QuestionQueryDto queryDto) {
-// log.info("根据查询条件获取题目Id======>queryDto:{}", queryDto);
-// return BaseResponse.success(tdQuestionService.getTestQuestionId(queryDto));
-// }
-
- @ApiOperation("题目分类")
- @PostMapping("/questionCategory")
- public BaseResponse questionCategory(@RequestBody QuestionQueryDto queryDto) {
- log.info("分类题目标识======>questionIdList:{}", queryDto.getQuestionIdList());
- if (CollectionUtil.isEmpty(queryDto.getQuestionIdList())){
- return BaseResponse.success(Collections.emptyList());
- }
- return BaseResponse.success(tdQuestionService.questionCategory(queryDto));
- }
@ApiOperation("对嘛接口-根据查询条件获取题目")
@GetMapping("/duima/list")
@@ -105,7 +86,7 @@ public class TdQuestionController {
log.info("获取题型======>queryDto:{}", queryDto);
Map result = new HashMap<>();
result.put("code", 200);
- result.put("data", tdQuestionService.queryQuestion(queryDto));
+ result.put("data", questionService.queryQuestion(queryDto));
return result;
}
@@ -115,7 +96,7 @@ public class TdQuestionController {
log.info("修改题库======>questionVo:{}", questionVo);
Map result = new HashMap<>();
result.put("code", 200);
- result.put("data", tdQuestionService.updateQuestion(questionVo));
+ result.put("data", questionService.updateQuestion(questionVo));
return result;
}
@@ -125,7 +106,7 @@ public class TdQuestionController {
log.info("新增题库======>QuestionAddDto:{}", addDto);
Map result = new HashMap<>();
result.put("code", 200);
- result.put("data", tdQuestionService.insertQuestion(addDto));
+ result.put("data", questionService.insertQuestion(addDto));
return result;
}
@@ -133,7 +114,7 @@ public class TdQuestionController {
@PostMapping("/querySpecialNum")
public BaseResponse querySpecialNum(@RequestBody QuestionQueryDto queryDto) {
log.info("查询各专项分类题目数量======>queryDto:{}", queryDto);
- return BaseResponse.success(tdQuestionService.querySpecialNum(queryDto));
+ return BaseResponse.success(questionService.querySpecialNum(queryDto));
}
}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdQuestionTestController.java b/src/main/java/com/wrj/driver/server/controller/WrjQuestionTestController.java
similarity index 70%
rename from src/main/java/com/wrj/driver/server/controller/TdQuestionTestController.java
rename to src/main/java/com/wrj/driver/server/controller/WrjQuestionTestController.java
index a4411b1..3545201 100644
--- a/src/main/java/com/wrj/driver/server/controller/TdQuestionTestController.java
+++ b/src/main/java/com/wrj/driver/server/controller/WrjQuestionTestController.java
@@ -4,9 +4,8 @@ package com.wrj.driver.server.controller;
import com.wrj.driver.server.constant.Constants;
import com.wrj.driver.server.dto.TestQueryDto;
import com.wrj.driver.server.dto.TestSubmitDto;
-import com.wrj.driver.server.interceptor.TenantContextHolder;
import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdQuestionTestService;
+import com.wrj.driver.server.service.IWrjQuestionTestService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -25,18 +24,17 @@ import javax.validation.Valid;
*/
@Api(tags = "考试")
@RestController
-@RequestMapping("/tdQuestionTest")
+@RequestMapping("/wrjQuestionTest")
@Slf4j
-public class TdQuestionTestController {
+public class WrjQuestionTestController {
@Autowired
- private ITdQuestionTestService testService;
+ private IWrjQuestionTestService testService;
@ApiOperation("提交考试成绩")
@PostMapping("/testSubmit")
public BaseResponse testSubmit(@RequestBody @Valid TestSubmitDto submitDto) {
log.info("考试成绩======>submitDto:{}", submitDto);
- submitDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId());
return testService.testSubmit(submitDto);
}
@@ -44,7 +42,6 @@ public class TdQuestionTestController {
@PostMapping("/testTotal")
public BaseResponse testTotal(@RequestBody @Valid TestQueryDto queryDto) {
log.info("考试统计查询======>queryDto:{}", queryDto);
- queryDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId());
return BaseResponse.success(testService.testTotal(queryDto));
}
@@ -52,7 +49,6 @@ public class TdQuestionTestController {
@PostMapping("/getTestScore")
public BaseResponse getTestScore(@RequestBody @Valid TestQueryDto queryDto) {
log.info("获取考试成绩======>queryDto:{}", queryDto);
- queryDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId());
return BaseResponse.success(testService.getTestScore(queryDto));
}
}
diff --git a/src/main/java/com/wrj/driver/server/controller/TdSysConfigController.java b/src/main/java/com/wrj/driver/server/controller/WrjSysConfigController.java
similarity index 53%
rename from src/main/java/com/wrj/driver/server/controller/TdSysConfigController.java
rename to src/main/java/com/wrj/driver/server/controller/WrjSysConfigController.java
index 1180519..3fcfcc5 100644
--- a/src/main/java/com/wrj/driver/server/controller/TdSysConfigController.java
+++ b/src/main/java/com/wrj/driver/server/controller/WrjSysConfigController.java
@@ -2,9 +2,9 @@ package com.wrj.driver.server.controller;
import com.wrj.driver.server.dto.SysConfigDto;
-import com.wrj.driver.server.entity.TdSysConfig;
+import com.wrj.driver.server.entity.WrjSysConfig;
import com.wrj.driver.server.response.BaseResponse;
-import com.wrj.driver.server.service.ITdSysConfigService;
+import com.wrj.driver.server.service.IWrjSysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -24,40 +24,40 @@ import java.util.Map;
*/
@Api(tags = "字典值配置")
@RestController
-@RequestMapping("/tdSysConfig")
+@RequestMapping("/wrjSysConfig")
@Slf4j
-public class TdSysConfigController {
+public class WrjSysConfigController {
@Autowired
- private ITdSysConfigService configService;
+ private IWrjSysConfigService configService;
/**
- * 根据配置key和carTypeId获取配置信息,配置与车型无关则carTypeId为-1
+ * 根据配置key和driverTypeId获取配置信息,配置与无人机无关则driverTypeId为-1
*/
- @ApiOperation("根据配置key和carTypeId获取配置信息,配置与车型无关则carTypeId为-1")
+ @ApiOperation("根据配置key和driverTypeId获取配置信息,配置与无人机无关则driverTypeId为-1")
@GetMapping(value = "/queryConfigByKey")
- public BaseResponse queryConfigByKey(@RequestParam("configKey") String configKey, @RequestParam("carTypeId") Integer carTypeId) {
- return BaseResponse.success(configService.queryConfigByKey(configKey, carTypeId));
+ public BaseResponse queryConfigByKey(@RequestParam("configKey") String configKey, @RequestParam("driverTypeId") Integer driverTypeId) {
+ return BaseResponse.success(configService.queryConfigByKey(configKey, driverTypeId));
}
/**
- * 根据配置key和carTypeId获取配置值,配置与车型无关则carTypeId为-1
+ * 根据配置key和driverTypeId获取配置信息,配置与无人机无关则driverTypeId为-1
*/
@ApiOperation("根据配置key获取配置值")
@GetMapping(value = "/queryConfigValueByKey")
- public BaseResponse queryConfigValueByKey(@RequestParam("configKey") String configKey, @RequestParam("carTypeId") Integer carTypeId) {
+ public BaseResponse queryConfigValueByKey(@RequestParam("configKey") String configKey, @RequestParam("driverTypeId") Integer driverTypeId) {
- return BaseResponse.success(configService.queryConfigValueByKey(configKey, carTypeId));
+ return BaseResponse.success(configService.queryConfigValueByKey(configKey, driverTypeId));
}
/**
- * 根据配置keys和carTypeId获取配置信息,配置与车型无关则carTypeId为-1
+ * 根据配置keys和driverTypeId获取配置信息,配置与无人机无关则driverTypeId为-1
*/
- @ApiOperation("根据配置keys和carTypeId获取配置信息,配置与车型无关则carTypeId为-1")
+ @ApiOperation("根据配置keys和driverTypeId获取配置信息,配置与无人机无关则driverTypeId为-1")
@GetMapping(value = "/queryConfigByKeys")
- public BaseResponse