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

@@ -8,6 +8,7 @@ import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gct.common.core.result.Result;
+import com.gct.common.util.DateTimeUtil;
 import com.gct.common.util.StringUtil;
 import com.gct.edge.actuator.entity.YieldDaily;
 import com.gct.edge.actuator.entity.excel.YieldDailyExcelObj;
@@ -36,25 +37,25 @@ public class YieldDailyController {
     public Result getWellProdData(@RequestParam String moduleKey, @RequestParam String wellId,
                                   @RequestParam String beginDate, @RequestParam String endDate,
                                   @RequestParam Integer curPage, @RequestParam Integer pageSize) {
-        return Result.ok(yieldDailyService.getWellProdData(moduleKey,wellId,beginDate,endDate,curPage,pageSize));
+        return Result.ok(yieldDailyService.getWellProdData(moduleKey, wellId, beginDate, endDate, curPage, pageSize));
     }
 
     @GetMapping("/getWellProdGraph")
     public Result getWellProdGraph(@RequestParam String moduleKey, @RequestParam String wellId,
-                                   @RequestParam String beginDate, @RequestParam String endDate){
+                                   @RequestParam String beginDate, @RequestParam String endDate) {
         if (StringUtil.isBlankOrEmpty(moduleKey)) return Result.error("参数条件不足");
-        return Result.ok(yieldDailyService.getWellProdGraph(moduleKey,wellId,beginDate,endDate));
+        return Result.ok(yieldDailyService.getWellProdGraph(moduleKey, wellId, beginDate, endDate));
     }
 
     @PostMapping("/exportWellProdData")
-    public void exportWellProdData(@RequestBody JSONObject param, HttpServletResponse response) throws IOException{
+    public void exportWellProdData(@RequestBody JSONObject param, HttpServletResponse response) throws IOException {
         String moduleKey = param.getString("moduleKey");
-        String wellId  = param.getString("wellId");
+        String wellId = param.getString("wellId");
         String beginDate = param.getString("beginDate");
         String endDate = param.getString("endDate");
         List<YieldDaily> list = yieldDailyService.getWellProdData(moduleKey, wellId, beginDate, endDate);
         List<YieldDailyExcelObj> collect = list.stream().map(
-                x-> {
+                x -> {
                     //大转小
                     YieldDailyExcelObj excelObj = ((JSONObject) JSON.toJSON(x)).toJavaObject(YieldDailyExcelObj.class);
                     excelObj.setProTimeStr(excelObj.getProTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
@@ -67,15 +68,35 @@ public class YieldDailyController {
                 .registerWriteHandler(new AbstractColumnWidthStyleStrategy() {
                     @Override
                     protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<CellData> list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
-                        writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(),3500);
+                        writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), 3500);
                     }
                 }).sheet("sheet1").doWrite(collect);
     }
 
     @GetMapping("/calculate")
     public Result calculate(@RequestParam String moduleKey,
-                               @RequestParam String wellIdList,
-                               @RequestParam String startTime) {
+                            @RequestParam String wellIdList,
+                            @RequestParam String startTime) {
         return yieldDailyService.calculate(moduleKey, wellIdList, startTime);
     }
+
+    @GetMapping("/calculate/daily-yield/dilution")
+    public Result calDailyYieldWithDilution(@RequestParam String moduleKey,
+                                            @RequestParam String wellId,
+                                            @RequestParam String wellName,
+                                            @RequestParam int dilution,
+                                            @RequestParam String date) {
+        if (StringUtil.isBlankOrEmpty(moduleKey) || StringUtil.isBlankOrEmpty(wellId) || StringUtil.isBlankOrEmpty(wellName) || StringUtil.isBlankOrEmpty(date))
+            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,10 +1,14 @@
 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;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author xusirui 2021/10/26
  */
@@ -12,4 +16,6 @@ import org.apache.ibatis.annotations.Param;
 public interface YieldRealTimeMapper extends BaseMapper<YieldRealTime> {
 
     int insertOneOnConflictDoNothing(@Param("one") YieldRealTime one);
+
+//    List<YieldRealTime> queryRangeFirst(String moduleKey, String wellId, ArrayList<Date2> dateList);
 }

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

@@ -21,4 +21,8 @@ public interface YieldDailyService extends IService<YieldDaily> {
     Result calculate(String moduleKey, String wellIdList, String startTime);
 
     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/YieldService.java

@@ -23,6 +23,7 @@ public interface YieldService {
     Result getWellIdsByNew(String moduleKey, String startDate);
 
     List<YieldRealTime> getYieldRealTimeInfoByWellId(String moduleKey,String wellId, String startdate);
+    List<YieldRealTime> getRealYieldWithDilution(String moduleKey,String wellId, String date,int dilutionVal);
 
     JSONArray getWellInfo(String moduleKey, String wellId, String prodTime);
 

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

@@ -100,6 +100,29 @@ public class YieldDailyServiceImpl extends ServicePlusImpl<YieldDailyMapper, Yie
         return openTotalTime;//h
     }
 
+    @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);
+        double prodTotalTime = calProdTime(states);
+        try {
+            return Result.ok(calculate_yield(lis, date, wellName, moduleKey, wellId, prodTotalTime));
+        } catch (Exception e) {
+            return Result.error(e.getMessage());
+        }
+    }
+
     private boolean calculate_yield_cal(String moduleKey, String wellIdList, String startTime) {
         JSONArray wells = JSON.parseArray(wellIdList);
         for (Object well : wells) {
@@ -108,7 +131,7 @@ public class YieldDailyServiceImpl extends ServicePlusImpl<YieldDailyMapper, Yie
             List<YieldRealTime> lis = yieldService.getYieldRealTimeInfoByWellId(moduleKey, wellId, startTime);
             List<AoidProdState> states = aoidProdStateService.getAoidProdStateList(moduleKey, wellId, startTime);
             double prodTotalTime = calProdTime(states);
-            calculate_yield(lis, startTime, wellName, moduleKey, wellId, prodTotalTime);
+            saveDailyYieldResult(calculate_yield(lis, startTime, wellName, moduleKey, wellId, prodTotalTime));
 
 
         }
@@ -119,7 +142,7 @@ public class YieldDailyServiceImpl extends ServicePlusImpl<YieldDailyMapper, Yie
         re.setBz((StringUtil.isBlankOrEmpty(re.getBz()) ? "" : re.getBz() + ";") + newRemark);
     }
 
-    private void calculate_yield(List<YieldRealTime> lis, String startTime, String wellName, String moduleKey, String wellId, Double prodTime) {
+    private YieldDaily calculate_yield(List<YieldRealTime> lis, String startTime, String wellName, String moduleKey, String wellId, Double prodTime) {
         //必要的初始化
         YieldDaily re = new YieldDaily() {
             {
@@ -243,7 +266,15 @@ 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
+
+
+        return re;
+    }
+
+    private void saveDailyYieldResult(YieldDaily re) {
         YieldDaily one = baseMapper.selectOne(new LambdaQueryWrapper<YieldDaily>()
                 .eq(YieldDaily::getModuleKey, re.getModuleKey())
                 .eq(YieldDaily::getWellId, re.getWellId())
@@ -253,8 +284,6 @@ public class YieldDailyServiceImpl extends ServicePlusImpl<YieldDailyMapper, Yie
                 .eq(YieldDaily::getModuleKey, re.getModuleKey())
                 .eq(YieldDaily::getWellId, re.getWellId())
                 .eq(YieldDaily::getProTime, re.getProTime()));
-
-
     }
 
     @Override

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;
@@ -17,11 +18,15 @@ import com.gct.edge.base.entity.TableNameEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.jws.Oneway;
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -95,36 +100,65 @@ public class YieldServiceImpl extends ServicePlusImpl<YieldRealTimeMapper, Yield
     @Override
     public Result getWellIdsByNew(String moduleKey, String startDate) {
 
-        LocalDateTime start = DateTimeUtil.formatDateTime(startDate +" 00:00:00");
-        LocalDateTime end = DateTimeUtil.formatDateTime(startDate +" 23:59:59");
+        LocalDateTime start = DateTimeUtil.formatDateTime(startDate + " 00:00:00");
+        LocalDateTime end = DateTimeUtil.formatDateTime(startDate + " 23:59:59");
 
         QueryWrapper<YieldRealTime> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("module_key",moduleKey);
-        queryWrapper.gt("pro_time",start);
-        queryWrapper.lt("pro_time",end);
-        return Result.ok( baseMapper.selectList(queryWrapper));
+        queryWrapper.eq("module_key", moduleKey);
+        queryWrapper.gt("pro_time", start);
+        queryWrapper.lt("pro_time", end);
+        return Result.ok(baseMapper.selectList(queryWrapper));
 
     }
 
+    @Override
+    public List<YieldRealTime> getRealYieldWithDilution(String moduleKey, String wellId, String date, int dilutionVal) {
+        int interval = 24 * 60;
+        if (dilutionVal <= 0 || dilutionVal >= interval) return getYieldRealTimeInfoByWellId(moduleKey, wellId, date);
+        LocalDateTime start = DateTimeUtil.formatDateTime(date + " 00:00:00");
+        LocalDateTime end = DateTimeUtil.formatDateTime(date + " 23:59:59");
+        interval = interval / dilutionVal;
+        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 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
     public List<YieldRealTime> getYieldRealTimeInfoByWellId(String moduleKey, String wellId, String startdate) {
 
-        LocalDateTime start = DateTimeUtil.formatDateTime(startdate +" 00:00:00");
-        LocalDateTime end = DateTimeUtil.formatDateTime(startdate +" 23:59:59");
+        LocalDateTime start = DateTimeUtil.formatDateTime(startdate + " 00:00:00");
+        LocalDateTime end = DateTimeUtil.formatDateTime(startdate + " 23:59:59");
 
         LambdaQueryWrapper<YieldRealTime> queryWrapper = new LambdaQueryWrapper<YieldRealTime>()
-                .eq(YieldRealTime::getModuleKey,moduleKey)
-                .between(YieldRealTime::getProTime,start,end)
-                .eq(YieldRealTime::getWellId,wellId)
+                .eq(YieldRealTime::getModuleKey, moduleKey)
+                .between(YieldRealTime::getProTime, start, end)
+                .eq(YieldRealTime::getWellId, wellId)
                 .orderByAsc(YieldRealTime::getProTime);
         List<YieldRealTime> maps = yieldRealTimeMapper.selectList(queryWrapper);
 
         return maps;
     }
 
-    private Double makeEffectiveMath(Double num,int effect){
-        return Math.ceil(num*Math.pow(10,effect))/(int)Math.pow(10,effect);
+    private Double makeEffectiveMath(Double num, int effect) {
+        return Math.ceil(num * Math.pow(10, effect)) / (int) Math.pow(10, effect);
     }
 
     @Override
@@ -132,23 +166,23 @@ public class YieldServiceImpl extends ServicePlusImpl<YieldRealTimeMapper, Yield
         YieldRealTime yieldRealTime = baseMapper.selectOne(new QueryWrapper<YieldRealTime>()
                 .eq("module_key", moduleKey)
                 .eq("well_id", wellId)
-                .between("pro_time", DateTimeUtil.formatDate(prodTime).atTime(0,0,0),
-                        DateTimeUtil.formatDate(prodTime).atTime(23,59,59)
+                .between("pro_time", DateTimeUtil.formatDate(prodTime).atTime(0, 0, 0),
+                        DateTimeUtil.formatDate(prodTime).atTime(23, 59, 59)
                 )
                 .orderByDesc("pro_time")
                 .last("limit 1")
         );
         JSONArray ja = new JSONArray();
         if (!Objects.isNull(yieldRealTime)) {
-            ja.add(infoObj("冲程：", makeEffectiveMath(yieldRealTime.getStroke(),2)+" m","冲次：", makeEffectiveMath(yieldRealTime.getFrequence(),2)));
-            ja.add(infoObj("泵深：", makeEffectiveMath(yieldRealTime.getPumpDepth(),1)+" m","泵径：", makeEffectiveMath(yieldRealTime.getPumpDiameter(),1)+" mm"));
-            ja.add(infoObj("动液面：", makeEffectiveMath((yieldRealTime.getPumpDepth() - yieldRealTime.getSubmergence()),1)+" m","含水率：", makeEffectiveMath(yieldRealTime.getMoistureContent(),1) + " %"));
-            ja.add(infoObj("沉没度：", makeEffectiveMath(yieldRealTime.getSubmergence(),1)+" m","气液比：", makeEffectiveMath(yieldRealTime.getGasLiqRatio(),1)));
+            ja.add(infoObj("冲程：", makeEffectiveMath(yieldRealTime.getStroke(), 2) + " m", "冲次：", makeEffectiveMath(yieldRealTime.getFrequence(), 2)));
+            ja.add(infoObj("泵深：", makeEffectiveMath(yieldRealTime.getPumpDepth(), 1) + " m", "泵径：", makeEffectiveMath(yieldRealTime.getPumpDiameter(), 1) + " mm"));
+            ja.add(infoObj("动液面：", makeEffectiveMath((yieldRealTime.getPumpDepth() - yieldRealTime.getSubmergence()), 1) + " m", "含水率：", makeEffectiveMath(yieldRealTime.getMoistureContent(), 1) + " %"));
+            ja.add(infoObj("沉没度：", makeEffectiveMath(yieldRealTime.getSubmergence(), 1) + " m", "气液比：", makeEffectiveMath(yieldRealTime.getGasLiqRatio(), 1)));
         }
         return ja;
     }
 
-    private JSONObject infoObj(String name, Object val,String name2,Object val2) {
+    private JSONObject infoObj(String name, Object val, String name2, Object val2) {
         JSONObject obj = new JSONObject();
         obj.put("name", name);
         obj.put("value", val);
@@ -158,7 +192,7 @@ public class YieldServiceImpl extends ServicePlusImpl<YieldRealTimeMapper, Yield
     }
 
     @Override
-    public Result getYieldResultDisperse(String moduleKey,String wellId, String beginDateTime, String endDateTime, Integer total) {
+    public Result getYieldResultDisperse(String moduleKey, String wellId, String beginDateTime, String endDateTime, Integer total) {
         YieldRealTime yieldRealTime = baseMapper.selectOne(new QueryWrapper<YieldRealTime>()
                 .eq("module_key", moduleKey)
                 .eq("well_id", wellId)

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: