Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 333bbd40 authored by maoying's avatar maoying
Browse files
Options

修改三维数据接口

parent 802a0f0a
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 28 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java
View file @ 333bbd40
...@@ -205,8 +205,10 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService { ...@@ -205,8 +205,10 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
// 是否关联风险点 // 是否关联风险点
notifyAlarm(equipmentSpecificIndex, 0); notifyAlarm(equipmentSpecificIndex, 0);
Map<String, Object> content = new HashMap<>(); Map<String, Object> content = new HashMap<>();
String location = equipmentSpecific.getLocation()+" "+equipmentSpecific.getDescription();
content.put("id", equipmentSpecific.getId()); 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("code", equipmentSpecific.getCode());
content.put("changeDate", new Date()); content.put("changeDate", new Date());
content.put("orgCode", equipmentSpecific.getOrgCode()); content.put("orgCode", equipmentSpecific.getOrgCode());
...@@ -226,7 +228,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService { ...@@ -226,7 +228,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
String key = equipmentSpecificIndex.getIotCode()+"-"+equipmentSpecificIndex.getNameKey(); String key = equipmentSpecificIndex.getIotCode()+"-"+equipmentSpecificIndex.getNameKey();
if(redisTemplate.hasKey(key)){ if(redisTemplate.hasKey(key)){
EquipmentSpecificIndexVo equipmentSpecificIndexVo = JSON.parseObject(redisTemplate.opsForValue().get(key).toString(), EquipmentSpecificIndexVo.class); 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())){ && equipmentSpecificIndex.getValue().equals(equipmentSpecificIndexVo.getValue())){
return false; return false;
} }
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/EquipmentSpecificForRiskVo.java
View file @ 333bbd40
...@@ -43,4 +43,16 @@ public class EquipmentSpecificForRiskVo { ...@@ -43,4 +43,16 @@ public class EquipmentSpecificForRiskVo {
@ApiModelProperty(value = "orgCode") @ApiModelProperty(value = "orgCode")
private String orgCode; private String orgCode;
/**
* 位置
*/
private String location;
/**
* 位置详情
*/
private String description;
} }
YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties
View file @ 333bbd40
#系统服务账号，用户后端服务调用 #\u7CFB\u7EDF\u670D\u52A1\u8D26\u53F7\uFF0C\u7528\u6237\u540E\u7AEF\u670D\u52A1\u8C03\u7528
security.password=a1234560 security.password=a1234560
security.loginId=fas_autosys security.loginId=fas_autosys
#environment #environment
#spring.profiles.active = dev #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.register-with-eureka = true
eureka.client.fetch-registry = true eureka.client.fetch-registry = true
eureka.client.healthcheck.enabled = true eureka.client.healthcheck.enabled = true
eureka.client.fetchRegistry = true eureka.client.fetchRegistry = true
eureka.instance.prefer-ip-address=true eureka.instance.prefer-ip-address=true
#DB properties: #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.username=root
spring.datasource.password=Yeejoin_1234 spring.datasource.password=Admin_1234
spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name = com.mysql.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000 spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10 spring.datasource.hikari.maximum-pool-size = 10
spring.datasource.testWhileIdle = true spring.datasource.testWhileIdle = true
spring.datasource.validationQuery = SELECT 1 spring.datasource.validationQuery = SELECT 1
#ws #ws
params.remoteWebsocketUrl=http://172.16.11.36:10600/ params.remoteWebsocketUrl=http://39.98.246.31:10600/
#redis #redis
spring.redis.database=0 spring.redis.database=0
spring.redis.host=172.16.3.100 spring.redis.host=39.98.246.31
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=1234560 spring.redis.password=1234560
spring.redis.jedis.pool.max-active=200 spring.redis.jedis.pool.max-active=200
...@@ -32,20 +32,20 @@ spring.redis.jedis.pool.min-idle=0 ...@@ -32,20 +32,20 @@ spring.redis.jedis.pool.min-idle=0
spring.redis.timeout=1000 spring.redis.timeout=1000
#picture upload #picture upload
windows.img.path = E:\\ windows.img.path = E:\\
linux.img.path = / linux.img.path = /home/yeejoin/
file.uploadUrl=E:\\upload\\files\\ file.uploadUrl=E:\\upload\\files\\
#picture read #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 params.isPush=true
## emqx ## emqx
emqx.clean-session=true emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]} 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.user-name=admin
emqx.password=admin emqx.password=admin
#�ļ����� #\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
file.downLoad.url=http://39.98.246.31:8888/ file.downLoad.url=http://39.98.246.31:8888/
#站端名称使用全拼 #\u7AD9\u7AEF\u540D\u79F0\u4F7F\u7528\u5168\u62FC
station.name = yinan station.name = yinan
#是否开启将风险区域同步至仓库货位true开启，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=false equipManage.fegin.isSyn=true
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml
View file @ 333bbd40
...@@ -177,11 +177,15 @@ ...@@ -177,11 +177,15 @@
wes.equipment_detail_id as equipmentDetailId, wes.equipment_detail_id as equipmentDetailId,
wes.qr_code as qrCode, wes.qr_code as qrCode,
wes.code as code, wes.code as code,
wes.org_code as orgCode wes.org_code as orgCode,
ws.full_name as location ,
sd.description
from from
wl_equipment_specific wes wl_equipment_specific wes
left join left join
wl_equipment_detail wed ON wed.id = wes.equipment_detail_id 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 where
wes.id=#{id} wes.id=#{id}
</select> </select>
......
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml
View file @ 333bbd40
...@@ -505,22 +505,34 @@ ...@@ -505,22 +505,34 @@
<select id="getEquipStatusTop5" resultType="com.yeejoin.amos.fas.business.bo.SafetyExecuteBo"> <select id="getEquipStatusTop5" resultType="com.yeejoin.amos.fas.business.bo.SafetyExecuteBo">
SELECT SELECT
wlesi.id, wlesi.id,
wlesi.`value` status, wlesi.`value` STATUS,
wlesi.update_date changeDate, 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 FROM
wl_equipment_specific_index wlesi wl_equipment_specific_index wlesi
LEFT JOIN wl_equipment_index wlei ON wlesi.equipment_index_id = wlei.id 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_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_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 WHERE
wles.org_code=#{orgCode} wles.org_code = '10'
and wlei.type_code!='BREAKDOWN' AND wlei.type_code != 'BREAKDOWN'
and wlei.type_code!='FIREALARM' AND wlei.type_code != 'FIREALARM'
and (wlesi.`value` = 'true' AND (
OR wlesi.`value` = 'false') wlesi.`value` = 'true'
ORDER BY wlesi.update_date DESC OR wlesi.`value` = 'false'
limit 0,5 )
ORDER BY
wlesi.update_date DESC
LIMIT 0,
5
</select> </select>
<select id="getPintsByType" resultType="hashmap"> <select id="getPintsByType" resultType="hashmap">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment