Your Name
2023-03-14 865cb1b3495e16b54fa44c3c695b70d14952f756
优化代码
3个文件已修改
45 ■■■■■ 已修改文件
springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyCommonChargeController.java 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyDingDingChargeController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyKeHangChargeController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyCommonChargeController.java
@@ -19,17 +19,17 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Base64;
/**
 * 通用充电桩 充电完成回调
 *
 * 主要用于测试 使用
 */
@RestController
@RequestMapping(path = "/app/charge")
public class NotifyCommonChargeController extends BaseController {
    private final static Logger logger = LoggerFactory.getLogger(NotifyCommonChargeController.class);
    public static final String DING_DING_DOMAIN = "DING_DING_CHARGE";
    public static final String DING_DING_APP_ID = "APP_ID";
    public static final String DING_DING_APP_SECURE = "APP_SECURE";
    @Autowired
    private INotifyChargeV1InnerServiceSMO notifyChargeV1InnerServiceSMOImpl;
@@ -39,42 +39,20 @@
     * @param request
     * @throws Exception
     */
    @RequestMapping(path = "/{id}/{port}/finish", method = RequestMethod.POST)
    @RequestMapping(path = "/finish", method = RequestMethod.POST)
    public ResponseEntity<String> finishCharge(
            @PathVariable String id,
            @PathVariable String port,
            @RequestBody String postInfo,
            HttpServletRequest request) {
        JSONObject param = JSONObject.parseObject(postInfo);
        NotifyChargeOrderDto notifyChargeOrderDto = new NotifyChargeOrderDto();
        notifyChargeOrderDto.setOrderId(param.getString("chargeId"));
        notifyChargeOrderDto.setMachineCode(id);
        notifyChargeOrderDto.setPortCode(port);
        notifyChargeOrderDto.setMachineCode(param.getString("machineCode"));
        notifyChargeOrderDto.setPortCode(param.getString("portCode"));
        notifyChargeOrderDto.setBodyParam(postInfo);
        notifyChargeOrderDto.setReason(param.getString("reason"));
        ResultVo resultVo = notifyChargeV1InnerServiceSMOImpl.finishCharge(notifyChargeOrderDto);
        return ResultVo.createResponseEntity(resultVo);
    }
    /**
     * <p>支付回调Api</p>
     *
     * @param request
     * @throws Exception
     */
    @RequestMapping(path = "/{id}/event", method = RequestMethod.POST)
    public ResponseEntity<String> heartbeat(
            @PathVariable String id,
            @RequestBody String postInfo,
            HttpServletRequest request) {
        NotifyChargeOrderDto notifyChargeOrderDto = new NotifyChargeOrderDto();
        notifyChargeOrderDto.setMachineCode(id);
        notifyChargeOrderDto.setBodyParam(postInfo);
        return notifyChargeV1InnerServiceSMOImpl.heartbeat(notifyChargeOrderDto);
    }
}
springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyDingDingChargeController.java
@@ -19,6 +19,9 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Base64;
/**
 * 叮叮充电桩 结束充电回调处理类
 */
@RestController
@RequestMapping(path = "/equipments")
public class NotifyDingDingChargeController extends BaseController {
springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyKeHangChargeController.java
@@ -19,6 +19,10 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Base64;
/**
 * 科航充电桩 充电完成回调
 *
 */
@RestController
@RequestMapping(path = "/app/charge/kehang")
public class NotifyKeHangChargeController extends BaseController {