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

Skip to content

L
liquidnet-bus-v1
Commit 35397304 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

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

parents f9731098 97b4b8b1
Show whitespace changes
Inline Side-by-side
Showing with 407 additions and 384 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performancesStatic.html
View file @ 35397304
...@@ -35,12 +35,12 @@ ...@@ -35,12 +35,12 @@
<div th:text="*{totalGeneral}">80</div> <div th:text="*{totalGeneral}">80</div>
</div> </div>
</div> </div>
<div class="col-lg-1"> <!-- <div class="col-lg-1">-->
<div> <!-- <div>-->
<div>已兑换总数(张)</div> <!-- <div>已兑换总数(张)</div>-->
<div th:text="*{totalExchange}">0</div> <!-- <div th:text="*{totalExchange}">0</div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<!-- <div class="col-lg-1">--> <!-- <div class="col-lg-1">-->
<!-- <div>--> <!-- <div>-->
<!-- <div>兑换库存(张)</div>--> <!-- <div>兑换库存(张)</div>-->
...@@ -100,9 +100,9 @@ ...@@ -100,9 +100,9 @@
<th> <th>
<div class="cell">销售额（元）</div> <div class="cell">销售额（元）</div>
</th> </th>
<th> <!-- <th>-->
<div class="cell">兑换数量</div> <!-- <div class="cell">兑换数量</div>-->
</th> <!-- </th>-->
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -137,9 +137,9 @@ ...@@ -137,9 +137,9 @@
<td> <td>
<div class="cell" th:text="${respBean.totalSalePrice}">0</div> <div class="cell" th:text="${respBean.totalSalePrice}">0</div>
</td> </td>
<td> <!-- <td>-->
<div class="cell" th:text="${respBean.totalExchange}">0</div> <!-- <div class="cell" th:text="${respBean.totalExchange}">0</div>-->
</td> <!-- </td>-->
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/StringUtil.java
View file @ 35397304
...@@ -447,10 +447,6 @@ public abstract class StringUtil { ...@@ -447,10 +447,6 @@ public abstract class StringUtil {
sb.append(right(bankId, 4)); sb.append(right(bankId, 4));
return sb.toString(); return sb.toString();
} }
public static void main(String[] args) {
System.out.println(isEmail("123@qq.com"));
}
public static boolean isBlank(CharSequence cs) { public static boolean isBlank(CharSequence cs) {
...@@ -598,4 +594,31 @@ public abstract class StringUtil { ...@@ -598,4 +594,31 @@ public abstract class StringUtil {
} }
return false; return false;
} }
public static void main(String[] args) {
System.out.println(isEmail("123@qq.com#$%^&*()"));
String regEx="[\n`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。， 、？]";
//可以在中括号内加上任何想要替换的字符，实际上是一个正则表达式
String aa = "";//这里是将特殊字符换为aa字符串," "代表直接去掉
Pattern p = Pattern.compile(regEx);
Matcher m = p.matcher("原字符串");//这里把想要替换的字符串传进来
String newString = m.replaceAll(aa).trim();
System.out.println("newString====="+newString);
//将替换后的字符串存在变量newString中
//方法二 如果第一种太麻烦可以直接用下面的
String str = "#$%^&*()我的正确#$%^&*()原字符串#$%^&*()";
String newString2 = str.replaceAll(regEx,aa).trim();//不想保留原来的字符串可以直接写成 “str = str.replaceAll(regEX,aa);”
System.out.println("newString2====="+newString2);
}
} }
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java
View file @ 35397304
...@@ -125,8 +125,8 @@ public class AdamUserController { ...@@ -125,8 +125,8 @@ public class AdamUserController {
// editVo.setAvatar(parameter.getAvatar()); // editVo.setAvatar(parameter.getAvatar());
// editVo.setBackground(parameter.getBackground()); // editVo.setBackground(parameter.getBackground());
// editVo.setNickname(parameter.getNickname()); // editVo.setNickname(parameter.getNickname());
editVo.setAvatar(editVo.getAvatar()); editVo.setAvatar(StringUtils.isEmpty(editVo.getAvatar()) ? avatarDefUrl : editVo.getAvatar());
editVo.setBackground(editVo.getBackground()); editVo.setBackground(StringUtils.isEmpty(editVo.getBackground()) ? avatarDefUrl : editVo.getBackground());
editVo.setNickname(editVo.getNickname()); editVo.setNickname(editVo.getNickname());
editVo.setSex(sex); editVo.setSex(sex);
editVo.setBirthday(parameter.getBirthday()); editVo.setBirthday(parameter.getBirthday());
......
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java
View file @ 35397304
...@@ -89,14 +89,14 @@ public class PayController { ...@@ -89,14 +89,14 @@ public class PayController {
dragonPayBaseReqDto.setOpenId(openId); dragonPayBaseReqDto.setOpenId(openId);
dragonPayBaseReqDto.setType(type); dragonPayBaseReqDto.setType(type);
dragonPayBaseReqDto.setPrice(price); dragonPayBaseReqDto.setPrice(price);
if(StringUtil.isNotNull(name)&&name.length()>=32){ // if(StringUtil.isNotNull(name)&&name.length()>=32){
name = name.substring(0,32); // name = name.substring(0,32);
} // }
dragonPayBaseReqDto.setName(name); dragonPayBaseReqDto.setName("正在现场");
if(StringUtil.isNotNull(detail)&&detail.length()>=64){ // if(StringUtil.isNotNull(detail)&&detail.length()>=64){
detail = detail.substring(0,64); // detail = detail.substring(0,64);
} // }
dragonPayBaseReqDto.setDetail(detail); dragonPayBaseReqDto.setDetail("正在现场");
dragonPayBaseReqDto.setOrderCode(orderCode); dragonPayBaseReqDto.setOrderCode(orderCode);
dragonPayBaseReqDto.setClientIp(clientIp); dragonPayBaseReqDto.setClientIp(clientIp);
dragonPayBaseReqDto.setNotifyUrl(notifyUrl); dragonPayBaseReqDto.setNotifyUrl(notifyUrl);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/BannersServiceImpl.java
View file @ 35397304
...@@ -63,7 +63,6 @@ public class BannersServiceImpl implements IKylinBannersService { ...@@ -63,7 +63,6 @@ public class BannersServiceImpl implements IKylinBannersService {
} }
// list // list
if (bannerInfo.getPromotionType() != 1) {
List<String> pList = bannerInfo.getPositionList(); List<String> pList = bannerInfo.getPositionList();
Boolean pis = false; Boolean pis = false;
if (null != pList) { if (null != pList) {
...@@ -77,6 +76,7 @@ public class BannersServiceImpl implements IKylinBannersService { ...@@ -77,6 +76,7 @@ public class BannersServiceImpl implements IKylinBannersService {
itBannerList.remove(); itBannerList.remove();
} }
if (bannerInfo.getPromotionType() != 1) {
List<String> proList = bannerInfo.getProvincesList(); List<String> proList = bannerInfo.getProvincesList();
Boolean prois = false; Boolean prois = false;
if (null != proList) { if (null != proList) {
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/adam/PlatformDMController.java
View file @ 35397304
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);
} // }
} //}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/kylin/DataController.java
View file @ 35397304
package com.liquidnet.service.platform.controller.kylin; //package com.liquidnet.service.platform.controller.kylin;
//
import com.liquidnet.service.base.ResponseDto; //import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.platform.service.impl.kylin.DataImpl; //import com.liquidnet.service.platform.service.impl.kylin.DataImpl;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; //import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; //import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; //import org.springframework.web.bind.annotation.RestController;
//
//
@Api(tags = "数据迁移 (会重复)") //@Api(tags = "数据迁移 (会重复)")
@RestController //@RestController
@RequestMapping("data") //@RequestMapping("data")
public class DataController { //public class DataController {
//
@Autowired // @Autowired
private DataImpl data; // private DataImpl data;
//
@PostMapping("performance") // @PostMapping("performance")
@ApiOperation("演出数据迁移") // @ApiOperation("演出数据迁移")
public ResponseDto<Boolean> performance() { // public ResponseDto<Boolean> performance() {
Boolean result = data.performance(); // Boolean result = data.performance();
return ResponseDto.success(result); // return ResponseDto.success(result);
} // }
//
@PostMapping("order") // @PostMapping("order")
@ApiOperation("订单数据迁移") // @ApiOperation("订单数据迁移")
public ResponseDto<Boolean> order(String month) { // public ResponseDto<Boolean> order(String month) {
Boolean result = data.order(month); // Boolean result = data.order(month);
return ResponseDto.success(result); // return ResponseDto.success(result);
} // }
//
@PostMapping("roadShow") // @PostMapping("roadShow")
@ApiOperation("巡演数据迁移") // @ApiOperation("巡演数据迁移")
public ResponseDto<Boolean> roadShow() { // public ResponseDto<Boolean> roadShow() {
Boolean result = data.roadShow(); // Boolean result = data.roadShow();
return ResponseDto.success(result); // return ResponseDto.success(result);
} // }
//
@PostMapping("childAccount") // @PostMapping("childAccount")
@ApiOperation("验票子账号数据迁移") // @ApiOperation("验票子账号数据迁移")
public ResponseDto<Boolean> childAccount() { // public ResponseDto<Boolean> childAccount() {
Boolean result = data.childAccount(); // Boolean result = data.childAccount();
return ResponseDto.success(result); // return ResponseDto.success(result);
} // }
//
} //}
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