Skip to content

Commit

Permalink
Update rollback
Browse files Browse the repository at this point in the history
  • Loading branch information
@dangkhanhtrung
dangkhanhtrung committed Mar 15, 2019
1 parent ef98859 commit 47d3f8c
Show file tree
Hide file tree
Showing 19 changed files with 2,849 additions and 136 deletions.
125 changes: 2 additions & 123 deletions ...backend-api-rest/src/main/java/org/opencps/api/controller/impl/DossierManagementImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3055,131 +3055,11 @@ public Response addDossierPublish(HttpServletRequest request, HttpHeaders header
User user, ServiceContext serviceContext, DossierPublishModel input) {

long groupId = GetterUtil.getLong(header.getHeaderString("groupId"));
BackendAuth auth = new BackendAuthImpl();
DossierActions actions = new DossierActionsImpl();

try {

if (!auth.isAuth(serviceContext)) {
throw new UnauthenticationException();
}

//Get input
String referenceUid = input.getReferenceUid();
int counter = 0;
String serviceCode = input.getServiceCode();
String serviceName = input.getServiceName();
String govAgencyCode = input.getGovAgencyCode();
String govAgencyName = input.getGovAgencyName();
String applicantName = input.getApplicantName();
String applicantType = input.getApplicantIdType();
String applicantIdNo = input.getApplicantIdNo();
String applicantIdDate = input.getApplicantIdDate();
String address = input.getAddress();
String cityCode = input.getCityCode();
String cityName = input.getCityName();
String districtCode = input.getDistrictCode();
String districtName = input.getDistrictName();
String wardCode = input.getWardCode();
String wardName = input.getWardName();
String contactName = input.getContactName();
String contactTelNo = input.getContactTelNo();
String contactEmail = input.getContactEmail();
String dossierTemplateNo = input.getDossierTemplateNo();
String password = input.getPassword();
String online = input.getOnline();
String applicantNote = input.getApplicantNote();
int originality = 0;
long createDateLong = GetterUtil.getLong(input.getCreateDate());
long modifiedDateLong = GetterUtil.getLong(input.getModifiedDate());
long submitDateLong = GetterUtil.getLong(input.getSubmitDate());
long receiveDateLong = GetterUtil.getLong(input.getReceiveDate());
long dueDateLong = GetterUtil.getLong(input.getDueDate());
long releaseDateLong = GetterUtil.getLong(input.getReleaseDate());
long finishDateLong = GetterUtil.getLong(input.getFinishDate());
long cancellingDateLong = GetterUtil.getLong(input.getCancellingDate());
long correcttingDateLong = GetterUtil.getLong(input.getCorrecttingDate());
long endorsementDateLong = GetterUtil.getLong(input.getEndorsementDate());
long extendDateLong = GetterUtil.getLong(input.getExtendDate());
long processDateLong = GetterUtil.getLong(input.getProcessDate());
String submissionNote = input.getSubmissionNote();
String lockState = input.getLockState();
String dossierNo = input.getDossierNo();
Dossier dossier = CPSDossierBusinessLocalServiceUtil.addDossierPublish(groupId, company, user, serviceContext, DossierUtils.convertFormModelToPublishModel(input));

// Dossier oldDossier = DossierUtils.getDossier(input.getReferenceUid(), groupId);
Dossier oldDossier = null;
if (Validator.isNotNull(input.getReferenceUid())) {
oldDossier = DossierUtils.getDossier(input.getReferenceUid(), groupId);
} else {
oldDossier = DossierLocalServiceUtil.getByDossierNo(groupId, dossierNo);
referenceUid = DossierNumberGenerator.generateReferenceUID(groupId);
}

if (oldDossier == null || oldDossier.getOriginality() == 0) {
Dossier dossier = actions.publishDossier(groupId, 0l, referenceUid, counter, serviceCode, serviceName,
govAgencyCode, govAgencyName, applicantName, applicantType,
applicantIdNo, applicantIdDate, address, cityCode,
cityName, districtCode, districtName, wardCode, wardName,
contactName, contactTelNo, contactEmail,
dossierTemplateNo, password, 0, StringPool.BLANK, StringPool.BLANK, StringPool.BLANK,
StringPool.BLANK, Boolean.valueOf(online), false, applicantNote,
originality,
createDateLong != 0 ? new Date(createDateLong) : null,
modifiedDateLong != 0 ? new Date(modifiedDateLong) : null,
submitDateLong != 0 ? new Date(submitDateLong) : null,
receiveDateLong != 0 ? new Date(receiveDateLong) : null,
dueDateLong != 0 ? new Date(dueDateLong) : null,
releaseDateLong != 0 ? new Date(releaseDateLong) : null,
finishDateLong != 0 ? new Date(finishDateLong) : null,
cancellingDateLong != 0 ? new Date(cancellingDateLong) : null,
correcttingDateLong != 0 ? new Date(correcttingDateLong) : null,
endorsementDateLong != 0 ? new Date(endorsementDateLong) : null,
extendDateLong != 0 ? new Date(extendDateLong) : null,
processDateLong != 0 ? new Date(processDateLong) : null,
input.getDossierNo(), input.getDossierStatus(), input.getDossierStatusText(), input.getDossierSubStatus(), input.getDossierSubStatusText(),
input.getDossierActionId() != null ? input.getDossierActionId(): 0, submissionNote, lockState, input.getDelegateName(), input.getDelegateIdNo(), input.getDelegateTelNo(), input.getDelegateEmail(),
input.getDelegateAddress(), input.getDelegateCityCode(), input.getDelegateCityName(), input.getDelegateDistrictCode(), input.getDelegateDistrictName(),
input.getDelegateWardCode(), input.getDelegateWardName(), input.getDurationCount(), input.getDurationUnit(), input.getDossierName(), input.getProcessNo(),
serviceContext);

// dossier.setDossierNo(input.getDossierNo());
// dossier.setDossierStatus(input.getDossierStatus());
// dossier.setDossierStatusText(input.getDossierStatusText());
// dossier.setDossierSubStatus(input.getDossierSubStatus());
// dossier.setDossierSubStatusText(input.getDossierSubStatusText());
// dossier.setDossierActionId(input.getDossierActionId() != null ? input.getDossierActionId(): 0);
// dossier.setSubmissionNote(submissionNote);
// dossier.setLockState(lockState);
// dossier.setCounter(input.getCounter() != null ? input.getCounter() : 0);
// dossier.setPostalAddress(input.getPostalAddress());
// dossier.setPostalCityCode(input.getPostalCityCode());
// dossier.setPostalCityName(input.getPostalCityName());
// dossier.setDelegateName(input.getDelegateName());
// dossier.setDelegateAddress(input.getDelegateAddress());
// dossier.setDelegateIdNo(input.getDelegateIdNo());
// dossier.setDelegateTelNo(input.getDelegateTelNo());
// dossier.setDelegateEmail(input.getDelegateEmail());
// dossier.setDelegateAddress(input.getDelegateAddress());
// dossier.setDelegateCityCode(input.getDelegateCityCode());
// dossier.setDelegateDistrictCode(input.getDelegateDistrictCode());
// dossier.setDelegateWardCode(input.getDelegateWardCode());
// dossier.setDelegateCityName(input.getDelegateCityName());
// dossier.setDelegateDistrictName(input.getDelegateDistrictName());
// dossier.setDelegateWardName(input.getDelegateWardName());
// dossier.setDurationCount(input.getDurationCount());
// dossier.setDurationUnit(input.getDurationUnit());
// dossier.setSampleCount(input.getSampleCount() != null ? input.getSampleCount() : 0l);
// dossier.setDossierName(input.getDossierName());
// dossier.setProcessNo(input.getProcessNo());

//Update dossier
// dossier = DossierLocalServiceUtil.updateDossier(dossier);

return Response.status(200).entity(JSONFactoryUtil.looseSerializeDeep(dossier)).build();
}
else {
return Response.status(200).entity(JSONFactoryUtil.looseSerializeDeep(oldDossier)).build();
}
return Response.status(200).entity(JSONFactoryUtil.looseSerializeDeep(dossier)).build();
} catch (Exception e) {
return BusinessExceptionImpl.processException(e);
}
Expand Down Expand Up @@ -4841,5 +4721,4 @@ else if (dossierAction != null && isAdmin) {
return BusinessExceptionImpl.processException(e);
}
}

}
73 changes: 73 additions & 0 deletions modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.opencps.dossiermgt.action.util.DossierMgtUtils;
import org.opencps.dossiermgt.action.util.DossierOverDueUtils;
import org.opencps.dossiermgt.input.model.DossierInputModel;
import org.opencps.dossiermgt.input.model.DossierPublishModel;
import org.opencps.dossiermgt.constants.ConstantsTerm;
import org.opencps.dossiermgt.constants.DossierTerm;
import org.opencps.dossiermgt.model.Dossier;
Expand Down Expand Up @@ -1254,6 +1255,78 @@ public static DossierInputModel convertFormModelToInputModel(org.opencps.api.dos
return model;
}

public static DossierPublishModel convertFormModelToPublishModel(org.opencps.api.dossier.model.DossierPublishModel input) {
DossierPublishModel model = new DossierPublishModel();
model.setAddress(input.getAddress());
model.setApplicantIdDate(input.getApplicantIdDate());
model.setApplicantIdNo(input.getApplicantIdNo());
model.setApplicantIdType(input.getApplicantIdType());
model.setApplicantName(input.getApplicantName());
model.setApplicantNote(input.getApplicantNote());
model.setCancellingDate(input.getCancellingDate());
model.setCityCode(input.getCityCode());
model.setCityName(input.getCityName());
model.setContactEmail(input.getContactEmail());
model.setContactName(input.getContactName());
model.setContactTelNo(input.getContactTelNo());
model.setCorrectingDate(input.getCorrecttingDate());
model.setCounter(input.getCounter());
model.setCreateDate(input.getCreateDate());
model.setDelegateAddress(input.getDelegateAddress());
model.setDelegateCityCode(input.getDelegateCityCode());
model.setDelegateCityName(input.getDelegateCityName());
model.setDelegateDistrictCode(input.getDelegateDistrictCode());
model.setDelegateDistrictName(input.getDelegateDistrictName());
model.setDelegateEmail(input.getDelegateEmail());
model.setDelegateIdNo(input.getDelegateIdNo());
model.setDelegateWardCode(input.getDelegateWardCode());
model.setDelegateWardName(input.getDelegateWardName());
model.setDistrictCode(input.getDistrictCode());
model.setDistrictName(input.getDistrictName());
model.setDossierActionId(input.getDossierActionId());
model.setDossierName(input.getDossierName());
model.setDossierNo(input.getDossierNo());
model.setDossierStatus(input.getDossierStatus());
model.setDossierStatusText(input.getDossierStatusText());
model.setDossierSubStatus(input.getDossierSubStatus());
model.setDossierSubStatusText(input.getDossierSubStatusText());
model.setDossierTemplateNo(input.getDossierTemplateNo());
model.setDueDate(input.getDueDate());
model.setDurationCount(input.getDurationCount());
model.setDurationUnit(input.getDurationUnit());
model.setEndorsementDate(input.getEndorsementDate());
model.setExtendDate(input.getExtendDate());
model.setFinishDate(input.getFinishDate());
model.setGovAgencyCode(input.getGovAgencyCode());
model.setGovAgencyName(input.getGovAgencyName());
model.setLockState(input.getLockState());
model.setModifiedDate(input.getModifiedDate());
model.setNotification(input.getNotification());
model.setOnline(input.getOnline());
model.setOriginality(input.getOriginality());
model.setPassword(input.getPassword());
model.setPostalAddress(input.getPostalAddress());
model.setPostalCityCode(input.getPostalCityCode());
model.setPostalCityName(input.getPostalCityName());
model.setPostalTelNo(input.getPostalTelNo());
model.setProcessDate(input.getProcessDate());
model.setProcessNo(input.getProcessNo());
model.setReceiveDate(input.getReceiveDate());
model.setReferenceUid(input.getReferenceUid());
model.setReleaseDate(input.getReleaseDate());
model.setSameAsApplicant(input.isSameAsApplicant());
model.setSampleCount(input.getSampleCount());
model.setServiceCode(input.getServiceCode());
model.setServiceName(input.getServiceName());
model.setSubmissionNote(input.getSubmissionNote());
model.setSubmitDate(input.getSubmitDate());
model.setViaPostal(input.getViaPostal());
model.setWardCode(input.getWardCode());
model.setWardName(input.getWardName());

return model;
}

private static boolean processBeTime(long releaseDate, long dueDate, long finishDate, long extendDate) {
return (releaseDate!=0 && dueDate!=0 &&
((releaseDate<dueDate && extendDate!=0) || (finishDate!=0 && finishDate<dueDate )));
Expand Down
2 changes: 1 addition & 1 deletion modules/backend-auth/src/main/java/org/opencps/auth/filter/RestAuthFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class RestAuthFilter implements Filter {
public final static String P_AUTH = "Token";
public final static String USER_ID = "USER_ID";
public final static String AUTHORIZATION = "Authorization";
public final static String[] IGNORE_PATTERN = new String[] { "/o/rest/v2/serviceinfos/\\w+/filetemplates/\\w+", "/o/rest/v2/barcode", "/o/rest/v2/qrcode", "/o/rest/v2/postal/votings/statistic", "/o/rest/v2/postal/invoice" };
public final static String[] IGNORE_PATTERN = new String[] { "/o/rest/v2/serviceinfos/\\w+/filetemplates/\\w+", "/o/rest/v2/barcode", "/o/rest/v2/qrcode", "/o/rest/v2/postal/votings/statistic", "/o/rest/v2/postal/invoice", "/o/rest/v2/dictcollections/GOVERNMENT_AGENCY/dictitems", "/o/rest/v2/dictcollections/SERVICE_DOMAIN/dictitems", "/o/rest/v2/dossiers", "/o/rest/v2/serviceinfos", "/o/rest/statistics/reports" };
public final static String OPENCPS_GZIP_FILTER = "org.opencps.servlet.filters.GZipFilter";
public final static String LIFERAY_GZIP_FILTER = "com.liferay.portal.servlet.filters.gzip.GZipFilter";

Expand Down
Loading

0 comments on commit 47d3f8c

Please sign in to comment.