修改

pom.xml

@@ -121,6 +121,7 @@
                         <!-- 排除 classes 目录下的这两个配置文件 -->
                         <exclude>**/application.properties</exclude>
                         <exclude>**/application-prod.properties</exclude>
+                        <exclude>**/application-dev.properties</exclude>
                     </excludes>
                 </configuration>
             </plugin>

src/main/java/com/steerinfo/filter/SecurityFilter.java

@@ -53,7 +53,6 @@ public class SecurityFilter implements Filter {
                 ||path.contains("/v1/authority/getVerification")
                 ||path.contains("/v1/meterworkcaractuals/ApplikeByDesc")
                 ||path.contains("/v1/meterworkcaractualfirsts/ApplikeByDesc")
-                ||path.contains("/v1/meterworkcaractuals/testBatchcommonRemove")
                 ||"/v2/api-docs".equals(path)){
             filterChain.doFilter(servletRequest,servletResponse);
             return;

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.SimpleDateFormat;
@@ -39,6 +40,9 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
 
     private static final Logger log = LoggerFactory.getLogger(MeterWorkMonitorController.class);
 
+    @Value("${rtdb.monitor.sync.pointNo}")
+    private List<String> rtdbPointNo;
+
     @Autowired
     IMeterWorkMonitorService meterWorkMonitorService;
 
@@ -203,22 +207,24 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
     public RESTfulResult updateLastTime(@RequestBody MeterWorkMonitor model) {
         long start = System.currentTimeMillis();
         String reqPointNo = model == null ? null : model.getPointNo();
-        log.info("[MonitorRTDB] updateLastTime enter pointNo={}", reqPointNo);
-        try {
-            String pointNo = meterWorkMonitorService.updateLastTime(model);
-            if (pointNo == null || pointNo.isEmpty()) {
-                log.warn("[MonitorRTDB] updateLastTime fail pointNo={} costMs={}",
-                        reqPointNo, System.currentTimeMillis() - start);
-                return failed(null, "修改失败");
-            }
-            log.info("[MonitorRTDB] updateLastTime ok pointNo={} costMs={}",
-                    pointNo, System.currentTimeMillis() - start);
-            return success(pointNo);
-        } catch (Exception ex) {
-            log.error("[MonitorRTDB] updateLastTime exception pointNo={} costMs={}",
-                    reqPointNo, System.currentTimeMillis() - start, ex);
-            throw new MarkerMetException(500, "操作异常！！");
-        }
+        return success();
+//        log.info("[MonitorRTDB] updateLastTime enter pointNo={}", reqPointNo);
+//        try {
+//
+//            String pointNo = meterWorkMonitorService.doUpdateWf(model);
+//            if (pointNo == null || pointNo.isEmpty()) {
+//                log.warn("[MonitorRTDB] updateLastTime fail pointNo={} costMs={}",
+//                        reqPointNo, System.currentTimeMillis() - start);
+//                return failed(null, "修改失败");
+//            }
+//            log.info("[MonitorRTDB] updateLastTime ok pointNo={} costMs={}",
+//                    pointNo, System.currentTimeMillis() - start);
+//            return success(pointNo);
+//        } catch (Exception ex) {
+//            log.error("[MonitorRTDB] updateLastTime exception pointNo={} costMs={}",
+//                    reqPointNo, System.currentTimeMillis() - start, ex);
+//            throw new MarkerMetException(500, "操作异常！！");
+//        }
     }
 
     @ApiOperation(value = "测试", notes = "根据url的id来获取详细信息")
@@ -248,4 +254,11 @@ public class MeterWorkMonitorController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @PostMapping(value = "/testRtdb")
+    public void testRtdb() {
+        // 获取数据库的数据
+        List<MeterWorkMonitor> dbList = meterWorkMonitorService.queryForList();
+        meterWorkMonitorService.doUpdateWf(dbList.get(0));
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.java

@@ -24,4 +24,7 @@ public interface MeterWorkMonitorMapper extends IBaseMapper<MeterWorkMonitor, St
 
     List<MeterWorkMonitor> weightByCarNo(HashMap<String, Object> map);
     List<MeterWorkMonitor> monitorLeftJoinUserSpotConfig(HashMap<String, Object> map);
+
+    List<MeterWorkMonitor> selectForList();
+
 }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.xml

@@ -2182,4 +2182,7 @@
             on A.point_no = B.base_spot_no
     <include refid="where" />
   </select>
+  <select id="selectForList" resultMap="BaseResultMap">
+    select t.* from METER_WORK_MONITOR t  where t.point_no = 'JT0127'
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkmonitor/rtdb/MeterWorkMonitorTupleCodec.java

@@ -178,11 +178,14 @@ public final class MeterWorkMonitorTupleCodec {
 
     /**
      * 将 patch 中非空字段合并到 base（selective update 语义）。
+     * patch是新的数据, base是旧的数据，patch中非空字段会覆盖base中的对应字段。
+     * @param base 旧数据
+     * @param patch 新数据
      */
     public static void mergeNonNull(MeterWorkMonitor base, MeterWorkMonitor patch) {
-        if (patch.getPointName() != null) {
-            base.setPointName(patch.getPointName());
-        }
+//        if (patch.getPointName() != null) {
+//            base.setPointName(patch.getPointName());
+//        }
         if (patch.getValidWgt() != null) {
             base.setValidWgt(patch.getValidWgt());
         }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/IMeterWorkMonitorService.java

@@ -7,6 +7,7 @@ import com.steerinfo.meterwork.meterworkmonitor.dto.MeterWorkMonitorDto;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
 
 import java.util.HashMap;
+import java.util.List;
 
 
 /**
@@ -36,4 +37,9 @@ public interface IMeterWorkMonitorService extends IBaseService<MeterWorkMonitor,
 
     PageList<MeterWorkMonitorDto> queryForPage2(HashMap parmas, Integer pageNum, Integer pageSize);
     PageList<MeterWorkMonitorDto> listByLonxi(HashMap parmas, Integer pageNum, Integer pageSize);
+
+    List<MeterWorkMonitor> queryForList();
+
+    String doUpdateOriginl(MeterWorkMonitor model);
+
 }

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

@@ -16,6 +16,7 @@ import com.steerinfo.meterwork.meterworkonline.model.MeterWorkOnline;
 import com.steerinfo.meterwork.rtdb.RtdbPoolProperties;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -83,6 +84,12 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         return rm;
     }
 
+    @Override
+    public String doUpdateOriginl(MeterWorkMonitor model) {
+        meterWorkMonitorMapper.updateByPrimaryKeySelective(model);
+        return model.getPointNo();
+    }
+
     @Override
     public String doUpdateWf(MeterWorkMonitor model) {
         long start = System.currentTimeMillis();
@@ -111,6 +118,7 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
                     }
                     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);
@@ -118,12 +126,12 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
                 } 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();
-                    }
+//                    if (isFallbackOracle()) {
+//                        meterWorkMonitorMapper.updateByPrimaryKeySelective(model);
+//                        log.warn("[MonitorRTDB] doUpdateWf fallback Oracle ok pointNo={} costMs={}",
+//                                model.getPointNo(), System.currentTimeMillis() - start);
+//                        return model.getPointNo();
+//                    }
                     return "";
                 }
             }
@@ -331,6 +339,13 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         return pageInfo;
     }
 
+    @Override
+    public List<MeterWorkMonitor> queryForList() {
+        return meterWorkMonitorMapper.selectForList();
+    }
+
+
+
 
     private void RandomAssign() {
         List<MeterWorkMonitor> list2 = meterWorkMonitorMapper.selectForAss();

src/main/resources/application-prod.properties

@@ -27,8 +27,6 @@ shiro.chains=/auth/login/**;/ktr/;/${api.version}/sys/**/export;/${api.version}/
 shiro.chains.append=/swagger**;/idmg/**;/ktr/;/${api.version}/sysposts/list/user**;/webjars/**;/v2/api**;/images/**;/configuration/**;
 
 # TODO[TEMP-AUTH-OFF] 测试完成后改回 true
-security.verification.enabled=true
-
 # Redis\u7F13\u5B58\u914D\u7F6E
 cache.level=1
 #Redis\u7F13\u5B58\u914D\u7F6E
@@ -141,3 +139,15 @@ server.tomcat.max-threads=400
 server.connection-timeout=20000
 
 logging.level.com=debug
+rtdb.host=10.99.200.86
+rtdb.port=2101
+rtdb.username=guest
+rtdb.password=
+rtdb.pool.size=8
+rtdb.pool.borrow-timeout-ms=3000
+rtdb.monitor.enabled=true
+rtdb.monitor.fallback-oracle = false
+rtdb.monitor.bootstrap-enabled = false
+#meter.monitor.sync.enabled = true
+#meter.monitor.sync.cron=0 */1 * * * ?
+security.verification.enabled = true

src/main/resources/application.properties

@@ -149,6 +149,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