Antiloveg 8 years ago
parent
commit
de33f702f7

+ 1 - 0
schema/2017-04-01.sql

@@ -0,0 +1 @@
+INSERT into  `user_role` (uid, rid) values ('1', '1');

File diff suppressed because it is too large
+ 1346 - 1237
src/main/java/com/goafanti/admin/controller/AdminApiController.java


+ 48 - 0
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -1,6 +1,8 @@
 package com.goafanti.admin.controller;
 
 import java.util.Arrays;
+import java.util.Map;
+import java.util.TreeMap;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -219,6 +221,16 @@ public class AdminCopyrightApiController extends CertifyApiController {
 		}
 		return res;
 	}
+	
+	@RequestMapping(value = "/status", method = RequestMethod.GET)
+	public Result status(){
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		res.setData(disposeStatus());
+		return res;
+	}
 
 	private boolean handleBindingError(Result res, BindingResult bindingResult) {
 		if (bindingResult.hasErrors()) {
@@ -239,4 +251,40 @@ public class AdminCopyrightApiController extends CertifyApiController {
 		}
 		return false;
 	}
+	
+	private Map<String, String> disposeStatus() {
+		Map<String, String> status = new  TreeMap<String, String>();
+		if (TokenManager.hasRole("999999")) {
+			for (CopyrightStatus p :  CopyrightStatus.values()){
+				status.put(p.getCode().toString(), p.getDesc());
+				status.remove(CopyrightStatus.OTHER.getCode().toString());
+			}
+		} else {
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.CREATE.getCode())){
+				status.put(CopyrightStatus.CREATE.getCode().toString(), CopyrightStatus.CREATE.getDesc());
+			}
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.DELIVERD.getCode())){
+				status.put(CopyrightStatus.DELIVERD.getCode().toString(), CopyrightStatus.DELIVERD.getDesc());
+			}
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.SUBMIT.getCode())){
+				status.put(CopyrightStatus.SUBMIT.getCode().toString(), CopyrightStatus.SUBMIT.getDesc());
+			}
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.ACCEPT.getCode())){
+				status.put(CopyrightStatus.ACCEPT.getCode().toString(), CopyrightStatus.ACCEPT.getDesc());
+			}
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.AMEND.getCode())){
+				status.put(CopyrightStatus.AMEND.getCode().toString(), CopyrightStatus.AMEND.getDesc());
+			}
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.REJECT.getCode())){
+				status.put(CopyrightStatus.REJECT.getCode().toString(), CopyrightStatus.REJECT.getDesc());
+			}
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.AUTHORIZED.getCode())){
+				status.put(CopyrightStatus.AUTHORIZED.getCode().toString(), CopyrightStatus.AUTHORIZED.getDesc());
+			}
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.CALLBACK.getCode())){
+				status.put(CopyrightStatus.CALLBACK.getCode().toString(), CopyrightStatus.CALLBACK.getDesc());
+			}
+		}
+		return status;
+	}
 }

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

@@ -6,6 +6,8 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 import java.util.UUID;
 
 import javax.annotation.Resource;
@@ -52,6 +54,7 @@ import com.goafanti.common.utils.FileUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.patent.bo.InputPatentCost;
 import com.goafanti.patent.bo.InputPatentInfo;
 import com.goafanti.patent.bo.InputPatentRegistration;
@@ -89,9 +92,53 @@ public class AdminPatentApiController extends CertifyApiController {
 	@Resource
 	private OrgRatepayService				orgRatepayService;
 
-	@RequestMapping(value = "", method = RequestMethod.GET)
-	public Result lastYearTaxUrl(){
+	/**
+	 * 专利状态流转下拉
+	 * @return
+	 */
+	@RequestMapping(value = "/patentStatus", method = RequestMethod.GET)
+	public Result patentStatus(){
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}  
+		res.setData(disposePatentStatus());
+		return res;
+	}
+	
+	
+	/**
+	 * 上年度纳税申报报表是否存在
+	 * @param uid
+	 * @param sign
+	 * @return
+	 */
+	@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, "找不到用户", "用户"));
+			return res;
+		}
+		
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.LAST_YEAR_RATEPAY) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+			return res;
+		}
+		
+		Calendar cal = Calendar.getInstance();
+		OrgRatepay ratepay = orgRatepayService.selectRatepayByUidAndYear(uid, cal.get(Calendar.YEAR)-1);
+		
+		if (null == ratepay){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到上年度纳税申报表", "上年度纳税申报表"));
+			return res;
+		}
+		
 		return res;
 	}
 	
@@ -1042,5 +1089,62 @@ public class AdminPatentApiController extends CertifyApiController {
 		return fileName;
 	}
 	
+	private Map<String, String> disposePatentStatus(){
+		Map<String, String> status = new  TreeMap<String, String>();
+		if (TokenManager.hasRole("999999")) {
+			for (PatentInfoStatus p :  PatentInfoStatus.values()){
+				status.put(p.getCode().toString(), p.getDesc());
+				status.remove(PatentInfoStatus.OTHER.getCode().toString());
+			}
+		} else {
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.CREATE.getCode())){
+				status.put(PatentInfoStatus.CREATE.getCode().toString(), PatentInfoStatus.CREATE.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.SIGN.getCode())){
+				status.put(PatentInfoStatus.SIGN.getCode().toString(), PatentInfoStatus.SIGN.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.DELIVERD.getCode())){
+				status.put(PatentInfoStatus.DELIVERD.getCode().toString(), PatentInfoStatus.DELIVERD.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.CIRCULATION.getCode())){
+				status.put(PatentInfoStatus.CIRCULATION.getCode().toString(), PatentInfoStatus.CIRCULATION.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.COMPOSE.getCode())){
+				status.put(PatentInfoStatus.COMPOSE.getCode().toString(), PatentInfoStatus.COMPOSE.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.ACCEPT.getCode())){
+				status.put(PatentInfoStatus.ACCEPT.getCode().toString(), PatentInfoStatus.ACCEPT.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.REVIEWNOTICE.getCode())){
+				status.put(PatentInfoStatus.REVIEWNOTICE.getCode().toString(), PatentInfoStatus.REVIEWNOTICE.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.REVIEWREPLY.getCode())){
+				status.put(PatentInfoStatus.REVIEWREPLY.getCode().toString(), PatentInfoStatus.REVIEWREPLY.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.CORRECTIONNOTICE.getCode())){
+				status.put(PatentInfoStatus.CORRECTIONNOTICE.getCode().toString(), PatentInfoStatus.CORRECTIONNOTICE.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.CORRECTIONREPLY.getCode())){
+				status.put(PatentInfoStatus.CORRECTIONREPLY.getCode().toString(), PatentInfoStatus.CORRECTIONREPLY.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.AUTHORIZE.getCode())){
+				status.put(PatentInfoStatus.AUTHORIZE.getCode().toString(), PatentInfoStatus.AUTHORIZE.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.REJECT.getCode())){
+				status.put(PatentInfoStatus.REJECT.getCode().toString(), PatentInfoStatus.REJECT.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.LICENSE.getCode())){
+				status.put(PatentInfoStatus.LICENSE.getCode().toString(), PatentInfoStatus.LICENSE.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.SETTLEMENT.getCode())){
+				status.put(PatentInfoStatus.SETTLEMENT.getCode().toString(), PatentInfoStatus.SETTLEMENT.getDesc());
+			}
+			if (TokenManager.hasPermission("PatentInfoStatus" + PatentInfoStatus.CALLBACK.getCode())){
+				status.put(PatentInfoStatus.CALLBACK.getCode().toString(), PatentInfoStatus.CALLBACK.getDesc());
+			}
+		}
+		return status;
+	}
+	
 
 }

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

@@ -4,6 +4,8 @@ import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -24,6 +26,7 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.TechProjectFields;
+import com.goafanti.common.enums.TechProjectStatus;
 import com.goafanti.common.model.TechProject;
 import com.goafanti.common.model.TechProjectLog;
 import com.goafanti.common.model.TechWebsite;
@@ -31,6 +34,7 @@ import com.goafanti.common.model.User;
 import com.goafanti.common.utils.AesUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.techproject.bo.InputTechProject;
 import com.goafanti.techproject.bo.InputTechWebsite;
 import com.goafanti.techproject.bo.TechProjectManageListBo;
@@ -54,6 +58,18 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	private TechProjectLogService	techProjectLogService;
 	@Resource
 	private UserService				userService;
+	
+	@RequestMapping(value = "/status", method = RequestMethod.GET)
+	public Result Status(){
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}  
+		res.setData(disposeStatus());
+		return res;
+	}
+
+	
 
 	/**
 	 * 获取科技部门
@@ -439,5 +455,47 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		downloadFile(response, t.getApprovalDownloadFileName(), t.getApprovalUrl());
 		return res;
 	}
+	
+	private Object disposeStatus() {
+		Map<String, String> status = new  TreeMap<String, String>();
+		if (TokenManager.hasRole("999999")) {
+			for (TechProjectStatus p :  TechProjectStatus.values()){
+				status.put(p.getCode().toString(), p.getDesc());
+				status.remove(TechProjectStatus.OTHER.getCode().toString());
+			}
+		} else {
+			if (TokenManager.hasPermission("TechProjectStatus" + TechProjectStatus.CREATE.getCode())){
+				status.put(TechProjectStatus.CREATE.getCode().toString(), TechProjectStatus.CREATE.getDesc());
+			}
+			if (TokenManager.hasPermission("TechProjectStatus" + TechProjectStatus.SIGN.getCode())){
+				status.put(TechProjectStatus.SIGN.getCode().toString(), TechProjectStatus.SIGN.getDesc());
+			}
+			if (TokenManager.hasPermission("TechProjectStatus" + TechProjectStatus.DELIVERD.getCode())){
+				status.put(TechProjectStatus.DELIVERD.getCode().toString(), TechProjectStatus.DELIVERD.getDesc());
+			}
+			if (TokenManager.hasPermission("TechProjectStatus" + TechProjectStatus.CIRCULATION.getCode())){
+				status.put(TechProjectStatus.CIRCULATION.getCode().toString(), TechProjectStatus.CIRCULATION.getDesc());
+			}
+			if (TokenManager.hasPermission("TechProjectStatus" + TechProjectStatus.SUBMIT.getCode())){
+				status.put(TechProjectStatus.SUBMIT.getCode().toString(), TechProjectStatus.SUBMIT.getDesc());
+			}
+			if (TokenManager.hasPermission("TechProjectStatus" + TechProjectStatus.ACCEPT.getCode())){
+				status.put(TechProjectStatus.ACCEPT.getCode().toString(), TechProjectStatus.ACCEPT.getDesc());
+			}
+			if (TokenManager.hasPermission("TechProjectStatus" + TechProjectStatus.APPRVOVED.getCode())){
+				status.put(TechProjectStatus.APPRVOVED.getCode().toString(), TechProjectStatus.APPRVOVED.getDesc());
+			}
+			if (TokenManager.hasPermission("TechProjectStatus" + TechProjectStatus.REJECT.getCode())){
+				status.put(TechProjectStatus.REJECT.getCode().toString(), TechProjectStatus.REJECT.getDesc());
+			}
+			if (TokenManager.hasPermission("TechProjectStatus" + TechProjectStatus.SETTLEMENT.getCode())){
+				status.put(TechProjectStatus.SETTLEMENT.getCode().toString(), TechProjectStatus.SETTLEMENT.getDesc());
+			}
+			if (TokenManager.hasPermission("TechProjectStatus" + TechProjectStatus.CALLBACK.getCode())){
+				status.put(TechProjectStatus.CALLBACK.getCode().toString(), TechProjectStatus.CALLBACK.getDesc());
+			}
+		}
+		return status;
+	}
 
 }

+ 12 - 5
src/main/java/com/goafanti/common/model/Permission.java

@@ -1,11 +1,8 @@
 package com.goafanti.common.model;
 
-public class Permission extends BaseModel {
+public class Permission  {
 
-	/**
-	 * 
-	 */
-	private static final long	serialVersionUID	= 1L;
+	private String id;
 
 	/**
 	 * 权限对应的url path
@@ -16,6 +13,16 @@ public class Permission extends BaseModel {
 	 * 权限名字
 	 */
 	private String	name;
+	
+	
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
 
 	public String getUrl() {
 		return url;

+ 7 - 0
src/main/java/com/goafanti/copyright/controller/CopyrightApiController.java

@@ -1,5 +1,6 @@
 package com.goafanti.copyright.controller;
 
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -215,6 +216,10 @@ public class CopyrightApiController extends CertifyApiController {
 		res.setData(copyrightInfoService.findLogsByPrimaryKey(id));
 		return res;
 	}
+	
+	
+
+	
 
 	private boolean handleBindingError(Result res, BindingResult bindingResult) {
 		if (bindingResult.hasErrors()) {
@@ -235,4 +240,6 @@ public class CopyrightApiController extends CertifyApiController {
 		}
 		return false;
 	}
+	
+	
 }

+ 10 - 1
src/main/java/com/goafanti/core/shiro/token/TokenManager.java

@@ -30,13 +30,22 @@ public class TokenManager {
 	}
 
 	/**
-	 * 获取当前登录的用户User对象
+	 * 获取当前登录的用户User对象Role
 	 * 
 	 * @return
 	 */
 	public static boolean hasRole(String role) {
 		return SecurityUtils.getSubject().hasRole(role);
 	}
+	
+	/**
+	 * 获取当前登录的用户User对象Permission
+	 * 
+	 * @return
+	 */
+	public static boolean hasPermission(String permission) {
+		return SecurityUtils.getSubject().isPermitted(permission);
+	}
 
 	/**
 	 * 获取当前用户的Session

+ 7 - 0
src/main/java/com/goafanti/permission/controller/PermissionApiController.java

@@ -1,7 +1,9 @@
+
 package com.goafanti.permission.controller;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 import javax.annotation.Resource;
 
@@ -37,6 +39,11 @@ public class PermissionApiController extends BaseApiController {
 			for (int idx = 0; idx < ja.size(); idx++) {
 				records.add(ja.getJSONObject(idx).toJavaObject(Permission.class));
 			}
+			for (Permission p : records){
+				if (null == p.getId()){
+					p.setId(UUID.randomUUID().toString());
+				}
+			}
 			res.setData(permissionService.insert(records));
 		} else {
 			res.getError().add(buildError("", "参数格式不正确"));

+ 0 - 3
src/main/java/com/goafanti/permission/controller/RoleApiController.java

@@ -15,7 +15,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.Role;
-import com.goafanti.common.utils.StringUtils;
 import com.goafanti.permission.service.RoleService;
 
 @RestController
@@ -39,9 +38,7 @@ public class RoleApiController extends BaseApiController {
 			List<String> permisionIds = new ArrayList<>();
 			for (int idx = 0; idx < permissions.size(); idx++) {
 				String pid = permissions.getString(idx);
-				if (StringUtils.isNumeric(pid)) {
 					permisionIds.add(pid);
-				}
 			}
 			Role records = jo.toJavaObject(Role.class);
 			res.setData(roleService.insert(records, permisionIds));

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.12
+static.host=//afts.hnzhiming.com/1.0.13
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.12
+static.host=//afts.hnzhiming.com/1.0.13
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.12
+static.host=//afts.hnzhiming.com/1.0.13

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.12
+static.host=//aftts.hnzhiming.com/1.0.13
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload

+ 15 - 22
src/main/webapp/WEB-INF/views/header.jsp

@@ -50,36 +50,29 @@
 	window.adminData = ""
 	</c:if>
 
-	<!--
 	<shiro:hasRole name="999999">
 	window.showSystem = true;
-	window.showConfigure = true;
-	window.showConfigview = true;
-	window.showSheet = true;
-	window.showPue = true;
-	window.showVideo = true;
-	window.showDevice = true;
+	window.showUserManage = true;
+	window.showServices = true;
+	window.showAchievement = true;
+	window.showDemand = true;
+	window.showIdea = true;
 	</shiro:hasRole>
 
-	<shiro:hasPermission name="configure">
-	window.showConfigure = true;
+	<shiro:hasPermission name="userManage">
+	window.showUserManage = true;
 	</shiro:hasPermission>
-	<shiro:hasPermission name="configview">
-	window.showConfigview = true;
+	<shiro:hasPermission name="services">
+	window.showService = true;
 	</shiro:hasPermission>
-	<shiro:hasPermission name="sheet">
-	window.showSheet = true;
+	<shiro:hasPermission name="achievement">
+	window.showAchievement = true;
 	</shiro:hasPermission>
-	<shiro:hasPermission name="pue">
-	window.showPue = true;
+	<shiro:hasPermission name="demand">
+	window.showDemand = true;
 	</shiro:hasPermission>
-
-	<shiro:hasPermission name="video">
-	window.showVideo = true;
-	</shiro:hasPermission>
-	<shiro:hasPermission name="device">
-	window.showDevice = true;
+	<shiro:hasPermission name="idea">
+	window.showIdea = true;
 	</shiro:hasPermission>
-	-->
 </script>
 <script type="text/javascript" src="${staticHost}/vendors.js"></script>