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

Commit da223fcc authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/dev' into dev

parents bb64ab87 fbea2052
...@@ -60,6 +60,7 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -60,6 +60,7 @@ public class AdamDMAdminController extends AdamBaseController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
log.info("===dg:{},lS:{},incrDt:{},flg:{},flu:{}", dg, lS, incrDt, flg, flu);
if (null != dg) { if (null != dg) {
ExecutorService exec = Executors.newFixedThreadPool(lS); ExecutorService exec = Executors.newFixedThreadPool(lS);
for (int i = 0; i < dg; i++) { for (int i = 0; i < dg; i++) {
...@@ -89,6 +90,7 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -89,6 +90,7 @@ public class AdamDMAdminController extends AdamBaseController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
log.info("===dg:{},lS:{},incrDt:{},flg:{},flu:{}", dg, lS, incrDt, flg, flu);
if (null != dg) { if (null != dg) {
ExecutorService exec = Executors.newFixedThreadPool(lS); ExecutorService exec = Executors.newFixedThreadPool(lS);
for (int i = 0; i < dg; i++) { for (int i = 0; i < dg; i++) {
...@@ -118,6 +120,7 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -118,6 +120,7 @@ public class AdamDMAdminController extends AdamBaseController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
log.info("===dg:{},lS:{},incrDt:{},flg:{},flu:{}", dg, lS, incrDt, flg, flu);
if (null != dg) { if (null != dg) {
ExecutorService exec = Executors.newFixedThreadPool(lS); ExecutorService exec = Executors.newFixedThreadPool(lS);
for (int i = 0; i < dg; i++) { for (int i = 0; i < dg; i++) {
...@@ -147,6 +150,7 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -147,6 +150,7 @@ public class AdamDMAdminController extends AdamBaseController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
log.info("===dg:{},lS:{},incrDt:{},flg:{},flu:{}", dg, lS, incrDt, flg, flu);
if (null != dg) { if (null != dg) {
ExecutorService exec = Executors.newFixedThreadPool(lS); ExecutorService exec = Executors.newFixedThreadPool(lS);
for (int i = 0; i < dg; i++) { for (int i = 0; i < dg; i++) {
...@@ -176,6 +180,7 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -176,6 +180,7 @@ public class AdamDMAdminController extends AdamBaseController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
log.info("===dg:{},lS:{},incrDt:{},flg:{},flu:{}", dg, lS, incrDt, flg, flu);
if (null != dg) { if (null != dg) {
ExecutorService exec = Executors.newFixedThreadPool(lS); ExecutorService exec = Executors.newFixedThreadPool(lS);
for (int i = 0; i < dg; i++) { for (int i = 0; i < dg; i++) {
...@@ -205,6 +210,7 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -205,6 +210,7 @@ public class AdamDMAdminController extends AdamBaseController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
log.info("===dg:{},lS:{},incrDt:{},flg:{},flu:{}", dg, lS, incrDt, flg, flu);
if (null != dg) { if (null != dg) {
ExecutorService exec = Executors.newFixedThreadPool(lS); ExecutorService exec = Executors.newFixedThreadPool(lS);
for (int i = 0; i < dg; i++) { for (int i = 0; i < dg; i++) {
...@@ -234,6 +240,7 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -234,6 +240,7 @@ public class AdamDMAdminController extends AdamBaseController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
log.info("===dg:{},lS:{},incrDt:{},flg:{},flu:{}", dg, lS, incrDt, flg, flu);
if (null != dg) { if (null != dg) {
ExecutorService exec = Executors.newFixedThreadPool(lS); ExecutorService exec = Executors.newFixedThreadPool(lS);
for (int i = 0; i < dg; i++) { for (int i = 0; i < dg; i++) {
...@@ -259,6 +266,7 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -259,6 +266,7 @@ public class AdamDMAdminController extends AdamBaseController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
log.info("===dg:{},lS:{},incrDt:{},flg:{},flu:{}", dg, lS, incrDt, flg, flu);
dmMemberOrderProcessor.dataProcessing(null, null, incrDt, flg, flu); dmMemberOrderProcessor.dataProcessing(null, null, incrDt, flg, flu);
return ResponseDto.success(dg); return ResponseDto.success(dg);
} }
...@@ -272,6 +280,7 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -272,6 +280,7 @@ public class AdamDMAdminController extends AdamBaseController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
log.info("===dg:{},lS:{},incrDt:{},flg:{},flu:{}", dg, lS, incrDt, flg, flu);
dmMemberCodeProcessor.dataProcessing(null, null, incrDt, flg, flu); dmMemberCodeProcessor.dataProcessing(null, null, incrDt, flg, flu);
return ResponseDto.success(dg); return ResponseDto.success(dg);
} }
...@@ -285,6 +294,7 @@ public class AdamDMAdminController extends AdamBaseController { ...@@ -285,6 +294,7 @@ public class AdamDMAdminController extends AdamBaseController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
log.info("===dg:{},lS:{},incrDt:{},flg:{},flu:{}", dg, lS, incrDt, flg, 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