Merge branch 'release-dev-1.0'

# Conflicts:
#	src/main/java/com/gct/aoid/entity/AoidDailyYield.java
#	src/main/java/com/gct/aoid/feignclient/BaseDataClient.java
#	src/main/java/com/gct/aoid/service/AoidDailyYieldService.java
#	src/main/java/com/gct/aoid/service/impl/AoidDailyYieldServiceImpl.java

pom.xml

@@ -37,10 +37,10 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
-        <dependency>
+       <!-- <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
+        </dependency>-->
         <!-- <dependency>
              <groupId>com.alibaba.csp</groupId>
              <artifactId>sentinel-datasource-nacos</artifactId>

src/main/java/com/gct/aoid/algorithm/CalDiagramProduction.java

@@ -5,6 +5,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Vector;
 
 /**
@@ -24,23 +25,44 @@ public class CalDiagramProduction {
         public double PumpCard_Slope;
     }
 
-    public class CalProductionResult {
-        public double rcyl1;
-        public double rcyl;
-        public double rcsl;
-        public double rcql;
-        public double bx;
-        public double llpl;
-        public double sjcc;
-        public double yxcc;
-        public double zcc;
-        public double ycc;
-        public double ccss;
-        public double lsss;
-        public double gyss;
-        public double l_StrokeRatio;
+    static public class CalProductionResult {
+        public Double rcyl1;
+        public Double rcyl;
+        public Double rcsl;
+        public Double rcql;
+        public Double bx;
+        public Double llpl;
+        public Double sjcc;
+        public Double yxcc;
+        public Double zcc;
+        public Double ycc;
+        public Double ccss;
+        public Double lsss;
+        public Double gyss;
+        public Double l_StrokeRatio;
+        public String remark;
+
+       public void formatted(){
+           if(Objects.nonNull(rcyl)) rcyl= Math.round(rcyl * 10) / 10d;
+           if(Objects.nonNull(rcyl1)) rcyl1= Math.round(rcyl1 * 10) / 10d;
+           if(Objects.nonNull(rcql)) rcql= Math.round(rcql * 10) / 10d;
+           if(Objects.nonNull(rcsl)) rcsl= Math.round(rcsl * 10) / 10d;
+           if(Objects.nonNull(bx)) bx= Math.round(bx * 100) / 100d;
+           if(Objects.nonNull(llpl)) llpl= Math.round(llpl * 10) / 10d;
+           if(Objects.nonNull(sjcc)) sjcc= Math.round(sjcc * 10) / 10d;
+           if(Objects.nonNull(yxcc)) yxcc= Math.round(yxcc * 10) / 10d;
+           if(Objects.nonNull(ycc)) ycc= Math.round(ycc * 10) / 10d;
+           if(Objects.nonNull(ccss)) ccss= Math.round(ccss * 100) / 100d;
+           if(Objects.nonNull(lsss)) lsss= Math.round(lsss * 100) / 100d;
+           if(Objects.nonNull(gyss)) gyss= Math.round(gyss * 100) / 100d;
+           if(Objects.nonNull(l_StrokeRatio)) l_StrokeRatio= Math.round(l_StrokeRatio * 100) / 100d;
+
+       }
     }
 
+    public static void main(String[] args) {
+        System.out.println("Math.round(0.2365) = " + Math.round(0.2365 * 0.1d));
+    }
     public CalProductionResult calProduction(Double[][] sgt, Double[][] bgt, double cc,
                                              double cc1, String zdjg,
                                              double bj, double bs, double hsl, double smd, double ymd, double qyb,
@@ -147,7 +169,7 @@ public class CalDiagramProduction {
         int L_UpPointDivide = 0;
         double L_Bdxs1;
         double L_Bdxs;
-       /* L_sgt = sgt;
+       /* L_sgt = sgtFormatted;
         L_bgt = bgt;*/
         L_Cc = cc;
         L_Cycle = cc1;
@@ -180,11 +202,11 @@ public class CalDiagramProduction {
         PumpCard_Power = 0;
         L_LeftDownStroke1 = 15;
         L_LeftDownStroke2 = -15;
-        //Card_MaxLoad=std::atof(sgt.substr(3+8*(-1),5))/100;
+        //Card_MaxLoad=std::atof(sgtFormatted.substr(3+8*(-1),5))/100;
         for (int i = 0; i < Card_Point; i++) {
             CardSlopeRec CardSlope = new CardSlopeRec();
-        /* Card_Shift = sgt[i][0];
-         Card_Load = sgt[i][1];
+        /* Card_Shift = sgtFormatted[i][0];
+         Card_Load = sgtFormatted[i][1];
          PumpCard_Shift = L_bgt[i][0];
          PumpCard_Load = L_bgt[i][1];*/
 
@@ -559,6 +581,7 @@ public class CalDiagramProduction {
         res.lsss = lsss;
         res.gyss = gyss;
         res.l_StrokeRatio = l_StrokeRatio;
+        res.formatted();
         return res;
     }
 }

src/main/java/com/gct/aoid/algorithm/CalPumpCard.java

@@ -67,7 +67,7 @@ public class CalPumpCard {
         int tmpANNNum = 0;
         if (diagramCardBaseParam.getIslegal() != 1) return null;//功图不合法不能计算
 
-        Double[][] cardArray = SGTUtil.diagramReverse(diagramCardBaseParam.getSgt());
+        Double[][] cardArray = SGTUtil.diagramReverse(diagramCardBaseParam.getSgtFormatted());
 
         while (tmpANNNum == 0) {
             boolean flag =false;
@@ -115,7 +115,6 @@ public class CalPumpCard {
         pumpdepth = (downLoadingLevel / 9.8 * 4 / Math.PI / 7.85) / (equivalRodDiameter * equivalRodDiameter);
         pumpdepth = 50;//???
 
-        System.out.println("...");
         boolean p_pc = singleDiagramDiagnoseResult.getResult1().indexOf("喷抽") >= 0;
         //Dbu[1][0]  Dbu[0][TotalPoint + 2]  Dbu[0][TotalPoint + 1]  Dbu[1][TotalPoint + 1]  Dbu[0][0]
 //        double dzxwyzh = 0, dzxwy = 0, dbmaxload = 0, dbminload = 0, ddZNXShC = 0;

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

@@ -42,7 +42,7 @@ public class AoidDailyYieldController {
     @ApiOperation(value = "根据井号和日期时间段查询量液的每日基本信息page" ,notes = "根据井号和日期时间段查询量液的每日基本信息")
     @PostMapping("/getAoidDailyYieldInfoPage")
     public Result getAoidDailyYieldInfoByWellIdAndPorDatePeriodPage(@RequestBody AoidYeildVo aoidYeildVo){
-        Page<Map<String, Object>> page =   aoidDailyYieldService.getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(aoidYeildVo.getWellId(), aoidYeildVo.getStartDate(),aoidYeildVo.getSize(),aoidYeildVo.getPage());
+        Page<Map<String, Object>> page =   aoidDailyYieldService.getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(aoidYeildVo.getOrg(),aoidYeildVo.getWellId(), aoidYeildVo.getStartDate(),aoidYeildVo.getSize(),aoidYeildVo.getPage());
         return page ==null|| page.getRecords().size()==0?Result.error("未找到"):Result.ok(page);
     }
 

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

@@ -156,13 +156,4 @@ 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/entity/AoidSinglegtYield.java

@@ -2,7 +2,9 @@ package com.gct.aoid.entity;
 
 import java.math.BigDecimal;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
@@ -11,6 +13,7 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -31,7 +34,7 @@ import lombok.experimental.Accessors;
 public class AoidSinglegtYield extends Model<AoidSinglegtYield> {
 
     private static final long serialVersionUID=1L;
-
+    @TableId
     private String wellId;
 
     private String wellCommonName;
@@ -39,21 +42,21 @@ public class AoidSinglegtYield extends Model<AoidSinglegtYield> {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private LocalDateTime prodDate;
 
-    private BigDecimal stroke;
+    private Double stroke;
 
-    private BigDecimal frequence;
+    private Double frequence;
 
-    private BigDecimal bj;
+    private Double bj;
 
-    private BigDecimal bs;
+    private Double bs;
 
-    private BigDecimal cmd;
+    private Double cmd;
 
-    private BigDecimal yzzj;
+    private Double yzzj;
 
-    private BigDecimal sxzh;
+    private Double sxzh;
 
-    private BigDecimal xxzh;
+    private Double xxzh;
 
     private String sgt;
 
@@ -65,68 +68,72 @@ public class AoidSinglegtYield extends Model<AoidSinglegtYield> {
 
     private LocalDateTime refrencecjsj;
 
-    private BigDecimal liqProdDaily;
+    private Double liqProdDaily;
 
-    private BigDecimal oilProdDaily;
+    private Double oilProdDaily;
 
-    private BigDecimal gasProdDaily;
+    private Double gasProdDaily;
 
     private String eczdjg;
 
-    private BigDecimal bx;
+    private Double bx;
 
-    private BigDecimal hsl;
+    private Double hsl;
 
-    private BigDecimal flag;
+    private Double flag;
 
-    private BigDecimal bdxs;
+    private Double bdxs;
 
-    private BigDecimal llpl;
+    private Double llpl;
 
-    private BigDecimal zcc;
+    private Double zcc;
 
-    private BigDecimal ycc;
+    private Double ycc;
 
-    private BigDecimal sjcc;
+    private Double sjcc;
 
-    private BigDecimal yxcc;
+    private Double yxcc;
 
-    private BigDecimal ccss;
+    private Double ccss;
 
-    private BigDecimal lsss;
+    private Double lsss;
 
-    private BigDecimal gyss;
+    private Double gyss;
 
-    private BigDecimal pumpdepth;
+    private Double pumpdepth;
 
-    private BigDecimal hy;
+    private Double hy;
 
-    private BigDecimal yy;
+    private Double yy;
 
-    private BigDecimal ty;
+    private Double ty;
 
-    private BigDecimal waterProdDaily;
+    private Double waterProdDaily;
 
     private String refrencesgt;
 
-    private BigDecimal scsj;
+    private Double scsj;
 
-    private BigDecimal qyb;
+    private Double qyb;
 
-    private BigDecimal strokeRatio;
+    private Double strokeRatio;
 
-    private BigDecimal djdy;
+    private Double djdy;
 
-    private BigDecimal hjwd;
+    private Double hjwd;
 
-    private BigDecimal ybdl;
+    private Double ybdl;
 
-    private BigDecimal xhqd;
+    private Double xhqd;
 
     private String sbh;
-    private BigDecimal smd;
-    private BigDecimal ymd;
+    private Double smd;
+    private Double ymd;
+
+    private Double dym;
 
+    @ApiModelProperty(value = "remark")
+    private String remark;
 
     @Override
     protected Serializable pkVal() {

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

@@ -1,10 +1,9 @@
 package com.gct.aoid.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.gct.common.util.SGTUtil;
 import lombok.Data;
 
-import java.util.Vector;
-
 /**
  * class name: DiagramCardBaseParam
  * 功图基础参数数据
@@ -16,16 +15,18 @@ import java.util.Vector;
 public class DiagramCardBaseParam {
 
     String id;
+
     String creatTime;
-    @TableField("recivetime")
-    String receiveTime;
+
+    String prodDate;
+
     @TableField("wellname")
     String wellName;
-    @TableField("sgt1")
-    Double[][] sgt;
+    Double[][] sgtFormatted;
+
     /*
-    功图内容，数据库内容 ，位移，载荷整百倍隔开
-     */
+        功图内容，数据库内容 ，位移，载荷整百倍隔开
+         */
     @TableField("sgt")
     String sgtStr;
     double s_max;

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

@@ -22,31 +22,31 @@ public class ProDataForCalProduction {
     @TableField("wellId")
     private String jh;
     @TableField("oilNozzle")
-    private BigDecimal bj;
+    private Double bj;
     @TableField("pumpDepth")
-    private BigDecimal bs;
+    private Double bs;
     /*
     %
      */
     @TableField("waterCut")
-    private BigDecimal hsl;
+    private Double hsl;
     @TableField("gasOilRatio")
-    private BigDecimal qyb;
+    private Double qyb;
     @TableField("startPumpLiqLevel")
-    private BigDecimal dym;
+    private Double dym;
     @TableField("surfaceCrudeOilDensity")
-    private BigDecimal ymd;
+    private Double ymd;
     @TableField("surfaceCrudeWaterDensity")
-    private BigDecimal smd;
+    private Double smd;
     @TableField("prodDate")
     private String proDate;
 
 
     @TableField("backPres")
-    private BigDecimal back_pres;
+    private Double back_pres;
     @TableField("tubingPres")
-    private BigDecimal tubing_pres;
+    private Double tubing_pres;
     @TableField("casingPres")
-    private BigDecimal casing_pres;
+    private Double casing_pres;
 
 }

src/main/java/com/gct/aoid/entity/Vo/AoidYeildVo.java

@@ -16,6 +16,8 @@ import lombok.Data;
 public class AoidYeildVo {
     @ApiModelProperty(value = "井号")
     private String wellId;
+    @ApiModelProperty(value = "org")
+    private String org;
     @ApiModelProperty(value = "开始时间")
     private String startDate;
     @ApiModelProperty(value = "结束时间")

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

@@ -6,8 +6,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.websocket.server.PathParam;
-
 /**
  * class name: BaseDataClient
  *
@@ -15,7 +13,7 @@ import javax.websocket.server.PathParam;
  * @version 1.0
  * @since 2021/1/25 下午6:02
  */
-@FeignClient(value = "centralbase",fallback = BaseDataHystrix.class,url = "localhost:9002")
+@FeignClient(value = "centralbase",fallback = BaseDataHystrix.class,url = "192.168.1.6:9002")
 public interface BaseDataClient {
     @RequestMapping(value = "/getLatestA2DailyData/{WellID}",method = RequestMethod.GET)
     String getLatestA2DailyData(@PathVariable("WellID") String wellID) ;
@@ -28,11 +26,6 @@ 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);
-
-
-
-
-
+    @RequestMapping(value = "/WellSource/jh",method = RequestMethod.GET)
+    String getWellListByOrgID(@RequestParam("orgid") String org);
 }

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

@@ -27,6 +27,11 @@ public class BaseDataHystrix implements  BaseDataClient {
         return "请求超时了";
     }
 
+    @Override
+    public String getWellListByOrgID(String org) {
+        return "请求超时了";
+    }
+
 
 
     @Override

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

@@ -1,9 +1,8 @@
 package com.gct.aoid.feignclient;
 
+import feign.Param;
 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;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * class name: DiagnoseClient
@@ -12,14 +11,16 @@ import org.springframework.web.bind.annotation.RequestMethod;
  * @version 1.0
  * @since 2021/1/29 下午9:43
  */
-@FeignClient(value = "dgns-diagnose")
+@FeignClient(value = "dgns-diagnose",url = "192.168.1.6:9000")
 public interface DiagnoseClient {
 
-
-    @RequestMapping(path = "/dgnsGtbaseparam/getBaseparamById/{id}", params = "id", method = RequestMethod.GET)
+    @GetMapping(path = "/dgnsGtbaseparam/getBaseparamById/{id}")
     String getDiagramCardBaseParamByID(@PathVariable("id") String id);
 
 
-    @RequestMapping(path = "/dgnsGtcvrresult/getCvrresultById/{id}", params = "id", method = RequestMethod.GET)
+    @GetMapping(path = "/dgnsGtcvrresult/getCvrresultById/{id}")
     String getSingleDiagramDiagnoseResultByID(@PathVariable("id") String id);
+
+    @GetMapping(path = "/dgnsGtcvrresult/getAllResult")
+    String getAllResult();
 }

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

@@ -10,4 +10,9 @@ public class DiagnoseHystrix implements DiagnoseClient{
     public String getSingleDiagramDiagnoseResultByID(String id) {
         return " error ";
     }
+
+    @Override
+    public String getAllResult() {
+        return " error ";
+    }
 }

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

@@ -35,7 +35,7 @@ public class CalLiqDailyJobDetail extends QuartzJobBean {
         //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();
+        LocalDateTime localDateTime = LocalDateTime.now().minusDays(3);
         log.info("*===>CalLiqDailyJobDetail--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";

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

@@ -5,16 +5,19 @@
 
     <insert id="sumData" >
         delete  from aoid.aoid_daily_yield where  prod_date = #{date}::timestamp;
-        insert into aoid.aoid_daily_yield (well_id,well_common_name,liq_prod_daily,oil_prod_daily,water_prod_daily,gas_prod_daily,
-                                           frequence,stroke,scsj,rcy2,rcu2,rcs2,yl,
-                                           bj,bs,cmd,water_cut,yz,yxgts,djdy,hjwd,xhqd,ybdl,sbh,prod_date,smd,ymd,qyb)
+        insert into aoid.aoid_daily_yield (well_id,well_common_name,liq_prod_daily,oil_prod_daily
+        ,water_prod_daily,gas_prod_daily,
+         frequence,stroke,scsj,rcy2,rcu2,rcs2,yl,
+         bj,bs,cmd,water_cut,yz,yxgts,djdy,hjwd,
+          xhqd,ybdl,sbh,prod_date,smd,ymd,qyb,bx,llpl,dym)
         select  well_id,well_common_name,avg(liq_prod_daily * scsj /24) rcy ,
                 avg(oil_prod_daily*scsj/24) rcu, avg(water_prod_daily*scsj/24) rcs,
                 avg(gas_prod_daily*scsj/24) rcq ,avg(frequence) cc1,avg(stroke) cc,
                 max(scsj),avg(liq_prod_daily) rcy2,avg(oil_prod_daily) rcu2,
                 avg(water_prod_daily) rcs2,avg(gas_prod_daily) rcq2,max(bj),
                 max(bs),max(cmd),max(hsl),max(yzzj),count(*) yxgts,min(djdy),
-                avg(hjwd),avg(xhqd),avg(ybdl),sbh,#{date}::timestamp,avg(ymd),avg(smd),avg(qyb)
+                avg(hjwd),avg(xhqd),avg(ybdl),sbh,#{date}::timestamp,avg(smd),avg(ymd),avg(qyb)
+        ,avg(bx),avg(llpl),max(dym)
         from aoid.aoid_singlegt_yield  where prod_date
             between #{dateTime}::timestamp and #{dateTime}::timestamp + '1 days'
         group by well_common_name,well_id,sbh;

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

@@ -32,11 +32,5 @@ public interface AoidDailyYieldService extends IService<AoidDailyYield> {
     List<Map<String, Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriod(String wellId, String startDate);
 
 
-    Page<Map<String,Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String wellId, String startDate, int pageSize, int pageNum);
-
-    AoidDailyYield getDefaultData();
-
-
-
-
+    Page<Map<String, Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String org, String wellId, String startDate, int pageSize, int pageNum);
 }

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

@@ -1,11 +1,10 @@
 package com.gct.aoid.service.impl;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 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;
@@ -18,9 +17,7 @@ import org.springframework.stereotype.Service;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -32,12 +29,13 @@ import java.util.Map;
  */
 @Service
 public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper, AoidDailyYield> implements AoidDailyYieldService {
-    private  DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    private DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
     @Autowired
     private AoidDailyYieldMapper aoidDailyYieldMapper;
     @Autowired
     BaseDataClient baseDataClient;
+
     @Override
     public Result getSingleHistoryYieldCurveOrChart(String wellName, String beginDate, String endDate) {
         QueryWrapper<AoidDailyYield> queryWrapper = new QueryWrapper<>();
@@ -62,56 +60,64 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
 
     @Override
     public List<Map<String, Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriod(String wellId, String startDate) {
-        startDate = startDate+" 00:00:00";
+        startDate = startDate + " 00:00:00";
         LocalDateTime localDateTime = LocalDateTime.parse(startDate, df);
         LocalDateTime localDateTime1 = localDateTime.plusDays(1);
         String end = localDateTime1.format(df);
         QueryWrapper<AoidDailyYield> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<AoidDailyYield> queryWrapper = wrapper.lambda().eq(AoidDailyYield::getWellId, wellId).
-                ge(AoidDailyYield::getProdDate, Timestamp.valueOf(LocalDateTime.parse(startDate,df))).
-                le(AoidDailyYield::getProdDate,Timestamp.valueOf(LocalDateTime.parse(end,df))).orderByAsc(AoidDailyYield::getProdDate);
+                ge(AoidDailyYield::getProdDate, Timestamp.valueOf(LocalDateTime.parse(startDate, df))).
+                le(AoidDailyYield::getProdDate, Timestamp.valueOf(LocalDateTime.parse(end, df))).orderByAsc(AoidDailyYield::getProdDate);
         List<Map<String, Object>> maps = aoidDailyYieldMapper.selectMaps(queryWrapper);
         for (Map<String, Object> map : maps) {
             String date = map.get("prod_date").toString().substring(0, 10);
-            String time = map.get("prod_date").toString().substring(11, 19);
-//            map.put("prod_date",date+" "+time);
-            map.put("prod_date",date);
+            //String time = map.get("prod_date").toString().substring(11, 19);
+            map.put("prod_date", date);
         }
         return maps;
+    }
 
+    private List<String> getWellIds(String org, String wellId) {
+        if (Objects.nonNull(wellId) && !wellId.isEmpty()) return new ArrayList<>(Arrays.asList(new String[]{wellId}));
 
+        if (Objects.isNull(org) || org.isEmpty()) return null;
 
+        String resultStr = baseDataClient.getWellListByOrgID(org);
+        if (Objects.isNull(resultStr) || resultStr.isEmpty()) return null;
+
+        Result result = JSONObject.parseObject(resultStr, Result.class);
+        if (Objects.isNull(result) || Objects.isNull(result.getData()))
+            return null;
+        JSONArray array = (JSONArray) result.getData();
+        ArrayList<String> re = new ArrayList<>();
+        for (int i = 0; i < array.size(); i++) {
+            re.add(array.getJSONObject(i).getString("id"));
+        }
+        return re;
     }
-    public Page<Map<String,Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String wellId, String startDate,int pageSize,int pageNum){
-        startDate = startDate+" 00:00:00";
+
+    @Override
+    public Page<Map<String, Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String org, String wellId, String startDate, int pageSize, int pageNum) {
+        startDate = startDate + " 00:00:00";
         LocalDateTime localDateTime = LocalDateTime.parse(startDate, df);
         LocalDateTime localDateTime1 = localDateTime.plusDays(1);
         String end = localDateTime1.format(df);
-        QueryWrapper<AoidDailyYield> wrapper = new QueryWrapper<>();
-        LambdaQueryWrapper<AoidDailyYield> queryWrapper = wrapper.lambda().eq(AoidDailyYield::getWellId, wellId).
-                ge(AoidDailyYield::getProdDate, Timestamp.valueOf(LocalDateTime.parse(startDate,df))).
-                le(AoidDailyYield::getProdDate,Timestamp.valueOf(LocalDateTime.parse(end,df))).orderByAsc(AoidDailyYield::getProdDate);
-        Page<Map<String,Object>> paramPage = new Page<>(pageNum,pageSize);
+        List<String> wellids = getWellIds(org, wellId);
+
+        LambdaQueryWrapper<AoidDailyYield> queryWrapper = new LambdaQueryWrapper<>();
+        if (wellids != null || wellids.size() > 0) {
+            queryWrapper.in(AoidDailyYield::getWellId, wellids);
+        }
+        queryWrapper.ge(AoidDailyYield::getProdDate, Timestamp.valueOf(LocalDateTime.parse(startDate, df))).
+                le(AoidDailyYield::getProdDate, Timestamp.valueOf(LocalDateTime.parse(end, df))).orderByAsc(AoidDailyYield::getProdDate);
+        Page<Map<String, Object>> paramPage = new Page<>(pageNum, pageSize);
         Page<Map<String, Object>> mapPage = aoidDailyYieldMapper.selectMapsPage(paramPage, queryWrapper);
         for (Map<String, Object> map : mapPage.getRecords()) {
             String date = map.get("prod_date").toString().substring(0, 10);
-            String time = map.get("prod_date").toString().substring(11, 19);
+           // String time = map.get("prod_date").toString().substring(11, 19);
 //            map.put("prod_date",date+" "+time);
-            map.put("prod_date",date);
+            map.put("prod_date", date);
         }
         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/AoidSinglegtYieldServiceImpl.java

@@ -56,7 +56,7 @@ public class AoidSinglegtYieldServiceImpl extends ServiceImpl<AoidSinglegtYieldM
         QueryWrapper<AoidSinglegtYield> queryWrapper = new QueryWrapper<>();
         QueryWrapper<AoidSinglegtYield> wapper = null;
 
-        wapper = queryWrapper.select("well_common_name","zdjg","prod_date","liq_prod_daily","sgt","oil_prod_daily","stroke","frequence","bx","hsl")
+        wapper = queryWrapper.select("well_common_name","zdjg","prod_date","liq_prod_daily","sgtFormatted","oil_prod_daily","stroke","frequence","bx","hsl")
                 .eq("well_common_name",jh);
 
         Page<Map<String,Object>> page = aoidSinglegtYieldMapper.selectMapsPage(paramPage,wapper);
@@ -64,7 +64,7 @@ public class AoidSinglegtYieldServiceImpl extends ServiceImpl<AoidSinglegtYieldM
         //格式化功图数据
         List<Map<String,Object>> records = page.getRecords();
         records.forEach((map)->{
-            map.put("sgt", SGTUtil.encodeToView((String)map.get("sgt")));
+            map.put("sgt", SGTUtil.encodeToView((String)map.get("sgtFormatted")));
             map.put("prod_date",df.format(((Timestamp)map.get("prod_date")).toLocalDateTime()));
         });
         return Result.ok(page);
@@ -93,7 +93,10 @@ public class AoidSinglegtYieldServiceImpl extends ServiceImpl<AoidSinglegtYieldM
         for (Map<String, Object> map : maps) {
             String date = map.get("prod_date").toString().substring(0, 10);
             String time = map.get("prod_date").toString().substring(11, 19);
-            List<List<Double>> bgtList = SGTUtil.encodeToUseList((String) map.get("bgt"));
+//            System.out.println("map = " + map);
+//            System.out.println("(String) map.get(\"bgt\") = " + (String) map.get("bgt"));
+//            System.out.println("(String) map.get(\"sgtFormatted\") = " + (String) map.get("sgtFormatted"));
+            List<List<Double>> bgtList =SGTUtil.encodeToUseList((String) map.get("bgt"));
             List<List<Double>> sgtList = SGTUtil.encodeToUseList((String) map.get("sgt"));
             List<List<Double>> tmp = new ArrayList<>();
             sgtList.remove(sgtList.size()-1);

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

@@ -1,6 +1,8 @@
 package com.gct.aoid.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gct.aoid.algorithm.CalDiagramProduction;
 import com.gct.aoid.algorithm.CalPumpCard;
 import com.gct.aoid.entity.*;
@@ -16,9 +18,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Objects;
 
 /**
  * class name: CalDiagramProductionService
@@ -47,88 +49,199 @@ public class CalDiagramProductionService {
     @Autowired
     private AoidSinglegtYieldService aoidSinglegtYieldService;
 
+    public int sus = 0;
+
     public void cal(String message) throws InstantiationException, IllegalAccessException {
         //if (message !=null ) return;
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        AoidCalprotaskqueue aoidCalprotaskqueue = JSONObject.parseObject(message,AoidCalprotaskqueue.class);
-        String dcbpStr =null;
+        AoidCalprotaskqueue aoidCalprotaskqueue = JSONObject.parseObject(message, AoidCalprotaskqueue.class);
+        String dcbpStr = null;
         DiagramCardBaseParam dcbp;
         SingleDiagramDiagnoseResult sddr;
         ProDataForCalProduction a2data;
         ProDataForCalProduction a2dataVol;
         try {
+//            System.out.println("aoidCalprotaskqueue .getSgtbaseparamId= " + aoidCalprotaskqueue.getSgtbaseparamId());
             dcbpStr = diagnoseClient.getDiagramCardBaseParamByID(aoidCalprotaskqueue.getSgtbaseparamId());
+//            System.out.println("dcbp json:" + JSONObject.parseObject(dcbpStr, Result.class).toString());
             dcbp = (DiagramCardBaseParam) JSONObject.parseObject(dcbpStr, Result.class).toFiguredOutObject(DiagramCardBaseParam.class);
-            dcbp.setSgt(SGTUtil.encodeToDoubleArray(dcbp.getSgtStr()));
+            dcbp.setSgtFormatted(SGTUtil.encodeToDoubleArray(dcbp.getSgtStr()));
             String sddrStr = diagnoseClient.getSingleDiagramDiagnoseResultByID(aoidCalprotaskqueue.getDiagnoseresultId());
             sddr = (SingleDiagramDiagnoseResult) JSONObject.parseObject(sddrStr, Result.class).toFiguredOutObject(SingleDiagramDiagnoseResult.class);
-            String a2dataStr = baseDataClient.getA2DataForCalProduction(dcbp.getWellName(),dcbp.getReceiveTime());
+//            System.out.println("dcbp.getReceiveTime() = " + dcbp.getProdDate());
+//            System.out.println("dcbp.getWellName() = " + dcbp.getWellName());
+            String a2dataStr = baseDataClient.getA2DataForCalProduction(dcbp.getWellName(), dcbp.getProdDate().substring(0, 10));
             a2data = (ProDataForCalProduction) JSONObject.parseObject(a2dataStr, Result.class).toFiguredOutObject(ProDataForCalProduction.class);
-            String a2dataStrVol = baseDataClient.getA2DataForCalVolDaily(dcbp.getWellName(), dcbp.getReceiveTime());
+          //  if (a2data != null) System.out.println("a2data = " + a2data);
+            String a2dataStrVol = baseDataClient.getA2DataForCalVolDaily(dcbp.getWellName(), dcbp.getProdDate().substring(0, 10));
             a2dataVol = (ProDataForCalProduction) JSONObject.parseObject(a2dataStrVol, Result.class).toFiguredOutObject(ProDataForCalProduction.class);
-        }catch (Exception e){
-            e.printStackTrace();
-            throw  new RuntimeException("[aoid->CalDiagramProductionService->cal:] fegin error ");
-        }
-            AoidGkModel model = aoidGkModelService.getGKModelByResultType(sddr.getResult1());
-            AoidSinglewellConfig effectStrockModel = aoidSinglewellConfigService.getConfigOneObjByID(1);
-            Double[][] bgt = calPumpCard.cal_bgt(dcbp, sddr);
-
-            CalDiagramProduction.CalProductionResult production = calDiagramProduction.calProduction(dcbp.getSgt(), bgt,
-                    dcbp.getS(), dcbp.getN(), sddr.getResult1(), Double.valueOf(String.valueOf(a2data.getBj())), Double.valueOf(String.valueOf(a2data.getBs())),
-                    Double.valueOf(String.valueOf(a2dataVol.getHsl()))/100 , Double.valueOf(String.valueOf(a2dataVol.getSmd())), Double.valueOf(String.valueOf(a2dataVol.getYmd())), Double.valueOf(String.valueOf(a2dataVol.getQyb())),
-                    Double.valueOf(String.valueOf(a2data.getDym())), model.getGkxs(), effectStrockModel
+           // if (a2dataVol != null) System.out.println("a2dataStrVol = " + a2dataVol);
+        } catch (Exception e) {
+            throw new RuntimeException("[aoid->CalDiagramProductionService->cal:] fegin error ");
+        }
+        AoidGkModel model = aoidGkModelService.getGKModelByResultType(sddr.getResult1());
+        AoidSinglewellConfig effectStrockModel = aoidSinglewellConfigService.getConfigOneObjByID(1);
+        Double[][] bgt = calPumpCard.cal_bgt(dcbp, sddr);
+        CalDiagramProduction.CalProductionResult production = new CalDiagramProduction.CalProductionResult();
+
+        boolean checked = checkInputDataBeforeCalDiagramProduction(production, a2data, a2dataVol, bgt, dcbp, model, effectStrockModel);
+        AoidSinglegtYield aoidSinglegtYield = new AoidSinglegtYield();
+        aoidSinglegtYield.setRemark(production.remark);
+        if (checked) {
+            production = calDiagramProduction.calProduction(
+                    dcbp.getSgtFormatted(),
+                    bgt,
+                    dcbp.getS(),
+                    dcbp.getN(),
+                    sddr.getResult1(),
+                    a2data.getBj(),
+                    a2data.getBs(),
+                    a2dataVol.getHsl() / 100,
+                    a2dataVol.getSmd(),
+                    a2dataVol.getYmd(),
+                    a2dataVol.getQyb(),
+                    a2data.getDym(),
+                    model.getGkxs(),
+                    effectStrockModel
             );
-            aoidCalprotaskqueue.setStatus(AoidCalprotaskqueue.TaskStatus.COMPLETED.getCode());
+            /*if (production != null)
+                System.out.println("production-remark = " + production.remark);*/
+            sus++;
+          /*  System.out.println("sus = " + sus);*/
+        }
+        aoidCalprotaskqueue.setStatus(AoidCalprotaskqueue.TaskStatus.COMPLETED.getCode());
+//        System.out.println("JSONObject.toJSONString(production) = " + JSONObject.toJSONString(production));
 
-        try {
-            AoidSinglegtYield aoidSinglegtYield = new AoidSinglegtYield();
+
+        if (dcbp != null) {
             aoidSinglegtYield.setWellId(dcbp.getWellName());
             aoidSinglegtYield.setWellCommonName(dcbp.getWellName());
-            aoidSinglegtYield.setProdDate(LocalDateTime.parse(dcbp.getReceiveTime(),df));
-            aoidSinglegtYield.setStroke(BigDecimal.valueOf(new BigDecimal(dcbp.getS()).setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            aoidSinglegtYield.setFrequence(BigDecimal.valueOf(new BigDecimal(dcbp.getN()).setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            aoidSinglegtYield.setBj(new BigDecimal(a2data.getBj().toString()).setScale(2, BigDecimal.ROUND_HALF_UP));
+            if (dcbp.getProdDate() != null)
+                try {
+                    aoidSinglegtYield.setProdDate(LocalDateTime.parse(dcbp.getProdDate(), df));
+                } catch (Exception e) {
+                    System.out.println("dcbp.getProdDate() ERROR= " + dcbp.getProdDate());
+                }
+            aoidSinglegtYield.setStroke(dcbp.getS());
+            aoidSinglegtYield.setFrequence(dcbp.getN());
+            aoidSinglegtYield.setSxzh(dcbp.getL_max());
+            aoidSinglegtYield.setXxzh(dcbp.getL_min());
+            aoidSinglegtYield.setSgt(dcbp.getSgtStr());
+        }
+        if (a2data != null) {
+            aoidSinglegtYield.setBj(a2data.getBj());
             aoidSinglegtYield.setBs(a2data.getBs());
-            aoidSinglegtYield.setCmd(new BigDecimal(a2data.getBs().subtract(a2data.getDym()).toString()).setScale(3, BigDecimal.ROUND_HALF_UP));
+            aoidSinglegtYield.setCmd(a2data.getBs());
             aoidSinglegtYield.setYzzj(a2data.getBj());
-            aoidSinglegtYield.setSxzh(BigDecimal.valueOf(dcbp.getL_max()));
-            aoidSinglegtYield.setXxzh(BigDecimal.valueOf(dcbp.getL_min()));
-            aoidSinglegtYield.setSgt(SGTUtil.encodeToString(dcbp.getSgt()));
-            aoidSinglegtYield.setBgt(SGTUtil.encodeToString(bgt));
-            aoidSinglegtYield.setZdjg(sddr.getResult1());
-            aoidSinglegtYield.setLiqProdDaily(BigDecimal.valueOf(new BigDecimal(production.rcyl).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            aoidSinglegtYield.setOilProdDaily(BigDecimal.valueOf(new BigDecimal(production.rcyl1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            aoidSinglegtYield.setGasProdDaily(BigDecimal.valueOf(new BigDecimal(production.rcql).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            aoidSinglegtYield.setEczdjg(sddr.getResult2());
-            aoidSinglegtYield.setBx(BigDecimal.valueOf(new BigDecimal(production.bx).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            aoidSinglegtYield.setHsl(new BigDecimal(a2dataVol.getHsl().toString()).setScale(3, BigDecimal.ROUND_HALF_UP));
-            //aoidSinglegtYield.setFlag();
-            //aoidSinglegtYield.setBdxs();
-            aoidSinglegtYield.setLlpl(BigDecimal.valueOf(new BigDecimal(production.llpl).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            aoidSinglegtYield.setZcc(BigDecimal.valueOf(production.zcc));
-            aoidSinglegtYield.setSjcc(BigDecimal.valueOf(new BigDecimal(production.sjcc ).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            aoidSinglegtYield.setYxcc(BigDecimal.valueOf(production.yxcc));
-            aoidSinglegtYield.setCcss(BigDecimal.valueOf(production.ccss));
-            aoidSinglegtYield.setLsss(BigDecimal.valueOf(production.lsss));
-            aoidSinglegtYield.setGyss(BigDecimal.valueOf(production.gyss));
+            aoidSinglegtYield.setHsl(a2dataVol.getHsl());
             aoidSinglegtYield.setHy(a2data.getBack_pres());
             aoidSinglegtYield.setYy(a2data.getTubing_pres());
             aoidSinglegtYield.setTy(a2data.getCasing_pres());
-            aoidSinglegtYield.setWaterProdDaily(BigDecimal.valueOf(new BigDecimal(production.rcsl).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            aoidSinglegtYield.setScsj(BigDecimal.valueOf(24));
-            aoidSinglegtYield.setStrokeRatio(BigDecimal.valueOf(new BigDecimal(production.l_StrokeRatio).setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            /*aoidSinglegtYield.setDjdy();
+            aoidSinglegtYield.setDym(a2data.getDym());
+        }
+        if (a2dataVol != null) {
+
+            aoidSinglegtYield.setSmd(a2dataVol.getSmd());
+            aoidSinglegtYield.setYmd(a2dataVol.getYmd());
+            aoidSinglegtYield.setQyb(a2dataVol.getQyb());
+        }
+        //sddr must be not null
+        aoidSinglegtYield.setEczdjg(sddr.getResult2());
+        aoidSinglegtYield.setZdjg(sddr.getResult1());
+
+        if (bgt != null && bgt.length > 0) {
+//            System.out.println("SGTUtil.encodeToString(bgt) = " + SGTUtil.encodeToString(bgt));
+            aoidSinglegtYield.setBgt(SGTUtil.encodeToString(bgt));
+        }
+        if (production != null) {
+            aoidSinglegtYield.setLiqProdDaily(production.rcyl);
+            aoidSinglegtYield.setOilProdDaily(production.rcyl1);
+            aoidSinglegtYield.setGasProdDaily(production.rcql);
+            aoidSinglegtYield.setBx(production.bx);
+            //aoidSinglegtYield.setFlag();
+            //aoidSinglegtYield.setBdxs();
+            aoidSinglegtYield.setLlpl(production.llpl);
+            aoidSinglegtYield.setZcc(production.zcc);
+            aoidSinglegtYield.setSjcc(production.sjcc);
+            aoidSinglegtYield.setYxcc(production.yxcc);
+            aoidSinglegtYield.setCcss(production.ccss);
+            aoidSinglegtYield.setLsss(production.lsss);
+            aoidSinglegtYield.setGyss(production.gyss);
+            aoidSinglegtYield.setWaterProdDaily(production.rcsl);
+            aoidSinglegtYield.setStrokeRatio(production.l_StrokeRatio);
+        }
+        aoidSinglegtYield.setScsj(24d);
+        /*aoidSinglegtYield.setDjdy();
             aoidSinglegtYield.setHjwd();
             aoidSinglegtYield.setYbdl();
             aoidSinglegtYield.setXhqd();
             aoidSinglegtYield.setSbh();*/
-            aoidSinglegtYield.setSmd(a2dataVol.getSmd());
-            aoidSinglegtYield.setYmd(a2dataVol.getYmd());
-            aoidSinglegtYield.setQyb(BigDecimal.valueOf(new BigDecimal(a2dataVol.getQyb().toString()).setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue()));
-            aoidSinglegtYieldService.save(aoidSinglegtYield);
-        }catch (Exception e){
-           throw  new RuntimeException("[aoid->CalDiagramProductionService->cal:] insert Aoid_singlegt_yield table error ");
+
+        System.out.println("aoidSinglegtYield = " + aoidSinglegtYield);
+        aoidSinglegtYieldService.saveOrUpdate(aoidSinglegtYield,
+                new LambdaQueryWrapper<AoidSinglegtYield>()
+                        .eq(AoidSinglegtYield::getWellId, aoidSinglegtYield.getWellId())
+                        .eq(AoidSinglegtYield::getProdDate, aoidSinglegtYield.getProdDate())
+        );
+
+    }
+
+
+    //public final static String[] name = {"N", "S", "BJ", "BS", "DYM", "HSL", "SMD", "QYB", "YMD"};
+//    public static int[] count = {0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+    private boolean checkInputDataBeforeCalDiagramProduction(CalDiagramProduction.CalProductionResult production, ProDataForCalProduction a2data, ProDataForCalProduction a2dataVol, Double[][] bgt, DiagramCardBaseParam dcbp, AoidGkModel model, AoidSinglewellConfig effectStrockModel) {
+        production.remark = "found unexpected data";
+        if (bgt == null || bgt.length == 0) return false;
+
+        if (Objects.isNull(dcbp)) return false;
+        if (Objects.isNull(dcbp.getN())) {
+//            count[0]++;
+            return false;
         }
+        if (Objects.isNull(dcbp.getS())) {
+//            count[1]++;
+            return false;
+
+        }
+
+        if (Objects.isNull(a2data)) return false;
+        if (Objects.isNull(a2data.getBj())) {
+//            count[2]++;
+            return false;
+        }
+        if (Objects.isNull(a2data.getBs())) {
+//            count[3]++;
+            return false;
+        }
+        if (Objects.isNull(a2data.getDym())) {
+//            count[4]++;
+            a2data.setDym(0.0);
+            // return false;
+        }
+
+        if (Objects.isNull(a2dataVol)) return false;
+        if (Objects.isNull(a2dataVol.getHsl())) {
+//            count[5]++;
+            return false;
+        }
+        if (Objects.isNull(a2dataVol.getSmd())) {
+//            count[6]++;
+            a2dataVol.setSmd(1.0);
+        }
+        if (Objects.isNull(a2dataVol.getQyb())) {
+//            count[7]++;
+            return false;
+        }
+        if (Objects.isNull(a2dataVol.getYmd())) {
+//            count[8]++;
+            a2dataVol.setYmd(0.84);
+        }
+
+        if (Objects.isNull(model) || Objects.isNull(model.getGkxs())) return false;
+
+        if (Objects.isNull(effectStrockModel)) return false;
+        production.remark = "checked legal";
+        return true;
     }
 }

src/test/java/com/gct/aoid/service/impl/CalDiagramProductionServiceTest.java

@@ -0,0 +1,62 @@
+package com.gct.aoid.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.gct.aoid.ProductionCalApplication;
+import com.gct.aoid.entity.AoidCalprotaskqueue;
+import com.gct.aoid.feignclient.DiagnoseClient;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+@Slf4j
+@SpringBootTest(classes = ProductionCalApplication.class)
+@RunWith(SpringRunner.class)
+@ContextConfiguration
+public class CalDiagramProductionServiceTest {
+
+    @Autowired
+    CalDiagramProductionService calDiagramProductionService;
+
+    @Autowired
+    DiagnoseClient diagnoseClient;
+    @Test
+    public void test() {
+
+        JSONObject allResult = JSONObject.parseObject( diagnoseClient.getAllResult());
+
+        JSONArray data = allResult.getJSONArray("data");
+        System.out.println("data.size() = " + data.size());
+        for (int i = 0; i < data.size(); i++) {
+            AoidCalprotaskqueue msg = new AoidCalprotaskqueue();
+            msg.setStatus(AoidCalprotaskqueue.TaskStatus.ADDED.getCode());
+//            System.out.println("data.getJSONObject(i).toJSONString() = " + data.getJSONObject(i).toJSONString());
+            msg.setDiagnoseresultId(data.getJSONObject(i).getString("resultId"));
+            msg.setSgtbaseparamId(data.getJSONObject(i).getString("gtbaseparamId"));
+            msg.setCreatetime(LocalDateTime.now());
+            msg.setId(UUID.randomUUID().toString());
+            try {
+                calDiagramProductionService.cal(JSONObject.toJSONString(msg));
+            } catch (InstantiationException e) {
+               // System.out.println("e1.getMessage() = " + e.getMessage());
+            } catch (IllegalAccessException e) {
+                //System.out.println("e2 = " + e.getMessage());
+            }
+            //System.out.println("msg run completed=>>>>>>" + msg.toString());
+        }
+
+        System.out.println("success:---->"+calDiagramProductionService.sus);
+//        for (int i = 0; i < CalDiagramProductionService.count.length; i++) {
+//            System.out.println(CalDiagramProductionService.name[i] +":"+ CalDiagramProductionService.count[i]);
+//        }
+
+    }
+
+}