Skip to content

A
abook_check
Commit 049c73aa by Lee Munkyeong
Options

コードレビュー対応。

parent 17f23320
Showing with 19 additions and 19 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
...@@ -50,6 +50,8 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsContentParameters; ...@@ -50,6 +50,8 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsContentParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.AcmsParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.AddMemberGroupParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.AddMemberGroupParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.AppStoreNewLoginParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.AppStoreNewLoginParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.ArchiveDetailRequestParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.ArchiveRequestParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.ChangeRoomNameParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.ChangeRoomNameParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.CheckSendLogParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.CheckSendLogParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.ContentReadingLogParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.ContentReadingLogParameters;
...@@ -60,8 +62,6 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.EnterpriseNewLoginParamete ...@@ -60,8 +62,6 @@ import jp.agentec.abook.abv.bl.acms.client.parameters.EnterpriseNewLoginParamete
import jp.agentec.abook.abv.bl.acms.client.parameters.FavoriteGroupParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.FavoriteGroupParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.FavoriteUserParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.FavoriteUserParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetApertureMasterDataParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.GetApertureMasterDataParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetArchivesDetailParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetArchivesParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetContentParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.GetContentParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetEnqueteReplyParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.GetEnqueteReplyParameters;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetFavoriteParameters; import jp.agentec.abook.abv.bl.acms.client.parameters.GetFavoriteParameters;
...@@ -762,7 +762,7 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -762,7 +762,7 @@ public class AcmsClient implements AcmsClientResponseListener {
* @throws AcmsException * @throws AcmsException
*/ */
public ArchiveListJSON getArchives(String sid, String updateDate) throws NetworkDisconnectedException, AcmsException { public ArchiveListJSON getArchives(String sid, String updateDate) throws NetworkDisconnectedException, AcmsException {
HttpResponse response = send(AcmsApis.ApigetArchive, new GetArchivesParameters(sid, AcmsApis.ArchiveCmds.getArchive, updateDate)); HttpResponse response = send(AcmsApis.ApigetArchive, new ArchiveRequestParameters(sid, AcmsApis.ArchiveCmds.getArchive, updateDate));
ArchiveListJSON json = new ArchiveListJSON(response.httpResponseBody); ArchiveListJSON json = new ArchiveListJSON(response.httpResponseBody);
return json; return json;
} }
...@@ -777,7 +777,7 @@ public class AcmsClient implements AcmsClientResponseListener { ...@@ -777,7 +777,7 @@ public class AcmsClient implements AcmsClientResponseListener {
* @throws AcmsException * @throws AcmsException
*/ */
public ArchiveDetailJSON getArchiveDetail(String sid, Integer archiveId, Integer collaborationDetailId) throws NetworkDisconnectedException, AcmsException { public ArchiveDetailJSON getArchiveDetail(String sid, Integer archiveId, Integer collaborationDetailId) throws NetworkDisconnectedException, AcmsException {
HttpResponse response = send(AcmsApis.ApigetArchive, new GetArchivesDetailParameters(sid, AcmsApis.ArchiveCmds.getArchiveDetail, archiveId, collaborationDetailId)); HttpResponse response = send(AcmsApis.ApigetArchive, new ArchiveDetailRequestParameters(sid, AcmsApis.ArchiveCmds.getArchiveDetail, archiveId, collaborationDetailId));
ArchiveDetailJSON json = new ArchiveDetailJSON(response.httpResponseBody); ArchiveDetailJSON json = new ArchiveDetailJSON(response.httpResponseBody);
return json; return json;
} }
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/ArchiveDetailJSON.java
...@@ -33,7 +33,7 @@ public class ArchiveDetailJSON extends AcmsCommonJSON { ...@@ -33,7 +33,7 @@ public class ArchiveDetailJSON extends AcmsCommonJSON {
archiveDto.archiveDate = DateTimeUtil.millToDateString(archiveInfo.getJSONObject(ABookCommConstants.KEY.ARCHIVE_DATE) archiveDto.archiveDate = DateTimeUtil.millToDateString(archiveInfo.getJSONObject(ABookCommConstants.KEY.ARCHIVE_DATE)
.getLong(ABookCommConstants.KEY.TIME), "yyyy/MM/dd HH:mm"); .getLong(ABookCommConstants.KEY.TIME), "yyyy/MM/dd HH:mm");
archiveDto.roomId = archiveInfo.getInt(ABookCommConstants.KEY.ROOM_ID); archiveDto.roomId = archiveInfo.getInt(ABookCommConstants.KEY.ROOM_ID);
archiveDto.saveuserId = archiveInfo.getInt(ABookCommConstants.KEY.SAVE_USER_ID); archiveDto.saveUserId = archiveInfo.getInt(ABookCommConstants.KEY.SAVE_USER_ID);
archiveDto.filePath = archiveInfo.getString(ABookCommConstants.KEY.FILE_PATH); archiveDto.filePath = archiveInfo.getString(ABookCommConstants.KEY.FILE_PATH);
if (archiveInfo.has(ABookCommConstants.KEY.ATTEND_USER_IDS)) { if (archiveInfo.has(ABookCommConstants.KEY.ATTEND_USER_IDS)) {
archiveDto.attendUserIds = archiveInfo.getJSONArray(ABookCommConstants.KEY.ATTEND_USER_IDS).toString(); archiveDto.attendUserIds = archiveInfo.getJSONArray(ABookCommConstants.KEY.ATTEND_USER_IDS).toString();
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/GetArchivesDetailParameters.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/ArchiveDetailRequestParameters.java
...@@ -4,11 +4,11 @@ import jp.agentec.adf.net.http.HttpParameterObject; ...@@ -4,11 +4,11 @@ import jp.agentec.adf.net.http.HttpParameterObject;
/** /**
* ACMSのAPIに渡す共通的なパラメータを格納します。ACMSのAPIのパラメータ用クラスを作成するときはこのクラスを継承してください。<br> * ACMSのAPIに渡す共通的なパラメータを格納します。ACMSのAPIのパラメータ用クラスを作成するときはこのクラスを継承してください。<br>
* ただし、このクラスはログイン状態の確認用として使われる {@link GetArchivesDetailParameters#sid} を持っているため、ログイン用のパラメータ {@link MobileLoginParameters} は、このクラスを継承する必要はありません。 * ただし、このクラスはログイン状態の確認用として使われる {@link ArchiveDetailRequestParameters#sid} を持っているため、ログイン用のパラメータ {@link MobileLoginParameters} は、このクラスを継承する必要はありません。
* @author lee-mk * @author lee-mk
* @version 1.0.0 * @version 1.0.0
*/ */
public class GetArchivesDetailParameters extends HttpParameterObject { public class ArchiveDetailRequestParameters extends HttpParameterObject {
/** /**
* セッションID * セッションID
* @since 1.0.0 * @since 1.0.0
...@@ -19,12 +19,12 @@ public class GetArchivesDetailParameters extends HttpParameterObject { ...@@ -19,12 +19,12 @@ public class GetArchivesDetailParameters extends HttpParameterObject {
private Integer collaborationDetailId; private Integer collaborationDetailId;
/** /**
* {@link GetArchivesDetailParameters} のインスタンスを初期化します。 * {@link ArchiveDetailRequestParameters} のインスタンスを初期化します。
* @param sid ログインした時のセッションIDです。 * @param sid ログインした時のセッションIDです。
* @param cmd Apiリクエストに必要なコマンド（ABOOK COMM専用）。 * @param cmd Apiリクエストに必要なコマンド（ABOOK COMM専用）。
* @since 1.0.0 * @since 1.0.0
*/ */
public GetArchivesDetailParameters(String sid, String cmd, Integer archiveId, Integer collaborationDetailId) { public ArchiveDetailRequestParameters(String sid, String cmd, Integer archiveId, Integer collaborationDetailId) {
this.sid = sid; this.sid = sid;
this.cmd = cmd; this.cmd = cmd;
this.archiveId = archiveId; this.archiveId = archiveId;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/GetArchivesParameters.java → ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/ArchiveRequestParameters.java
...@@ -4,11 +4,11 @@ import jp.agentec.adf.net.http.HttpParameterObject; ...@@ -4,11 +4,11 @@ import jp.agentec.adf.net.http.HttpParameterObject;
/** /**
* ACMSのAPIに渡す共通的なパラメータを格納します。ACMSのAPIのパラメータ用クラスを作成するときはこのクラスを継承してください。<br> * ACMSのAPIに渡す共通的なパラメータを格納します。ACMSのAPIのパラメータ用クラスを作成するときはこのクラスを継承してください。<br>
* ただし、このクラスはログイン状態の確認用として使われる {@link GetArchivesParameters#sid} を持っているため、ログイン用のパラメータ {@link MobileLoginParameters} は、このクラスを継承する必要はありません。 * ただし、このクラスはログイン状態の確認用として使われる {@link ArchiveRequestParameters#sid} を持っているため、ログイン用のパラメータ {@link MobileLoginParameters} は、このクラスを継承する必要はありません。
* @author Taejin Hong * @author Lee-mk
* @version 1.0.0 * @version 1.0.0
*/ */
public class GetArchivesParameters extends HttpParameterObject { public class ArchiveRequestParameters extends HttpParameterObject {
/** /**
* セッションID * セッションID
* @since 1.0.0 * @since 1.0.0
...@@ -18,12 +18,12 @@ public class GetArchivesParameters extends HttpParameterObject { ...@@ -18,12 +18,12 @@ public class GetArchivesParameters extends HttpParameterObject {
private String updatedDate; private String updatedDate;
/** /**
* {@link GetArchivesParameters} のインスタンスを初期化します。 * {@link ArchiveRequestParameters} のインスタンスを初期化します。
* @param sid ログインした時のセッションIDです。 * @param sid ログインした時のセッションIDです。
* @param cmd Apiリクエストに必要なコマンド（ABOOK COMM専用）。 * @param cmd Apiリクエストに必要なコマンド（ABOOK COMM専用）。
* @since 1.0.0 * @since 1.0.0
*/ */
public GetArchivesParameters(String sid, String cmd, String updatedDate) { public ArchiveRequestParameters(String sid, String cmd, String updatedDate) {
this.sid = sid; this.sid = sid;
this.cmd = cmd; this.cmd = cmd;
this.updatedDate = updatedDate; this.updatedDate = updatedDate;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ArchiveDao.java
...@@ -48,7 +48,7 @@ public class ArchiveDao extends AbstractDao { ...@@ -48,7 +48,7 @@ public class ArchiveDao extends AbstractDao {
} }
column = cursor.getColumnIndex("save_user_id"); column = cursor.getColumnIndex("save_user_id");
if (column != -1) { if (column != -1) {
dto.saveuserId = cursor.getInt(column); dto.saveUserId = cursor.getInt(column);
} }
column = cursor.getColumnIndex("attend_user_ids"); column = cursor.getColumnIndex("attend_user_ids");
if (column != -1) { if (column != -1) {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/ArchiveDto.java
...@@ -7,7 +7,7 @@ public class ArchiveDto extends AbstractDto { ...@@ -7,7 +7,7 @@ public class ArchiveDto extends AbstractDto {
public String archiveDate; public String archiveDate;
public Integer archiveType; public Integer archiveType;
public Integer roomId; public Integer roomId;
public Integer saveuserId; public Integer saveUserId;
public String attendUserIds; public String attendUserIds;
public String filePath; public String filePath;
public Integer collaborationDetailId; public Integer collaborationDetailId;
...@@ -16,7 +16,7 @@ public class ArchiveDto extends AbstractDto { ...@@ -16,7 +16,7 @@ public class ArchiveDto extends AbstractDto {
@Override @Override
public Object[] getInsertValues() { public Object[] getInsertValues() {
return new Object[]{archiveId, archiveName, archiveDate, archiveType, roomId, saveuserId, attendUserIds, collaborationDetailId, filePath}; return new Object[]{archiveId, archiveName, archiveDate, archiveType, roomId, saveUserId, attendUserIds, collaborationDetailId, filePath};
} }
@Override @Override
...@@ -25,7 +25,7 @@ public class ArchiveDto extends AbstractDto { ...@@ -25,7 +25,7 @@ public class ArchiveDto extends AbstractDto {
} }
public Object[] getUpdateDetailValues() { public Object[] getUpdateDetailValues() {
return new Object[]{archiveName, archiveType, archiveDate, roomId, attendUserIds, filePath, saveuserId, archiveId}; return new Object[]{archiveName, archiveType, archiveDate, roomId, attendUserIds, filePath, saveUserId, archiveId};
} }
@Override @Override
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
...@@ -829,7 +829,7 @@ public class CommunicationLogic extends AbstractLogic { ...@@ -829,7 +829,7 @@ public class CommunicationLogic extends AbstractLogic {
archiveMap.put(ABookCommConstants.KEY.ARCHIVE_TYPE, archiveDto.archiveType); archiveMap.put(ABookCommConstants.KEY.ARCHIVE_TYPE, archiveDto.archiveType);
archiveMap.put(ABookCommConstants.KEY.ROOM_ID, archiveDto.roomId); archiveMap.put(ABookCommConstants.KEY.ROOM_ID, archiveDto.roomId);
archiveMap.put(ABookCommConstants.KEY.ROOM_NAME, chatRoomDao.getChatRoom(archiveDto.roomId).chatRoomName); archiveMap.put(ABookCommConstants.KEY.ROOM_NAME, chatRoomDao.getChatRoom(archiveDto.roomId).chatRoomName);
archiveMap.put(ABookCommConstants.KEY.SAVE_USER_ID, archiveDto.saveuserId); archiveMap.put(ABookCommConstants.KEY.SAVE_USER_ID, archiveDto.saveUserId);
archiveMap.put(ABookCommConstants.KEY.ATTEND_USER_IDS, archiveDto.attendUserIds); archiveMap.put(ABookCommConstants.KEY.ATTEND_USER_IDS, archiveDto.attendUserIds);
archiveMap.put(ABookCommConstants.KEY.FILE_PATH, archiveDto.filePath); archiveMap.put(ABookCommConstants.KEY.FILE_PATH, archiveDto.filePath);
JSONObject jsonObject = new JSONObject(archiveMap); JSONObject jsonObject = new JSONObject(archiveMap);
......
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