update

data-common/src/main/java/com/bailuntec/mapper/DcAutoSalesForecastConfigMapper.java

@@ -13,4 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DcAutoSalesForecastConfigMapper extends BaseMapper<DcAutoSalesForecastConfig> {
 
+
+    DcAutoSalesForecastConfig selectById(Integer id);
 }

data-common/src/main/java/com/bailuntec/mapper/DcAutoSalesForecastConfigMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bailuntec.mapper.DcAutoSalesForecastConfigMapper">
 
+    <select id="selectById" resultType="com.bailuntec.domain.entity.DcAutoSalesForecastConfig">
+        select *
+        from dc_auto_sales_forecast_config
+        where id = #{id}
+    </select>
 </mapper>

data-common/src/main/java/com/bailuntec/mapper/DcBaseStockMapper.xml

@@ -1387,6 +1387,7 @@
                            on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code
         where (t2.`status` = 0 or t2.`status` is null)
           and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
+        order by t1.id desc
         limit #{pageStart}, #{pageOffset};
     </select>
 

data-common/src/main/java/com/bailuntec/support/PointJob.java

@@ -35,12 +35,12 @@ public abstract class PointJob implements SimpleJob {
         }
     }
 
-    private JobPointLog jobInit(ShardingContext shardingContext) {
+    public JobPointLog jobInit(ShardingContext shardingContext) {
         JobPointLog jobPointLog = null;
         try {
             JobPointLogMapper mapper = SessionUtil.getSession().getMapper(JobPointLogMapper.class);
-
             jobPointLog = mapper.selectOneByExample(JobPointLogExample.newAndCreateCriteria().andJobNameEqualTo(shardingContext.getJobName()).example());
+
             if (jobPointLog == null) {
                 jobPointLog = new JobPointLog(shardingContext.getJobName(), 1, 100, 0, 1, LocalDateTime.now().minusDays(1), LocalDateTime.now());
             }
@@ -53,7 +53,7 @@ public abstract class PointJob implements SimpleJob {
         return jobPointLog;
     }
 
-    public abstract void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) ;
+    public abstract void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog);
 
 
 }

data-common/src/main/java/com/bailuntec/utils/SessionUtil.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 
 import java.io.Reader;
 
@@ -13,7 +14,7 @@ public class SessionUtil {
     private static final ThreadLocal<SqlSession> threadLocal = new ThreadLocal<>();
     private static final ThreadLocal<SqlSession> threadLocalTransction = new ThreadLocal<>();
     private static Reader reader = null;
-    private static MybatisSqlSessionFactoryBuilder builder = null;
+    private static SqlSessionFactoryBuilder builder = null;
     private static SqlSessionFactory factory = null;
 
     //不允许对该类进行new操作
@@ -25,7 +26,7 @@ public class SessionUtil {
             //1.加载配置文件
             reader = Resources.getResourceAsReader(CommonConstant.MYBATIS_CONFIG);
             //2.得到工厂的创建对象
-            builder = new MybatisSqlSessionFactoryBuilder();
+            builder = new SqlSessionFactoryBuilder();
             //3.得到工厂对象
             factory = builder.build(reader);
         } catch (Exception e) {

data-common/src/main/resources/mybatis-config.xml

@@ -5,8 +5,8 @@
 <configuration>
 
     <!--<properties  resource="db-tj.properties"/>-->
-    <!--    <properties resource="db-dev.properties"/>-->
     <properties resource="db-dev.properties"/>
+    <!--    <properties resource="db-prod.properties"/>-->
     <settings>
         <setting name="mapUnderscoreToCamelCase" value="true"/>
     </settings>

data-parent/pom.xml

@@ -33,11 +33,9 @@
         <okhttp.version>3.12.0</okhttp.version>
         <slf4j.version>1.7.25</slf4j.version>
         <log4j.version>2.11.1</log4j.version>
-        <mybatis.version>3.4.6</mybatis.version>
         <fastjson.version>1.2.54</fastjson.version>
         <commons-beanutils.version>1.9.3</commons-beanutils.version>
         <data-common.version>1.0-SNAPSHOT</data-common.version>
-        <mybatis-spring-boot.version>1.3.1</mybatis-spring-boot.version>
         <pagehelper-spring-boot.version>1.2.4</pagehelper-spring-boot.version>
         <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <lombok.version>1.18.4</lombok.version>
@@ -143,13 +141,6 @@
                 </exclusions>
             </dependency>
 
-            <!--mybatis-->
-            <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>${mybatis-spring-boot.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
@@ -175,14 +166,6 @@
                 <version>${spring-boot.version}</version>
             </dependency>
 
-            <!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis</artifactId>
-                <version>${mybatis.version}</version>
-                <scope>compile</scope>
-            </dependency>
-
             <dependency>
                 <groupId>com.bailuntec</groupId>
                 <artifactId>data-common</artifactId>

data-show/pom.xml

@@ -9,11 +9,12 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../data-parent/pom.xml</relativePath>
     </parent>
-    <groupId>com.bailuntec</groupId>
+
     <artifactId>data-show</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
+
     <modules>
         <module>show-auto-turnover</module>
     </modules>
-</project>
+</project>
\ No newline at end of file

data-show/show-auto-turnover/src/test/java/com/bailuntec/job/AutoTurnoverJobTest.java

@@ -51,13 +51,13 @@ public class AutoTurnoverJobTest {
 
 
     @Test
-    public void syncAll() {
+    public void syncAll0() {
         JobPointLog jobPointLog = new JobPointLog();
         jobPointLog.setPageIndex(1);
         jobPointLog.setPageSize(1000);
 
         AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
-        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 1, "NORMAL", new HashMap<>()), 0),
+        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 8, "NORMAL", new HashMap<>()), 0),
                 jobPointLog);
     }
 
@@ -68,7 +68,7 @@ public class AutoTurnoverJobTest {
         jobPointLog.setPageSize(1000);
 
         AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
-        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 4, "NORMAL", new HashMap<>()), 1),
+        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 8, "NORMAL", new HashMap<>()), 1),
                 jobPointLog);
     }
 
@@ -79,7 +79,7 @@ public class AutoTurnoverJobTest {
         jobPointLog.setPageSize(1000);
 
         AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
-        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 4, "NORMAL", new HashMap<>()), 2),
+        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 8, "NORMAL", new HashMap<>()), 2),
                 jobPointLog);
     }
 
@@ -90,10 +90,64 @@ public class AutoTurnoverJobTest {
         jobPointLog.setPageSize(1000);
 
         AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
-        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 4, "NORMAL", new HashMap<>()), 3),
+        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 8, "NORMAL", new HashMap<>()), 3),
+                jobPointLog);
+    }
+
+    @Test
+    public void syncAll4() {
+        JobPointLog jobPointLog = new JobPointLog();
+        jobPointLog.setPageIndex(1);
+        jobPointLog.setPageSize(1000);
+
+        AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
+        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 8, "NORMAL", new HashMap<>()), 4),
+                jobPointLog);
+    }
+
+    @Test
+    public void syncAll5() {
+        JobPointLog jobPointLog = new JobPointLog();
+        jobPointLog.setPageIndex(1);
+        jobPointLog.setPageSize(1000);
+
+        AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
+        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 8, "NORMAL", new HashMap<>()), 5),
+                jobPointLog);
+    }
+
+    @Test
+    public void syncAll6() {
+        JobPointLog jobPointLog = new JobPointLog();
+        jobPointLog.setPageIndex(1);
+        jobPointLog.setPageSize(1000);
+
+        AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
+        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 8, "NORMAL", new HashMap<>()), 6),
+                jobPointLog);
+    }
+
+    @Test
+    public void syncAll7() {
+        JobPointLog jobPointLog = new JobPointLog();
+        jobPointLog.setPageIndex(2);
+        jobPointLog.setPageSize(1000);
+
+        AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
+        autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 8, "NORMAL", new HashMap<>()), 7),
                 jobPointLog);
     }
 
+    @Test
+    public void syncAll7_1() {
+        JobPointLog jobPointLog = new JobPointLog();
+        jobPointLog.setPageIndex(1);
+        jobPointLog.setPageSize(1000);
+
+        AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
+        autoTurnoverJob.jobInit(new ShardingContext(new ShardingContexts("x", "show-auto-turnover2", 8, "NORMAL", new HashMap<>()), 7));
+    }
+
 
     @Test
     public void syncIncrement() {

mybatis-generator/pom.xml

@@ -29,13 +29,6 @@
         <version>5.1.47</version>
     </dependency>
 
-    <!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
-    <dependency>
-        <groupId>org.mybatis</groupId>
-        <artifactId>mybatis</artifactId>
-        <version>3.4.6</version>
-    </dependency>
-
     <dependency>
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok</artifactId>