包引用

YeeAmosFireAutoSysService/pom.xml

@@ -86,11 +86,6 @@
 	  <artifactId>amos-component-feign</artifactId>
 	  <version>1.1.0-SNAPSHOT</version>
      </dependency>
-      
-
-
-
-
 
 		<!-- <dependency>
 			<groupId>com.yeejoin.amos</groupId>

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/RiskSourceController.java

@@ -653,7 +653,7 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success();
     }
 
-    // @Permission
+     @Permission
 //  @Authorization(ingore = true)
     @ApiOperation(httpMethod = "PUT", value = "上传巡检数据", notes = "上传巡检数据")
     @RequestMapping(value = "/data/patroldata", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)

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

@@ -3,16 +3,16 @@ security.password=a1234560
 security.loginId=fas_autosys
 #environment
 #spring.profiles.active = dev
-eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://172.16.3.100:10001/eureka/
 eureka.client.register-with-eureka = true
 eureka.client.fetch-registry = true
 eureka.client.healthcheck.enabled = true
 eureka.client.fetchRegistry = true
 eureka.instance.prefer-ip-address=true
 #DB properties:
-spring.datasource.url=jdbc:mysql://172.16.11.33:3306/safety-business-2.0-36?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.3.100:3306/autosys_business_v2.1.3.2?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
-spring.datasource.password=admin_1234
+spring.datasource.password=Yeejoin_1234
 spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
 spring.datasource.hikari.maxLifetime = 1765000
 spring.datasource.hikari.maximum-pool-size = 10
@@ -22,9 +22,9 @@ spring.datasource.validationQuery = SELECT 1
 params.remoteWebsocketUrl=http://172.16.11.36:10600/
 #redis
 spring.redis.database=0
-spring.redis.host=172.16.10.85
+spring.redis.host=172.16.3.100
 spring.redis.port=6379
-spring.redis.password=amos2019Redis
+spring.redis.password=1234560
 spring.redis.jedis.pool.max-active=200
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=10
@@ -40,9 +40,9 @@ params.isPush=true
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.85:1883
-emqx.user-name=super
-emqx.password=a123456
+emqx.broker=tcp://172.16.3.100:1883
+emqx.user-name=admin
+emqx.password=admin
 #�ļ�����
 file.downLoad.url=http://39.98.246.31:8888/
 #站端名称使用全拼

YeeAmosFireAutoSysStart/src/main/resources/application.properties

-spring.application.name = AMOS-AUTOSYS
+spring.application.name = AMOS-AUTOSYS-my
 server.servlet.context-path=/fireAutoSys
 server.port = 8083
 spring.profiles.active=dev

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

@@ -32,9 +32,10 @@
 
     <select id="queryInitAlarm" resultType="com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo">
         SELECT
-            wed.id,
+            concat(wes.id) as id,
+        	concat(wes.id) as equipmentSpecificId,
             wed.`name`,
-            wed.`code`,
+            wes.`code`,
             wei.name_key,
             wei.`name` AS equipmentIndexName,
             wsi.`value`
@@ -61,8 +62,8 @@
     </select>
     <select id="getInitAlarm" resultType="com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo">
         SELECT
-        wes.id,
-        wes.id as equipmentSpecificId,
+        concat(wes.id) as id,
+        concat(wes.id) as equipmentSpecificId,
         wed.`name`,
         wes.`code`,
         wei.name_key,

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

@@ -21,7 +21,7 @@
 
     <select id="getInitAlarm" resultType="com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo">
         SELECT
-        p.id,
+        concat(p.id) as id,
         p.`name`,
         p.point_no AS `code`,
         'patrol' AS type,

pom.xml

@@ -34,9 +34,8 @@
 	  <dependency>
 	      <groupId>com.yeejoin</groupId>
 	      <artifactId>amos-component-rule</artifactId>
-	      <version>1.2.0-SNAPSHOT</version>
-       </dependency> 
-
+	      <version>1.4.3-SNAPSHOT</version>
+       </dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>