修改

pom.xml

@@ -113,18 +113,18 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <!-- 排除 classes 目录下的这两个配置文件 -->
-                        <exclude>**/application.properties</exclude>
-                        <exclude>**/application-prod.properties</exclude>
-                        <exclude>**/application-dev.properties</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-jar-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <excludes>-->
+<!--                        &lt;!&ndash; 排除 classes 目录下的这两个配置文件 &ndash;&gt;-->
+<!--                        <exclude>**/application.properties</exclude>-->
+<!--                        <exclude>**/application-prod.properties</exclude>-->
+<!--                        <exclude>**/application-dev.properties</exclude>-->
+<!--                    </excludes>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
         <pluginManagement>
             <plugins>

src/main/java/com/steerinfo/meterwork/meterworkmonitor/controller/MeterWorkMonitorController.java

@@ -177,22 +177,13 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
     //@RequiresPermissions("meterworkmonitor:update")
     @PostMapping(value = "/doUpdateWf", produces = "application/json;charset=UTF-8")
     public RESTfulResult update(@RequestBody MeterWorkMonitor model) {
-        long start = System.currentTimeMillis();
-        String reqPointNo = model == null ? null : model.getPointNo();
-        log.info("[MonitorRTDB] doUpdateWf enter pointNo={}", reqPointNo);
         try {
             String pointNo = meterWorkMonitorService.doUpdateWf(model);
             if (pointNo == null || pointNo.isEmpty()) {
-                log.warn("[MonitorRTDB] doUpdateWf fail pointNo={} costMs={}",
-                        reqPointNo, System.currentTimeMillis() - start);
                 return failed(null, "修改失败");
             }
-            log.info("[MonitorRTDB] doUpdateWf ok pointNo={} costMs={}",
-                    pointNo, System.currentTimeMillis() - start);
-            return success(pointNo);
+            return success("操作成功!");
         } catch (Exception ex) {
-            log.error("[MonitorRTDB] doUpdateWf exception pointNo={} costMs={}",
-                    reqPointNo, System.currentTimeMillis() - start, ex);
             throw new MarkerMetException(500, "操作异常！！");
         }
     }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -90,59 +90,66 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         return model.getPointNo();
     }
 
+//    @Override
+//    public String doUpdateWf(MeterWorkMonitor model) {
+//        long start = System.currentTimeMillis();
+//        try {
+//            Assert.isTrue(model != null && StringUtils.isNotEmpty(model.getPointNo()), "秤点编号为空");
+//            boolean rtdbEnabled = isRtdbWriteEnabled();
+//            log.info("[MonitorRTDB] doUpdateWf service start pointNo={} rtdbEnabled={}",
+//                    model.getPointNo(), rtdbEnabled);
+//            if (rtdbEnabled) {
+//                try {
+//                    MeterWorkMonitor existing = meterWorkMonitorRtdbRepository.getByPointNo(model.getPointNo());
+//                    String source;
+//                    if (existing == null || existing.getPointNo() == null) {
+//                        existing = meterWorkMonitorMapper.selectByPrimaryKey(model.getPointNo());
+//                        if (existing == null || existing.getPointNo() == null) {
+//                            existing = model;
+//                            source = "request";
+//                        } else {
+//                            source = "oracle";
+//                        }
+//                    } else {
+//                        source = "tarantool";
+//                    }
+//                    if (!"request".equals(source)) {
+//                        MeterWorkMonitorTupleCodec.mergeNonNull(existing, model);
+//                    }
+//                    log.info("[MonitorRTDB] doUpdateWf replace Tarantool pointNo={} baseSource={} dirty=true",
+//                            existing.getPointNo(), source);
+//                    existing.setLastTime(new Date());
+//                    meterWorkMonitorRtdbRepository.replace(existing, true);
+//                    log.info("[MonitorRTDB] doUpdateWf Tarantool ok pointNo={} costMs={}",
+//                            existing.getPointNo(), System.currentTimeMillis() - start);
+//                    return existing.getPointNo();
+//                } catch (Exception rtdbEx) {
+//                    log.error("[MonitorRTDB] doUpdateWf Tarantool failed pointNo={} fallbackOracle={} costMs={}",
+//                            model.getPointNo(), isFallbackOracle(), System.currentTimeMillis() - start, rtdbEx);
+////                    if (isFallbackOracle()) {
+////                        meterWorkMonitorMapper.updateByPrimaryKeySelective(model);
+////                        log.warn("[MonitorRTDB] doUpdateWf fallback Oracle ok pointNo={} costMs={}",
+////                                model.getPointNo(), System.currentTimeMillis() - start);
+////                        return model.getPointNo();
+////                    }
+//                    return "";
+//                }
+//            }
+//            log.info("[MonitorRTDB] doUpdateWf write Oracle (rtdb disabled) pointNo={}", model.getPointNo());
+//            meterWorkMonitorMapper.updateByPrimaryKeySelective(model);
+//            return model.getPointNo();
+//        } catch (Exception ex) {
+//            log.error("[MonitorRTDB] doUpdateWf failed pointNo={} costMs={}",
+//                    model == null ? null : model.getPointNo(), System.currentTimeMillis() - start, ex);
+//            return "";
+//        }
+//    }
+
     @Override
     public String doUpdateWf(MeterWorkMonitor model) {
-        long start = System.currentTimeMillis();
-        try {
-            Assert.isTrue(model != null && StringUtils.isNotEmpty(model.getPointNo()), "秤点编号为空");
-            boolean rtdbEnabled = isRtdbWriteEnabled();
-            log.info("[MonitorRTDB] doUpdateWf service start pointNo={} rtdbEnabled={}",
-                    model.getPointNo(), rtdbEnabled);
-            if (rtdbEnabled) {
-                try {
-                    MeterWorkMonitor existing = meterWorkMonitorRtdbRepository.getByPointNo(model.getPointNo());
-                    String source;
-                    if (existing == null || existing.getPointNo() == null) {
-                        existing = meterWorkMonitorMapper.selectByPrimaryKey(model.getPointNo());
-                        if (existing == null || existing.getPointNo() == null) {
-                            existing = model;
-                            source = "request";
-                        } else {
-                            source = "oracle";
-                        }
-                    } else {
-                        source = "tarantool";
-                    }
-                    if (!"request".equals(source)) {
-                        MeterWorkMonitorTupleCodec.mergeNonNull(existing, model);
-                    }
-                    log.info("[MonitorRTDB] doUpdateWf replace Tarantool pointNo={} baseSource={} dirty=true",
-                            existing.getPointNo(), source);
-                    existing.setLastTime(new Date());
-                    meterWorkMonitorRtdbRepository.replace(existing, true);
-                    log.info("[MonitorRTDB] doUpdateWf Tarantool ok pointNo={} costMs={}",
-                            existing.getPointNo(), System.currentTimeMillis() - start);
-                    return existing.getPointNo();
-                } catch (Exception rtdbEx) {
-                    log.error("[MonitorRTDB] doUpdateWf Tarantool failed pointNo={} fallbackOracle={} costMs={}",
-                            model.getPointNo(), isFallbackOracle(), System.currentTimeMillis() - start, rtdbEx);
-//                    if (isFallbackOracle()) {
-//                        meterWorkMonitorMapper.updateByPrimaryKeySelective(model);
-//                        log.warn("[MonitorRTDB] doUpdateWf fallback Oracle ok pointNo={} costMs={}",
-//                                model.getPointNo(), System.currentTimeMillis() - start);
-//                        return model.getPointNo();
-//                    }
-                    return "";
-                }
-            }
-            log.info("[MonitorRTDB] doUpdateWf write Oracle (rtdb disabled) pointNo={}", model.getPointNo());
-            meterWorkMonitorMapper.updateByPrimaryKeySelective(model);
-            return model.getPointNo();
-        } catch (Exception ex) {
-            log.error("[MonitorRTDB] doUpdateWf failed pointNo={} costMs={}",
-                    model == null ? null : model.getPointNo(), System.currentTimeMillis() - start, ex);
-            return "";
-        }
+        model.setLastTime(new Date());
+        meterWorkMonitorMapper.updateByPrimaryKeySelective(model);
+        return "更新成功";
     }
 
     @Override

src/main/resources/application-prod.properties

@@ -148,6 +148,7 @@ rtdb.pool.borrow-timeout-ms=3000
 rtdb.monitor.enabled=true
 rtdb.monitor.fallback-oracle = false
 rtdb.monitor.bootstrap-enabled = false
+rtdb.monitor.sync.pointNo = JT0038
 #meter.monitor.sync.enabled = true
 #meter.monitor.sync.cron=0 */1 * * * ?
 security.verification.enabled = true

src/main/resources/bootstrap.yml

@@ -7,12 +7,12 @@ spring:
     sampler:
       #默认值为0.1f，现在为了测试设置100%采集
       percentage: 1.0      
-  cloud:
-    config:
-#      fail-fast: true
-      discovery:
-        enabled: true
-        service-id: config-server
+#  cloud:
+#    config:
+##      fail-fast: true
+#      discovery:
+#        enabled: true
+#        service-id: config-server
     bus:
       trace:
         enabled: false # 2021年9月10日取消springcloud中bus总线服务