Ver código fonte

warewms api 1.0 example

ChenYang 1 ano atrás
pai
commit
d80df4b66e

BIN
doc/ddl/RFIDAPI32PC.dll


BIN
doc/ddl/RFIDAPI3_JNI_HOST.dll


BIN
doc/ddl/rxtxParallel.dll


BIN
doc/ddl/rxtxSerial.dll


+ 2 - 8
pom.xml

@@ -30,7 +30,6 @@
         <druid.version>1.2.16</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
         <kaptcha.version>2.3.3</kaptcha.version>
-        <!--<pagehelper.boot.version>1.4.6</pagehelper.boot.version>-->
         <fastjson.version>2.0.25</fastjson.version>
         <oshi.version>6.4.0</oshi.version>
         <commons.io.version>2.11.0</commons.io.version>
@@ -42,6 +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>
+
     </properties>
 
     <!-- 依赖声明 -->
@@ -71,13 +72,6 @@
                 <version>${bitwalker.version}</version>
             </dependency>
 
-            <!-- pagehelper 分页插件 -->
-            <!--<dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.boot.version}</version>
-            </dependency>-->
-
             <!-- 获取系统信息 -->
             <dependency>
                 <groupId>com.github.oshi</groupId>

+ 52 - 0
warewms-admin/pom.xml

@@ -13,6 +13,10 @@
     <artifactId>warewms-admin</artifactId>
     <description>web application</description>
 
+    <properties>
+        <local.lib.basedir>${pom.basedir}/src/main/resources/lib</local.lib.basedir>
+    </properties>
+
     <dependencies>
         <!-- Mysql驱动包 -->
         <dependency>
@@ -37,6 +41,54 @@
             <groupId>com.warewms</groupId>
             <artifactId>warewms-generator</artifactId>
         </dependency>
+
+
+
+        <!--硬件Jar集成,自定义starter组件-->
+        <dependency>
+            <groupId>com.jwk</groupId>
+            <artifactId>modbus-spring-boot-starter</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${local.lib.basedir}/modbus-spring-boot-starter.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.jwk</groupId>
+            <artifactId>rfid-zebra-spring-boot-starter</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${local.lib.basedir}/rfid-zebra-spring-boot-starter.jar</systemPath>
+        </dependency>
+        <!-- rfid-zebra-只能跑在window上-->
+        <dependency>
+            <groupId>com.jwk</groupId>
+            <artifactId>rfid</artifactId>
+            <version>1.0.0</version>
+            <scope>system</scope>
+            <systemPath>${local.lib.basedir}/rfid-1.0.0.jar</systemPath>
+        </dependency>
+        <!--modbus4j start-->
+        <dependency>
+            <groupId>com.jwk</groupId>
+            <artifactId>RXTXcomm</artifactId>
+            <version>3.0.5</version>
+            <scope>system</scope>
+            <systemPath>${local.lib.basedir}/RXTXcomm.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.jwk</groupId>
+            <artifactId>modbus4j</artifactId>
+            <version>3.0.5</version>
+            <scope>system</scope>
+            <systemPath>${local.lib.basedir}/modbus4j-3.0.5.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.jwk</groupId>
+            <artifactId>jssc</artifactId>
+            <version>2.8.0</version>
+            <scope>system</scope>
+            <systemPath>${local.lib.basedir}/jssc-2.8.0.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>

BIN
warewms-admin/src/main/resources/lib/RXTXcomm.jar


BIN
warewms-admin/src/main/resources/lib/jssc-2.8.0.jar


BIN
warewms-admin/src/main/resources/lib/modbus-spring-boot-starter.jar


BIN
warewms-admin/src/main/resources/lib/modbus4j-3.0.5.jar


BIN
warewms-admin/src/main/resources/lib/rfid-1.0.0.jar


BIN
warewms-admin/src/main/resources/lib/rfid-zebra-spring-boot-starter.jar


+ 0 - 6
warewms-common/pom.xml

@@ -32,12 +32,6 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
 
-        <!-- pagehelper 分页插件 -->
-        <!--<dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>-->
-
         <!-- 自定义验证注解 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 8 - 5
warewms-common/src/main/java/com/warewms/common/core/domain/entity/SysUser.java

@@ -1,16 +1,19 @@
 package com.warewms.common.core.domain.entity;
 
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-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.annotation.Excel.Type;
 import com.warewms.common.annotation.Excels;
 import com.warewms.common.core.domain.base.BaseEntity;
 import com.warewms.common.xss.Xss;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 用户对象 sys_user

+ 0 - 43
warewms-common/src/main/java/com/warewms/common/utils/PageUtils.java

@@ -1,43 +0,0 @@
-/*
-package com.warewms.common.utils;
-
-import com.github.pagehelper.PageHelper;
-import com.warewms.common.core.page.PageDomain;
-import com.warewms.common.core.page.TableSupport;
-import com.warewms.common.utils.sql.SqlUtil;
-
-*/
-/**
- * 分页工具类
- * 
- * @author ruoyi
- *//*
-
-public class PageUtils extends PageHelper
-{
-    */
-/**
-     * 设置请求分页数据
-     *//*
-
-    public static void startPage()
-    {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
-        Boolean reasonable = pageDomain.getReasonable();
-        PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
-    }
-
-    */
-/**
-     * 清理分页的线程变量
-     *//*
-
-    public static void clearPage()
-    {
-        PageHelper.clearPage();
-    }
-}
-*/

+ 2 - 1
warewms-quartz/pom.xml

@@ -10,9 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>warewms-quartz</artifactId>
-
     <description>quartz schedule task</description>
 
+
+
     <dependencies>
 
         <!-- 定时任务 -->