Antiloveg 8 jaren geleden
bovenliggende
commit
fa9e9ca4a6

+ 2 - 72
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -104,9 +104,6 @@ public class AdminPatentApiController extends CertifyApiController {
 			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
 			String author, String pageNo, String pageSize) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -132,9 +129,6 @@ public class AdminPatentApiController extends CertifyApiController {
 					PatentInfoFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(patentInfo.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -162,9 +156,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/detail", method = RequestMethod.GET)
 	public Result patentDetail(String pid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(pid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "公司"));
 		} else {
@@ -179,9 +170,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/logs", method = RequestMethod.GET)
 	public Result patentProcess(String pid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(pid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "专利ID"));
 		} else {
@@ -206,9 +194,6 @@ public class AdminPatentApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(patentInfo.getId())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
@@ -246,9 +231,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/patentStatus", method = RequestMethod.GET)
 	public Result patentStatus(){
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}  
 		res.setData(disposePatentStatus());
 		return res;
 	}
@@ -263,9 +245,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/lastYearTax", method = RequestMethod.GET)
 	public Result lastYearTax(String uid, String sign){
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		
 		if (StringUtils.isBlank(uid)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -301,9 +280,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/upload", method = RequestMethod.POST)
 	public Result upload(HttpServletRequest req, String sign, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
@@ -333,9 +309,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/download", method = RequestMethod.GET)
 	public Result download(String id, String sign, HttpServletResponse response) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "专利id"));
 			return res;
@@ -373,9 +346,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadTemplateFile", method = RequestMethod.GET)
 	public Result downloadTemplateFile(HttpServletResponse response, String sign) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		AttachmentType attachmentType = AttachmentType.getField(sign);
 		if (attachmentType == AttachmentType.PATENT_PRORY_STATEMENT) {
 			String fileName = "";
@@ -405,9 +375,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadRatepay", method = RequestMethod.GET)
 	public Result downloadRatepay(HttpServletResponse response, String uid, String sign) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(uid)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
@@ -439,9 +406,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/uploadTemplate", method = RequestMethod.POST)
 	public Result uploadPatentTemplate(HttpServletRequest req, String sign) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		String fileName = "";
 		List<MultipartFile> files = getFiles(req);
 		MultipartFile mf = files.get(0);
@@ -483,9 +447,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/delete", method = RequestMethod.POST)
 	public Result deletePatent(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -494,15 +455,6 @@ public class AdminPatentApiController extends CertifyApiController {
 		return res;
 	}
 
-	
-	
-	
-	
-	
-
-	
-
-	
 
 	/**
 	 * 待缴费专利管理列表
@@ -510,9 +462,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/pendingPaymentList", method = RequestMethod.GET)
 	public Result managePendingPaymentList(String locationProvince, String pageNo, String pageSize) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -531,9 +480,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/confirmPayment", method = RequestMethod.POST)
 	public Result confirmPayment(String cid, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(cid) || StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
 			return res;
@@ -570,9 +516,6 @@ public class AdminPatentApiController extends CertifyApiController {
 			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
 			String author, String pageNo, String pageSize) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -592,9 +535,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/replyConfirm", method = RequestMethod.POST)
 	public Result replyConfirm(String pid, String uid, Integer patentState) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(pid) || StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
 			return res;
@@ -621,9 +561,6 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/getRecieveSendList", method = RequestMethod.GET)
 	public Result RecieveSendList(String pageNo, String pageSize) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 
@@ -652,10 +589,6 @@ public class AdminPatentApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
-
 		if (StringUtils.isBlank(pid) || StringUtils.isBlank(rid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利记录ID", "专利记录ID"));
 			return res;
@@ -695,9 +628,6 @@ public class AdminPatentApiController extends CertifyApiController {
 					PatentCostFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (null == cid) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利记录ID", "专利记录ID"));
@@ -716,6 +646,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	 * 
 	 * @throws ParseException
 	 */
+	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/exportComposite", method = RequestMethod.GET)
 	public Result exportComposite(@RequestParam(name = "serialNumber", required = false) String serialNumber,
 			String patentNumber, String office, String locationProvince, String unitName,
@@ -730,7 +661,6 @@ public class AdminPatentApiController extends CertifyApiController {
 		Integer pc = (!StringUtils.isNumeric(patentCatagory) ? null : Integer.parseInt(patentCatagory));
 		Integer ps = (!StringUtils.isNumeric(patentState) ? null : Integer.parseInt(patentState));
 		String lp = ("undefined".equals(locationProvince)) ? null : locationProvince;
-		@SuppressWarnings("unchecked")
 		List<PatentManageListBo> composites = (List<PatentManageListBo>) getManagePatentList(sn, patentNumber, office,
 				lp, unitName, pc, patentName, ps, createTime, patentApplicationDate, author, 1, 1000).getList();
 		if (res.getError().isEmpty()) {
@@ -763,12 +693,12 @@ public class AdminPatentApiController extends CertifyApiController {
 	 * 
 	 * @throws ParseException
 	 */
+	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/exportApplicationFee", method = RequestMethod.GET)
 	public Result exportApplicationFee(
 			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
 			String locationProvince, HttpServletResponse response) throws ParseException {
 		Result res = new Result();
-		@SuppressWarnings("unchecked")
 		List<PatentApplicationFeeBo> fees = (List<PatentApplicationFeeBo>) getApplicationFeeList(patentApplicationDate,
 				locationProvince, 1, 1000).getList();
 		if (res.getError().isEmpty()) {

+ 0 - 44
src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java

@@ -72,9 +72,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/listTechProject", method = RequestMethod.POST)
 	public Result listClientTechProject(String province, String unitName, String pageNo, String pageSize) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -114,9 +111,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 					TechProjectFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(techProject.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -141,9 +135,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/techProjectDetial", method = RequestMethod.POST)
 	public Result techProjectDetial(String pid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(pid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "公司"));
 		} else {
@@ -161,9 +152,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/techProjectLog", method = RequestMethod.POST)
 	public Result techProjectLog(String pid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(pid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "科技项目申报ID"));
 		} else {
@@ -190,9 +178,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 					TechProjectFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(techProject.getId())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技申报项目", "科技项目申报ID"));
@@ -228,9 +213,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/status", method = RequestMethod.GET)
 	public Result Status(){
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}  
 		res.setData(disposeStatus());
 		return res;
 	}
@@ -245,9 +227,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/getDepartment", method = RequestMethod.GET)
 	public Result getDepartment(String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		res.setData(techWebsiteService.getDepartment(uid));
 		return res;
 	}
@@ -281,9 +260,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/deleteTechWebsite", method = RequestMethod.POST)
 	public Result deleteTechWebsite(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
@@ -299,9 +275,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/listTechWebsite", method = RequestMethod.POST)
 	public Result listTechWebsite(String province, String unitName, String pageNo, String pageSize) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -320,7 +293,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 						w.setPassword(AesUtils.decrypt(w.getPassword(), aesSecretKey));
 					} catch (Exception e) {
 					}
-					// w.setPassword(Base64Utils.decodeData(w.getPassword()));
 				}
 			}
 			t.setList(l);
@@ -338,9 +310,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/techWebsiteDetail", method = RequestMethod.POST)
 	public Result techWebsiteDetail(String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "公司"));
 		} else {
@@ -375,9 +344,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 					TechProjectFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isBlank(w.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
@@ -389,10 +355,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 			return res;
 		}
 
-		/*
-		 * if (null != w && null != (w.getPassword())) {
-		 * w.setPassword(Base64Utils.encodeData(w.getPassword().trim())); }
-		 */
 
 		if (null != w && null != (w.getPassword())) {
 			try {
@@ -418,9 +380,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/upload", method = RequestMethod.POST)
 	public Result cognizanceFile(HttpServletRequest req, String uid) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
 			return res;
@@ -443,9 +402,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/download", method = RequestMethod.GET)
 	public Result download(HttpServletResponse response, String id) {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
-			return res;
-		}
 
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技项目ID"));