Skip to content

D
dc-java
Commit 2413092d by huluobin
Options

listen ge jb

parent e9b89000
Showing with 84 additions and 87 deletions
data-common/src/main/resources/db-prod.properties
...@@ -3,8 +3,3 @@ url=jdbc:mysql://10.0.8.15:3306/bailun_datacenter?useUnicode=true&characterEncod ...@@ -3,8 +3,3 @@ url=jdbc:mysql://10.0.8.15:3306/bailun_datacenter?useUnicode=true&characterEncod
username=root username=root
password=#7kfnymAM$Y9-Ntf password=#7kfnymAM$Y9-Ntf
readonly-url=jdbc:mysql://10.0.8.21:3306/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
readonly-username=root
readonly-password=#7kfnymAM$Y9-Ntf
data-common/src/main/resources/mybatis-config.xml
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<configuration> <configuration>
<!--<properties resource="db-tj.properties"/>--> <!--<properties resource="db-tj.properties"/>-->
<properties resource="db-dev.properties"/> <properties resource="db-dev.properties"/>
<!-- <properties resource="db-prod.properties"/>--> <!-- <properties resource="db-prod.properties"/>-->
<settings> <settings>
<setting name="mapUnderscoreToCamelCase" value="true"/> <setting name="mapUnderscoreToCamelCase" value="true"/>
</settings> </settings>
......
data-finance/finance-balance-sheet/src/test/java/com/bailuntec/balancesheet/service/BalanceSheetServiceTest.java
...@@ -99,8 +99,8 @@ public class BalanceSheetServiceTest { ...@@ -99,8 +99,8 @@ public class BalanceSheetServiceTest {
@Test @Test
public void generateBalanceSheet() { public void generateBalanceSheet() {
Date startDate = DateTimeUtil.stringToDate("2019-01-28", DateTimeUtil.DATE_FORMAT); Date startDate = DateTimeUtil.stringToDate("2020-10-20", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-02-26", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2020-10-28", DateTimeUtil.DATE_FORMAT);
while (startDate.compareTo(endDate) == -1) { while (startDate.compareTo(endDate) == -1) {
balanceSheetService.generateBalanceSheet(0, "百伦供应链", startDate); balanceSheetService.generateBalanceSheet(0, "百伦供应链", startDate);
startDate = DateTimeUtil.addDays(startDate, 1); // 日期增加一天 startDate = DateTimeUtil.addDays(startDate, 1); // 日期增加一天
...@@ -109,8 +109,8 @@ public class BalanceSheetServiceTest { ...@@ -109,8 +109,8 @@ public class BalanceSheetServiceTest {
@Test @Test
public void updatePlatformBalance() { public void updatePlatformBalance() {
Date startDate = DateTimeUtil.stringToDate("2019-03-15", DateTimeUtil.DATE_FORMAT); Date startDate = DateTimeUtil.stringToDate("2020-10-20", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-03-16", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2020-10-28", DateTimeUtil.DATE_FORMAT);
while (startDate.compareTo(endDate) == -1) { while (startDate.compareTo(endDate) == -1) {
// 银行账号 // 银行账号
BigDecimal bankAccountBalanceSum = dcBankAccountBalanceMapper.getBalanceSum(startDate); BigDecimal bankAccountBalanceSum = dcBankAccountBalanceMapper.getBalanceSum(startDate);
...@@ -139,8 +139,8 @@ public class BalanceSheetServiceTest { ...@@ -139,8 +139,8 @@ public class BalanceSheetServiceTest {
@Test @Test
public void getSupplierTransactionBatch() { public void getSupplierTransactionBatch() {
Date startDate = DateTimeUtil.stringToDate("2019-04-25", DateTimeUtil.DATE_FORMAT); Date startDate = DateTimeUtil.stringToDate("2020-10-20", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-05-08", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2020-10-28", DateTimeUtil.DATE_FORMAT);
while (startDate.compareTo(endDate) == -1) { while (startDate.compareTo(endDate) == -1) {
balanceSheetService.getSupplierTransaction(startDate); balanceSheetService.getSupplierTransaction(startDate);
// balanceSheetService.getLogisticsSupplierTransaction(startDate); // balanceSheetService.getLogisticsSupplierTransaction(startDate);
...@@ -167,8 +167,8 @@ public class BalanceSheetServiceTest { ...@@ -167,8 +167,8 @@ public class BalanceSheetServiceTest {
@Test @Test
public void getInventoryBalance() { public void getInventoryBalance() {
Date startDate = DateTimeUtil.stringToDate("2019-05-01", DateTimeUtil.DATE_FORMAT); Date startDate = DateTimeUtil.stringToDate("2020-10-20", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-07-19", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2020-10-28", DateTimeUtil.DATE_FORMAT);
while (startDate.compareTo(endDate) == -1) { while (startDate.compareTo(endDate) == -1) {
// balanceSheetService.getInventoryBalance(startDate); // balanceSheetService.getInventoryBalance(startDate);
balanceSheetService.updateInventoryBalance(startDate); balanceSheetService.updateInventoryBalance(startDate);
...@@ -181,8 +181,8 @@ public class BalanceSheetServiceTest { ...@@ -181,8 +181,8 @@ public class BalanceSheetServiceTest {
/*Date startDate = DateTimeUtil.stringToDate("2014-04-25", DateTimeUtil.DATE_FORMAT); /*Date startDate = DateTimeUtil.stringToDate("2014-04-25", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2018-08-06", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2018-08-06", DateTimeUtil.DATE_FORMAT);
balanceSheetService.getSemiInventoryBalance(startDate,endDate);*/ balanceSheetService.getSemiInventoryBalance(startDate,endDate);*/
Date startDate = DateTimeUtil.stringToDate("2020-09-28", DateTimeUtil.DATE_FORMAT); Date startDate = DateTimeUtil.stringToDate("2020-10-20", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2020-09-29", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2020-10-28", DateTimeUtil.DATE_FORMAT);
assert endDate != null; assert endDate != null;
assert startDate != null; assert startDate != null;
while (startDate.compareTo(endDate) < 0) { while (startDate.compareTo(endDate) < 0) {
...@@ -194,8 +194,8 @@ public class BalanceSheetServiceTest { ...@@ -194,8 +194,8 @@ public class BalanceSheetServiceTest {
@Test @Test
public void getSemiTransferAmount() { public void getSemiTransferAmount() {
Date startDate = DateTimeUtil.stringToDate("2020-09-25", DateTimeUtil.DATE_FORMAT); Date startDate = DateTimeUtil.stringToDate("2020-10-20", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2020-09-29", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2020-10-28", DateTimeUtil.DATE_FORMAT);
assert endDate != null; assert endDate != null;
assert startDate != null; assert startDate != null;
while (startDate.compareTo(endDate) < 0) { while (startDate.compareTo(endDate) < 0) {
...@@ -248,8 +248,8 @@ public class BalanceSheetServiceTest { ...@@ -248,8 +248,8 @@ public class BalanceSheetServiceTest {
@Test @Test
public void getFixedAssets() { public void getFixedAssets() {
Date startDate = DateTimeUtil.stringToDate("2019-03-01", DateTimeUtil.DATE_FORMAT); Date startDate = DateTimeUtil.stringToDate("2020-10-20", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-03-07", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2020-10-28", DateTimeUtil.DATE_FORMAT);
while (startDate.compareTo(endDate) == -1) { while (startDate.compareTo(endDate) == -1) {
// 固定资产 // 固定资产
balanceSheetService.getFixedAssets(DateTimeUtil.addDays(startDate, -1), startDate, DateTimeUtil.addDays(startDate, 1)); balanceSheetService.getFixedAssets(DateTimeUtil.addDays(startDate, -1), startDate, DateTimeUtil.addDays(startDate, 1));
...@@ -272,8 +272,8 @@ public class BalanceSheetServiceTest { ...@@ -272,8 +272,8 @@ public class BalanceSheetServiceTest {
@Test @Test
public void updateFund() { public void updateFund() {
Date startDate = DateTimeUtil.stringToDate("2019-05-01", DateTimeUtil.DATE_FORMAT); Date startDate = DateTimeUtil.stringToDate("2020-10-20", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-06-11", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2020-10-28", DateTimeUtil.DATE_FORMAT);
while (startDate.compareTo(endDate) == -1) { while (startDate.compareTo(endDate) == -1) {
DcBalanceSheet dcBalanceSheet = new DcBalanceSheet(); DcBalanceSheet dcBalanceSheet = new DcBalanceSheet();
// 银行账户余额汇总 // 银行账户余额汇总
......
data-show/show-auto-turnover/src/main/java/com/bailuntec/listener/AutoTurnoverJobListener.java
package com.bailuntec.listener; //package com.bailuntec.listener;
//
import com.bailuntec.domain.constant.CommonConstant; //import com.bailuntec.domain.constant.CommonConstant;
import com.bailuntec.domain.entity.DcAutoException; //import com.bailuntec.domain.entity.DcAutoException;
import com.bailuntec.domain.entity.DcBaseStock; //import com.bailuntec.domain.entity.DcBaseStock;
import com.bailuntec.domain.example.DcAutoExceptionExample; //import com.bailuntec.domain.example.DcAutoExceptionExample;
import com.bailuntec.domain.example.DcBaseStockExample; //import com.bailuntec.domain.example.DcBaseStockExample;
import com.bailuntec.job.AutoTurnoverJob; //import com.bailuntec.job.AutoTurnoverJob;
import com.bailuntec.mapper.DcAutoExceptionMapper; //import com.bailuntec.mapper.DcAutoExceptionMapper;
import com.bailuntec.mapper.DcBaseStockMapper; //import com.bailuntec.mapper.DcBaseStockMapper;
import com.bailuntec.utils.SessionUtil; //import com.bailuntec.utils.SessionUtil;
import com.dangdang.ddframe.job.executor.ShardingContexts; //import com.dangdang.ddframe.job.executor.ShardingContexts;
import com.dangdang.ddframe.job.lite.api.listener.ElasticJobListener; //import com.dangdang.ddframe.job.lite.api.listener.ElasticJobListener;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.SqlSession; //import org.apache.ibatis.session.SqlSession;
//
import java.time.LocalDate; //import java.time.LocalDate;
import java.time.format.DateTimeFormatter; //import java.time.format.DateTimeFormatter;
import java.util.List; //import java.util.List;
//
@Slf4j //@Slf4j
public class AutoTurnoverJobListener implements ElasticJobListener { //public class AutoTurnoverJobListener implements ElasticJobListener {
@Override // @Override
public void beforeJobExecuted(ShardingContexts shardingContexts) { // public void beforeJobExecuted(ShardingContexts shardingContexts) {
//
} // }
//
@Override // @Override
public void afterJobExecuted(ShardingContexts shardingContexts) { // public void afterJobExecuted(ShardingContexts shardingContexts) {
String queryTime = DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT).format(LocalDate.now()); // String queryTime = DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT).format(LocalDate.now());
int pageIndex = 0; // int pageIndex = 0;
int pageSize = 1000; // int pageSize = 1000;
AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob(); // AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
List<DcAutoException> dcAutoExceptions = null; // List<DcAutoException> dcAutoExceptions;
SqlSession sqlSession = SessionUtil.getFactory().openSession(true); //
try { // SqlSession sqlSession = SessionUtil.getFactory().openSession(true);
DcAutoExceptionMapper mapper = sqlSession.getMapper(DcAutoExceptionMapper.class); // try {
DcBaseStockMapper dcBaseStockMapper = sqlSession.getMapper(DcBaseStockMapper.class); // DcAutoExceptionMapper mapper = sqlSession.getMapper(DcAutoExceptionMapper.class);
do { // DcBaseStockMapper dcBaseStockMapper = sqlSession.getMapper(DcBaseStockMapper.class);
dcAutoExceptions = mapper.selectByExample(DcAutoExceptionExample.newAndCreateCriteria().example().limit(pageIndex * pageSize, pageSize)); // do {
if (dcAutoExceptions != null && dcAutoExceptions.size() >0) { // dcAutoExceptions = mapper.selectByExample(DcAutoExceptionExample.newAndCreateCriteria().example().limit(pageIndex * pageSize, pageSize));
for (DcAutoException dcAutoException : dcAutoExceptions) { // if (dcAutoExceptions != null && dcAutoExceptions.size() > 0) {
DcBaseStock dcBaseStock = dcBaseStockMapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo(dcAutoException.getBailunSku()).andWarehouseCodeEqualTo(dcAutoException.getWarehouseCode()).example()); // for (DcAutoException dcAutoException : dcAutoExceptions) {
try { // DcBaseStock dcBaseStock = dcBaseStockMapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo(dcAutoException.getBailunSku()).andWarehouseCodeEqualTo(dcAutoException.getWarehouseCode()).example());
autoTurnoverJob.autoTurnoverFromStock(queryTime, dcBaseStock); // try {
mapper.deleteByPrimaryKey(dcAutoException.getId()); // autoTurnoverJob.autoTurnoverFromStock(queryTime, dcBaseStock);
} catch (Exception e) { // mapper.deleteByPrimaryKey(dcAutoException.getId());
log.error("Mybatis操作自动周转异常数据再次计算失败SKU=" + dcAutoException.getBailunSku() + ",仓库编码=" + dcAutoException.getWarehouseCode()); // } catch (Exception e) {
} // log.error("Mybatis操作自动周转异常数据再次计算失败SKU=" + dcAutoException.getBailunSku() + ",仓库编码=" + dcAutoException.getWarehouseCode());
} // }
} // }
pageIndex++; // }
} while (dcAutoExceptions != null && dcAutoExceptions.size() == pageSize); // pageIndex++;
} catch (RuntimeException e) { // } while (dcAutoExceptions != null && dcAutoExceptions.size() == pageSize);
throw new RuntimeException("Mybatis操作自动周转异常数据再次计算失败"); // } catch (RuntimeException e) {
} finally { // throw new RuntimeException("Mybatis操作自动周转异常数据再次计算失败");
if (sqlSession != null) { // } finally {
sqlSession.close(); // if (sqlSession != null) {
} // sqlSession.close();
} // }
} // }
} // }
//}
data-show/show-auto-turnover/src/main/resources/job.properties
...@@ -20,5 +20,6 @@ JOB_CRON_NE_NORMAL=0 0 1 ? * MON ...@@ -20,5 +20,6 @@ JOB_CRON_NE_NORMAL=0 0 1 ? * MON
JOB_NAME_INCREMENT=show-auto-turnover-increment JOB_NAME_INCREMENT=show-auto-turnover-increment
JOB_CRON_INCREMENT=0 40 14 * * ? JOB_CRON_INCREMENT=0 20 14 * * ?
SHARDING_TOTAL_COUNT_INCREMENT=8 SHARDING_TOTAL_COUNT_INCREMENT=8
data-show/show-auto-turnover/src/test/java/com/bailuntec/job/AutoTurnoverJobTest.java
...@@ -325,7 +325,7 @@ public class AutoTurnoverJobTest { ...@@ -325,7 +325,7 @@ public class AutoTurnoverJobTest {
DcBaseStockMapper dcBaseStockMapper = sqlSession.getMapper(DcBaseStockMapper.class); DcBaseStockMapper dcBaseStockMapper = sqlSession.getMapper(DcBaseStockMapper.class);
DcBaseStock dcBaseStock = dcBaseStockMapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria() DcBaseStock dcBaseStock = dcBaseStockMapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
.andBailunSkuEqualTo("285472531") .andBailunSkuEqualTo("949361401")
.andWarehouseCodeEqualTo("GZBLWH") .andWarehouseCodeEqualTo("GZBLWH")
.example()); .example());
......
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