Merge remote-tracking branch 'origin/dev_upgrade-1225' into dev_upgrade-1225

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

@@ -131,6 +131,6 @@ public class EquipmentSpecificServiceImpl implements EquipmentSpecificService {
             substring = id.substring(0, 1);
         }
 
-        return substring;
+        return substring+"%";
     }
 }

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -3,7 +3,7 @@ security.password=a1234560
 security.loginId=fas_autosys
 #environment
 #spring.profiles.active = dev
-eureka.client.serviceUrl.defaultZone=http://172.16.3.100:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
 eureka.client.register-with-eureka = true
 eureka.client.fetch-registry = true
 eureka.client.healthcheck.enabled = true
@@ -19,11 +19,13 @@ spring.datasource.hikari.maxLifetime = 1765000
 spring.datasource.hikari.maximum-pool-size = 10
 spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
+#ws
+params.remoteWebsocketUrl=http://172.16.11.36:10600/
 #redis
 spring.redis.database=0
-spring.redis.host=172.16.3.100
+spring.redis.host=172.16.10.85
 spring.redis.port=6379
-spring.redis.password=1234560
+spring.redis.password=amos2019Redis
 spring.redis.jedis.pool.max-active=200
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=10
@@ -39,9 +41,9 @@ params.isPush=true
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.3.100:1883
-emqx.user-name=admin
-emqx.password=admin
+emqx.broker=tcp://172.16.10.85:1883
+emqx.user-name=super
+emqx.password=a123456
 #�ļ�����
 file.downLoad.url=http://39.98.246.31:8888/
 #站端名称使用全拼

YeeAmosFireAutoSysStart/src/main/resources/application.properties

 spring.application.name = AMOS-AUTOSYS
 server.servlet.context-path=/fireAutoSys
-server.port = 8083
+server.port = 8085
 spring.profiles.active=dev
 #应用product appkey
 security.productWeb=STUDIO_APP_WEB

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

@@ -32,7 +32,7 @@
         equ.code as code,
         det.name as name,
         cate.name as type,
-        ware.full_name as address,
+        concat_ws('-',ware.full_name, det.area) as address,
         spe.single as single,
         sto.amount as amount,
         spe.iot_code,
@@ -55,7 +55,7 @@
             and (det.name like CONCAT('%',#{name},'%') or ware.full_name like CONCAT('%',#{name},'%') or spe.iot_code like CONCAT('%',#{name},'%') or spe.code like CONCAT('%',#{name},'%'))
         </if>
         <if test="code != null and code!='null' ">
-            and cate.code  like CONCAT('%',#{code},'%' )
+            and cate.code  like #{code}
         </if>
         <if test="equipmentId != null and equipmentId!='null' ">
             and fire.equipment_id  = #{equipmentId}
@@ -87,7 +87,7 @@
             and (det.name like CONCAT('%',#{name},'%') or ware.full_name like CONCAT('%',#{name},'%') or spe.iot_code like CONCAT('%',#{name},'%') or spe.code like CONCAT('%',#{name},'%'))
         </if>
         <if test="code != null and code!='null' ">
-            and cate.code  like CONCAT('%',#{code},'%' )
+            and cate.code  like #{code}
         </if>
         <if test="equipmentId != null and equipmentId!='null' ">
             and fire.equipment_id  = #{equipmentId}