Commit eb386f06 authored by 刘林's avatar 刘林

Merge branch 'develop_dl_3.7.0.9' into develop_dl

# Conflicts: # amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java # amos-boot-system-equip/src/main/resources/application-dev.properties
parents 5282006a 501bbca5
...@@ -56,6 +56,12 @@ ...@@ -56,6 +56,12 @@
<artifactId>amos-component-security</artifactId> <artifactId>amos-component-security</artifactId>
<version>1.7.13-SNAPSHOT</version> <version>1.7.13-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-influxdb</artifactId>
<version>1.8.5-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -1714,16 +1714,18 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1714,16 +1714,18 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Override @Override
public void updateEquipmentSpecIndexRealtimeData(EquipmentSpecificIndex index) { public void updateEquipmentSpecIndexRealtimeData(EquipmentSpecificIndex index) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
if (!ObjectUtils.isEmpty(index)) { if (!ObjectUtils.isEmpty(index.getEquipmentSpecificId())) {
EquipmentSpecific es = equipmentSpecificMapper.selectById(index.getEquipmentSpecificId()); EquipmentSpecific es = equipmentSpecificMapper.selectById(index.getEquipmentSpecificId());
es.setRealtimeIotEsIndexId(index.getId()); if(!ObjectUtils.isEmpty(es)){
es.setRealtimeIotIndexKey(index.getNameKey()); es.setRealtimeIotEsIndexId(index.getId());
es.setRealtimeIotIndexName(index.getEquipmentSpecificIndexName()); es.setRealtimeIotIndexKey(index.getNameKey());
es.setRealtimeIotIndexValue(index.getValue()); es.setRealtimeIotIndexName(index.getEquipmentSpecificIndexName());
es.setRealtimeIotIndexId(index.getEquipmentIndexId()); es.setRealtimeIotIndexValue(index.getValue());
es.setRealtimeIotIndexUpdateDate(index.getUpdateDate()); es.setRealtimeIotIndexId(index.getEquipmentIndexId());
es.setValueLabel(index.getValueLabel()); es.setRealtimeIotIndexUpdateDate(index.getUpdateDate());
equipmentSpecificMapper.updateById(es); es.setValueLabel(index.getValueLabel());
equipmentSpecificMapper.updateById(es);
}
} }
} }
......
...@@ -135,4 +135,14 @@ water.level.indexKey=FHS_FirePoolDevice_WaterLevel,FHS_LevelDetector_WaterLevel, ...@@ -135,4 +135,14 @@ water.level.indexKey=FHS_FirePoolDevice_WaterLevel,FHS_LevelDetector_WaterLevel,
mileage.parameter=0.5 mileage.parameter=0.5
# 江西电建-车辆里程跨天记录切分(每日0点执行) # 江西电建-车辆里程跨天记录切分(每日0点执行)
mileage.segmentation.cron=0 0 0 * * ? mileage.segmentation.cron=0 0 0 * * ?
mileage.clippingtime=600000 mileage.clippingtime=600000
\ No newline at end of file
# influxDB
spring.influx.url=http://172.16.11.201:8086
spring.influx.password=Yeejoin@2020
spring.influx.user=root
spring.influx.database=iot_platform
spring.influx.retention_policy=default
spring.influx.retention_policy_time=30d
spring.influx.actions=10000
spring.influx.bufferLimit=20000
\ No newline at end of file
...@@ -9,7 +9,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver ...@@ -9,7 +9,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#mybatis mapper file #mybatis mapper file
mybatis.mapper-locations=classpath:mapper/*.xml mybatis.mapper-locations=classpath:mapper/*.xml
#mybatis-plus #mybatis-plus
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.slf4j.Slf4jImpl
# mybatis entity package # mybatis entity package
mybatis.type-aliases-package=com.yeejoin.equipmanage.common.entity mybatis.type-aliases-package=com.yeejoin.equipmanage.common.entity
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
......
...@@ -513,6 +513,8 @@ ...@@ -513,6 +513,8 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
and es.iot_code is not null
and es.iot_code != ''
</where> </where>
</select> </select>
......
...@@ -3870,5 +3870,16 @@ ...@@ -3870,5 +3870,16 @@
</sql> </sql>
</changeSet> </changeSet>
</databaseChangeLog> <changeSet author="ltw" id="20230614-ltw-01">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_organization_user" columnName="post_name"/>
</not>
</preConditions>
<comment>modify table cb_organization_user modify columns</comment>
<sql>
ALTER TABLE `cb_organization_user` MODIFY `post_name` varchar(4000) DEFAULT NULL COMMENT '岗位名称'
</sql>
</changeSet>
</databaseChangeLog>
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