influxDB开发环境和正式环境配置

platform-dao/src/main/resources/application-daoProd.yml

@@ -140,5 +140,5 @@ logging:
     org.activiti: INFO
 
 influx:
-  url: http://192.168.108.180:8086
+  url: http://10.10.103.230:8086
   token: _22UZ9zjSdWzNZWF0a97x6VDM2NJqw47Z6xVN1_odtyGMW5sA2axcEe-nEk74Z5r6l_Ety9G2uB6NukDnMMd2Q==

platform-dao/src/main/resources/application-daoTest.yml

@@ -140,5 +140,5 @@ logging:
     org.activiti: INFO
 
 influx:
-  url: http://192.168.108.180:8086
+  url: http://10.10.103.230:8086
   token: _22UZ9zjSdWzNZWF0a97x6VDM2NJqw47Z6xVN1_odtyGMW5sA2axcEe-nEk74Z5r6l_Ety9G2uB6NukDnMMd2Q==

platform-dao/src/main/resources/application-influxDB.yml

@@ -1,5 +0,0 @@
-influx:
-  url: http://192.168.108.180:8086
-  token: qEMI2lHel0NPscN32WgmZtuymxmYZZZv67hHeRGA2_VJ_gd5sHH_QTyZ34T_ThhcbwFaqx4Qs9Q5BQBNpfMLkg==   #可以从页面上获取
-  org: qykh
-  bucket: qykh_dcs

platform-opc/src/main/java/com/platform/opc/command/InitAddGroupAndItem.java

@@ -58,8 +58,8 @@ public class InitAddGroupAndItem implements CommandLineRunner {
         if (!CollectionUtils.isEmpty(list)) {
             remoteOpcMapper.updateBatch(list);
         }
-        log.info("结束-初始化分组");
         RedisUtils.del(RedisKeyConstants.redis_ok);
+        log.info("结束-初始化分组");
     }
 }
 

platform-opc/src/main/java/com/platform/opc/servie/OpcService.java

@@ -54,6 +54,7 @@ public class OpcService {
         String jsonStr = RedisUtils.getString(RedisKeyConstants.DCS_PREFIX + id);
         if (StringUtils.isNotBlank(jsonStr)) {
             log.info("保存-" + id);
+            log.info("jsonStr：" + jsonStr);
             List<RemoteOpcVO> resultList = JSON.parseArray(jsonStr, RemoteOpcVO.class);
             influxDBService.writeBatch(resultList);
         }

platform-opc/src/main/java/com/platform/opc/servie/OpcTask.java

@@ -92,7 +92,7 @@ public class OpcTask {
     @Scheduled(fixedDelay = 2000)  //间隔2秒
     public void getValue() throws JIException {
         String key = RedisUtils.getString(RedisKeyConstants.redis_opc_update_flag);
-        String ok = RedisUtils.getString(RedisKeyConstants.redis_opc_update_flag);
+        String ok = RedisUtils.getString(RedisKeyConstants.redis_ok);
         if(StringUtils.isBlank(key) && StringUtils.isBlank(ok)){
             for (int i = 0; i < OpcDAClient.groupList.size(); i++) {
                 Group group = OpcDAClient.groupList.get(i);
@@ -108,10 +108,10 @@ public class OpcTask {
      * 1）循环查询点位在当天是否存在记录，如果存在，则追加
      * 2）批量写入数据库，每天的数据追加到一条里面
      */
-    @Scheduled(fixedDelay = 10000)  //间隔10秒，保存一次数据到数据库，确保每天不超过700万数据
+    @Scheduled(fixedDelay = 100000)  //间隔10秒，保存一次数据到数据库，确保每天不超过700万数据
     public void saveValue() throws JIException {
         String key = RedisUtils.getString(RedisKeyConstants.redis_opc_update_flag);
-        String ok = RedisUtils.getString(RedisKeyConstants.redis_opc_update_flag);
+        String ok = RedisUtils.getString(RedisKeyConstants.redis_ok);
         if(StringUtils.isBlank(key) && StringUtils.isBlank(ok)){
             for (int i = 0; i < OpcDAClient.groupList.size(); i++) {
                 Group group = OpcDAClient.groupList.get(i);

platform-opc/src/main/java/com/platform/opc/util/OpcDAClient.java

@@ -184,7 +184,7 @@ public class OpcDAClient {
             Map<String, Integer> errorsItemMap = e.getErrors();
             // e.printStackTrace();
             log.error("添加点位出错，有不存在的点位，等待下次启动添加");
-            for (Group checkGroup : groupList) {
+            /*for (Group checkGroup : groupList) {
                 try {
                     server.removeGroup(checkGroup, true);
                 } catch (JIException ex) {
@@ -193,7 +193,7 @@ public class OpcDAClient {
                 }
             }
             groupList = new ArrayList<>();
-            itemArrList = new HashMap<>();
+            itemArrList = new HashMap<>();*/
             return e;
         } catch (DuplicateGroupException e) {
             e.printStackTrace();

platform-rest/src/main/java/com/platform/rest/controller/influxdb/InfluxDBController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -55,7 +56,7 @@ public class InfluxDBController {
     public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody RemoteOpcDTO remoteMeasureDTO) {
         RemoteOpcVO vo = BeanConverterUtil.copyObjectProperties(remoteOpcService.getModelById(id), RemoteOpcVO.class);
         float value = RandomUtils.nextFloat();
-        vo.setResult(new BigDecimal(value).setScale(2));
+        vo.setResult(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
         influxDBService.writeOne(vo);
         return new R<>();
     }
@@ -73,7 +74,7 @@ public class InfluxDBController {
         List<RemoteOpcVO> voList = remoteOpcService.selectPageList(null, pageNum, pageSize).getRows();
         for (RemoteOpcVO vo : voList) {
             float value = RandomUtils.nextFloat();
-            vo.setResult(new BigDecimal(value).setScale(2));
+            vo.setResult(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
         }
         influxDBService.writeBatch(voList);
         return new R<>("批量新增点位记录成功");