new

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.fastjson.JSON;
@@ -35,7 +36,7 @@ import com.fuzamei.utils.PageDTO;
 import com.fuzamei.utils.RelativePathUtil;
 import com.fuzamei.utils.ValidationUtil;
 
-@Controller
+@RestController
 @RequestMapping("/business_declare")
 public class BusinessDeclareAction {
 	
@@ -69,7 +70,6 @@ public class BusinessDeclareAction {
 	* @throws
 	 */
 	@RequestMapping(value="/uploadBusinessMaterialsByBranchBank",method=RequestMethod.POST)
-	@ResponseBody
 	private Map<String, Object> uploadValuationPOIByBank(@RequestParam("businessApproval") MultipartFile file1,
 			@RequestParam("responsibleInvestigation") MultipartFile file2,
 			@RequestParam("productApproval") MultipartFile file3,
@@ -203,7 +203,6 @@ public class BusinessDeclareAction {
 	* @authority: 经办支行，二级支行，省分行
 	 */
 	@RequestMapping(value="/queryBusinessDeclareInformation",method=RequestMethod.POST)
-	@ResponseBody
 	private Map<String,Object> queryBusinessDeclareInformation(@RequestBody String data){
 		try {
 			System.out.println("查询业务申请信息....");
@@ -256,7 +255,6 @@ public class BusinessDeclareAction {
 	* @authority: 经办支行，二级支行，省分行
 	 */
 	@RequestMapping(value="/queryBusinessCheckInformation",method=RequestMethod.POST)
-	@ResponseBody
 	private Map<String,Object> queryBusinessCheckInformation(@RequestBody String data){
 		try {
 			System.out.println("查询业务审核总表信息....");
@@ -297,7 +295,6 @@ public class BusinessDeclareAction {
 	* @throws
 	 */
 	@RequestMapping(value="/businessDeclareCheckedBy",method=RequestMethod.POST)
-	@ResponseBody
 	private Map<String,Object> businessDeclareCheckedBy(@RequestBody String data){
 		try {
 			System.out.println("添加到业务审核总表信息....");
@@ -348,7 +345,6 @@ public class BusinessDeclareAction {
 	* @throws
 	 */
 	@RequestMapping(value="/uploadContractByProvincialBranchBank",method=RequestMethod.POST)
-	@ResponseBody
 	private Map<String, Object> uploadContractByProvincialBranchBank(@RequestParam("contract") MultipartFile file,
 																	HttpServletRequest request,
 																	@RequestParam("businessId") Object bId,
@@ -409,7 +405,6 @@ public class BusinessDeclareAction {
 	* @throws
 	 */
 	@RequestMapping(value="/downloadBusinessDeclareFiles")
-	@ResponseBody
 	private Map<String, Object> downloadBusinessDeclareFiles(HttpServletRequest request,HttpServletResponse response,
 										@RequestParam("url") String url,
 										@RequestParam("userId") Object uId) {
@@ -454,7 +449,6 @@ public class BusinessDeclareAction {
 	 * @throws
 	 */
 	@RequestMapping(value="/downloadContractFiles")
-	@ResponseBody
 	private Map<String, Object> downloadContractFiles(HttpServletRequest request,HttpServletResponse response,
 			@RequestParam("url") String url,
 			@RequestParam("userId") Object uId) {

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.service.OperationHistoryService;
@@ -17,7 +18,7 @@ import com.fuzamei.utils.PageDTO;
 import com.fuzamei.utils.ValidationUtil;
 
 
-@Controller
+@RestController
 @RequestMapping("/operation_history")
 public class OperationHistoryAction {
 
@@ -25,8 +26,8 @@ public class OperationHistoryAction {
 	private OperationHistoryService operationHistoryService;
 	
 	private static final int ROW_NUM = 10; // 分页每页显示数据的数量
+	
 	/**
-	 * 
 	* @Title: queryOperationHistoryInformation
 	* @Description: TODO(查询操作记录信息....)
 	* @param @param data--前台传递过来的application/json数据
@@ -45,10 +46,8 @@ public class OperationHistoryAction {
 	* @return Map<String,Object>    返回类型
 	* @author ylx
 	* @date 2017年12月14日 下午5:12:17
-	* @throws
 	 */
 	@RequestMapping(value="/queryOperationHistoryInformation",method=RequestMethod.POST)
-	@ResponseBody
 	private Map<String,Object> queryOperationHistoryInformation(@RequestBody String data){
 		try {
 			System.out.println("查询操作记录信息....");

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.fastjson.JSON;
@@ -36,7 +37,7 @@ import com.fuzamei.utils.ValidationUtil;
  * @author ylx
  * 
  */
-@Controller
+@RestController
 @RequestMapping("/project_file")
 public class ProjectFileAction {
 
@@ -70,7 +71,6 @@ public class ProjectFileAction {
 	 * @date 2017年12月15日下午1:24:40
 	 */
 	@RequestMapping(value = "/queryProjectFileInformation")
-	@ResponseBody
 	private Map<String, Object> queryProjectFileInformation(@RequestBody String data) {
 		try {
 			System.out.println("查询项目文档记录信息....");
@@ -117,12 +117,11 @@ public class ProjectFileAction {
 	* @date 2017年12月15日 下午8:09:44
 	* @throws
 	 */
-	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/checkoutProjectFiles")
-	@ResponseBody
 	private Map<String, Object> checkoutProjectFiles(@RequestBody String data){
 		try {
 			System.out.println("项目文档查看....");
+			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);	// 将前端传过来的json数据转化为map对象，并将map对象传入service层进行数据校验
 			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));	//userId只要是一个int类型即可
 			Integer projectId = ValidationUtil.checkAndAssignDefaultInt(map.get("projectId"),0);	//默认项目编号为空
@@ -151,7 +150,6 @@ public class ProjectFileAction {
 	* @throws
 	 */
 	@RequestMapping(value="/downloadProjectFile")
-	@ResponseBody
 	private Map<String, Object> download(HttpServletRequest request,HttpServletResponse response,@RequestParam("url") String url,@RequestParam("userId") Object uId) {
 		try {
 			int userId=ValidationUtil.checkAndAssignInt(uId);
@@ -197,11 +195,10 @@ public class ProjectFileAction {
 	* @date 2017年12月15日 下午8:11:09
 	* @throws
 	 */
-	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/showUploadProjectFileInterface")
-	@ResponseBody
 	private Map<String, Object> showUploadProjectFileInterface(@RequestBody String data){
 		try {
+			@SuppressWarnings("unchecked")
 			Map<String,Object> map = JSON.parseObject(data, Map.class);
 			int userId = ValidationUtil.checkAndAssignInt(map.get("userId"));									//userId只要是一个int类型即可
 			userAuthoricationService.checkUserAuthority(userId,Role.ARCHIVE_KEEPING_POS_OF_PBBTBC);				//该权限只有	【省分行托管分中心档案保管岗】才能操作
@@ -234,7 +231,6 @@ public class ProjectFileAction {
 	* @date 2017年12月27日 下午5:32:18
 	 */
 	@RequestMapping(value="/uploadProjetcFile",method=RequestMethod.POST)
-	@ResponseBody
 	private Map<String, Object> upload(@RequestParam("file") MultipartFile file,//================================>>多文件上传？待定TODO
 									@RequestParam("projectId") String pId,
 									@RequestParam("projectName") String pName,

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.fastjson.JSON;
@@ -45,7 +46,7 @@ import com.fuzamei.utils.ValidationUtil;
  * @author chb & ylx
  * @throws IOException
  */
-@Controller
+@RestController
 @RequestMapping(value = "/prompt_letter")
 public class PromptLetterAction {
 	@Autowired
@@ -72,7 +73,7 @@ public class PromptLetterAction {
 	 */
 	@RequestMapping(value = "/uploadPromptLetterFile", method = RequestMethod.POST)
 	@ResponseBody
-	public Map<String, Object> uploadPromptLetterFile(@RequestParam("file") MultipartFile file,
+	private Map<String, Object> uploadPromptLetterFile(@RequestParam("file") MultipartFile file,
 													  HttpServletRequest request, 
 													  @RequestParam("receiverId") Object rId,
 													  @RequestParam("userId") Object uId) throws IOException {
@@ -134,7 +135,7 @@ public class PromptLetterAction {
 	 */
 	@RequestMapping(value = "/queryPromptLetter", method = RequestMethod.POST)
 	@ResponseBody
-	public Map<String, Object> selectPromptLetter(@RequestBody String data) {
+	private Map<String, Object> selectPromptLetter(@RequestBody String data) {
 		try {
 			// System.out.println("管理人查询风险提示函信息列表");
 			@SuppressWarnings("unchecked")
@@ -172,7 +173,7 @@ public class PromptLetterAction {
 	 */
 	@RequestMapping(value = "/downloadFile")
 	@ResponseBody
-	public Map<String, Object> downloadFile(HttpServletRequest request, 
+	private Map<String, Object> downloadFile(HttpServletRequest request, 
 											HttpServletResponse response,
 											@RequestParam("url") String url,
 											@RequestParam("userId") Object uId) throws Exception {

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.fuzamei.constant.HintMSG;
@@ -30,7 +31,7 @@ import com.fuzamei.utils.ValidationUtil;
  * @describe 真伪查询模块
  * @date 2018-1-4 12:17
  */
-@Controller
+@RestController
 @RequestMapping(value = "/query_true_or_false")
 public class TrueFalseSelectAction {
 	
@@ -49,8 +50,7 @@ public class TrueFalseSelectAction {
      * @throws Exception  
      */  
     @RequestMapping(value="/trueFalseSelect",method=RequestMethod.POST)  
-    @ResponseBody  
-    public Map<String,Object> trueFalseSelect(@RequestParam("file") MultipartFile file,
+    private Map<String,Object> trueFalseSelect(@RequestParam("file") MultipartFile file,
     										  HttpServletRequest request,
     										  @RequestParam("userId") Object uId) throws IOException{  
        try {

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.fastjson.JSON;
@@ -44,7 +45,7 @@ import com.fuzamei.utils.ValidationUtil;
  * @author ylx
  *
  */
-@Controller
+@RestController
 @RequestMapping("/valuation_accounting")
 public class ValuationAccountingAction {
 
@@ -75,8 +76,7 @@ public class ValuationAccountingAction {
 	* @date 2017年12月18日 下午3:17:30
 	 */
 	@RequestMapping(value="/queryValuationAccountingInformation",method=RequestMethod.POST)
-	@ResponseBody
-	public Map<String,Object> queryOperationHistoryInformation(@RequestBody String data){
+	private Map<String,Object> queryOperationHistoryInformation(@RequestBody String data){
 		try {
 			System.out.println("查询估值核算数据");
 			@SuppressWarnings("unchecked")
@@ -124,8 +124,7 @@ public class ValuationAccountingAction {
 	* @date 2017年12月28日 下午1:48:43
 	 */
 	@RequestMapping(value="/checkoutDownloadInformation",method=RequestMethod.POST)
-	@ResponseBody
-	public Map<String,Object> checkoutDownloadInformation(@RequestBody String data){
+	private Map<String,Object> checkoutDownloadInformation(@RequestBody String data){
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
@@ -154,8 +153,7 @@ public class ValuationAccountingAction {
 	* @date 2017年12月28日 下午3:39:18
 	 */
 	@RequestMapping(value="/fistUploadFundDataByAdmin",method=RequestMethod.POST)
-	@ResponseBody
-	public Map<String,Object> fistUploadFundDataByAdmin(@RequestBody String data){
+	private Map<String,Object> fistUploadFundDataByAdmin(@RequestBody String data){
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
@@ -181,8 +179,7 @@ public class ValuationAccountingAction {
 	* @date 2017年12月18日 下午5:26:46
 	 */
 	@RequestMapping(value="/downloadValuationPOI")
-	@ResponseBody
-	public Map<String, Object> download(HttpServletRequest request,HttpServletResponse response,
+	private Map<String, Object> download(HttpServletRequest request,HttpServletResponse response,
 										@RequestParam("url") String url,
 										@RequestParam("userId") Object uId) {
 		try {
@@ -236,8 +233,7 @@ public class ValuationAccountingAction {
 	* @date 2017年12月18日 下午5:29:38
 	 */
 	@RequestMapping(value="/uploadValuationPOIByAdminForTheFirstTime",method=RequestMethod.POST)
-	@ResponseBody
-	public Map<String, Object> uploadValuationPOIByAdmin(@RequestParam("file") MultipartFile file,HttpServletRequest request,
+	private Map<String, Object> uploadValuationPOIByAdmin(@RequestParam("file") MultipartFile file,HttpServletRequest request,
 														 @RequestParam("fundId") String fId,
 														 @RequestParam("fundName") String fName, 
 														 @RequestParam("assets") String ass,
@@ -306,8 +302,7 @@ public class ValuationAccountingAction {
 	* @date 2017年12月18日 下午8:17:47
 	 */
 	@RequestMapping(value="/uploadValuationPOIByBankOrByAdmin",method=RequestMethod.POST)
-	@ResponseBody
-	public Map<String, Object> uploadValuationPOIByBankOrByAdmin(@RequestParam("file") MultipartFile file,HttpServletRequest request,
+	private Map<String, Object> uploadValuationPOIByBankOrByAdmin(@RequestParam("file") MultipartFile file,HttpServletRequest request,
 														@RequestParam("fundId") String fId,
 														@RequestParam("fundName") String fName, 
 														@RequestParam("userId") Object uId) {