记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 78e95f57 authored by 张国柄's avatar 张国柄
Browse files
Options

Merge branch 'dev' into test

parents f2e11462 81b616f8
Hide whitespace changes
Inline Side-by-side
Showing with 379 additions and 305 deletions
liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/service/IDragonOrderRefundsService.java
View file @ 78e95f57
...@@ -22,6 +22,6 @@ public interface IDragonOrderRefundsService { ...@@ -22,6 +22,6 @@ public interface IDragonOrderRefundsService {
String wePayRefundCallBack(HttpServletRequest request , HttpServletResponse response); String wePayRefundCallBack(HttpServletRequest request , HttpServletResponse response);
String aliPayRefundCodeStatus(String outTradeNo ,String tradeNo ,String outBizNo,String callBackUrl);
} }
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/RefundController.java
View file @ 78e95f57
...@@ -46,4 +46,16 @@ public class RefundController { ...@@ -46,4 +46,16 @@ public class RefundController {
return orderRefundsService.wePayRefundCallBack(request, response); return orderRefundsService.wePayRefundCallBack(request, response);
} }
@PostMapping("refund/alipay/result")
@ApiOperation("支付宝查询退款结果")
@ApiResponse(code = 200, message = "接口返回对象参数")
public String refundSingle(
@RequestParam(value = "orderCode") String orderCode,
@RequestParam(value = "paymentId") String paymentId,
@RequestParam(value = "orderRefundCode") String orderRefundCode,
@RequestParam(value = "callBackUrl") String callBackUrl) {
return orderRefundsService.aliPayRefundCodeStatus(orderCode, paymentId, orderRefundCode, callBackUrl);
}
} }
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java
View file @ 78e95f57
...@@ -384,7 +384,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService ...@@ -384,7 +384,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
dto.setRefundAt(refundAt); dto.setRefundAt(refundAt);
dto.setRefundError(callBackDto.getReturnMsg()); dto.setRefundError(callBackDto.getReturnMsg());
log.debug("SEND WEPAY NOTIFTURL = " + JSON.toJSONString(dto)); log.debug("SEND WEPAY NOTIFTURL = " + JSON.toJSONString(dto));
sendNotifyUrl(dto); sendNotifyUrl(dto,null);
mqHandleUtil.sendMySqlRedis( mqHandleUtil.sendMySqlRedis(
SqlMapping.get("dragon_order_refund_log.insert"), SqlMapping.get("dragon_order_refund_log.insert"),
...@@ -412,6 +412,63 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService ...@@ -412,6 +412,63 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
} }
} }
@Override
public String aliPayRefundCodeStatus(String outTradeNo, String tradeNo, String outBizNo,String callBackUrl) {
try {
LocalDateTime nowTime = LocalDateTime.now();
AlipayTradeFastpayRefundQueryRequest request = new AlipayTradeFastpayRefundQueryRequest();//创建API对应的request类
request.setBizContent("{" +
"\"out_trade_no\":\"" + outTradeNo + "\"," +
"\"trade_no\":\"" + tradeNo + "\"," +
"\"out_request_no\":\"" + outBizNo + "\"}"); //设置业务参数
AlipayTradeFastpayRefundQueryResponse response = PayAlipayUtils.getInstance().getHttpClient().execute(request);
log.info("AlipayTradeFastpayRefundQueryRequest -> data = " + JSON.toJSONString(response));
if (response.isSuccess()) {
try {
NotifyUrlDto dto = new NotifyUrlDto();
if (response.getMsg().equalsIgnoreCase("SUCCESS")) {
dto.setStatus(1);
} else {
dto.setStatus(0);
}
dto.setOrderRefundCode(response.getOutRequestNo());
dto.setRefundCode(response.getOutTradeNo());
dto.setRefundPrice(response.getRefundAmount());
dto.setRefundAt(DateUtil.format(response.getGmtRefundPay(), DateUtil.Formatter.yyyyMMddHHmmss));
dto.setRefundPrice(response.getRefundAmount());
dto.setRefundError("");
sendNotifyUrl(dto,callBackUrl);
mqHandleUtil.sendMySqlRedis(
SqlMapping.get("dragon_order_refund_log.insert"),
new Object[]{outBizNo, "ALIPAY", JSON.toJSONString(response), nowTime, nowTime},
DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode()
);
mqHandleUtil.sendMySqlRedis(
SqlMapping.get("dragon_order_refund_success.update"),
new Object[]{nowTime, DateUtil.format(response.getGmtRefundPay(), DateUtil.Formatter.yyyyMMddHHmmss), DragonConstant.RefundStatusEnum.STATUS_REFUNDED.getCode(), response.getOutRequestNo()},
DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode()
);
return "success";
} catch (Exception e) {
e.printStackTrace();
log.error("");
return "fail";
}
} else {
log.error("response.isSuccess() -> fail ");
return "fail";
}
}catch (Exception e){
}
return null;
}
public String aliPayRefundCallBack(String jsonStr) { public String aliPayRefundCallBack(String jsonStr) {
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
try { try {
...@@ -426,7 +483,6 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService ...@@ -426,7 +483,6 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
if (response.isSuccess()) { if (response.isSuccess()) {
try { try {
NotifyUrlDto dto = new NotifyUrlDto(); NotifyUrlDto dto = new NotifyUrlDto();
if (response.getMsg().equalsIgnoreCase("SUCCESS")) { if (response.getMsg().equalsIgnoreCase("SUCCESS")) {
dto.setStatus(1); dto.setStatus(1);
...@@ -440,7 +496,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService ...@@ -440,7 +496,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
dto.setRefundPrice(response.getRefundAmount()); dto.setRefundPrice(response.getRefundAmount());
dto.setRefundError(""); dto.setRefundError("");
log.debug("SEND ALIPAY NOTIFTURL = " + JSON.toJSONString(dto)); log.debug("SEND ALIPAY NOTIFTURL = " + JSON.toJSONString(dto));
sendNotifyUrl(dto); sendNotifyUrl(dto,null);
mqHandleUtil.sendMySqlRedis( mqHandleUtil.sendMySqlRedis(
SqlMapping.get("dragon_order_refund_log.insert"), SqlMapping.get("dragon_order_refund_log.insert"),
...@@ -471,7 +527,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService ...@@ -471,7 +527,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
} }
} }
private void sendNotifyUrl(NotifyUrlDto notifyUrlDto) { private void sendNotifyUrl(NotifyUrlDto notifyUrlDto,String url) {
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
MultiValueMap<String, String> params = new LinkedMultiValueMap(); MultiValueMap<String, String> params = new LinkedMultiValueMap();
params.add("orderRefundCode", notifyUrlDto.getOrderRefundCode()); params.add("orderRefundCode", notifyUrlDto.getOrderRefundCode());
...@@ -480,8 +536,8 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService ...@@ -480,8 +536,8 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
params.add("refundError", notifyUrlDto.getRefundError()); params.add("refundError", notifyUrlDto.getRefundError());
params.add("refundPrice", notifyUrlDto.getRefundPrice()); params.add("refundPrice", notifyUrlDto.getRefundPrice());
params.add("status", notifyUrlDto.getStatus().toString()); params.add("status", notifyUrlDto.getStatus().toString());
String response = HttpUtil.post(dataUtils.getRefundNotifyUrl(DragonConstant.REFUND_REDIS_KET + notifyUrlDto.getOrderRefundCode()), params); String response = HttpUtil.post(url==null?dataUtils.getRefundNotifyUrl(DragonConstant.REFUND_REDIS_KET + notifyUrlDto.getOrderRefundCode()):url, params);
log.debug("RETURN RESPONSE=" + response); log.info("RETURN RESPONSE=" + response);
if (response.equals("success")) { if (response.equals("success")) {
mqHandleUtil.sendMySqlRedis( mqHandleUtil.sendMySqlRedis(
SqlMapping.get("dragon_order_refund_call_back.update"), SqlMapping.get("dragon_order_refund_call_back.update"),
...@@ -496,4 +552,5 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService ...@@ -496,4 +552,5 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
); );
} }
} }
} }
liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java
View file @ 78e95f57
...@@ -412,6 +412,11 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService ...@@ -412,6 +412,11 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
} }
} }
@Override
public String aliPayRefundCodeStatus(String outTradeNo, String tradeNo, String outBizNo,String callBackUrl) {
return null;
}
public String aliPayRefundCallBack(String jsonStr) { public String aliPayRefundCallBack(String jsonStr) {
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
try { try {
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/adam/PlatformDMController.java
View file @ 78e95f57
//package com.liquidnet.service.platform.controller.adam; package com.liquidnet.service.platform.controller.adam;
//
//import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
//import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
//import com.liquidnet.common.exception.LiquidnetServiceException; import com.liquidnet.common.exception.LiquidnetServiceException;
//import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
//import com.liquidnet.service.platform.service.impl.adam.dm.processor.*; import com.liquidnet.service.platform.service.impl.adam.dm.processor.*;
//import io.swagger.annotations.Api; import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
//import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
//import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
//import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
//import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
//import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
//
//import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
//import java.time.LocalDateTime; import java.time.LocalDateTime;
//import java.time.temporal.ChronoField; import java.time.temporal.ChronoField;
//import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
//import java.util.concurrent.Executors; import java.util.concurrent.Executors;
//import java.util.regex.Pattern; import java.util.regex.Pattern;
//
//@ApiSupport(order = 90062) @ApiSupport(order = 90062)
//@Api(tags = "DM") @Api(tags = "DM")
//@Slf4j @Slf4j
//@Validated @Validated
//@RestController @RestController
//@RequestMapping("dm") @RequestMapping("dm")
//public class PlatformDMController { public class PlatformDMController {
// @Autowired @Autowired
// DMUserInformationProcessor dmUserInformationProcessor; DMUserInformationProcessor dmUserInformationProcessor;
// @Autowired @Autowired
// DMThirdPartsProcessor dmThirdPartsProcessor; DMThirdPartsProcessor dmThirdPartsProcessor;
// @Autowired @Autowired
// DMRealNameProcessor dmRealNameProcessor; DMRealNameProcessor dmRealNameProcessor;
// @Autowired @Autowired
// DMUserMemberProcessor dmUserMemberProcessor; DMUserMemberProcessor dmUserMemberProcessor;
// @Autowired @Autowired
// DMEntersProcessor dmEntersProcessor; DMEntersProcessor dmEntersProcessor;
// @Autowired @Autowired
// DMAddressesProcessor dmAddressesProcessor; DMAddressesProcessor dmAddressesProcessor;
// @Autowired @Autowired
// DMTracesInfoProcessor dmTracesInfoProcessor; DMTracesInfoProcessor dmTracesInfoProcessor;
// @Autowired @Autowired
// DMMemberOrderProcessor dmMemberOrderProcessor; DMMemberOrderProcessor dmMemberOrderProcessor;
// @Autowired @Autowired
// DMMemberCodeProcessor dmMemberCodeProcessor; DMMemberCodeProcessor dmMemberCodeProcessor;
// @Autowired @Autowired
// DMCollectionProcessor dmCollectionProcessor; DMCollectionProcessor dmCollectionProcessor;
//
// @ModelAttribute @ModelAttribute
// public void accessExecuting(HttpServletRequest request) { public void accessExecuting(HttpServletRequest request) {
// String alis = request.getHeader("alis"); String alis = request.getHeader("alis");
// LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
// int hour = now.get(ChronoField.HOUR_OF_DAY), minute = now.getMinute(), dom = now.get(ChronoField.DAY_OF_MONTH);; int hour = now.get(ChronoField.HOUR_OF_DAY), minute = now.getMinute(), dom = now.get(ChronoField.DAY_OF_MONTH);;
// String lns = "^(" + (dom % 10) + hour % (minute / 10 + 1) + "[A-Z]{2})" + minute / 10 + "[0-9]{1}$"; String lns = "^(" + (dom % 10) + hour % (minute / 10 + 1) + "[A-Z]{2})" + minute / 10 + "[0-9]{1}$";
// log.info("lns:{},alis:{}", lns, alis); log.info("lns:{},alis:{}", lns, alis);
// if (StringUtils.isEmpty(alis) || !Pattern.matches(lns, alis)) { if (StringUtils.isEmpty(alis) || !Pattern.matches(lns, alis)) {
// throw new LiquidnetServiceException("44444", "非法操作"); throw new LiquidnetServiceException("44444", "非法操作");
// } }
// log.info("uri:[{}],Parameter:{}", request.getRequestURI(), request.getParameterMap()); log.info("uri:[{}],Parameter:{}", request.getRequestURI(), request.getParameterMap());
// } }
//
// @ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
// @ApiOperation(value = "T - user") @ApiOperation(value = "T - user")
// @ApiImplicitParams({ @ApiImplicitParams({
// @ApiImplicitParam(type = "form", name = "dG", example = "220"), @ApiImplicitParam(type = "form", name = "dG", example = "220"),
// }) })
// @GetMapping(value = {"user"}) @GetMapping(value = {"user"})
// public ResponseDto<Object> dataMigrationForUser(@RequestParam(required = false) Integer dG, public ResponseDto<Object> dataMigrationForUser(@RequestParam(required = false) Integer dG,
// @RequestParam(required = false) String incrDt, @RequestParam(required = false) String incrDt,
// @RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
// @RequestParam(required = false) String flu @RequestParam(required = false) String flu
// ) { ) {
// log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu); log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
// if (null != dG) { if (null != dG) {
// ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
// for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
// final int k = i; final int k = i;
// exec.execute(() -> { exec.execute(() -> {
// log.info("==================" + k); log.info("==================" + k);
// dmUserInformationProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : ""); dmUserInformationProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
// }); });
// try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
// } }
// exec.shutdown(); exec.shutdown();
// } else { } else {
// dmUserInformationProcessor.dataProcessing(null, null, incrDt, flg, flu); dmUserInformationProcessor.dataProcessing(null, null, incrDt, flg, flu);
// } }
// return ResponseDto.success(dG); return ResponseDto.success(dG);
// } }
//
// @ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
// @ApiOperation(value = "T - tpa") @ApiOperation(value = "T - tpa")
// @ApiImplicitParams({ @ApiImplicitParams({
// @ApiImplicitParam(type = "form", name = "dG", example = "45"), @ApiImplicitParam(type = "form", name = "dG", example = "45"),
// }) })
// @GetMapping(value = {"tpa"}) @GetMapping(value = {"tpa"})
// public ResponseDto<Object> dataMigrationForTpa(@RequestParam(required = false) Integer dG, public ResponseDto<Object> dataMigrationForTpa(@RequestParam(required = false) Integer dG,
// @RequestParam(required = false) String incrDt, @RequestParam(required = false) String incrDt,
// @RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
// @RequestParam(required = false) String flu @RequestParam(required = false) String flu
// ) { ) {
// if (null != dG) { if (null != dG) {
// ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
// for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
// final int k = i; final int k = i;
// exec.execute(() -> { exec.execute(() -> {
// log.info("==================" + k); log.info("==================" + k);
// dmThirdPartsProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : ""); dmThirdPartsProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
// }); });
// try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
// } }
// exec.shutdown(); exec.shutdown();
// } else { } else {
// dmThirdPartsProcessor.dataProcessing(null, null, incrDt, flg, flu); dmThirdPartsProcessor.dataProcessing(null, null, incrDt, flg, flu);
// } }
// return ResponseDto.success(dG); return ResponseDto.success(dG);
// } }
//
// @ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
// @ApiOperation(value = "T - real") @ApiOperation(value = "T - real")
// @ApiImplicitParams({ @ApiImplicitParams({
// @ApiImplicitParam(type = "form", name = "dG", example = "2"), @ApiImplicitParam(type = "form", name = "dG", example = "2"),
// }) })
// @GetMapping(value = {"real"}) @GetMapping(value = {"real"})
// public ResponseDto<Object> dataMigrationForReal(@RequestParam(required = false) Integer dG, public ResponseDto<Object> dataMigrationForReal(@RequestParam(required = false) Integer dG,
// @RequestParam(required = false) String incrDt, @RequestParam(required = false) String incrDt,
// @RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
// @RequestParam(required = false) String flu @RequestParam(required = false) String flu
// ) { ) {
// if (null != dG) { if (null != dG) {
// ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
// for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
// final int k = i; final int k = i;
// exec.execute(() -> { exec.execute(() -> {
// log.info("==================" + k); log.info("==================" + k);
// dmRealNameProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : ""); dmRealNameProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
// }); });
// try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
// } }
// exec.shutdown(); exec.shutdown();
// } else { } else {
// dmRealNameProcessor.dataProcessing(null, null, incrDt, flg, flu); dmRealNameProcessor.dataProcessing(null, null, incrDt, flg, flu);
// } }
// return ResponseDto.success(dG); return ResponseDto.success(dG);
// } }
//
// @ApiOperationSupport(order = 4) @ApiOperationSupport(order = 4)
// @ApiOperation(value = "T - collect") @ApiOperation(value = "T - collect")
// @ApiImplicitParams({ @ApiImplicitParams({
// @ApiImplicitParam(type = "form", name = "dG", example = "15"), @ApiImplicitParam(type = "form", name = "dG", example = "15"),
// }) })
// @GetMapping(value = {"collect"}) @GetMapping(value = {"collect"})
// public ResponseDto<Object> dataMigrationForCollect(@RequestParam(required = false) Integer dG, public ResponseDto<Object> dataMigrationForCollect(@RequestParam(required = false) Integer dG,
// @RequestParam(required = false) String incrDt, @RequestParam(required = false) String incrDt,
// @RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
// @RequestParam(required = false) String flu @RequestParam(required = false) String flu
// ) { ) {
// if (null != dG) { if (null != dG) {
// ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
// for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
// final int k = i; final int k = i;
// exec.execute(() -> { exec.execute(() -> {
// log.info("==================" + k); log.info("==================" + k);
// dmCollectionProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : ""); dmCollectionProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
// }); });
// try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
// } }
// exec.shutdown(); exec.shutdown();
// } else { } else {
// dmCollectionProcessor.dataProcessing(null, null, incrDt, flg, flu); dmCollectionProcessor.dataProcessing(null, null, incrDt, flg, flu);
// } }
// return ResponseDto.success(dG); return ResponseDto.success(dG);
// } }
//
// @ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
// @ApiOperation(value = "T - enters") @ApiOperation(value = "T - enters")
// @ApiImplicitParams({ @ApiImplicitParams({
// @ApiImplicitParam(type = "form", name = "dG", example = "93"), @ApiImplicitParam(type = "form", name = "dG", example = "93"),
// }) })
// @GetMapping(value = {"enters"}) @GetMapping(value = {"enters"})
// public ResponseDto<Object> dataMigrationForEnters(@RequestParam(required = false) Integer dG, public ResponseDto<Object> dataMigrationForEnters(@RequestParam(required = false) Integer dG,
// @RequestParam(required = false) String incrDt, @RequestParam(required = false) String incrDt,
// @RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
// @RequestParam(required = false) String flu @RequestParam(required = false) String flu
// ) { ) {
// if (null != dG) { if (null != dG) {
// ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
// for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
// final int k = i; final int k = i;
// exec.execute(() -> { exec.execute(() -> {
// log.info("==================" + k); log.info("==================" + k);
// dmEntersProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : ""); dmEntersProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
// }); });
// try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
// } }
// exec.shutdown(); exec.shutdown();
// } else { } else {
// dmEntersProcessor.dataProcessing(null, null, incrDt, flg, flu); dmEntersProcessor.dataProcessing(null, null, incrDt, flg, flu);
// } }
// return ResponseDto.success(dG); return ResponseDto.success(dG);
// } }
//
// @ApiOperationSupport(order = 6) @ApiOperationSupport(order = 6)
// @ApiOperation(value = "T - addr") @ApiOperation(value = "T - addr")
// @ApiImplicitParams({ @ApiImplicitParams({
// @ApiImplicitParam(type = "form", name = "dG", example = "27"), @ApiImplicitParam(type = "form", name = "dG", example = "27"),
// }) })
// @GetMapping(value = {"addr"}) @GetMapping(value = {"addr"})
// public ResponseDto<Object> dataMigrationForAddr(@RequestParam(required = false) Integer dG, public ResponseDto<Object> dataMigrationForAddr(@RequestParam(required = false) Integer dG,
// @RequestParam(required = false) String incrDt, @RequestParam(required = false) String incrDt,
// @RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
// @RequestParam(required = false) String flu @RequestParam(required = false) String flu
// ) { ) {
// if (null != dG) { if (null != dG) {
// ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
// for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
// final int k = i; final int k = i;
// exec.execute(() -> { exec.execute(() -> {
// log.info("==================" + k); log.info("==================" + k);
// dmAddressesProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : ""); dmAddressesProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
// }); });
// try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
// } }
// exec.shutdown(); exec.shutdown();
// } else { } else {
// dmAddressesProcessor.dataProcessing(null, null, incrDt, flg, flu); dmAddressesProcessor.dataProcessing(null, null, incrDt, flg, flu);
// } }
// return ResponseDto.success(dG); return ResponseDto.success(dG);
// } }
//
// @ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
// @ApiOperation(value = "T - vip") @ApiOperation(value = "T - vip")
// @ApiImplicitParams({ @ApiImplicitParams({
// @ApiImplicitParam(type = "form", name = "dG", example = "2"), @ApiImplicitParam(type = "form", name = "dG", example = "2"),
// }) })
// @GetMapping(value = {"vip"}) @GetMapping(value = {"vip"})
// public ResponseDto<Object> dataMigrationForVip(@RequestParam(required = false) Integer dG, public ResponseDto<Object> dataMigrationForVip(@RequestParam(required = false) Integer dG,
// @RequestParam(required = false) String incrDt, @RequestParam(required = false) String incrDt,
// @RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
// @RequestParam(required = false) String flu @RequestParam(required = false) String flu
// ) { ) {
// if (null != dG) { if (null != dG) {
// ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
// for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
// final int k = i; final int k = i;
// exec.execute(() -> { exec.execute(() -> {
// log.info("==================" + k); log.info("==================" + k);
// dmUserMemberProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : ""); dmUserMemberProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
// }); });
// try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
// } }
// exec.shutdown(); exec.shutdown();
// } else { } else {
// dmUserMemberProcessor.dataProcessing(null, null, incrDt, flg, flu); dmUserMemberProcessor.dataProcessing(null, null, incrDt, flg, flu);
// } }
// return ResponseDto.success(dG); return ResponseDto.success(dG);
// } }
//
// @ApiOperationSupport(order = 8) @ApiOperationSupport(order = 8)
// @ApiOperation(value = "morder") @ApiOperation(value = "morder")
// @GetMapping(value = {"morder"}) @GetMapping(value = {"morder"})
// public ResponseDto<Object> dataMigrationForMOrder(@RequestParam(required = false) Integer dG, public ResponseDto<Object> dataMigrationForMOrder(@RequestParam(required = false) Integer dG,
// @RequestParam(required = false) String incrDt, @RequestParam(required = false) String incrDt,
// @RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
// @RequestParam(required = false) String flu @RequestParam(required = false) String flu
// ) { ) {
// dmMemberOrderProcessor.dataProcessing(null, null, incrDt, flg, flu); dmMemberOrderProcessor.dataProcessing(null, null, incrDt, flg, flu);
// return ResponseDto.success(dG); return ResponseDto.success(dG);
// } }
//
// @ApiOperationSupport(order = 9) @ApiOperationSupport(order = 9)
// @ApiOperation(value = "mcode") @ApiOperation(value = "mcode")
// @GetMapping(value = {"mcode"}) @GetMapping(value = {"mcode"})
// public ResponseDto<Object> dataMigrationForMCode(@RequestParam(required = false) Integer dG, public ResponseDto<Object> dataMigrationForMCode(@RequestParam(required = false) Integer dG,
// @RequestParam(required = false) String incrDt, @RequestParam(required = false) String incrDt,
// @RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
// @RequestParam(required = false) String flu @RequestParam(required = false) String flu
// ) { ) {
// dmMemberCodeProcessor.dataProcessing(null, null, incrDt, flg, flu); dmMemberCodeProcessor.dataProcessing(null, null, incrDt, flg, flu);
// return ResponseDto.success(dG); return ResponseDto.success(dG);
// } }
//
// @ApiOperationSupport(order = 10) @ApiOperationSupport(order = 10)
// @ApiOperation(value = "traces") @ApiOperation(value = "traces")
// @GetMapping(value = {"traces"}) @GetMapping(value = {"traces"})
// public ResponseDto<Object> dataMigrationForTraces(@RequestParam(required = false) Integer dG, public ResponseDto<Object> dataMigrationForTraces(@RequestParam(required = false) Integer dG,
// @RequestParam(required = false) String incrDt, @RequestParam(required = false) String incrDt,
// @RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
// @RequestParam(required = false) String flu @RequestParam(required = false) String flu
// ) { ) {
// dmTracesInfoProcessor.dataProcessing(null, null, incrDt, flg, flu); dmTracesInfoProcessor.dataProcessing(null, null, incrDt, flg, flu);
// return ResponseDto.success(dG); return ResponseDto.success(dG);
// } }
//} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment