|
|
@@ -93,14 +93,14 @@ public class PreviewController extends BaseApiController {
|
|
|
private String secretKey = null;
|
|
|
|
|
|
@RequestMapping(value = "/preview", method = RequestMethod.GET)
|
|
|
- public Result preview(HttpServletResponse response, String sign, String temp, String token, String auth) {
|
|
|
+ public Result preview(HttpServletResponse response, String sign, String temp, String token2, String auth) {
|
|
|
Result res = new Result();
|
|
|
if (!StringUtils.isNumeric(temp)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "预览"));
|
|
|
} else if (DateUtils.truncatedMinuteDiffTo(Calendar.getInstance().getTime(),
|
|
|
new Date(Long.parseLong(temp))) > 19) {
|
|
|
res.getError().add(buildError(ErrorConstants.NO_AUTH_ERROR));
|
|
|
- } else if (!SHA256Util.toHash(sign + "|" + token + "|" + secretKey, temp).equals(auth)) {
|
|
|
+ } else if (!SHA256Util.toHash(sign + "|" + token2 + "|" + secretKey, temp).equals(auth)) {
|
|
|
res.getError().add(buildError(ErrorConstants.NO_AUTH_ERROR));
|
|
|
} else {
|
|
|
AttachmentType attachmentType = AttachmentType.getField(sign);
|
|
|
@@ -109,13 +109,13 @@ public class PreviewController extends BaseApiController {
|
|
|
case PATENT_WRITING:
|
|
|
case AUTHORIZATION_NOTICE:
|
|
|
case ORGANIZATION_APPLICATION:
|
|
|
- CustomerOrganizationDetailBo u=userMapper.findOrganizationCustomerDetail(token);
|
|
|
+ CustomerOrganizationDetailBo u=userMapper.findOrganizationCustomerDetail(token2);
|
|
|
TechProject p=new TechProject();
|
|
|
p.setApprovalUrl(u.getPojectApplicationUrl());
|
|
|
handleTechProjectPreview(response, p, attachmentType);
|
|
|
break;
|
|
|
case PATENT_CERTIFICATE:
|
|
|
- PatentInfo pi = patentInfoService.selectByPrimaryKey(token);
|
|
|
+ PatentInfo pi = patentInfoService.selectByPrimaryKey(token2);
|
|
|
if (pi == null) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -125,7 +125,7 @@ public class PreviewController extends BaseApiController {
|
|
|
break;
|
|
|
case LAST_YEAR_RATEPAY:
|
|
|
case RATEPAY:
|
|
|
- OrgRatepay ratepay = orgRatepayService.selectByPrimaryKey(token);
|
|
|
+ OrgRatepay ratepay = orgRatepayService.selectByPrimaryKey(token2);
|
|
|
if (null == ratepay) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -135,7 +135,7 @@ public class PreviewController extends BaseApiController {
|
|
|
break;
|
|
|
case COPYRIGHT_AUTH:
|
|
|
case COPYRIGHT_APPLY:
|
|
|
- CopyrightInfoDetail ci = copyrightInfoService.findByPrimaryKey(token);
|
|
|
+ CopyrightInfoDetail ci = copyrightInfoService.findByPrimaryKey(token2);
|
|
|
if (null == ci) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -144,7 +144,7 @@ public class PreviewController extends BaseApiController {
|
|
|
}
|
|
|
break;
|
|
|
case TECH_PROJECT:
|
|
|
- TechProject tp = techProjectService.selectByPrimaryKey(token);
|
|
|
+ TechProject tp = techProjectService.selectByPrimaryKey(token2);
|
|
|
if (null == tp) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -153,7 +153,7 @@ public class PreviewController extends BaseApiController {
|
|
|
}
|
|
|
break;
|
|
|
case PROTOCOL:
|
|
|
- OrgTechCenterDetail otcd = orgTechCenterDetailService.selectByPrimaryKey(token);
|
|
|
+ OrgTechCenterDetail otcd = orgTechCenterDetailService.selectByPrimaryKey(token2);
|
|
|
if (null == otcd) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -162,7 +162,7 @@ public class PreviewController extends BaseApiController {
|
|
|
}
|
|
|
break;
|
|
|
case PROOF:
|
|
|
- OrgActivity oa = orgActivityService.selectOrgActivityByPrimaryKey(token);
|
|
|
+ OrgActivity oa = orgActivityService.selectOrgActivityByPrimaryKey(token2);
|
|
|
if (null == oa) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -171,7 +171,7 @@ public class PreviewController extends BaseApiController {
|
|
|
}
|
|
|
break;
|
|
|
case ACTIVITY_COST_ACCOUNT:
|
|
|
- OrgActivityCost oac = orgActivityCostService.selectByPrimaryKey(token);
|
|
|
+ OrgActivityCost oac = orgActivityCostService.selectByPrimaryKey(token2);
|
|
|
if (null == oac) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -180,7 +180,7 @@ public class PreviewController extends BaseApiController {
|
|
|
}
|
|
|
break;
|
|
|
case TECH_PRODUCT:
|
|
|
- OrgTechProduct otp = orgTechProductService.selectByPrimaryKey(token);
|
|
|
+ OrgTechProduct otp = orgTechProductService.selectByPrimaryKey(token2);
|
|
|
if (null == otp) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -189,7 +189,7 @@ public class PreviewController extends BaseApiController {
|
|
|
}
|
|
|
break;
|
|
|
case PROPERTY_RIGHT:
|
|
|
- OrgIntellectualProperty oip = orgIntellectualPropertyService.selectByPrimaryKey(token);
|
|
|
+ OrgIntellectualProperty oip = orgIntellectualPropertyService.selectByPrimaryKey(token2);
|
|
|
if (null == oip) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -198,7 +198,7 @@ public class PreviewController extends BaseApiController {
|
|
|
}
|
|
|
break;
|
|
|
case ACHIEVEMENT:
|
|
|
- OrgTechAchievement ota = orgTechAchievementService.selectByPrimaryKey(token);
|
|
|
+ OrgTechAchievement ota = orgTechAchievementService.selectByPrimaryKey(token2);
|
|
|
if (null == ota) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -207,7 +207,7 @@ public class PreviewController extends BaseApiController {
|
|
|
}
|
|
|
break;
|
|
|
case FINANCE:
|
|
|
- OrgFinance of = orgFinanceService.selectByPrimaryKey(token);
|
|
|
+ OrgFinance of = orgFinanceService.selectByPrimaryKey(token2);
|
|
|
if (null == of) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -217,7 +217,7 @@ public class PreviewController extends BaseApiController {
|
|
|
break;
|
|
|
case ROSTER:
|
|
|
case SOCIAL_SECURITY:
|
|
|
- OrgHumanResource ohr = OrgHumanResourceService.selectByPrimaryKey(token);
|
|
|
+ OrgHumanResource ohr = OrgHumanResourceService.selectByPrimaryKey(token2);
|
|
|
if (null == ohr) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -226,7 +226,7 @@ public class PreviewController extends BaseApiController {
|
|
|
}
|
|
|
break;
|
|
|
case HONOR:
|
|
|
- OrgHonorDatum ohd = OrgHonorDatumService.selectByPrimaryKey(token);
|
|
|
+ OrgHonorDatum ohd = OrgHonorDatumService.selectByPrimaryKey(token2);
|
|
|
if (null == ohd) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|
|
|
@@ -235,7 +235,7 @@ public class PreviewController extends BaseApiController {
|
|
|
}
|
|
|
break;
|
|
|
case STANDARD:
|
|
|
- OrgStandard os = orgStandardService.selectByPrimaryKey(token);
|
|
|
+ OrgStandard os = orgStandardService.selectByPrimaryKey(token2);
|
|
|
if (null == os) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "预览"));
|
|
|
return res;
|