增加打印日志

gaudi-service/src/main/java/com/jianxun/gaudi/qs/service/impl/QuestionnaireSurveyServiceImpl.java

@@ -41,6 +41,7 @@ import com.jianxun.gaudi.common.exception.MyException;
 import com.jianxun.gaudi.common.utils.CheckTokenUtil;
 import com.jianxun.gaudi.cp.vo.UserVO;
 import com.jianxun.gaudi.qs.service.QuestionnaireSurveyService;
+import org.springframework.util.CollectionUtils;
 
 @Service
 public class QuestionnaireSurveyServiceImpl implements QuestionnaireSurveyService {
@@ -160,9 +161,11 @@ public class QuestionnaireSurveyServiceImpl implements QuestionnaireSurveyServic
             newToken = tokens[0];
             platfromType = tokens[1];
         }
-        logger.info("lstToFill-newToken:{}",newToken);
+        long beginTime = System.currentTimeMillis();
+        logger.info("问卷列表-getManager-lstToFill newToken:{};获取用户信息开始时间:{}",newToken,beginTime);
         UserVO userVO = CheckTokenUtil.getUserDataByTokenV2(newToken, Integer.parseInt(platfromType));
-        logger.info("lstToFill-newToken:{}",JsonUtils.toJson(userVO));
+        long endTime = System.currentTimeMillis();
+        logger.info("问卷列表-getManager-lstToFill userVO:{};获取用户信息结束时间:{}；耗时:{}",JsonUtils.toJson(userVO),endTime,(beginTime-endTime));
 
         this.check(userVO);
         String realname = StringUtils.isEmpty(userVO.getUserName()) || userVO.getUserName().length() > 10 ? "" : userVO.getUserName(); // 填写者，真实姓名
@@ -186,8 +189,12 @@ public class QuestionnaireSurveyServiceImpl implements QuestionnaireSurveyServic
                 .replace("{$extf$}", extf)
                 .replace("{$ts$}", ts)
                 .replace("{$sign$}", sign);
+        long bTime = System.currentTimeMillis();
+        logger.info("问卷列表-getManager-lstToFill url:{};请求问卷星接口开始时间:{}",url,bTime);
         // 调用接口并获取结果
         String result = HttpClientUtils.doGet(url);
+        long eTime = System.currentTimeMillis();
+        logger.info("问卷列表-getManager-lstToFill result:{};请求问卷星接口结束时间:{};所用时间差：{}",result,eTime,(eTime-bTime));
         // 问题传递参数
         String questionParamsString = questionParams.replace("{$sojumpparm$}", token);
         logger.info("lstToFill questionParams===>" + questionParams);
@@ -271,10 +278,15 @@ public class QuestionnaireSurveyServiceImpl implements QuestionnaireSurveyServic
 
         List<QuestionairesVO> lstQuestionairesVO = JSON.parseArray(result, QuestionairesVO.class);
 
+        if(CollectionUtils.isEmpty(lstQuestionairesVO)){
+            return lstQuestionairesVO;
+        }
         // Json转列表
 
         for (QuestionairesVO questionairesVO : lstQuestionairesVO) {
-
+            if(null == questionairesVO){
+                continue;
+            }
 
             questionairesVO.setLink(officalWebsite + questionairesVO.getLink() );
         }

gaudi-web/src/main/java/com/jianxun/gaudi/controller/qs/QuestionnaireSurveyController.java

@@ -174,6 +174,12 @@ public class QuestionnaireSurveyController {
     @ResponseBody
     public ResponseResult getQuestionnaireInformation(@ModelAttribute QuestionnaireInquiryParam param) throws Exception {
         logger.info("QuestionnaireSurveyController.getQuestionnaireInformation param:{}", JsonUtils.toJson(param));
+        if(null == param.getPageNum()){
+            param.setPageNum(1);
+        }
+        if(null == param.getPageSize()){
+            param.setPageSize(10);
+        }
         ResponseResult<PageInfo<QsQuestionnaireVO>> result = new ResponseResult<PageInfo<QsQuestionnaireVO>>();
         result.setData(service.getQuestionnaireInformation(param));
         return result;