抽稀计算液量对比完成

src/main/java/com/gct/edge/actuator/config/FeignConfig.java

@@ -1,14 +1,14 @@
 package com.gct.edge.actuator.config;
 
 
+import com.gct.common.util.StringUtil;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.EnvironmentAware;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Arrays;
@@ -16,43 +16,40 @@ import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
 
-/**
- * feign 调用配置，统一添加token请求头
- * @author: NewMeanning
- * @create: 2021-01-29 00:10
- **/
 @Slf4j
 @Configuration
-public class FeignConfig implements RequestInterceptor, EnvironmentAware {
+public class FeignConfig implements RequestInterceptor {
 
+    @Value("${auth.hostList}")
+    private String tokeAuthUrl;
     private static String token;
 
-    private static Environment env;
+    private final static String lockStr = "token";
 
     @Bean(name = "restTemplate")
-    RestTemplate getRestTemplate(){
+    RestTemplate getRestTemplate() {
         return new RestTemplate();
     }
 
     @Override
     public void apply(RequestTemplate requestTemplate) {
-        requestTemplate.header("token",token);//请求头添加token
-    }
-
-    @Override
-    public void setEnvironment(Environment environment) {
-        //获取配置的认证中心主机地址  todo 升级为自动从Nacos中读取，目前这里读取不到
-        this.env = environment;
-        List<String> hostList = Arrays.asList(this.env.getProperty("auth.hostList").split(","));
-        //手动获取RestTemplate 实例
-        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
-        applicationContext.register(RestTemplate.class);
-        applicationContext.refresh();
-        RestTemplate restTemplate= (RestTemplate) applicationContext.getBean("restTemplate");
-        //自定义轮询方式负载
-        int index = ThreadLocalRandom.current().nextInt(hostList.size());
-        String url = "http://"+hostList.get(index)+"/token";
-        token = restTemplate.getForObject(url,String.class);
-        log.info("token:{}",token);
+        if (StringUtil.isBlankOrEmpty(token)) {
+            synchronized (lockStr) {
+                if (StringUtil.isBlankOrEmpty(token)) {
+                    List<String> hostList = Arrays.asList(tokeAuthUrl.split(","));
+                    //手动获取RestTemplate 实例
+                    AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
+                    applicationContext.register(RestTemplate.class);
+                    applicationContext.refresh();
+                    RestTemplate restTemplate = (RestTemplate) applicationContext.getBean("restTemplate");
+                    //自定义轮询方式负载
+                    int index = ThreadLocalRandom.current().nextInt(hostList.size());
+                    String url = "http://" + hostList.get(index) + "/token";
+                    token = restTemplate.getForObject(url, String.class);
+                    log.info("token:{}", token);
+                }
+            }
+        }
+        requestTemplate.header("token", token);//请求头添加token
     }
 }

src/main/java/com/gct/edge/actuator/controller/YieldDailyController.java

@@ -90,5 +90,13 @@ public class YieldDailyController {
             return Result.error("请求参数不合法");
         return yieldDailyService.calDailyYieldWithDilution(moduleKey, wellId, date, dilution, wellName);
     }
+    @GetMapping("/daily-yield/one")
+    public Result selectOne(@RequestParam String moduleKey,
+                                            @RequestParam String wellId,
+                                            @RequestParam String date) {
+        if (StringUtil.isBlankOrEmpty(moduleKey) || StringUtil.isBlankOrEmpty(wellId) ||  StringUtil.isBlankOrEmpty(date))
+            return Result.error("请求参数不合法");
+        return yieldDailyService.selectOne(moduleKey, wellId, date);
+    }
 
 }

src/main/java/com/gct/edge/actuator/entity/Date2.java

@@ -0,0 +1,12 @@
+package com.gct.edge.actuator.entity;
+
+@Deprecated
+public class Date2 {
+    public String start;
+    public String end;
+
+    public Date2(String start, String end) {
+        this.start = start;
+        this.end = end;
+    }
+}

src/main/java/com/gct/edge/actuator/mapper/YieldRealTimeMapper.java

@@ -1,6 +1,7 @@
 package com.gct.edge.actuator.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gct.edge.actuator.entity.Date2;
 import com.gct.edge.actuator.entity.YieldRealTime;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,5 +17,5 @@ public interface YieldRealTimeMapper extends BaseMapper<YieldRealTime> {
 
     int insertOneOnConflictDoNothing(@Param("one") YieldRealTime one);
 
-    List<YieldRealTime> queryRangeFirst(String moduleKey, String wellId, ArrayList<String[]> dateList);
+//    List<YieldRealTime> queryRangeFirst(String moduleKey, String wellId, ArrayList<Date2> dateList);
 }

src/main/java/com/gct/edge/actuator/mapper/YieldRealTimeMapper.xml

@@ -53,10 +53,11 @@
              on conflict (well_id,pro_time) do nothing
 
     </insert>
-    <select id="queryRangeFirst" resultMap="YieldRealTimeMapper">
+<!--    sharding jdbc 不支持 union all，下面方法不可行-->
+<!--    <select id="queryRangeFirst" resultMap="YieldRealTimeMapper">
         <foreach collection="dateList" separator=" union all " item="date">
-            select * from yield_real_time where module_key = #{moduleKey} and well_id = #{wellId} and pro_time between
-            #{date[0]} and #{date[1]} limit 1
+            (select * from yield_real_time where module_key = #{moduleKey} and well_id = #{wellId} and pro_time between
+            #{date.start} and #{date.end} limit 1)
         </foreach>
-    </select>
+    </select>-->
 </mapper>

src/main/java/com/gct/edge/actuator/service/YieldDailyService.java

@@ -23,4 +23,6 @@ public interface YieldDailyService extends IService<YieldDaily> {
     List<YieldDaily> getAoidDailyYieldInfoByWellId(String moduleKey,String wellName, String startDate);
 
     Result calDailyYieldWithDilution(String moduleKey, String wellId, String date,int dilution,String wellName);
+
+    Result selectOne(String moduleKey, String wellId, String date);
 }

src/main/java/com/gct/edge/actuator/service/impl/YieldDailyServiceImpl.java

@@ -101,6 +101,17 @@ public class YieldDailyServiceImpl extends ServicePlusImpl<YieldDailyMapper, Yie
     }
 
     @Override
+    public Result selectOne(String moduleKey, String wellId, String date) {
+        LambdaQueryWrapper<YieldDaily> queryWrapper = new LambdaQueryWrapper<YieldDaily>()
+                .eq(YieldDaily::getModuleKey, moduleKey)
+                .eq(YieldDaily::getWellId, wellId)
+                .eq(YieldDaily::getProTime, DateTimeUtil.formatDateTime(date+" 00:00:00"));
+        YieldDaily one = yieldDailyMapper.selectOne(queryWrapper);
+        if (Objects.isNull(one)) return Result.error("查无数据");
+        return Result.ok(one);
+    }
+
+    @Override
     public Result calDailyYieldWithDilution(String moduleKey, String wellId, String date, int dilution, String wellName) {
         List<YieldRealTime> lis = yieldService.getRealYieldWithDilution(moduleKey, wellId, date, dilution);
         List<AoidProdState> states = aoidProdStateService.getAoidProdStateList(moduleKey, wellId, date);
@@ -255,6 +266,8 @@ public class YieldDailyServiceImpl extends ServicePlusImpl<YieldDailyMapper, Yie
         if (Objects.nonNull(re.getBx())) re.setBx(Math.round(re.getBx() * 10) / 10d);
         if (Objects.nonNull(re.getLlpl())) re.setLlpl(Math.round(re.getLlpl() * 10) / 10d);
         if (Objects.nonNull(re.getWaterCut())) re.setWaterCut(Math.round(re.getWaterCut() * 10) / 10d);
+        re.setYxgts(calNormalCount);
+        re.setErrorgts(lis.size() - calNormalCount);
         //endregion
 
 

src/main/java/com/gct/edge/actuator/service/impl/YieldServiceImpl.java

@@ -8,6 +8,7 @@ import com.gct.common.core.result.Result;
 import com.gct.common.util.DateTimeUtil;
 import com.gct.common.util.StringUtil;
 import com.gct.edge.actuator.algorithm.CalIntegral;
+import com.gct.edge.actuator.entity.Date2;
 import com.gct.edge.actuator.entity.YieldRealTime;
 import com.gct.edge.actuator.mapper.YieldRealTimeMapper;
 import com.gct.edge.actuator.service.ServicePlusImpl;
@@ -117,15 +118,27 @@ public class YieldServiceImpl extends ServicePlusImpl<YieldRealTimeMapper, Yield
         LocalDateTime start = DateTimeUtil.formatDateTime(date + " 00:00:00");
         LocalDateTime end = DateTimeUtil.formatDateTime(date + " 23:59:59");
         interval = interval / dilutionVal;
-        ArrayList<String[]> dateList = new ArrayList<>();
-        while (Duration.between(start.minusSeconds(interval), end).getSeconds() > 0) {
-            dateList.add(new String[]{DateTimeUtil.formatString(start), DateTimeUtil.formatString(start.minusSeconds(interval))});
-            start = start.minusSeconds(interval);
+        ArrayList<LocalDateTime[]> dateList = new ArrayList<>();
+        while (Duration.between(start.plusMinutes(interval), end).getSeconds() > 0) {
+            dateList.add(new LocalDateTime[]{start, start.plusMinutes(interval)});
+            start = start.plusMinutes(interval);
         }
         //最多只能补一个，够数了就不用补
         if (dateList.size() < dilutionVal)
-            dateList.add(new String[]{DateTimeUtil.formatString(start), DateTimeUtil.formatString(end)});
-        return yieldRealTimeMapper.queryRangeFirst(moduleKey, wellId, dateList);
+            dateList.add(new LocalDateTime[]{start, end});
+
+        List<YieldRealTime> lis = new ArrayList<>();
+        for (LocalDateTime[] item : dateList) {
+            LambdaQueryWrapper<YieldRealTime> wrapper = new LambdaQueryWrapper<YieldRealTime>()
+                    .eq(YieldRealTime::getModuleKey, moduleKey)
+                    .eq(YieldRealTime::getWellId, wellId)
+                    .between(YieldRealTime::getProTime, item[0], item[1])
+                    .last(" limit 1 ");
+            YieldRealTime one = yieldRealTimeMapper.selectOne(wrapper);
+            if (Objects.nonNull(one)) lis.add(one);
+        }
+
+        return lis;
     }
 
     @Override

src/main/resources/application-dev.yml

@@ -8,8 +8,8 @@ server:
 logging:
   level:
     root: info
-    com.gct.edge.actuator.mapper: off
-    com.gct.edge.actuator.service: off
+    com.gct.edge.actuator.mapper: debug
+    com.gct.edge.actuator.service: debug
 
 management:
   endpoints:
@@ -110,3 +110,7 @@ auth:
 
 sample-source-path: ${user.home}/dl/samplesource/
 
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    default-statement-timeout: