周系数

data-common/src/main/resources/generatorConfig.xml

@@ -11,15 +11,16 @@
     <properties resource="init.properties"/>
 
     <!-- 指定数据连接驱动jar地址 -->
-    <classPathEntry location="/Users/huluobin/IdeaProjects/dc-java/elastic-job-lite/elastic-job-lite-console/target/elastic-job-lite-console-3.0.0.M1-SNAPSHOT/lib/mysql-connector-java-5.1.30.jar"/>
+    <classPathEntry
+            location="/Users/huluobin/IdeaProjects/dc-java/elastic-job-lite/elastic-job-lite-console/target/elastic-job-lite-console-3.0.0.M1-SNAPSHOT/lib/mysql-connector-java-5.1.30.jar"/>
 
     <!-- 一个数据库一个context -->
     <!--targetRuntime="MyBatis3Simple" 不生成Mapper-->
-    <context id="assetsoracle" >
+    <context id="assetsoracle">
         <!-- 自动生成toString方法 -->
-        <plugin type="org.mybatis.generator.plugins.ToStringPlugin" />
+        <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
         <!-- 自动生成equals方法和hashcode方法 -->
-        <plugin type="org.mybatis.generator.plugins.EqualsHashCodePlugin" />
+        <plugin type="org.mybatis.generator.plugins.EqualsHashCodePlugin"/>
         <!-- 存在即更新插件 -->
         <plugin type="com.itfsw.mybatis.generator.plugins.UpsertPlugin">
             <!--
@@ -33,6 +34,7 @@
             -->
             <property name="allowBatchUpsert" value="fasle"/>
         </plugin>
+
         <!-- 批量插入插件 -->
         <plugin type="com.itfsw.mybatis.generator.plugins.BatchInsertPlugin">
             <!--
@@ -50,7 +52,7 @@
             <property name="@NoArgsConstructor" value="false"/>
         </plugin>
         <!-- 查询结果选择性返回插件 -->
-        <plugin type="com.itfsw.mybatis.generator.plugins.SelectSelectivePlugin" />
+        <plugin type="com.itfsw.mybatis.generator.plugins.SelectSelectivePlugin"/>
         <!-- Selective选择插入更新增强插件 -->
         <plugin type="com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin"/>
         <!-- 批量插入插件 -->
@@ -78,9 +80,9 @@
 
 
         <!-- 注释 -->
-        <commentGenerator >
+        <commentGenerator>
             <property name="suppressAllComments" value="false"/><!-- 是否取消注释 -->
-            <property name="suppressDate" value="true" /> <!-- 是否生成注释代时间戳-->
+            <property name="suppressDate" value="true"/> <!-- 是否生成注释代时间戳-->
         </commentGenerator>
 
         <!-- jdbc连接 -->
@@ -98,7 +100,7 @@
 
         <!-- 生成实体类地址 -->
         <javaModelGenerator targetPackage="com.bailuntec.domain.entity"
-                            targetProject="src/main/java" >
+                            targetProject="src/main/java">
             <!-- 是否在当前路径下新加一层schema,eg：fase路径com.oop.eksp.user.model， true:com.oop.eksp.user.model.[schemaName] -->
             <property name="enableSubPackages" value="false"/>
             <!-- 是否针对string类型的字段在set的时候进行trim调用 -->
@@ -107,16 +109,16 @@
 
         <!-- 生成mapxml文件 -->
         <sqlMapGenerator targetPackage="com.bailuntec.mapper"
-                         targetProject="src/main/java" >
+                         targetProject="src/main/java">
             <!-- 是否在当前路径下新加一层schema,eg：fase路径com.oop.eksp.user.model， true:com.oop.eksp.user.model.[schemaName] -->
-            <property name="enableSubPackages" value="false" />
+            <property name="enableSubPackages" value="false"/>
         </sqlMapGenerator>
 
         <!-- 生成mapxml对应client，也就是接口dao -->
         <javaClientGenerator targetPackage="com.bailuntec.mapper"
-                             targetProject="src/main/java" type="XMLMAPPER" >
+                             targetProject="src/main/java" type="XMLMAPPER">
             <!-- 是否在当前路径下新加一层schema,eg：fase路径com.oop.eksp.user.model， true:com.oop.eksp.user.model.[schemaName] -->
-            <property name="enableSubPackages" value="false" />
+            <property name="enableSubPackages" value="false"/>
         </javaClientGenerator>
 
         <!-- 配置表信息 domainObjectName="${}"-->

data-finance/finance-balance-sheet/src/test/java/com/bailuntec/balancesheet/service/BalanceSheetServiceTest.java

@@ -137,7 +137,7 @@ public class BalanceSheetServiceTest {
 
     @Test
     public void getSupplierTransaction() {
-        Date date = DateTimeUtil.stringToDate("2019-04-24", DateTimeUtil.DATE_FORMAT);
+        Date date = DateTimeUtil.stringToDate("2020-11-30", DateTimeUtil.DATE_FORMAT);
         balanceSheetService.getSupplierTransaction(date);
         balanceSheetService.updateSuppliserTransactionOfBalanceSheet(date);
     }

data-show/show-auto-turnover/src/main/dotnet-docker/Dockerfile

+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
+WORKDIR /app
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+EXPOSE 80
+EXPOSE 443
+
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends libgdiplus libc6-dev 
+
+FROM microsoft/dotnet:2.2-sdk-alpine AS build
+WORKDIR /src
+COPY ["SalaryAutoServices/SalaryAutoServices.csproj", "SalaryAutoServices/"]
+COPY ["SalaryAIServices/SalaryAIServices.csproj", "SalaryAIServices/"]
+COPY ["DapperDao/DapperDao.csproj", "DapperDao/"]
+COPY ["Utility/Utility.csproj", "Utility/"]
+COPY ["EFCore/EFCore.csproj", "EFCore/"]
+COPY ["CommonServics/CommonServics.csproj", "CommonServics/"]
+RUN dotnet restore "SalaryAutoServices/SalaryAutoServices.csproj"
+COPY . .
+WORKDIR "/src/SalaryAutoServices"
+RUN dotnet build "SalaryAutoServices.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "SalaryAutoServices.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY fonts/simkai.ttf .
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "SalaryAutoServices.dll"]
\ No newline at end of file

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java

@@ -780,60 +780,60 @@ public class AutoTurnoverJob extends PointJob {
             dcAutoTurnover.setIsOutStock(0);
             dcAutoTurnover.setGmtModified(LocalDateTime.now());
 
-            /*周系数*/
-
-            List<String> param = new ArrayList<>(Lists.newArrayList(dcAutoTurnover.getSalesDetails()
-                    .trim()
-                    .substring(1)
-                    .substring(0, dcAutoTurnover.getSalesDetails().length() - 2)
-                    .split(",")));
-
-            List<BigDecimal> salesDetails = param.stream().map(var -> {
-                try {
-                    String ss = var.trim();
-                    return new BigDecimal(ss);
-                } catch (Exception ex) {
-                    throw ex;
-                }
-            }).collect(Collectors.toList());
-            AtomicReference<LocalDate> localDate = new AtomicReference<>(LocalDate.now().minusDays(7));
-
-            List<SalesDetailItem> salesDetailItemList = salesDetails.stream().map(salesDetail -> {
-                SalesDetailItem salesDetailItem = new SalesDetailItem();
-                salesDetailItem.setSales(salesDetail);
-                salesDetailItem.setDate(localDate.get());
-
-                localDate.set(localDate.get().plusDays(1));
-                return salesDetailItem;
-            }).collect(Collectors.toList());
-
-            DcBaseWeekCoefficientMapper dcBaseWeekCoefficientMapper = SessionUtil.getSession().getMapper(DcBaseWeekCoefficientMapper.class);
-            SalesDayConfigMapper salesDayConfigMapper = SessionUtil.getSession().getMapper(SalesDayConfigMapper.class);
-
-            List<DcBaseWeekCoefficient> dcBaseWeekCoefficientList = dcBaseWeekCoefficientMapper.selectByDays(salesDetailItemList, dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode());
-            List<SalesDayConfig> salesDayConfigMapperList = salesDayConfigMapper.selectByDays(salesDetailItemList, dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode());
-
-            if (ListUtil.isNotEmpty(dcBaseWeekCoefficientList)) {
-                Map<LocalDate, DcBaseWeekCoefficient> weekCoefficientMap = dcBaseWeekCoefficientList.stream().collect(Collectors.toMap(DcBaseWeekCoefficient::getWeekDate, dcBaseWeekCoefficient -> dcBaseWeekCoefficient));
-                salesDetailItemList.forEach(salesDetailItem -> {
-                    DcBaseWeekCoefficient coefficient = weekCoefficientMap.get(salesDetailItem.getDate());
-                    if (coefficient != null) {
-                        salesDetailItem.setWeekCoefficient(new BigDecimal(coefficient.getCoefficient()));
-                    }
-                });
-            }
-            if (ListUtil.isNotEmpty(salesDayConfigMapperList)) {
-                Map<LocalDate, SalesDayConfig> salesDayConfigMap = salesDayConfigMapperList.stream().collect(Collectors.toMap(salesDayConfig -> salesDayConfig.getDate().toLocalDate(), salesDayConfig -> salesDayConfig));
-                salesDetailItemList.forEach(salesDetailItem -> {
-                    SalesDayConfig salesDayConfig = salesDayConfigMap.get(salesDetailItem.getDate());
-                    if (salesDayConfig != null) {
-                        salesDetailItem.setSalesDayConfig(salesDayConfig.getSales());
-                    }
-                });
-            }
-            salesDetailItemList.forEach(SalesDetailItem::calcShowSales);
-
-            dcAutoTurnover.setSalesDetails(salesDetailItemList.stream().map(SalesDetailItem::getShowSales).map(BigDecimal::toString).collect(Collectors.joining(",")));
+//            /*周系数*/
+//            List<String> param = new ArrayList<>(Lists.newArrayList(dcAutoTurnover.getSalesDetails()
+//                    .trim()
+//                    .substring(1)
+//                    .substring(0, dcAutoTurnover.getSalesDetails().length() - 2)
+//                    .split(",")));
+//
+//            List<BigDecimal> salesDetails = param.stream().map(var -> {
+//                try {
+//                    String ss = var.trim();
+//                    return new BigDecimal(ss);
+//                } catch (Exception ex) {
+//                    throw ex;
+//                }
+//            }).collect(Collectors.toList());
+//            AtomicReference<LocalDate> localDate = new AtomicReference<>(LocalDate.now().minusDays(7));
+//
+//            List<SalesDetailItem> salesDetailItemList = salesDetails.stream().map(salesDetail -> {
+//                SalesDetailItem salesDetailItem = new SalesDetailItem();
+//                salesDetailItem.setSales(salesDetail);
+//                salesDetailItem.setDate(localDate.get());
+//
+//                localDate.set(localDate.get().plusDays(1));
+//                return salesDetailItem;
+//            }).collect(Collectors.toList());
+//
+//            DcBaseWeekCoefficientMapper dcBaseWeekCoefficientMapper = SessionUtil.getSession().getMapper(DcBaseWeekCoefficientMapper.class);
+//            SalesDayConfigMapper salesDayConfigMapper = SessionUtil.getSession().getMapper(SalesDayConfigMapper.class);
+//
+//            List<DcBaseWeekCoefficient> dcBaseWeekCoefficientList = dcBaseWeekCoefficientMapper.selectByDays(salesDetailItemList, dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode());
+//            List<SalesDayConfig> salesDayConfigMapperList = salesDayConfigMapper.selectByDays(salesDetailItemList, dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode());
+//
+//            if (ListUtil.isNotEmpty(dcBaseWeekCoefficientList)) {
+//                Map<LocalDate, DcBaseWeekCoefficient> weekCoefficientMap = dcBaseWeekCoefficientList.stream().collect(Collectors.toMap(DcBaseWeekCoefficient::getWeekDate, dcBaseWeekCoefficient -> dcBaseWeekCoefficient));
+//                salesDetailItemList.forEach(salesDetailItem -> {
+//                    DcBaseWeekCoefficient coefficient = weekCoefficientMap.get(salesDetailItem.getDate());
+//                    if (coefficient != null) {
+//                        salesDetailItem.setWeekCoefficient(new BigDecimal(coefficient.getCoefficient()));
+//                    }
+//                });
+//            }
+//            if (ListUtil.isNotEmpty(salesDayConfigMapperList)) {
+//                Map<LocalDate, SalesDayConfig> salesDayConfigMap = salesDayConfigMapperList.stream().collect(Collectors.toMap(salesDayConfig -> salesDayConfig.getDate().toLocalDate(), salesDayConfig -> salesDayConfig));
+//                salesDetailItemList.forEach(salesDetailItem -> {
+//                    SalesDayConfig salesDayConfig = salesDayConfigMap.get(salesDetailItem.getDate());
+//                    if (salesDayConfig != null) {
+//                        salesDetailItem.setSalesDayConfig(salesDayConfig.getSales());
+//                    }
+//                });
+//            }
+//            salesDetailItemList.forEach(SalesDetailItem::calcShowSales);
+//
+//            dcAutoTurnover.setGmtModified(LocalDateTime.now());
+//            dcAutoTurnover.setSalesDetails("[" + salesDetailItemList.stream().map(SalesDetailItem::getShowSales).map(BigDecimal::toString).collect(Collectors.joining(",")) + "]");
 
             int i = autoTurnoverMapper.updateByExampleSelective(dcAutoTurnover, DcAutoTurnoverExample.newAndCreateCriteria().andBailunSkuEqualTo(dcAutoTurnover.getBailunSku()).andWarehouseCodeEqualTo(dcAutoTurnover.getWarehouseCode()).example());
             if (i == 0) {

data-show/show-auto-turnover/src/main/resources/job.properties

@@ -10,9 +10,9 @@ EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
 ZOOKEEPER_SERVER=172.31.255.120:2181
 NAME_SPACE=data-center
 
-JOB_NAME=show-auto-turnover12
-JOB_CRON=0 0 3 * * ?
-#JOB_CRON=0 50 9 * * ?
+JOB_NAME=show-auto-turnover17
+JOB_CRON=0 30 0 * * ?
+#JOB_CRON=0 10 9 * * ?
 SHARDING_TOTAL_COUNT=8