diff --git a/secondev-hx-webservice/src/main/java/com/weaver/seconddev/controller/Showhl1_controller.java b/secondev-hx-webservice/src/main/java/com/weaver/seconddev/controller/Showhl1_controller.java index fbaff11..1c64db0 100644 --- a/secondev-hx-webservice/src/main/java/com/weaver/seconddev/controller/Showhl1_controller.java +++ b/secondev-hx-webservice/src/main/java/com/weaver/seconddev/controller/Showhl1_controller.java @@ -3,7 +3,7 @@ package com.weaver.seconddev.controller; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.seconddev.util.DataOperateUtil; import lombok.extern.slf4j.Slf4j; -import org.json.JSONObject; +import cn.hutool.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -39,17 +39,18 @@ public class Showhl1_controller { try { sql = "select azj03 from hxjm.azj_file where azj01 = 'USD' and ((year(to_date(azj02, 'yyyy-mm')) = year(sysdate)) and (month(to_date(azj02, 'yyyy-mm')) = month(sysdate)))"; String SourceType = "EXTERNAL"; - String groupId = "Topgp"; + String groupId = "976355735283761152"; Map datas = dataOperateUtil.executeForQuery(SourceType, groupId, sql); if (datas != null && datas.size() > 0) { if (String.valueOf(datas.get("status")).equals("OK")) { List> records = (List>) datas.get("records"); if (records.size() > 0) { Map map = records.get(0); - result = Float.valueOf(map.get("azk03").toString()); + result = Float.valueOf(map.get("AZJ03").toString()); } } } + log.info("Showhl_controller execute result : " + result); jsonObject.put("result", result); return WeaResult.success(jsonObject); }catch (Exception e){ diff --git a/secondev-hx-webservice/src/main/java/com/weaver/seconddev/controller/Showhl_controller.java b/secondev-hx-webservice/src/main/java/com/weaver/seconddev/controller/Showhl_controller.java index c619837..14531c3 100644 --- a/secondev-hx-webservice/src/main/java/com/weaver/seconddev/controller/Showhl_controller.java +++ b/secondev-hx-webservice/src/main/java/com/weaver/seconddev/controller/Showhl_controller.java @@ -41,14 +41,14 @@ public class Showhl_controller { try { sql = "select azk03 from HOXIN.azk_file where azk01='USD' and year(azk02) = year(sysdate) and month(azk02) = month(sysdate) and day(azk02) = day(sysdate)"; String SourceType = "EXTERNAL"; - String groupId = "Topgp"; + String groupId = "976355735283761152"; Map datas = dataOperateUtil.executeForQuery(SourceType, groupId, sql); if (datas != null && datas.size() > 0) { if (String.valueOf(datas.get("status")).equals("OK")) { List> records = (List>) datas.get("records"); if (records.size() > 0) { Map map = records.get(0); - tz = Float.valueOf(map.get("azk03").toString()); + tz = Float.valueOf(map.get("AZK03").toString()); } } } @@ -59,7 +59,7 @@ public class Showhl_controller { List> records = (List>) datas.get("records"); if (records.size() > 0) { Map map = records.get(0); - my = Float.valueOf(map.get("azj03").toString()); + my = Float.valueOf(map.get("AZJ03").toString()); } } } diff --git a/secondev-hx-webservice/src/main/java/com/weaver/seconddev/util/DataOperateUtil.java b/secondev-hx-webservice/src/main/java/com/weaver/seconddev/util/DataOperateUtil.java index ed5ed32..92910f1 100644 --- a/secondev-hx-webservice/src/main/java/com/weaver/seconddev/util/DataOperateUtil.java +++ b/secondev-hx-webservice/src/main/java/com/weaver/seconddev/util/DataOperateUtil.java @@ -92,7 +92,7 @@ public class DataOperateUtil { executeSqlEntity.setSourceType(SourceType.valueOf(sourceType)); // log.info("executeForQuery executeSqlEntity-->"+executeSqlEntity.getSql()+"-->"+executeSqlEntity.getGroupId()+"-->"+executeSqlEntity.getSourceType()); Map datas = dataSetService.executeSql(executeSqlEntity); -// log.info("executeForQuery datas-->" + datas); + log.info("executeForQuery datas-->" + datas); TenantRpcContext.removeTargetTenantKey(); return datas; }