Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

YeeAmosFireAutoSysCommon/pom.xml

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

YeeAmosFireAutoSysService/pom.xml

@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>com.yeejoin.amos</groupId>
 		<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-		<version>2.1.0</version>
+		<version>2.0.3</version>
 	</parent>
 
 	<dependencies>
 	    <dependency>
             <groupId>com.yeejoin.amos</groupId>
             <artifactId>YeeAmosFireAutoSysCommon</artifactId>
-            <version>2.1.0</version>
+            <version>2.0.3</version>
         </dependency>
         
       <dependency>
@@ -69,12 +69,12 @@
 			<artifactId>spring-boot-starter-redis</artifactId>
 			<version>1.4.5.RELEASE</version>
 		</dependency>
-           <!-- 平台接口 -->
+           <!-- 平台接口-->
 	 <dependency>
 	  <groupId>com.yeejoin</groupId>
 	  <artifactId>amos-feign-privilege</artifactId>
 	  <version>1.1.0-SNAPSHOT</version>	  
-     </dependency>
+     </dependency> 
     <dependency>
 	  <groupId>com.yeejoin</groupId>
 	  <artifactId>amos-feign-systemctl</artifactId>

YeeAmosFireAutoSysStart/pom.xml

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

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -256,8 +256,7 @@
         frs.name riskSourceName
         from f_fire_equipment fe
         left join f_risk_source frs on frs.id = fe.risk_source_id
-        where
-        1=1
+        <where>
         <if test="equipClassify!=null">
             and fe.equip_classify in ( ${equipClassify} )
         </if>
@@ -268,6 +267,7 @@
         <if test="name!=null">
             and (fe.`name` like '%${name}%' or fe.`code` like '%${name}%')
         </if>
+        </where>
         LIMIT ${start},${length}
     </select>
 
@@ -301,8 +301,9 @@
         FROM
         f_equipment eq
         LEFT JOIN f_fire_station fs ON fs.id = eq.fire_station_id
-        WHERE 1=1
+        <where>
         <if test="id!=null">AND eq.id = #{id}</if>
+        </where>
     </select>
 
     <select id="findAllEquipPointInfo" resultType="com.yeejoin.amos.fas.business.vo.EquipCommunicationData">

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.yeejoin.amos</groupId>
 	<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-	<version>2.1.0</version>
+	<version>2.0.3</version>
 	<packaging>pom</packaging>
 	<name>YeeAmosFireAutoSysRoot</name>