ChenYang 1 year ago
parent
commit
24b8f9b92b

BIN
lib/RXTXcomm.jar


BIN
lib/jssc-2.8.0.jar


BIN
lib/modbus4j-3.0.5.jar


BIN
lib/rxtxParallel.dll


BIN
lib/rxtxSerial.dll


+ 78 - 33
ruoyi-admin/pom.xml

@@ -15,6 +15,11 @@
         web服务入口
     </description>
 
+    <properties>
+        <project.name>${project.artifactId}-release-${project.parent.version}</project.name>
+        <project.build.libUrl>${project.build.directory}/${project.name}/${project.name}/lib</project.build.libUrl>
+    </properties>
+
     <dependencies>
 
         <!-- spring-boot-devtools -->
@@ -85,40 +90,62 @@
             <artifactId>warewms-ams</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>warewms-hard</artifactId>
+        </dependency>
+
     </dependencies>
 
-<!--    <build>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <version>2.1.1.RELEASE</version>-->
-<!--                <configuration>-->
-<!--                    <fork>true</fork> &lt;!&ndash; 如果没有该配置,devtools不会生效 &ndash;&gt;-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-war-plugin</artifactId>-->
-<!--                <version>3.1.0</version>-->
-<!--                <configuration>-->
-<!--                    <failOnMissingWebXml>false</failOnMissingWebXml>-->
-<!--                    <warName>${project.artifactId}</warName>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--        <finalName>${project.artifactId}</finalName>-->
-<!--    </build>-->
+    <!--<build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <fork>true</fork> &lt;!&ndash; 如果没有该配置,devtools不会生效 &ndash;&gt;
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>-->
 
     <build>
         <plugins>
+
+            <!--<plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                    <fork>true</fork> &lt;!&ndash; 如果没有该配置,devtools不会生效 &ndash;&gt;
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -156,11 +183,30 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.libUrl}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- 使用 mvn clean package 打包 更多配置可参考官司方文档:http://maven.apache.org/plugins/maven-assembly-plugin/single-mojo.html -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.1.0</version>
+
                 <executions>
                     <execution>
                         <id>make-assembly</id>
@@ -168,14 +214,13 @@
                         <goals>
                             <goal>single</goal>
                         </goals>
-
                         <configuration>
                             <!-- 打包生成的文件名 -->
-                            <finalName>${project.artifactId}</finalName>
+                            <finalName>${project.name}</finalName>
                             <!-- jar 等压缩文件在被打包进入 zip、tar.gz 时是否压缩,设置为 false 可加快打包速度 -->
                             <recompressZippedFiles>false</recompressZippedFiles>
-                            <!-- 打包生成的文件是否要追加 release.xml 中定义的 id 值 -->
-                            <appendAssemblyId>true</appendAssemblyId>
+                            <!-- 打包生成的文件是否要追加 package.xml 中定义的 id 值 -->
+                            <appendAssemblyId>false</appendAssemblyId>
                             <!-- 指向打包描述文件 package.xml -->
                             <descriptors>
                                 <descriptor>package.xml</descriptor>

+ 0 - 4
ruoyi-admin/src/main/java/com/ruoyi/nieyan/controller/pda/PdaDocQcController.java

@@ -3,19 +3,15 @@ package com.ruoyi.nieyan.controller.pda;
 import cn.hutool.core.lang.Assert;
 import com.ruoyi.ams.nieyan.dto.LotInfoFctAgvDTO;
 import com.ruoyi.ams.nieyan.dto.QcInfoFctAgvDTO;
-import com.ruoyi.ams.nieyan.entity.QcInfoFctAgvEntity;
 import com.ruoyi.ams.nieyan.service.ILotInfoFctAgvService;
 import com.ruoyi.ams.nieyan.service.IQcInfoFctAgvService;
 import com.ruoyi.ams.qc.domain.vo.DocQcListVo;
 import com.ruoyi.ams.qc.service.IDocQcDetailsService;
 import com.ruoyi.ams.qc.service.IDocQcHeaderService;
-import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
-import org.apache.http.util.Asserts;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

+ 21 - 0
ruoyi-admin/src/main/resources/application-dev.yml

@@ -55,6 +55,27 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+    redis:
+        # 地址
+        host: 154.12.20.200
+        # 端口,默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password:
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间(使用负值表示没有限制)
+                max-wait: -1ms
 
 # 日志配置
 logging:

+ 21 - 0
ruoyi-admin/src/main/resources/application-prod.yml

@@ -55,6 +55,27 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+    redis:
+        # 地址
+        host: localhost
+        # 端口,默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password:
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间(使用负值表示没有限制)
+                max-wait: -1ms
 
 # 日志配置
 logging:

+ 1 - 22
ruoyi-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: prod
   # 文件上传
   servlet:
     multipart:
@@ -51,27 +51,6 @@ spring:
       # 热部署开关
       enabled: true
   # redis 配置
-  redis:
-    # 地址
-    host: 154.12.20.200
-    # 端口,默认为6379
-    port: 6379
-    # 数据库索引
-    database: 0
-    # 密码
-    password:
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间(使用负值表示没有限制)
-        max-wait: -1ms
 
 # token配置
 token:

+ 2 - 2
warewms-ams/src/main/resources/mapper/weighData/WeighDataMapper.xml

@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="lotnum != null">#{lotnum},</if>
             <if test="num != null">#{num},</if>
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateWeighData" parameterType="WeighData">

+ 6 - 6
warewms-hard/pom.xml

@@ -25,14 +25,14 @@
             <artifactId>modbus-spring-boot-starter</artifactId>
             <version>1.0</version>
             <scope>system</scope>
-            <systemPath>${basedir}/src/main/resources/lib/modbus-spring-boot-starter.jar</systemPath>
+            <systemPath>${pom.basedir}/src/main/resources/lib/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>${basedir}/src/main/resources/lib/rfid-zebra-spring-boot-starter.jar</systemPath>
+            <systemPath>${pom.basedir}/src/main/resources/lib/rfid-zebra-spring-boot-starter.jar</systemPath>
         </dependency>
 
         <!-- rfid-zebra-只能跑在window上-->
@@ -41,7 +41,7 @@
             <artifactId>rfid</artifactId>
             <version>1.0.0</version>
             <scope>system</scope>
-            <systemPath>${basedir}/src/main/resources/lib/rfid-1.0.0.jar</systemPath>
+            <systemPath>${pom.basedir}/src/main/resources/lib/rfid-1.0.0.jar</systemPath>
         </dependency>
 
         <!--modbus4j start-->
@@ -50,21 +50,21 @@
             <artifactId>RXTXcomm</artifactId>
             <version>3.0.5</version>
             <scope>system</scope>
-            <systemPath>${basedir}/src/main/resources/lib/RXTXcomm.jar</systemPath>
+            <systemPath>${pom.basedir}/src/main/resources/lib/RXTXcomm.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.jwk</groupId>
             <artifactId>modbus4j</artifactId>
             <version>3.0.5</version>
             <scope>system</scope>
-            <systemPath>${basedir}/src/main/resources/lib/modbus4j-3.0.5.jar</systemPath>
+            <systemPath>${pom.basedir}/src/main/resources/lib/modbus4j-3.0.5.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.jwk</groupId>
             <artifactId>jssc</artifactId>
             <version>2.8.0</version>
             <scope>system</scope>
-            <systemPath>${basedir}/src/main/resources/lib/jssc-2.8.0.jar</systemPath>
+            <systemPath>${pom.basedir}/src/main/resources/lib/jssc-2.8.0.jar</systemPath>
         </dependency>
         <!--modbus4j end-->
     </dependencies>

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


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