update config

src/main/java/com/gct/aoid/config/FeignConfig.java

@@ -31,6 +31,8 @@ public class FeignConfig implements RequestInterceptor {
     private String tokeAuthUrl;
     private static String token;
 
+    private static String lockStr = "token";
+
     @Bean(name = "restTemplate")
     RestTemplate getRestTemplate() {
         return new RestTemplate();
@@ -39,7 +41,7 @@ public class FeignConfig implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate requestTemplate) {
         if (StringUtil.isBlankOrEmpty(token)) {
-            synchronized (token) {
+            synchronized (lockStr) {
                 if (StringUtil.isBlankOrEmpty(token)) {
                     List<String> hostList = Arrays.asList(tokeAuthUrl.split(","));
                     //手动获取RestTemplate 实例

src/main/java/com/gct/aoid/controller/AoidDailyYieldController.java

@@ -266,5 +266,7 @@ public class AoidDailyYieldController {
 //        System.out.println("do run");
 //        System.exit(0);
 //    }
+
+
 }
 

src/main/java/com/gct/aoid/service/impl/CalDiagramProductionService.java

@@ -1405,6 +1405,8 @@ public class CalDiagramProductionService {
 
         }
 
+
+
         //endregion
         //region step 2:
         AoidMsgValue.DiagnoseResult diagnoseResult = msg.getDiagnoseResult();
@@ -1494,7 +1496,6 @@ public class CalDiagramProductionService {
         //endregion
     }
 
-
     public class ProDataForCalProductionValue {
 
         private Double bj;

src/main/resources/application-dev.yml

@@ -94,7 +94,7 @@ gct:
         access-key: warn-msg-v1
         secret-key: warn-msg-v1
     aoid:
-      enable: false
+      enable: true
       topic: aoid-msg3
       tags: v3
       log-file-path: /home/lloyd/Desktop/log/task-aoid.json

src/main/resources/application-test.yml

@@ -20,7 +20,7 @@ spring:
   cloud:
     nacos:
       ## 指定nacos server地址
-      server-addr: 192.168.31.252
+      server-addr: 192.168.31.101
     #      discovery:
     #        namespace: bcff0d3d-a340-448c-a2c8-4a195276807e
     #        group: DEV_GROUP
@@ -39,7 +39,7 @@ spring:
   datasource:
     ## Hikari连接池的设置 Hikari 时间单位都是毫秒
     type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:postgresql://192.168.31.252:54321/calliquid
+    url: jdbc:postgresql://192.168.31.101:54321/calliquid
     username: root
     password: 123456
     driver-class-name: org.postgresql.Driver
@@ -94,7 +94,7 @@ gct:
         access-key: warn-msg-v1
         secret-key: warn-msg-v1
     aoid:
-      enable: false
+      enable: true
       topic: aoid-msg3
       tags: v3
       log-file-path: /home/lloyd/Desktop/log/task-aoid.json
@@ -102,7 +102,7 @@ gct:
         group: aoid3
         access-key: aoid-msg-v3
         secret-key: aoid-msg-v3
-      name-server: 192.168.31.252:9876
+      name-server: 192.168.31.101:9876
       consumer:
         group: aoid3
         access-key: aoid-msg-v3
@@ -181,7 +181,7 @@ feign:
         ReadTimeOut: 50000
 #token 认证中心主机地址
 auth:
-  hostList: 192.168.31.252:9001
+  hostList: 192.168.31.101:9001
 
 mybatis-plus:
   global-config:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 spring:
   ## 切换配置文件
   profiles:
-    active: dev   # dev 开发环境    /   pro  生产环境    / test   测试环境
+    active: test   # dev 开发环境    /   pro  生产环境    / test   测试环境
 
   application:
     name: production-calculation

src/test/java/com/gct/aoid/MyTest.java

@@ -15,6 +15,7 @@ import com.gct.aoid.service.AoidDailyYieldService;
 import com.gct.aoid.service.AoidSinglegtYieldService;
 import com.gct.aoid.service.EnableOrPauseService;
 import com.gct.aoid.service.LiqProdDailyCalService;
+import com.gct.aoid.service.impl.AoidDailyYieldServiceImpl;
 import com.gct.aoid.service.impl.CalDiagramProductionService;
 import com.gct.aoid.service.impl.CalibrationParameterService;
 import com.gct.common.util.DateTimeUtil;
@@ -46,92 +47,13 @@ import java.util.stream.Collectors;
 @RunWith(SpringRunner.class)
 @ContextConfiguration
 public class MyTest {
-    @Autowired
-    CalDiagramProductionService calDiagramProductionService ;
-    @Autowired
-    BaseDataClient client;
-    @Autowired
-    DiagnoseClient diagnoseClient;
-    @Autowired
-    AoidSinglegtYieldService aoidSinglegtYieldService;
-    @Autowired
-    AoidDailyYieldService aoidDailyYieldService;
-    @Autowired
-    AoidSinglegtYieldController aoidSinglegtYieldController;
-    @Autowired
-    AoidSinglegtYieldMapper aoidSinglegtYieldMapper;
-    @Autowired
-    LiqProdDailyCalService liqProdDailyCalService;
-//    @Autowired
-//    SumDataTaskMapper sumDataTaskMapper;
-//    @Autowired
-//    AoidParamSettingService aoidParamSettingService;
-//    @Autowired
-//    AoidLiquidAbnormalService aoidLiquidAbnormalService;
-//    private static final  Logger reload = (Logger) LoggerFactory.getLogger("reload");
-//    @Test
-//    public void test() {
-//        List<AoidParamSetting> aoidParamSetting = aoidParamSettingService.getAoidParamSetting();
-//        aoidLiquidAbnormalService.addAoidLiquidAbnormalNew(DateTimeUtil.formatDateTime("2021-08-18 00:00:00"),aoidParamSetting);
-//    }
-@Autowired
-    EnableOrPauseService enableOrPauseService;
-
-    @Test
-    public void test1() throws InvocationTargetException, IllegalAccessException, InstantiationException, NoSuchMethodException {
-        String[] x = {"27"};
-        String starDate = "2022-07-05";
-        String time = "16:00:00";
-        liqProdDailyCalService.calculate(x,starDate,time);
-    }
 
     @Autowired
-    AoidSinglegtYieldMapper singlegtYieldMapper;
-    @Test
-    //@Scheduled
-    public void test2(){
-        LiqWarringVo liqWarringVo = new LiqWarringVo()
-                .setWellId("CHW04").setPordDate("2021-08-17 00:00:00");
-
-        System.out.println(aoidDailyYieldService.getLiqWarring(liqWarringVo));
-    }
-
+    AoidDailyYieldServiceImpl aoidDailyYieldService;
 
     @Autowired
-    CalibrationParameterService calibrationParameterService;
-
-    @Test
-    public void testXs(){
-        double sumArea = 0;
-        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        List<AoidSinglegtYield> results = aoidSinglegtYieldService.list(new QueryWrapper<AoidSinglegtYield>().eq("well_id", "车峰15")
-                .between("prod_date", LocalDateTime.parse("2022-10-03 16:00:00",df)
-                        , LocalDateTime.parse("2022-10-04 16:00:00",df)));
-        String[] sgts = results.stream().map(AoidSinglegtYield::getSgt).collect(Collectors.toList()).toArray(new String[]{});
-
-        for (int y = 0; y < sgts.length; y++) {
+    AoidSinglegtYieldService aoidSinglegtYieldService;
 
-            List<List<Double>> sgtList = new ArrayList<>();
-            if (Objects.nonNull(sgts[y])) {
-                sgtList = SGTUtil.encodeToUseList(sgts[y]);
-                if (Objects.nonNull(sgtList) && sgtList.size() > 1) {
-                    sgtList.remove(sgtList.size() - 1);
-                    sgtList.add(sgtList.get(0));
-                }
-                Double[][] sgtValue = JSONObject.parseObject(sgtList.toString(), Double[][].class);
-                double areaReal = CardAreaAlgorithm.calArea(sgtValue);
-                if (areaReal>0)
-                {
-                    sumArea += areaReal;
-                }
-            }
 
-        }
-        double areaAvg = sumArea/sgts.length;
-        if (areaAvg<200)
-        {
-            System.out.println(calibrationParameterService.coefficientValue(0,results));
-        }
-    }
     
 }