修改版本号及预案水源信息返回

YeeAmosFireAutoSysCommon/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.yeejoin.amos</groupId>
 		<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-		<version>2.0.6</version>
+		<version>2.1.3.3</version>
 	</parent>
 
 	<!-- <dependencies>

YeeAmosFireAutoSysService/pom.xml

@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>com.yeejoin.amos</groupId>
 		<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-		<version>2.0.6</version>
+		<version>2.1.3.3</version>
 	</parent>
 
 	<dependencies>
 	    <dependency>
             <groupId>com.yeejoin.amos</groupId>
             <artifactId>YeeAmosFireAutoSysCommon</artifactId>
-            <version>2.0.6</version>
+            <version>2.1.3.3</version>
         </dependency>
         
       <dependency>

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -1476,7 +1476,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     continue;
                 }
                 EquipCommunicationData data = (EquipCommunicationData) hashOperations.get("Analogue", map.get("code"));
-                map.put("level", StringUtil.isNumeric(data.getState()) ? data.getState() : level);
+              
+                map.put("level", ObjectUtils.isEmpty(data.getState()) ?level:data.getState());
+                map.put("value", map.get("level").toString());
                 map.put("volume", String.format("%.2f", (Double.valueOf(map.get("level").toString()) * area)));
             } else {
                 map.put("level", level);

YeeAmosFireAutoSysStart/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yeejoin.amos</groupId>
         <artifactId>YeeAmosFireAutoSysRoot</artifactId>
-        <version>2.0.6</version>
+        <version>2.1.3.3</version>
     </parent>
 
     <dependencies>
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.yeejoin.amos</groupId>
             <artifactId>YeeAmosFireAutoSysService</artifactId>
-            <version>2.0.6</version>
+            <version>2.1.3.3</version>
         </dependency>
     </dependencies>
 

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.yeejoin.amos</groupId>
 	<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-	<version>2.0.6</version>
+	<version>2.1.3.3</version>
 	<packaging>pom</packaging>
 	<name>YeeAmosFireAutoSysRoot</name>
 
@@ -224,16 +224,6 @@
 		  <name>Snapshots</name>
 		  <url>http://172.16.1.6:8081/nexus/content/repositories/snapshots/</url>
 	  </repository>
-	<repository>
-		<id>maven-public-ty</id>
-		<name>maven-public</name>
-		<url>http://repo.typroject.org:8081/repository/maven-public/</url>
-	</repository>
-	<repository>
-		<id>maven-snapshot</id>
-		<name>maven-snapshot</name>
-		<url>http://repo.typroject.org:8081/repository/maven-snapshots/</url>
-	</repository>
   </repositories>
 
   <pluginRepositories>