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

Commit 0a690b34 authored by 张国柄's avatar 张国柄

opt;

parent e4aafb30
...@@ -2,6 +2,7 @@ package com.liquidnet.service.platform.controller.adam; ...@@ -2,6 +2,7 @@ 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.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;
...@@ -9,12 +10,17 @@ import io.swagger.annotations.ApiImplicitParam; ...@@ -9,12 +10,17 @@ 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.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 java.time.LocalDateTime;
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;
@ApiSupport(order = 90062) @ApiSupport(order = 90062)
@Api(tags = "DM") @Api(tags = "DM")
...@@ -44,17 +50,18 @@ public class PlatformDMController { ...@@ -44,17 +50,18 @@ public class PlatformDMController {
@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());
}
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
@ApiOperation(value = "T - user") @ApiOperation(value = "T - user")
...@@ -96,7 +103,6 @@ public class PlatformDMController { ...@@ -96,7 +103,6 @@ public class PlatformDMController {
@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);
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++) {
...@@ -125,7 +131,6 @@ public class PlatformDMController { ...@@ -125,7 +131,6 @@ public class PlatformDMController {
@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);
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++) {
...@@ -154,7 +159,6 @@ public class PlatformDMController { ...@@ -154,7 +159,6 @@ public class PlatformDMController {
@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);
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++) {
...@@ -183,7 +187,6 @@ public class PlatformDMController { ...@@ -183,7 +187,6 @@ public class PlatformDMController {
@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);
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++) {
...@@ -212,7 +215,6 @@ public class PlatformDMController { ...@@ -212,7 +215,6 @@ public class PlatformDMController {
@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);
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++) {
...@@ -241,7 +243,6 @@ public class PlatformDMController { ...@@ -241,7 +243,6 @@ public class PlatformDMController {
@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);
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++) {
...@@ -267,7 +268,6 @@ public class PlatformDMController { ...@@ -267,7 +268,6 @@ public class PlatformDMController {
@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);
dmMemberOrderProcessor.dataProcessing(null, null, incrDt, flg, flu); dmMemberOrderProcessor.dataProcessing(null, null, incrDt, flg, flu);
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -280,7 +280,6 @@ public class PlatformDMController { ...@@ -280,7 +280,6 @@ public class PlatformDMController {
@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);
dmMemberCodeProcessor.dataProcessing(null, null, incrDt, flg, flu); dmMemberCodeProcessor.dataProcessing(null, null, incrDt, flg, flu);
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -293,7 +292,6 @@ public class PlatformDMController { ...@@ -293,7 +292,6 @@ public class PlatformDMController {
@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);
dmTracesInfoProcessor.dataProcessing(null, null, incrDt, flg, flu); dmTracesInfoProcessor.dataProcessing(null, null, incrDt, flg, flu);
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<spring-cloud.version>Hoxton.SR1</spring-cloud.version> <spring-cloud.version>Hoxton.SR1</spring-cloud.version>
<mybatis-spring-boot-starter.version>2.1.4</mybatis-spring-boot-starter.version> <mybatis-spring-boot-starter.version>2.1.4</mybatis-spring-boot-starter.version>
<mysql-connector-java.version>8.0.23</mysql-connector-java.version> <mysql-connector-java.version>8.0.19</mysql-connector-java.version>
<slf4j-api.version>1.7.30</slf4j-api.version> <slf4j-api.version>1.7.30</slf4j-api.version>
<junit.version>5.7.1</junit.version> <junit.version>5.7.1</junit.version>
......
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