Kazuyuki Hida · @hida-k · Kazuyuki Hida · Kazuyuki Hida · Kazuyuki Hida · Yujin Seo
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
 		return json;
 	}

+	public LockReportJSON sendLockReport(LockReportParameters param) throws NetworkDisconnectedException, AcmsException {
+		HttpResponse response = send(AcmsApis.ApiLockReport, param);
+		String json = response.httpResponseBody;
+		return new LockReportJSON(json);
+	}
+
+	public UnlockReportJSON sendUnlockReport(UnlockReportParameters param) throws NetworkDisconnectedException, AcmsException {
+		HttpResponse response = send(AcmsApis.ApiUnlockReport, param);
+		String json = response.httpResponseBody;
+		return new UnlockReportJSON(json);
+	}
+
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
                AcmsApis.ApiUrlNewAppStoreLogin,
                AcmsApis.ApiUrlAppStoreNewLogin,
 				AcmsApis.ApiGetPushMessages,
-				AcmsApis.ApiSendPushMessage
+				AcmsApis.ApiSendPushMessage,
+				AcmsApis.ApiLockReport,
+				AcmsApis.ApiUnlockReport
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
+					mTaskKey,
+					dateOrNull(abookCheckParam.get("reportStartDate")),
+					r.getExtParam().getReportStatus(),
+					r.getExtParam().getReportLockUserId(),
+					r.getExtParam().getReportLockUserName(),
+					r.getExtParam().getReportLockTime()
+			);
+			// JSコールバック
+			afterABookCheckApi(
+					mCmd,
+					mTaskKey,
+					r.getResult(),
+					r.getMessage(),
+					r.getExtParam().json()
+			);
+		} else if (mCmd.equals(ABookKeys.CMD_UNLOCK_REPORT)) {
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/UnlockReportJSON.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/UnlockReportJSON.java 0 → 100644
+
+    public int getHttpStatus() {
+        return httpStatus;
+    }
+
+    public Date getPresentTime() {
+        return presentTime;
+    }
+
+    public Date getPresentTimeUTC() {
+        return presentTimeUTC;
+    }
+
+    public int getReportStatus() {return reportStatus; }
+
+    private int intOrDef(JSONObject json, String key, int def) {
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/UnlockReportJSON.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/UnlockReportJSON.java 0 → 100644
+
+    public Date getPresentTimeUTC() {
+        return presentTimeUTC;
+    }
+
+    public int getReportStatus() {return reportStatus; }
+
+    private int intOrDef(JSONObject json, String key, int def) {
+        if (json.has(key)) {
+            return json.getInt(key);
+        } else {
+            return def;
+        }
+    }
+
+    private Date dateOrNull(JSONObject json, String key) {
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java 0 → 100644
+import jp.agentec.abook.abv.bl.acms.client.json.LockReportJSON;
+import jp.agentec.abook.abv.bl.acms.client.parameters.LockReportParameters;
+import jp.agentec.abook.abv.bl.dto.MemberInfoDto;
+import jp.agentec.adf.util.DateTimeFormat;
+import jp.agentec.adf.util.DateTimeUtil;
+
+import static java.net.HttpURLConnection.HTTP_OK;
+
+public class LockReportLogic extends AbstractLogic {
+
+    public static LockReportLogic newInstance() {
+        return new LockReportLogic();
+    }
+
+    public Result lock(Map<String, String> param) {
+        Long taskReportId = longOrNull(param.get("taskReportId"));
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java 0 → 100644
+import jp.agentec.abook.abv.bl.acms.client.parameters.LockReportParameters;
+import jp.agentec.abook.abv.bl.dto.MemberInfoDto;
+import jp.agentec.adf.util.DateTimeFormat;
+import jp.agentec.adf.util.DateTimeUtil;
+
+import static java.net.HttpURLConnection.HTTP_OK;
+
+public class LockReportLogic extends AbstractLogic {
+
+    public static LockReportLogic newInstance() {
+        return new LockReportLogic();
+    }
+
+    public Result lock(Map<String, String> param) {
+        Long taskReportId = longOrNull(param.get("taskReportId"));
+        Date reportStartDate = dateOrNull(param.get("reportStartDate"));
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java 0 → 100644
+import jp.agentec.adf.util.DateTimeUtil;
+
+import static java.net.HttpURLConnection.HTTP_OK;
+
+public class LockReportLogic extends AbstractLogic {
+
+    public static LockReportLogic newInstance() {
+        return new LockReportLogic();
+    }
+
+    public Result lock(Map<String, String> param) {
+        Long taskReportId = longOrNull(param.get("taskReportId"));
+        Date reportStartDate = dateOrNull(param.get("reportStartDate"));
+
+        return sendLockReport(
+                param.get("taskKey"),
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java 0 → 100644
+        public Date getReportLockTime() {
+            return reportLockTime;
+        }
+
+        public String json() {
+            JSONObject extParam = new JSONObject();
+            extParam.put("reportStatus", String.valueOf(reportStatus));
+            extParam.put("reportLockUserId", reportLockUserId);
+            extParam.put("reportLockUserName", reportLockUserName);
+            extParam.put("reportLockTime", DateTimeUtil.formatDate(reportLockTime, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen));
+
+            if (taskReportId != null && taskReportId != 0) {
+                extParam.put("taskReportId", taskReportId);
+            }
+            if (reportStartDate != null) {
+                extParam.put("reportStartDate", DateTimeUtil.formatDate(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen));
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java 0 → 100644
+import jp.agentec.adf.util.DateTimeUtil;
+
+import static java.net.HttpURLConnection.HTTP_OK;
+
+public class UnlockReportLogic extends AbstractLogic {
+
+    public static UnlockReportLogic newInstance() {
+        return new UnlockReportLogic();
+    }
+
+    public Result unlock(Map<String, String> param) {
+        Long taskReportId = longOrNull(param.get("taskReportId"));
+        Date reportStartDate = dateOrNull(param.get("reportStartDate"));
+
+        return sendUnlockReport(
+                param.get("taskKey"),
--- a/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java 0 → 100644
+++ b/ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java 0 → 100644
+            this.taskReportId = taskReportId;
+            this.reportStartDate = reportStartDate;
+        }
+
+        public int getReportStatus() {
+            return reportStatus;
+        }
+
+        public String json() {
+            JSONObject extParam = new JSONObject();
+            extParam.put("reportStatus", String.valueOf(reportStatus));
+            if (taskReportId != null && taskReportId != 0) {
+                extParam.put("taskReportId", taskReportId);
+            }
+            if (reportStartDate != null) {
+                extParam.put("reportStartDate", DateTimeUtil.formatDate(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen));
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
 			// ビーコンデータを受信して目的のデバイスIDの信号から値を取得する
 			// 1:中心温度計  2:置くだけセンサー　3:バーコード
 			getDeviceInfo(abookCheckParam);
-
+		} else if (mCmd.equals(ABookKeys.CMD_LOCK_REPORT)) {
+			LockReportLogic.Result r = LockReportLogic.newInstance().lock(abookCheckParam);
+			// ローカルDBに反映
+			TaskReportDao dao = AbstractDao.getDao(TaskReportDao.class);
+			dao.updateReportLock(
+					mTaskKey,
+					dateOrNull(abookCheckParam.get("reportStartDate")),
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
+			);
+			// JSコールバック
+			afterABookCheckApi(
+					mCmd,
+					mTaskKey,
+					r.getResult(),
+					r.getMessage(),
+					r.getExtParam().json()
+			);
+		} else if (mCmd.equals(ABookKeys.CMD_UNLOCK_REPORT)) {
+			UnlockReportLogic.Result r = UnlockReportLogic.newInstance().unlock(abookCheckParam);
+			// ローカルDBに反映
+			TaskReportDao dao = AbstractDao.getDao(TaskReportDao.class);
+			dao.updateReportLock(
+					mTaskKey,
+					dateOrNull(abookCheckParam.get("reportStartDate")),