warewms api 1.0 example 08.01

pom.xml

@@ -41,8 +41,8 @@
         <lombok.version>1.18.12</lombok.version>
         <mybatis.plus.version>3.5.2</mybatis.plus.version>
         <knife4j.spring.version>3.0.3</knife4j.spring.version>
-        <local.lib.basedir>${pom.basedir}/warewms-admin/src/main/resources/lib</local.lib.basedir>
-
+        <guava.version>23.0</guava.version>
+        <guava.retry.version>2.0.0</guava.retry.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -190,6 +190,19 @@
                 <artifactId>hutool-all</artifactId>
                 <version>${hutool.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.rholder</groupId>
+                <artifactId>guava-retrying</artifactId>
+                <version>${guava.retry.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

warewms-admin/pom.xml

@@ -43,6 +43,11 @@
         </dependency>
 
 
+        <!-- 单元测试 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
 
         <!--硬件Jar集成，自定义starter组件-->
         <dependency>
@@ -89,6 +94,11 @@
             <scope>system</scope>
             <systemPath>${local.lib.basedir}/jssc-2.8.0.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

warewms-admin/src/main/java/com/warewms/hard/WarewmsApplication.java

@@ -1,18 +0,0 @@
-package com.warewms.hard;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-/**
- * 启动程序
- *
- * @author ruoyi
- */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class WarewmsApplication {
-    public static void main(String[] args)
-    {
-        SpringApplication.run(WarewmsApplication.class, args);
-    }
-}

warewms-admin/src/main/java/com/warewms/protocol/WarewmsApplication.java

@@ -1,18 +0,0 @@
-package com.warewms.protocol;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-/**
- * 启动程序
- *
- * @author ruoyi
- */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class WarewmsApplication {
-    public static void main(String[] args)
-    {
-        SpringApplication.run(WarewmsApplication.class, args);
-    }
-}

warewms-admin/src/test/java/com/ruoyi/admin/test/base/WarehouseTest.java

@@ -0,0 +1,42 @@
+package com.ruoyi.admin.test.base;
+
+import com.google.common.collect.Maps;
+import com.warewms.WarewmsApplication;
+import com.warewms.common.core.domain.entity.SysUser;
+import com.warewms.system.mapper.SysUserMapper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: andy.qu
+ * Date: 2022/2/9
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = WarewmsApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class WarehouseTest {
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Test
+    public void test() {
+
+        SysUser sysUser = new SysUser();
+        Map<String, Object> param = Maps.newHashMap();
+        param.put("beginTime", "2023-06-01 00:00:00");
+        param.put("endTime", "2023-08-01 23:59:59");
+        sysUser.setParams(param);
+        List<SysUser> sysUsers = userMapper.selectUserList(sysUser);
+        System.out.println(sysUsers);
+    }
+
+
+
+}

warewms-common/pom.xml

@@ -139,6 +139,16 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.rholder</groupId>
+            <artifactId>guava-retrying</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

warewms-common/src/main/java/com/warewms/common/core/domain/entity/SysDictType.java

@@ -1,13 +1,14 @@
 package com.warewms.common.core.domain.entity;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.warewms.common.annotation.Excel;
 import com.warewms.common.annotation.Excel.ColumnType;
 import com.warewms.common.core.domain.base.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 
 /**
  * 字典类型表 sys_dict_type

warewms-common/src/main/java/com/warewms/common/service/impl/SystemService.java

@@ -16,6 +16,10 @@ import com.warewms.common.utils.StringUtils;
 
 public abstract class SystemService<T extends BaseEntity> {
 
+
+
+    //集成重试工具类
+
     protected Page<T> convertToPage(PageDomain pageDomain){
         Page<T> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
         page.addOrder(new OrderItem[]{});

warewms-system/src/main/java/com/warewms/system/mapper/SysUserMapper.java

@@ -29,7 +29,7 @@ public interface SysUserMapper
      * @param sysUser 用户信息
      * @return 用户信息集合信息
      */
-    List<SysUser> selectUserList(SysUser sysUser);
+    List<SysUser> selectUserList(@Param("sysUser") SysUser sysUser);
 
     /**
      * 根据条件分页查询已配用户角色列表