CONSTANT

ccb_fund_trusteeship/src/main/java/com/fuzamei/constant/OperationTypeId.java

@@ -0,0 +1,21 @@
+package com.fuzamei.constant;
+/**
+ * 
+ * @author ylx
+ * @describe: 操作类型id号
+ */
+public class OperationTypeId {
+	public static final Integer BUSINESS_APPLY =1001;						//业务申报
+	public static final Integer BUSINESS_FIRST_TRIAL_AGREED =1002;			//业务初审通过
+	public static final Integer BUSINESS_REEXAMINE_REJECTED =1003;			//业务复审拒绝
+	public static final Integer CONTRACT_UPLOAD =1004;						//合同上传
+	public static final Integer CONTRACT_CONFIRM =1005;						//合同确认
+	public static final Integer CAPITAL_TRANSFER_FIRST_TRIAL =1006;			//资金划转初审
+	public static final Integer CAPITAL_TRANSFER_REEXAMINE =1007;			//资金划转复审
+	public static final Integer CAPITAL_TRANSFER_REEXAMINE_REJECTED =1008;	//资金划转复审拒绝
+	public static final Integer CAPITAL_TRANSFER_FINAL_JUDGE =1009;			//资金划转终审
+	public static final Integer UPLOAD_VALUATION_CHECK =1010;				//上传估值核算表
+	public static final Integer UPLOAD_PROJECT_FILE =1011;					//上传项目文档
+	public static final Integer BUSINESS_FIRST_TRIAL_REJECTED =1012;		//业务初审拒绝
+	public static final Integer BUSINESS_REEXAMINE_AGREED =1013;			//业务复审通过
+}

ccb_fund_trusteeship/src/main/java/com/fuzamei/constant/Permission.java

@@ -0,0 +1,28 @@
+package com.fuzamei.constant;
+
+/**
+ * 
+ * @author ylx
+ * @describe: 权限名称常量表
+ * @date: 2017-12-28 10:12 am
+ */
+public class Permission {
+	public static final String ADD="添加";
+	public static final String FIRST_TRIAL="初审";
+	public static final String REEXAMINE="复审";
+	public static final String UPLOAD_CONTRACT="上传合同";
+	public static final String MODIFY_CONTRACT="修订合同";
+	public static final String CONFIRM_CONTRACT="确认合同";
+	public static final String SEND_TRANSFER_ORDER="发出划款指令";
+	public static final String UPLOAD_VALUATION_REPORT="上传估值报表";
+	public static final String OPEN_ACCOUNT="开立账户";
+	public static final String CHECK_ACCOUNT_INFO="查看账户信息";
+	public static final String FIRST_TRIAL_OF_TRANSFER_ORDER="初审划款指令";
+	public static final String REEXAMINE_OF_TRANSFER_ORDER="复审划款指令";
+	public static final String FINAL_CHECK_OF_TRANSFER_ORDER="划款指令";
+	public static final String UPLOAD_PROJECT_FILE="上传项目文档";
+	public static final String CHECK_PROJECT_FILE="查看项目文档";
+	public static final String CHECK_INNER_CETIFICATION_FILE="验证文件是否是内部认证文档";
+	public static final String SEND_VENTURE_LETTER="发风险提示函";
+	public static final String CHECK_OUT="查看";
+}

ccb_fund_trusteeship/src/main/java/com/fuzamei/constant/Role.java

@@ -0,0 +1,34 @@
+package com.fuzamei.constant;
+
+/**
+ * 
+ * @author ylx
+ * @DESCRIBE: 角色名称常量表
+ * @Date:2017-12-28 10:08 am
+ */
+public class Role {
+	//TRAN is abbreviation of transactor
+	public static final String TRAN_BRANCH_BANK = "经办支行";
+	//SEC is abbreviation of secondary
+	public static final String SEC_BRANCH_BANK = "二级分行";
+	//PBB is abbreviation of provincial branch bank
+	public static final String BUSINESS_DEP_OF_PBB = "省分行业务部门";
+	public static final String ADMIN = "管理人";
+	public static final String BUSINESS_CHIEF_DEP_OF_PBB = "省分行业务主管部门";
+	public static final String LAW_DEP_OF_PBB = "省分行法律部";
+	//POS is abbreviation of position
+	//PBBTBC is abbreviation of provincial branch bank trusteeship branch center
+	public static final String ACCOUNT_MAINTAIN_POS_OF_PBBTBC = "省分行托管分中心账户维护岗";
+	public static final String ACCOUNT_MANAGE_POS_OF_PBBTBC = "省分行托管分中心账户管理岗";
+	public static final String BUSINESS_TRAN_POS_OF_PBBTBC = "省分行托管分中心业务经办岗";
+	public static final String BUSINESS_CHECK_POS_OF_PBBTBC = "省分行托管分中心业务复核岗";
+	public static final String BUSINESS_CHIEF_POS_OF_PBBTBC = "省分行托管分中心业务主管岗";
+	//TBC is abbreviation of trusteeship branch center
+	public static final String ACCOUNTING_POS_OF_TBC = "托管分中心核算岗";
+	public static final String ARCHIVE_KEEPING_POS_OF_PBBTBC = "省分行托管分中心档案保管岗";
+	public static final String SUPERVISION_AGENCY = "监管机构";
+	public static final String OUTERS_OF_BANK = "银行内外部人员";
+	public static final String VENTURE_MANAGEMENT_POS = "风管岗";
+	public static final String OTHER_POS = "其余岗";
+	public static final String INNERS_OF_BANK = "银行内部人员";
+}

ccb_fund_trusteeship/src/main/java/com/fuzamei/service/OperationHistoryService.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.fuzamei.constant.Role;
 import com.fuzamei.dao.OperationHistoryDao;
 import com.fuzamei.dao.UserAuthoricationDao;
 import com.fuzamei.entity.OperationHistory;
@@ -46,12 +47,12 @@ public class OperationHistoryService {
 			throw new RuntimeException("用户信息不存在");
 		}
 		List<String> roleList = userDetail.getRole_name();
-		if(roleList.contains("风管岗")){
+		if(roleList.contains(Role.VENTURE_MANAGEMENT_POS)){		//判断是否是风管岗位
 			// 去dao层取分页的数据,因为是风管岗位，可以查看所有人的操作记录
 			informationList = operationHistoryDao.queryOperationHistoryInformation(map); 
 		}else{
 			//根据用户id号查询出用户的账号account信息
-			//TODO这里还有上下级关系查看的问题还没解决============================================================>>>>>>待定
+			//这里还有上下级关系查看的问题还没解决============================================================>>>>>>待定TODO
 			String account = userDetail.getAccount();
 			if(StringUtil.isEmpty(account)){
 				throw new RuntimeException("用户账号信息不存在");

ccb_fund_trusteeship/src/main/java/com/fuzamei/service/ProjectFileService.java

@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.fuzamei.constant.OperationTypeId;
+import com.fuzamei.constant.Role;
 import com.fuzamei.dao.ProjectFileDao;
 import com.fuzamei.dao.UserAuthoricationDao;
 import com.fuzamei.entity.ProjectFile;
@@ -41,7 +43,7 @@ public class ProjectFileService {
 		
 		PageDTO pageDto = new PageDTO(); // 创建分页对象
 		int userId = (Integer) map.get("userId");
-		checkUserAuthority(userId,"监管机构","省分行托管分中心档案保管岗");		//查看用户非空和权限
+		checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);		//查看用户非空和权限
 		List<ProjectFile> informationList = projectFileDao.queryProjectFileInformation(map);
 		int count = projectFileDao.findAllInformation();
 		pageDto.setRows(informationList);
@@ -63,7 +65,7 @@ public class ProjectFileService {
 	 */
 	public Map<String, Object> checkoutProjectFiles(Map<String, Object> map) {
 		int userId = (Integer) map.get("userId");
-		checkUserAuthority(userId,"监管机构","省分行托管分中心档案保管岗");	//查看用户非空和权限
+		checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);	//查看用户非空和权限
 		List<ProjectFile> informationList = projectFileDao.checkoutProjectFiles(map);	//将项目id和项目名称封装成map到dao层去获取数据
 		Map<String, Object> mapBackToController = new LinkedHashMap<String, Object>();
 		mapBackToController.put("projectId", map.get("projectId"));		//展示给前端的项目id号码
@@ -107,9 +109,9 @@ public class ProjectFileService {
 		
 		//此外，还要将业务申报的这个操作信息插入到操作记录表中【操作记录表】
 		Map<String, Object> mapToOperationHistory = new LinkedHashMap<String,Object>();
-		mapToOperationHistory.put("operatorTypeId", 1011);								//上传项目文档的类型为1011
+		mapToOperationHistory.put("operatorTypeId", OperationTypeId.UPLOAD_PROJECT_FILE);//上传项目文档的类型为1011
 		mapToOperationHistory.put("operatorAccount", userDetail.getAccount());			//操作账号通过userDetail中获取
-		mapToOperationHistory.put("operatorRole", "省分行托管分中心档案保管岗");			//创建这个操作的角色只能是省分行托管分中心档案保管岗
+		mapToOperationHistory.put("operatorRole", Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);	//创建这个操作的角色只能是省分行托管分中心档案保管岗
 		mapToOperationHistory.put("operatorPerson", userDetail.getPerson_name());		//操作人通过userDetail中获取
 		mapToOperationHistory.put("operatorTime", currentTime);							//操作时间为当前操作时间
 		mapToOperationHistory.put("hash", map.get("hash"));								//如何计算操作的hash值？(按照上传的项目文件的hash值算)=====>>待定TODO
@@ -139,7 +141,7 @@ public class ProjectFileService {
 			temp=roleList.contains(string)||temp;
 		}
 		if(!temp){
-			throw new RuntimeException("无权查看项目文档信息");
+			throw new RuntimeException("无权操作");
 		}
 		return userDetail;
 		/*if(!(roleList.contains("监管机构")||roleList.contains("省分行托管分中心档案保管岗"))){

ccb_fund_trusteeship/src/main/java/com/fuzamei/web/ProjectFileAction.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.fastjson.JSON;
+import com.fuzamei.constant.Role;
 import com.fuzamei.entity.UserDetail;
 import com.fuzamei.service.ProjectFileService;
 import com.fuzamei.utils.HashXiZhiUtil;
@@ -150,7 +151,7 @@ public class ProjectFileAction {
 	public Map<String, Object> download(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url,@RequestParam("userId") Object id) {
 		try {
 			int userId=ValidationUtil.checkAndAssignInt(id);
-			projectFileService.checkUserAuthority(userId,"监管机构","省分行托管分中心档案保管岗");//查看用户是否为空及是否有权限下载项目文档文件
+			projectFileService.checkUserAuthority(userId,Role.SUPERVISION_AGENCY,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);//查看用户是否为空及是否有权限下载项目文档文件
 			String fileName = request.getServletContext().getRealPath("")+url;  		//SP是系统分隔符
 			//如果文件不存在直接抛出异常
 			if(!new File(fileName).exists()){
@@ -198,8 +199,8 @@ public class ProjectFileAction {
 		try {
 			Map<String,Object> map = JSON.parseObject(data, Map.class);
 			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));	//userId只要是一个int类型即可
-			projectFileService.checkUserAuthority(userId,"省分行托管分中心档案保管岗");		//该权限只有	【省分行托管分中心档案保管岗】才能操作
-			Integer projectId = ValidationUtil.checkAndAssignDefaultInt(map.get("projectId"),0);	//默认项目编号为空
+			projectFileService.checkUserAuthority(userId,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);		//该权限只有	【省分行托管分中心档案保管岗】才能操作
+			Integer projectId = ValidationUtil.checkAndAssignDefaultInt(map.get("projectId"),-1);	//默认项目编号为-1,就是让你查不到
 			String projectName=ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("projectName"));		//默认项目名称为空值
 			Map<String, Object> mapToClient =new LinkedHashMap<String, Object>();
 			mapToClient.put("projectId", projectId);
@@ -229,10 +230,14 @@ public class ProjectFileAction {
 	 */
 	@RequestMapping(value="/uploadProjetcFile",method=RequestMethod.POST)
 	@ResponseBody
-	public Map<String, Object> upload(@RequestParam("file") MultipartFile file,HttpServletRequest request,@RequestParam("projectId") String pId,@RequestParam("projectName") String pName,@RequestParam("userId") Object uId) {
+	public Map<String, Object> upload(@RequestParam("file") MultipartFile file,//================================>>多文件上传？待定TODO
+									@RequestParam("projectId") String pId,
+									@RequestParam("projectName") String pName,
+									@RequestParam("userId") Object uId,
+									HttpServletRequest request) {
 		try {
 			int userId=ValidationUtil.checkAndAssignInt(uId);
-			UserDetail userDetail = projectFileService.checkUserAuthority(userId,"监管机构","省分行托管分中心档案保管岗");//查看用户是否为空及是否有权限下载项目文档文件
+			UserDetail userDetail = projectFileService.checkUserAuthority(userId,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);//查看用户是否为空及是否有权限下载项目文档文件
 			String projectId = ValidationUtil.checkBlankAndAssignString(pId);				//校验projectId并赋值
 			String projectName = ValidationUtil.checkBlankAndAssignString(pName);			//校验projectName并赋值
 			String path = request.getServletContext().getRealPath("")+SP+"content";			//SP是系统分隔符,path是存放上传文件的父类文件夹绝对路径	
@@ -244,7 +249,7 @@ public class ProjectFileAction {
 			String pathFile=path+SP+filename;												//pathFile是该文件在系统中的绝对路径
 			File newFile=new File(pathFile);
 			file.transferTo(newFile);														//文件已经上传成功
-			String fileHash = HashXiZhiUtil.getMD5Checksum(filename);						//文件上传后计算文件的hash值=============>>换hash算法这里直接换掉即可			
+			String fileHash = HashXiZhiUtil.getMD5Checksum(filename);						//文件上传后计算文件的hash值=============>>换hash算法这里直接换掉即可TODO			
 			Map<String, Object> mapToService =new LinkedHashMap<String, Object>();
 			mapToService.put("userDetail", userDetail);				//将用户的信息传入
 			mapToService.put("projectId", projectId);