Merge branch 'release-dev-1.0' of http://117.34.118.57:23000/GCT-RDC/microarch_bg_aoid

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

@@ -44,9 +44,12 @@ 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);
     }
+
+    @ApiOperation(value="get default data from aoid_daily_yield,may be return null")
+    @GetMapping("/getDefaultData")
     public Result getDefaultData(){
         AoidDailyYield defaultData = aoidDailyYieldService.getDefaultData();
-        return defaultData ==null?Result.error("未找到"):Result.ok(defaultData);
+        return defaultData ==null?Result.error("Can not find available data for default view."):Result.ok(defaultData);
     }
 
 

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

@@ -24,7 +24,7 @@ public class AoidDailyYield {
     private String wellId;
 
     @ApiModelProperty(value = "日期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:ss:mm" , timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private LocalDateTime prodDate;
 
     @ApiModelProperty(value = "日产液量 t(实际产量)")

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

@@ -123,11 +123,12 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
 
     @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());
+        AoidDailyYield aoidDailyYield = aoidDailyYieldMapper.selectOne(new LambdaQueryWrapper<AoidDailyYield>().orderByDesc(AoidDailyYield::getProdDate).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;
     }
 }