修改三维数据接口

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

@@ -205,8 +205,10 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
             // 是否关联风险点
             notifyAlarm(equipmentSpecificIndex, 0);
             Map<String, Object> content = new HashMap<>();
+            String location = equipmentSpecific.getLocation()+" "+equipmentSpecific.getDescription();
+           
             content.put("id", equipmentSpecific.getId());
-            content.put("label", equipmentSpecific.getName()+" "+equipmentSpecificIndex.getEquipmentIndexName());
+            content.put("label", equipmentSpecific.getName()+" "+equipmentSpecificIndex.getEquipmentIndexName() + (ObjectUtils.isEmpty(location)?("【" +location+"】"):""));
             content.put("code", equipmentSpecific.getCode());
             content.put("changeDate", new Date());
             content.put("orgCode", equipmentSpecific.getOrgCode());
@@ -226,7 +228,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
     	String key = equipmentSpecificIndex.getIotCode()+"-"+equipmentSpecificIndex.getNameKey();
     	if(redisTemplate.hasKey(key)){
     		EquipmentSpecificIndexVo equipmentSpecificIndexVo = JSON.parseObject(redisTemplate.opsForValue().get(key).toString(), EquipmentSpecificIndexVo.class);
-    		if(equipmentSpecificIndex.getEquipmentSpecificId().equals(equipmentSpecificIndexVo.getEquipmentSpecificId()) 
+    		if(equipmentSpecificIndex.getEquipmentSpecificId().toString().equals(equipmentSpecificIndexVo.getEquipmentSpecificId().toString()) 
     				&& equipmentSpecificIndex.getValue().equals(equipmentSpecificIndexVo.getValue())){
     			return false;
     		}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/EquipmentSpecificForRiskVo.java

@@ -43,4 +43,16 @@ public class EquipmentSpecificForRiskVo {
 
     @ApiModelProperty(value = "orgCode")
     private String orgCode;
+    
+    /**
+     * 位置
+     */
+    private String location;
+    
+    /**
+     * 位置详情
+     */
+    private String description;
+    
+    
 }

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

-#系统服务账号，用户后端服务调用
+#\u7CFB\u7EDF\u670D\u52A1\u8D26\u53F7\uFF0C\u7528\u6237\u540E\u7AEF\u670D\u52A1\u8C03\u7528
 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://39.98.246.31: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.3.100:3306/autosys_business_v2.1.3.2?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://39.98.246.31:3306/autosys_business_v2.1.3.2?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
-spring.datasource.password=Yeejoin_1234
-spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
+spring.datasource.password=Admin_1234
+spring.datasource.driver-class-name = com.mysql.jdbc.Driver
 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/
+params.remoteWebsocketUrl=http://39.98.246.31:10600/
 #redis
 spring.redis.database=0
-spring.redis.host=172.16.3.100
+spring.redis.host=39.98.246.31
 spring.redis.port=6379
 spring.redis.password=1234560
 spring.redis.jedis.pool.max-active=200
@@ -32,20 +32,20 @@ spring.redis.jedis.pool.min-idle=0
 spring.redis.timeout=1000
 #picture upload
 windows.img.path = E:\\
-linux.img.path = /
+linux.img.path = /home/yeejoin/
 file.uploadUrl=E:\\upload\\files\\
 #picture read
-file.readUrl=http://172.16.3.89:8083/file/getFile?in=
+file.readUrl=http://39.98.246.31:8085/file/getFile?in=
 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.broker=tcp://39.98.246.31:1883
 emqx.user-name=admin
 emqx.password=admin
-#�ļ�����
+#\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 file.downLoad.url=http://39.98.246.31:8888/
-#站端名称使用全拼
+#\u7AD9\u7AEF\u540D\u79F0\u4F7F\u7528\u5168\u62FC
 station.name = yinan
-#是否开启将风险区域同步至仓库货位true开启，false关闭。默认关闭。
-equipManage.fegin.isSyn=false
+#\u662F\u5426\u5F00\u542F\u5C06\u98CE\u9669\u533A\u57DF\u540C\u6B65\u81F3\u4ED3\u5E93\u8D27\u4F4Dtrue\u5F00\u542F\uFF0Cfalse\u5173\u95ED\u3002\u9ED8\u8BA4\u5173\u95ED\u3002
+equipManage.fegin.isSyn=true

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

@@ -177,11 +177,15 @@
             wes.equipment_detail_id as equipmentDetailId,
             wes.qr_code as qrCode,
             wes.code as code,
-            wes.org_code as orgCode
+            wes.org_code as orgCode,
+			ws.full_name as location ,
+			sd.description 
         from
             wl_equipment_specific wes
         left join
             wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+				LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = wes.id
+				LEFT JOIN wl_warehouse_structure ws ON ws.id = sd.warehouse_structure_id
         where
             wes.id=#{id}
     </select>

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

@@ -505,22 +505,34 @@
 	<select id="getEquipStatusTop5" resultType="com.yeejoin.amos.fas.business.bo.SafetyExecuteBo">
 		SELECT
 			wlesi.id,
-			wlesi.`value` status,
+			wlesi.`value` STATUS,
 			wlesi.update_date changeDate,
-			CONCAT(ed.name,' ',wlei.name) label
+			CONCAT(ed. NAME, ' ', wlei. NAME,IF((ISNULL(ws.full_name) AND ISNULL(sd.description)),'',CONCAT(
+				'【',
+				IFNULL(ws.full_name, ''),
+				' ',
+				IFNULL(sd.description, ''),
+				'】'
+			))) label
 		FROM
 			wl_equipment_specific_index wlesi
 		LEFT JOIN wl_equipment_index wlei ON wlesi.equipment_index_id = wlei.id
-			left join wl_equipment_specific wles on wlesi.equipment_specific_id = wles.id
-			left join wl_equipment_detail ed on ed.id = wles.equipment_detail_id
+		LEFT JOIN wl_equipment_specific wles ON wlesi.equipment_specific_id = wles.id
+		LEFT JOIN wl_equipment_detail ed ON ed.id = wles.equipment_detail_id
+		LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = wles.id
+		LEFT JOIN wl_warehouse_structure ws ON ws.id = sd.warehouse_structure_id
 		WHERE
-			wles.org_code=#{orgCode}
-			and wlei.type_code!='BREAKDOWN'
-			and wlei.type_code!='FIREALARM'
-			and (wlesi.`value` = 'true'
-			OR wlesi.`value` = 'false')
-			ORDER BY wlesi.update_date DESC
-			limit 0,5
+			wles.org_code = '10'
+		AND wlei.type_code != 'BREAKDOWN'
+		AND wlei.type_code != 'FIREALARM'
+		AND (
+			wlesi.`value` = 'true'
+			OR wlesi.`value` = 'false'
+		)
+		ORDER BY
+			wlesi.update_date DESC
+		LIMIT 0,
+		 5
 	</select>
 
 	<select id="getPintsByType" resultType="hashmap">