短信依赖

zd-modules/zd-chemical/pom.xml

@@ -137,7 +137,7 @@
 
         <!-- 四医大短信依赖包 -->
         <dependency>
-            <groupId>commons</groupId>
+            <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <version>1.4</version>
             <scope>system</scope>
@@ -145,7 +145,7 @@
         </dependency>
 
         <dependency>
-            <groupId>commons</groupId>
+            <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>1.3.2</version>
             <scope>system</scope>
@@ -153,15 +153,15 @@
         </dependency>
 
         <dependency>
-            <groupId>commons</groupId>
+            <groupId>commons-pool</groupId>
             <artifactId>commons-pool</artifactId>
             <version>1.5.4</version>
             <scope>system</scope>
             <systemPath>${pom.basedir}/src/main/resources/libs/sms-syd/commons-pool-1.5.4.jar</systemPath>
         </dependency>
 
-        <dependency>
-            <groupId>jackson</groupId>
+<!--        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
             <version>2.6.0</version>
             <scope>system</scope>
@@ -169,7 +169,7 @@
         </dependency>
 
         <dependency>
-            <groupId>jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
             <version>2.6.2</version>
             <scope>system</scope>
@@ -177,7 +177,7 @@
         </dependency>
 
         <dependency>
-            <groupId>jackson</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>2.6.2</version>
             <scope>system</scope>
@@ -185,7 +185,7 @@
         </dependency>
 
         <dependency>
-            <groupId>jackson</groupId>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
             <version>2.6.2</version>
             <scope>system</scope>
@@ -193,23 +193,29 @@
         </dependency>
 
         <dependency>
-            <groupId>jackson</groupId>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jaxb-annotations</artifactId>
             <version>2.6.2</version>
             <scope>system</scope>
             <systemPath>${pom.basedir}/src/main/resources/libs/sms-syd/jackson-module-jaxb-annotations-2.6.2.jar</systemPath>
-        </dependency>
+        </dependency>-->
 
-        <dependency>
+        <!--<dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.8.1</version>
             <scope>system</scope>
             <systemPath>${pom.basedir}/src/main/resources/libs/sms-syd/junit-4.8.1.jar</systemPath>
-        </dependency>
+        </dependency>-->
 
         <dependency>
-            <groupId>postmsg</groupId>
+            <groupId>com.xuanwu</groupId>
             <artifactId>postmsg-ump</artifactId>
             <version>5.3.0.0</version>
             <scope>system</scope>
@@ -217,7 +223,7 @@
         </dependency>
 
         <dependency>
-            <groupId>protobuf</groupId>
+            <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
             <version>2.4.1</version>
             <scope>system</scope>
@@ -225,7 +231,7 @@
         </dependency>
 
         <dependency>
-            <groupId>stax2-api</groupId>
+            <groupId>org.codehaus.woodstox</groupId>
             <artifactId>stax2-api</artifactId>
             <version>3.1.4</version>
             <scope>system</scope>
@@ -233,7 +239,7 @@
         </dependency>
 
         <dependency>
-            <groupId>xpp3_min</groupId>
+            <groupId>xpp3</groupId>
             <artifactId>xpp3_min</artifactId>
             <version>1.1.4c</version>
             <scope>system</scope>
@@ -241,7 +247,7 @@
         </dependency>
 
         <dependency>
-            <groupId>xstream</groupId>
+            <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
             <version>1.3.1</version>
             <scope>system</scope>

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -181,7 +181,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
 
         logger.info("化学品入库，前端参数：" + JSONUtil.toJsonStr(hxpStock));
 
-        if(hxpStock.getOutUsages().compareTo(hxpStock.getTare()) < 0){
+        if(hxpStock.getUsages().compareTo(hxpStock.getTare()) <= 0){
             throw new ServiceException("入库重量错误，入库失败！");
         }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPermitMenuServiceImpl.java

@@ -113,7 +113,8 @@ public class SysPermitMenuServiceImpl implements ISysPermitMenuService {
         }
 
         if(CollectionUtils.isEmpty(list) && !sysUser.isAdmin()){
-            throw new PreAuthorizeException();
+//            throw new PreAuthorizeException();
+            throw new ServiceException("用户未配置菜单权限，请联系管理员！", 530);
         }
 
         for (SysPermitInfo sysPermitInfo : list) {