添加统一处理异常

VisualInspection_server/.gitignore

@@ -21,4 +21,5 @@ build/
 nbbuild/
 dist/
 nbdist/
-.nb-gradle/
+.nb-gradle/
+/bin

VisualInspection_server/pom.xml

@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
             <artifactId>thymeleaf-extras-springsecurity4</artifactId>
-            <version>2.1.2.RELEASE</version>
+            <version>2.1.2.RELEASE</version><!--$NO-MVN-MAN-VER$-->
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.thymeleaf/thymeleaf-spring4 -->
@@ -117,7 +117,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.41</version>
+			<version>5.1.41</version><!--$NO-MVN-MAN-VER$-->
 		</dependency>
 
         <dependency>
@@ -132,7 +132,17 @@
             <version>1.2.31</version>
         </dependency>
 
-
+		<!-- https://mvnrepository.com/artifact/org.aspectj/aspectjrt -->
+		<dependency>
+		    <groupId>org.aspectj</groupId>
+		    <artifactId>aspectjrt</artifactId>
+		    <version>1.8.10</version>
+		</dependency>
+		 <dependency>
+		    <groupId>org.aspectj</groupId>
+		    <artifactId>aspectjweaver</artifactId>
+		    <version>1.8.10</version>
+		 </dependency>
 
         <dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -140,7 +150,6 @@
 			<scope>test</scope>
 		</dependency>
 
-
     </dependencies>
 
 	<dependencyManagement>
@@ -166,7 +175,6 @@
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
-
 				</configuration>
 			</plugin>
 		</plugins>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/AssessmentItem.java → VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/CheckItem.java

@@ -8,7 +8,7 @@ import org.omg.CORBA.INTERNAL;
  * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @Data
-public class AssessmentItem {
+public class CheckItem {
     //编号
     private Integer id;
     //考核办法id

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/AssessmentMethod.java → VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/CheckRule.java

@@ -7,7 +7,7 @@ import lombok.Data;
  * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @Data
-public class AssessmentMethod {
+public class CheckRule {
     //编号
     private Integer id;
     //名称

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/ScoreDeducting.java → VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Score.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @Data
-public class ScoreDeducting {
+public class Score {
     //编号
     private Integer id;
     //时间

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/VisualInspectionTask.java → VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Task.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * 版本信息：日期：2017/4/15 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @Data
-public class VisualInspectionTask{
+public class Task{
     //编号
     private Integer id;
     //审核状态

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/BaseController.java

@@ -1,5 +1,6 @@
 package com.xintong.visualinspection.controller;
 
+import java.io.FileNotFoundException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
 import com.alibaba.fastjson.JSON;
+import com.xintong.visualinspection.err.BusinessException;
+import com.xintong.visualinspection.err.ErrorCode;
 
 /**
  * 文件名：TestController
@@ -32,17 +35,57 @@ public class BaseController {
         return JSON.toJSON(result).toString();
     }
     
+    /**
+     * 返回前台结果结构体
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    public String returnSuccessResult(String result_desc){
+    	Map<String,Object> result = new HashMap<>();
+    	result.put("result_code", 0);
+    	result.put("result_desc", result_desc);
+        return JSON.toJSON(result).toString();
+    }
+    
+    /**
+     * 返回前台结果结构体
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    public String returnSuccessResult(String result_desc, Object o){
+    	Map<String,Object> result = new HashMap<>();
+    	result.put("result_code", 0);
+    	result.put("result_desc", result_desc);
+    	result.put("result_data", o);
+        return JSON.toJSON(result).toString();
+    }
+    
     /** 基于@ExceptionHandler异常处理 */  
     @ExceptionHandler  
-    public String exp(int errcode, Exception ex) {  
-//        request.setAttribute("ex", ex);
-        // 根据不同错误转向不同页面  
-    	String err;
+    public String exp(HttpServletRequest request, Exception ex) {  
+        // 根据不同错误提示不同的错误  
+    	ErrorCode code;
         if(ex instanceof NullPointerException) {  
-        	err = "空指针错误";
-        } else {  
-        	err = "好多错误";  
-        }  
-        return returnResult(errcode,err,null);
+        	code = new ErrorCode(10001);
+        } else if (ex instanceof NumberFormatException) {  
+        	code = new ErrorCode(10002);
+        } else if (ex instanceof IndexOutOfBoundsException) {  
+        	code = new ErrorCode(10003);  
+        } else if (ex instanceof ArithmeticException) {  
+        	code = new ErrorCode(10004);  
+        } else if (ex instanceof FileNotFoundException) {  
+        	code = new ErrorCode(10005);  
+        } else if (ex instanceof IllegalArgumentException) {  
+        	code = new ErrorCode(10006); 
+        } else if (ex instanceof BusinessException) {
+        	code = ((BusinessException) ex).getErrCode(); 
+        } else{
+        	code = new ErrorCode(11000); 
+        }
+        return returnResult(code.getCode(),code.getDesc(),null);
     }  
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/UserServiceImpl.java

@@ -1,17 +1,12 @@
 package com.xintong.visualinspection.service.impl;
 
-import com.xintong.visualinspection.bean.Permission;
-import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.dao.cluster.UserInfoDao;
-import com.xintong.visualinspection.dao.master.PermissionDao;
-import com.xintong.visualinspection.dao.master.UserDao;
-import com.xintong.visualinspection.service.BaseService;
-import com.xintong.visualinspection.service.UserService;
+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.Data;
-import org.slf4j.Logger;
+
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -19,8 +14,13 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.xintong.visualinspection.bean.Permission;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.dao.cluster.UserInfoDao;
+import com.xintong.visualinspection.dao.master.PermissionDao;
+import com.xintong.visualinspection.dao.master.UserDao;
+import com.xintong.visualinspection.service.BaseService;
+import com.xintong.visualinspection.service.UserService;
 
 /**
  * 文件名：UserServiceImpl