rollback::getDefault something

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

@@ -45,17 +45,15 @@ public class AoidDailyYieldController {
         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);
     }
+    public Result getDefaultData(){
+        AoidDailyYield defaultData = aoidDailyYieldService.getDefaultData();
+        return defaultData ==null?Result.error("未找到"):Result.ok(defaultData);
+    }
 
 
 
 
 
-    @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

@@ -156,4 +156,9 @@ 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

@@ -29,4 +29,8 @@ public interface BaseDataClient {
 
     @RequestMapping(value = "/WellSource/jh", method = RequestMethod.GET)
     String getWellListByOrgID(@RequestParam("orgid") String org);
+
+    @RequestMapping("/org/getOrgId/{orgId}")
+    String getOrgId(@PathVariable("orgId") String orgId);
+
 }

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

@@ -32,8 +32,6 @@ public class BaseDataHystrix implements  BaseDataClient {
         return "请求超时了";
     }
 
-
-
     @Override
     public String getOrgId(String orgId) {
         return "请求超时了";
@@ -42,6 +40,4 @@ public class BaseDataHystrix implements  BaseDataClient {
 
 
 
-
-
 }

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

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

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

@@ -120,4 +120,14 @@ 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/test/java/com/gct/aoid/service/impl/CalDiagramProductionServiceTest.java

@@ -27,6 +27,7 @@ public class CalDiagramProductionServiceTest {
 
     @Autowired
     DiagnoseClient diagnoseClient;
+
     @Test
     public void test() {