Browse Source

aoid defaultData interface

gxt_xa_000000 3 years ago
parent
commit
ab7e625717

+ 5 - 0
src/main/java/com/gct/aoid/controller/AoidDailyYieldController.java

@@ -56,5 +56,10 @@ public class AoidDailyYieldController {
56
         AoidDailyYield defaultData = aoidDailyYieldService.getDefaultData();
56
         AoidDailyYield defaultData = aoidDailyYieldService.getDefaultData();
57
         return defaultData ==null?Result.error("未找到"):Result.ok(defaultData);
57
         return defaultData ==null?Result.error("未找到"):Result.ok(defaultData);
58
     }
58
     }
59
+
60
+
61
+
62
+
63
+
59
 }
64
 }
60
 
65
 

+ 0 - 3
src/main/java/com/gct/aoid/entity/AoidDailyYield.java

@@ -162,9 +162,6 @@ public class AoidDailyYield {
162
 
162
 
163
 
163
 
164
 
164
 
165
-
166
-
167
-
168
     @TableField(exist = false)
165
     @TableField(exist = false)
169
     private String  zd;
166
     private String  zd;
170
 
167
 

+ 0 - 3
src/main/java/com/gct/aoid/feignclient/BaseDataClient.java

@@ -35,7 +35,4 @@ public interface BaseDataClient {
35
 
35
 
36
 
36
 
37
 
37
 
38
-
39
-
40
-
41
 }
38
 }

+ 1 - 4
src/main/java/com/gct/aoid/feignclient/BaseDataHystrix.java

@@ -31,7 +31,7 @@ public class BaseDataHystrix implements  BaseDataClient {
31
 
31
 
32
     @Override
32
     @Override
33
     public String getOrgId(String orgId) {
33
     public String getOrgId(String orgId) {
34
-        return null;
34
+        return "请求超时了";
35
     }
35
     }
36
 
36
 
37
 
37
 
@@ -39,7 +39,4 @@ public class BaseDataHystrix implements  BaseDataClient {
39
 
39
 
40
 
40
 
41
 
41
 
42
-
43
-
44
-
45
 }
42
 }

+ 0 - 3
src/main/java/com/gct/aoid/service/AoidDailyYieldService.java

@@ -39,7 +39,4 @@ public interface AoidDailyYieldService extends IService<AoidDailyYield> {
39
 
39
 
40
 
40
 
41
 
41
 
42
-
43
-
44
-
45
 }
42
 }

+ 0 - 1
src/main/java/com/gct/aoid/service/impl/AoidDailyYieldServiceImpl.java

@@ -81,7 +81,6 @@ public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper,
81
 
81
 
82
 
82
 
83
 
83
 
84
-
85
     }
84
     }
86
     public Page<Map<String,Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String wellId, String startDate,int pageSize,int pageNum){
85
     public Page<Map<String,Object>> getAoidDailyYieldInfoByWellIdAndPorDatePeriodByPage(String wellId, String startDate,int pageSize,int pageNum){
87
         startDate = startDate+" 00:00:00";
86
         startDate = startDate+" 00:00:00";