Merge branch 'zhaoyue-dev' into 'master'

add log



See merge request !21

@@ -2,7 +2,7 @@ git pull
 git add --all src/*
 git add --all src/*
 git add push.sh
 git add push.sh
 git add pom.xml
 git add pom.xml
-git commit -m "Add admin info inter"
+git commit -m "add log"
 git push origin zhaoyue-dev
 git push origin zhaoyue-dev
 git status
 git status
 git pull
 git pull

@@ -9,6 +9,7 @@ import com.xkl.model.ReportIdModel;
 import com.xkl.model.ResultModel;
 import com.xkl.model.ResultModel;
 import com.xkl.repository.*;
 import com.xkl.repository.*;
 import com.xkl.security.SecurityTool;
 import com.xkl.security.SecurityTool;
+import lombok.extern.apachecommons.CommonsLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
@@ -22,6 +23,7 @@ import java.util.*;
  * Created by zhao yue on 2016/11/13.
  * Created by zhao yue on 2016/11/13.
  */
  */
 @Service
 @Service
+@CommonsLog
 public class ReportService implements IReportService {
 public class ReportService implements IReportService {
     @Autowired
     @Autowired
     private ReportMetaItemsRepository reportMetaItemsRepository;
     private ReportMetaItemsRepository reportMetaItemsRepository;
@@ -207,6 +209,7 @@ public class ReportService implements IReportService {
                 }
                 }
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
+            log.info("ERROR, JSON FROMAT ERROR!!!"+e);
             return null;
             return null;
         }
         }
         markItemStatus(sex, detailList);
         markItemStatus(sex, detailList);