Merge remote-tracking branch 'origin/master'

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

@@ -2,16 +2,14 @@ package com.gct.aoid.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gct.aoid.entity.AoidDailyYield;
 import com.gct.aoid.entity.Vo.AoidYeildVo;
 import com.gct.aoid.service.AoidDailyYieldService;
 import com.gct.common.core.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -27,6 +25,7 @@ import java.util.Map;
 @Api(value = "AoidDailyYieldController", description = "功图量液")
 @RestController
 @RequestMapping("/aoidDailyYield")
+@CrossOrigin
 public class AoidDailyYieldController {
 
     @Autowired
@@ -46,5 +45,21 @@ public class AoidDailyYieldController {
         Page<Map<String, Object>> page =   aoidDailyYieldService.getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(aoidYeildVo.getWellId(), aoidYeildVo.getStartDate(),aoidYeildVo.getSize(),aoidYeildVo.getPage());
         return page ==null|| page.getRecords().size()==0?Result.error("未找到"):Result.ok(page);
     }
+
+
+
+
+
+    @ApiOperation(value = "获取默认数据" ,notes = "量液获取默认数据")
+    @GetMapping("/getDefaultData")
+    public Result getDefaultData(){
+        AoidDailyYield defaultData = aoidDailyYieldService.getDefaultData();
+        return defaultData ==null?Result.error("未找到"):Result.ok(defaultData);
+    }
+
+
+
+
+
 }
 

src/main/java/com/gct/aoid/entity/AoidDailyYield.java

@@ -155,4 +155,14 @@ public class AoidDailyYield {
 
     @ApiModelProperty(value = "汽油比")
     private double qyb;
+
+    @TableField(exist = false)
+    private String jq;
+
+
+
+
+    @TableField(exist = false)
+    private String  zd;
+
 }

src/main/java/com/gct/aoid/feignclient/BaseDataClient.java

@@ -15,7 +15,7 @@ import javax.websocket.server.PathParam;
  * @version 1.0
  * @since 2021/1/25 下午6:02
  */
-@FeignClient(value = "centralbase",fallback = BaseDataHystrix.class)
+@FeignClient(value = "centralbase",fallback = BaseDataHystrix.class,url = "localhost:9002")
 public interface BaseDataClient {
     @RequestMapping(value = "/getLatestA2DailyData/{WellID}",method = RequestMethod.GET)
     String getLatestA2DailyData(@PathVariable("WellID") String wellID) ;
@@ -28,4 +28,11 @@ public interface BaseDataClient {
     @RequestMapping(value = "/cbPcProWellboreVolDaily/getA2DataForCalVolDaily/{WellName}/{dateTime}",method = RequestMethod.GET)
     String getA2DataForCalVolDaily(@PathVariable("WellName") String wellName,@PathVariable("dateTime") String dateTime);
 
+    @RequestMapping("/org/getOrgId/{orgId}")
+    String getOrgId(@PathVariable("orgId") String orgId);
+
+
+
+
+
 }

src/main/java/com/gct/aoid/feignclient/BaseDataHystrix.java

@@ -28,4 +28,15 @@ public class BaseDataHystrix implements  BaseDataClient {
     }
 
 
+
+    @Override
+    public String getOrgId(String orgId) {
+        return "请求超时了";
+    }
+
+
+
+
+
+
 }

src/main/java/com/gct/aoid/feignclient/WarningClint.java

@@ -0,0 +1,13 @@
+package com.gct.aoid.feignclient;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@FeignClient(value = "warning",fallback = WarningHystrix.class)
+public interface WarningClint {
+
+    @RequestMapping(value = "/wnGkMsg/extractWorkingConditionDiagnosis/{WellID}",method = RequestMethod.GET)
+    String extractWorkingConditionDiagnosis(@PathVariable("WellID") String wellID,@PathVariable("date") String date) ;
+}

src/main/java/com/gct/aoid/feignclient/WarningHystrix.java

@@ -0,0 +1,9 @@
+package com.gct.aoid.feignclient;
+
+public class WarningHystrix implements WarningClint{
+
+    @Override
+    public String extractWorkingConditionDiagnosis(String wellID, String date) {
+        return "error";
+    }
+}

src/main/java/com/gct/aoid/job/AoidWarningJobDetail.java

@@ -0,0 +1,46 @@
+package com.gct.aoid.job;
+
+import com.gct.aoid.mapper.SumDataTaskMapper;
+import com.gct.aoid.service.AoidWarningService;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * class name: CalLiqDailyJobDetail
+ *
+ * @author lloyd
+ * @version 1.0
+ * @since 2021/5/21 上午10:24
+ */
+@Slf4j
+public class AoidWarningJobDetail extends QuartzJobBean {
+    @Autowired
+    public AoidWarningService aoidWarningService;
+
+    @Override
+    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        //sumDataTaskMapper= (SumDataTaskMapper)jobExecutionContext.getJobDetail().getJobDataMap().get("dao");
+        String jobName = jobExecutionContext.getJobDetail().getJobDataMap().getString(JobDataKey.JobName.getDec());
+        String jobGroup = jobExecutionContext.getJobDetail().getJobDataMap().getString(JobDataKey.JobGroup.getDec());
+        LocalDateTime localDateTime = LocalDateTime.now();
+        log.info("*===>AoidWarningJobDetail--JobName:{}--JobGroup:{},Time:{}", jobName, jobGroup, localDateTime.format(DateTimeFormatter.ISO_DATE_TIME));
+        //String date = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(localDateTime);
+       // String dateTime = date + " 00:00:00";
+        try {
+            String isWarning = aoidWarningService.isWarning("H257", "2021-05-15");
+            System.out.println(isWarning);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("aoidWaring error");
+        } finally {
+            log.info("<===*AoidWarningJobDetail,Time:{}", localDateTime.format(DateTimeFormatter.ISO_DATE_TIME));
+        }
+    }
+
+}

src/main/java/com/gct/aoid/mapper/AoidDailyYieldMapper.java

@@ -17,4 +17,5 @@ public interface AoidDailyYieldMapper extends BaseMapper<AoidDailyYield> {
 
 
     List<AoidDailyYield> getAoidDailyYieldInfoByWellIdAndPorDatePeriod(@Param("wellId") String wellId,@Param("startDate") String startDate,@Param("endDate") String endDate);
+    String getAVGForA2LiqProdDaily(@Param("wellId") String wellId,@Param("date") String date);
 }

src/main/java/com/gct/aoid/mapper/AoidDailyYieldMapper.xml

@@ -54,5 +54,9 @@
         where well_id=#{wellId} and prod_date >= #{startDate}::timestamp and  #{endDate}::timestamp >= prod_date
 
     </select>
+    <select id="getAVGForA2LiqProdDaily" resultType="string">
+        select avg(liq_prod_daily) from aoid_daily_yield where well_id= #{wellId} and
+            prod_date>=#{date}::timestamp - interval '30 day';
+    </select>
 
 </mapper>

src/main/java/com/gct/aoid/service/AoidDailyYieldService.java

@@ -34,4 +34,9 @@ public interface AoidDailyYieldService extends IService<AoidDailyYield> {
 
     Page<Map<String,Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String wellId, String startDate, int pageSize, int pageNum);
 
-    }
+    AoidDailyYield getDefaultData();
+
+
+
+
+}

src/main/java/com/gct/aoid/service/AoidWarningService.java

@@ -0,0 +1,6 @@
+package com.gct.aoid.service;
+
+public interface AoidWarningService {
+
+    String isWarning(String wellId,String date);
+}

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

@@ -1,9 +1,11 @@
 package com.gct.aoid.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.gct.aoid.entity.AoidDailyYield;
 import com.gct.aoid.feignclient.BaseDataClient;
 import com.gct.aoid.mapper.AoidDailyYieldMapper;
@@ -34,7 +36,8 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
 
     @Autowired
     private AoidDailyYieldMapper aoidDailyYieldMapper;
-
+    @Autowired
+    BaseDataClient baseDataClient;
     @Override
     public Result getSingleHistoryYieldCurveOrChart(String wellName, String beginDate, String endDate) {
         QueryWrapper<AoidDailyYield> queryWrapper = new QueryWrapper<>();
@@ -75,6 +78,9 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
             map.put("prod_date",date);
         }
         return maps;
+
+
+
     }
     public Page<Map<String,Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String wellId, String startDate,int pageSize,int pageNum){
         startDate = startDate+" 00:00:00";
@@ -95,4 +101,17 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
         }
         return mapPage;
     }
+
+    @Override
+    public AoidDailyYield getDefaultData() {
+        AoidDailyYield aoidDailyYield = aoidDailyYieldMapper.selectOne(new QueryWrapper<AoidDailyYield>().last(" limit 1"));
+        String org = baseDataClient.getOrgId(aoidDailyYield.getZyq());
+        Result<List<Map<String, Object>>> result =JSONObject.parseObject(org, Result.class);
+        aoidDailyYield.setJq(result.getData().get(11).get("orgId").toString());
+        aoidDailyYield.setZd(result.getData().get(5).get("orgId").toString());
+        return aoidDailyYield;
+
+
+
+    }
 }

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

@@ -0,0 +1,62 @@
+package com.gct.aoid.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gct.aoid.entity.AoidDailyYield;
+import com.gct.aoid.feignclient.WarningClint;
+import com.gct.aoid.mapper.AoidDailyYieldMapper;
+import com.gct.aoid.service.AoidWarningService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.math.BigDecimal;
+
+public class AoidWarningServiceImpl implements AoidWarningService {
+
+    @Autowired
+    AoidDailyYieldMapper aoidDailyYieldMapper;
+    @Autowired
+    WarningClint warningClint;
+    @Override
+    public String isWarning(String wellId,String date) {
+
+        //获取前一个月的平均产液量
+        String avgForA2LiqProdDaily = aoidDailyYieldMapper.getAVGForA2LiqProdDaily(wellId, date);
+        //获取当前的产液量
+        QueryWrapper<AoidDailyYield> wrapper = new QueryWrapper<>();
+        wrapper.eq("well_id",wellId).eq("prod_date",date);
+        AoidDailyYield aoidDailyYield = aoidDailyYieldMapper.selectOne(wrapper);
+        Double aDouble = Double.valueOf(avgForA2LiqProdDaily);
+        double liqProdDaily = aoidDailyYield.getLiqProdDaily();
+        double difference = aDouble-liqProdDaily;
+        String result = "";
+        int[] num = {15,10,5,1,0};
+        double[] coefficient = {0.1,0.15,0.2,0.25,0.5};
+        for (int i = 0 ;i< num.length; i++){
+            if (aDouble>=num[i]){
+                if (aDouble * (1-coefficient[i]) > liqProdDaily){
+                    result = "液量异常";
+                    break;
+                }else {
+                    result = "液量正常";
+                    break;
+                }
+            }
+        }
+        //液量异常井 提取工况诊断是否正常，不正常 进入油井工况诊断 得出结论并输出 yuancheng wn_gk_msg context
+        if (result.equals("液量异常")){
+            String extractWorkingConditionDiagnosis = warningClint.extractWorkingConditionDiagnosis(wellId,date);
+            if(extractWorkingConditionDiagnosis.equals("正常")){
+                //正常 提取该井压力库数据，判断是否在高压区 默认 低压区
+                //如处在低压区，查看 平均值与当日值的差是否大于0 ，大于0 分析为油井见效，输出结果;小于0 分析为能量不足，输出结果
+                //如在高压区，查看 平均值与当日值的差是否大于0 ,大于0 分析为油井见效,输出结果;小于0分析为地层堵塞，输出结果
+                if (difference > 0){
+                    result = "油井见效";
+                }else {
+                    result = "能量不足";
+                }
+            }else{
+                result = extractWorkingConditionDiagnosis;
+            }
+        }
+        return result;
+    }
+}

src/main/resources/application-dev.yml

@@ -83,6 +83,12 @@ spring:
         JobGroup: CAL_TASK
         DelayMilliseconds: 1000
         IsRepeatable: true
+      jt2:
+        IntervalInSeconds: 600
+        JobName: AoidWarningJobDetail
+        JobGroup: AoidWarning
+        DelayMilliseconds: 1000
+        IsRepeatable: true
 # swagger 相关配置
 swagger:
   authorization: