|
@ -35,13 +35,12 @@ public class ExtApiControler { |
|
|
List<Map<String, Object>> services = new ArrayList<>(); |
|
|
List<Map<String, Object>> services = new ArrayList<>(); |
|
|
var classes = SpringBootBeanUtil.getBeans(); |
|
|
var classes = SpringBootBeanUtil.getBeans(); |
|
|
for (var clazz : classes) { |
|
|
for (var clazz : classes) { |
|
|
var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class); |
|
|
|
|
|
var cfg = extApiTabCfgService.getCfg(clazz); |
|
|
var cfg = extApiTabCfgService.getCfg(clazz); |
|
|
|
|
|
|
|
|
if (cfg == null) { |
|
|
if (cfg == null) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
if (null == hardwareServiceAnnotation || !cfg.display) { |
|
|
|
|
|
|
|
|
if (!cfg.display) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -145,8 +144,7 @@ public class ExtApiControler { |
|
|
Class<?> serviceClass = null; |
|
|
Class<?> serviceClass = null; |
|
|
var classes = SpringBootBeanUtil.getBeans(); |
|
|
var classes = SpringBootBeanUtil.getBeans(); |
|
|
for (var clazz : classes) { |
|
|
for (var clazz : classes) { |
|
|
var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class); |
|
|
|
|
|
if (null == hardwareServiceAnnotation || !clazz.getSimpleName().equals(serviceKey)) { |
|
|
|
|
|
|
|
|
if ( !clazz.getSimpleName().equals(serviceKey)) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
serviceClass = clazz; |
|
|
serviceClass = clazz; |
|
@ -185,8 +183,7 @@ public class ExtApiControler { |
|
|
Class<?> serviceClass = null; |
|
|
Class<?> serviceClass = null; |
|
|
var classes = SpringBootBeanUtil.getBeans(); |
|
|
var classes = SpringBootBeanUtil.getBeans(); |
|
|
for (var clazz : classes) { |
|
|
for (var clazz : classes) { |
|
|
var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class); |
|
|
|
|
|
if (null == hardwareServiceAnnotation || !clazz.getSimpleName().equals(serviceKey)) { |
|
|
|
|
|
|
|
|
if (!clazz.getSimpleName().equals(serviceKey)) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
serviceClass = clazz; |
|
|
serviceClass = clazz; |
|
@ -335,8 +332,7 @@ public class ExtApiControler { |
|
|
Class<?> serviceClass = null; |
|
|
Class<?> serviceClass = null; |
|
|
var classes = SpringBootBeanUtil.getBeans(); |
|
|
var classes = SpringBootBeanUtil.getBeans(); |
|
|
for (var clazz : classes) { |
|
|
for (var clazz : classes) { |
|
|
var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class); |
|
|
|
|
|
if (null == hardwareServiceAnnotation || !clazz.getSimpleName().equals(serviceKey)) { |
|
|
|
|
|
|
|
|
if (!clazz.getSimpleName().equals(serviceKey)) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
serviceClass = clazz; |
|
|
serviceClass = clazz; |
|
@ -352,12 +348,12 @@ public class ExtApiControler { |
|
|
private Object getServiceParamHandlerByServiceKey(String serviceKey) { |
|
|
private Object getServiceParamHandlerByServiceKey(String serviceKey) { |
|
|
var classes = SpringBootBeanUtil.getBeans(); |
|
|
var classes = SpringBootBeanUtil.getBeans(); |
|
|
for (var clazz : classes) { |
|
|
for (var clazz : classes) { |
|
|
var hardwareServiceParamsAnnotation = clazz.getAnnotation(ExtApiParamsTab.class); |
|
|
|
|
|
if (null == hardwareServiceParamsAnnotation) { |
|
|
|
|
|
continue; |
|
|
|
|
|
} |
|
|
|
|
|
var serviceClass = hardwareServiceParamsAnnotation.service(); |
|
|
|
|
|
if (!serviceClass.getSimpleName().equals(serviceKey)) { |
|
|
|
|
|
|
|
|
// var hardwareServiceParamsAnnotation = clazz.getAnnotation(ExtApiParamsTab.class); |
|
|
|
|
|
// if (null == hardwareServiceParamsAnnotation) { |
|
|
|
|
|
// continue; |
|
|
|
|
|
// } |
|
|
|
|
|
// var serviceClass = hardwareServiceParamsAnnotation.service(); |
|
|
|
|
|
if (!clazz.getSimpleName().equals(serviceKey)) { |
|
|
continue; |
|
|
continue; |
|
|
} |
|
|
} |
|
|
return SpringBootBeanUtil.getBean(clazz); |
|
|
return SpringBootBeanUtil.getBean(clazz); |
|
|