|
@@ -105,8 +105,8 @@ public class EnterpriseServiceImpl implements IEnterpriseService {
|
|
|
return result.substring(0,result.lastIndexOf(","));
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public Result deviceQuery(DeviceVo deviceVo) {
|
|
|
+
|
|
|
+ public Result deviceQuery2(DeviceVo deviceVo) {
|
|
|
|
|
|
//构建mysql数据库连接数据源--DataSource
|
|
|
Map<String, Object> mapParams = new HashMap<String, Object>();
|
|
@@ -150,8 +150,8 @@ public class EnterpriseServiceImpl implements IEnterpriseService {
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- public Result deviceQuery2(DeviceVo deviceVo) {
|
|
|
+ @Override
|
|
|
+ public Result deviceQuery(DeviceVo deviceVo) {
|
|
|
|
|
|
//数据源
|
|
|
Map<String, Object> entDsParams = new HashMap<String, Object>();
|