Commit 75cef969 by Kazuyuki Hida

文字列リテラルが残っていたので修正した。

parent c366960a
...@@ -12,6 +12,7 @@ import jp.agentec.abook.abv.bl.common.log.Logger; ...@@ -12,6 +12,7 @@ import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.bl.dto.DashboardStatusDto; import jp.agentec.abook.abv.bl.dto.DashboardStatusDto;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.OperationId; import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.OperationId;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.OperationList;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportList; import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportList;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStartDate; import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStartDate;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatus; import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatus;
...@@ -31,7 +32,7 @@ public class DashboardStatusJSON extends AcmsCommonJSON { ...@@ -31,7 +32,7 @@ public class DashboardStatusJSON extends AcmsCommonJSON {
@Override @Override
protected void parse(JSONObject json) { protected void parse(JSONObject json) {
// 使わないので無視 → //presentTimeUTC = dateOrNull(json.getString("presentTimeUTC")); // 使わないので無視 → //presentTimeUTC = dateOrNull(json.getString("presentTimeUTC"));
JSONArray oprations = json.getJSONArray("operationList"); JSONArray oprations = json.getJSONArray(OperationList);
reportStatuses = new ArrayList<DashboardStatusDto>(); reportStatuses = new ArrayList<DashboardStatusDto>();
......
...@@ -23,6 +23,8 @@ public class OperationDataJSON extends AcmsCommonJSON { ...@@ -23,6 +23,8 @@ public class OperationDataJSON extends AcmsCommonJSON {
public static final String OperationId = "operationId"; public static final String OperationId = "operationId";
public static final String OperationList = "operationList"; public static final String OperationList = "operationList";
public static final String ReportStatusId = "reportStatusId"; public static final String ReportStatusId = "reportStatusId";
public static final String ReportStatusCount = "reportStatusCount";
public static final String ReportStatusCountList = "reportStatusCountList";
public static final String TaskId = "taskId"; public static final String TaskId = "taskId";
public static final String TaskKey = "taskKey"; public static final String TaskKey = "taskKey";
public static final String TaskCode = "taskCode"; public static final String TaskCode = "taskCode";
......
...@@ -15,6 +15,10 @@ import jp.agentec.abook.abv.bl.dto.ReportStatusDto; ...@@ -15,6 +15,10 @@ import jp.agentec.abook.abv.bl.dto.ReportStatusDto;
import jp.agentec.adf.util.DateTimeFormat; import jp.agentec.adf.util.DateTimeFormat;
import jp.agentec.adf.util.DateTimeUtil; import jp.agentec.adf.util.DateTimeUtil;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatusCount;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatusCountList;
import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatusId;
public class ReportStatusDao extends AbstractDao { public class ReportStatusDao extends AbstractDao {
public void insert(DashboardStatusDto dto) { public void insert(DashboardStatusDto dto) {
...@@ -252,12 +256,12 @@ public class ReportStatusDao extends AbstractDao { ...@@ -252,12 +256,12 @@ public class ReportStatusDao extends AbstractDao {
for (ReportStatusCountDto dto: getReportStatusCountList()) { for (ReportStatusCountDto dto: getReportStatusCountList()) {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("reportStatusId", dto.getReportStatusId()); json.put(ReportStatusId, dto.getReportStatusId());
json.put("reportStatusCount", dto.getReportStatusCount()); json.put(ReportStatusCount, dto.getReportStatusCount());
list.put(json); list.put(json);
} }
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("reportStatusCountList", list); result.put(ReportStatusCountList, list);
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment