Merge branch 'develop_dl_3.7.0.9' into develop_dl

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/pom.xml

@@ -56,6 +56,12 @@
             <artifactId>amos-component-security</artifactId>
             <version>1.7.13-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.yeejoin</groupId>
+            <artifactId>amos-component-influxdb</artifactId>
+            <version>1.8.5-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1714,16 +1714,18 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Override
     public void updateEquipmentSpecIndexRealtimeData(EquipmentSpecificIndex index) {
         // TODO Auto-generated method stub
-        if (!ObjectUtils.isEmpty(index)) {
+        if (!ObjectUtils.isEmpty(index.getEquipmentSpecificId())) {
             EquipmentSpecific es = equipmentSpecificMapper.selectById(index.getEquipmentSpecificId());
-            es.setRealtimeIotEsIndexId(index.getId());
-            es.setRealtimeIotIndexKey(index.getNameKey());
-            es.setRealtimeIotIndexName(index.getEquipmentSpecificIndexName());
-            es.setRealtimeIotIndexValue(index.getValue());
-            es.setRealtimeIotIndexId(index.getEquipmentIndexId());
-            es.setRealtimeIotIndexUpdateDate(index.getUpdateDate());
-            es.setValueLabel(index.getValueLabel());
-            equipmentSpecificMapper.updateById(es);
+            if(!ObjectUtils.isEmpty(es)){
+            	 es.setRealtimeIotEsIndexId(index.getId());
+                 es.setRealtimeIotIndexKey(index.getNameKey());
+                 es.setRealtimeIotIndexName(index.getEquipmentSpecificIndexName());
+                 es.setRealtimeIotIndexValue(index.getValue());
+                 es.setRealtimeIotIndexId(index.getEquipmentIndexId());
+                 es.setRealtimeIotIndexUpdateDate(index.getUpdateDate());
+                 es.setValueLabel(index.getValueLabel());
+                 equipmentSpecificMapper.updateById(es);
+            }
         }
     }
 

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -135,4 +135,14 @@ water.level.indexKey=FHS_FirePoolDevice_WaterLevel,FHS_LevelDetector_WaterLevel,
 mileage.parameter=0.5
 # 江西电建-车辆里程跨天记录切分(每日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

amos-boot-system-equip/src/main/resources/application.properties

@@ -9,7 +9,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #mybatis mapper file
 mybatis.mapper-locations=classpath:mapper/*.xml
 #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.type-aliases-package=com.yeejoin.equipmanage.common.entity
 spring.jackson.time-zone=GMT+8

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -513,6 +513,8 @@
                     #{item}
                 </foreach>
             </if>
+            and es.iot_code is not null
+            and es.iot_code != ''
         </where>
     </select>
 

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3870,5 +3870,16 @@
         </sql>
     </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>