培训不返回异常，setting没有时返回空

ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/office/provider/BpmInitiatedProvider.java

@@ -1,6 +1,7 @@
 package com.lc.ibps.office.provider;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -13,6 +14,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.lc.ibps.base.core.util.Collections;
 import com.lc.ibps.base.framework.table.ICommonDao;
 import com.lc.ibps.bpmn.service.impl.BpmProcInstServiceImpl;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
@@ -1499,13 +1501,23 @@ public class BpmInitiatedProvider extends GenericProvider implements IBpmInitiat
 				infobox2.setAlias("myTraining");
 				infobox2.setDataText("-1");
 				infobox2.setAccessToken(ContextUtil.getCurrentAccessToken());
-				List<Map<String,Object>> objects =
-						(List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_wodepeixun WHERE peixunrenyuan=#{p0} and shi_fou_guo_shen_ NOT IN ('已删除','未发布')",
-								new String[]{currentUserId});
-				int allNum = Integer.parseInt(objects.get(0).get("total").toString());
-				objects =
-						(List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_wodepeixun WHERE peixunrenyuan=#{p0} and shi_fou_guo_shen_ NOT IN ('已删除','未发布','已结束')",
-								new String[]{currentUserId});
+				List<Map<String,Object>> objects = new  ArrayList<>();
+				int allNum ;
+				//获取setting配置判断培训版本
+				String setting = ContextUtil.getSetting();
+				ObjectMapper objectMapper = new ObjectMapper();
+				HashMap<String, Object> map =(HashMap) objectMapper.readValue(setting, Map.class);
+				HashMap<String, Object> option = (HashMap)map.get("pxSpectacularsOption");
+				String ver = option.get("version").toString();
+				if(BeanUtils.isNotEmpty(ver) && "1".equals(ver)) {
+					objects=(List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_wodepeixun WHERE peixunrenyuan=#{p0} and pei_xun_zhuang_ta NOT IN ('已删除','未发布')",	new String[]{currentUserId});
+					allNum = Integer.parseInt(objects.get(0).get("total").toString());
+					objects =(List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_wodepeixun WHERE peixunrenyuan=#{p0} and pei_xun_zhuang_ta NOT IN ('已删除','未发布','已结束')",new String[]{currentUserId});
+				}else {
+					objects = (List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_wodepeixun WHERE peixunrenyuan=#{p0} and shi_fou_guo_shen_ NOT IN ('已删除','未发布')",new String[]{currentUserId});
+					allNum = Integer.parseInt(objects.get(0).get("total").toString());
+					objects = (List<Map<String, Object>>) commonDao.query("SELECT COUNT(1) AS total FROM v_wodepeixun WHERE peixunrenyuan=#{p0} and shi_fou_guo_shen_ NOT IN ('已删除','未发布','已结束')",new String[]{currentUserId});
+				}
 				int unNum = Integer.parseInt(objects.get(0).get("total").toString());
 				infobox2.setDataText(String.format("%d,%d,%d",allNum,allNum-unNum,unNum));
 				infobox2.setMessage(String.format("总数:%d,已完成:%d,未完成:%d",allNum,allNum-unNum,unNum));

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/impl/StatisticServiceImpl.java

@@ -69,7 +69,7 @@ public class StatisticServiceImpl implements StatisticService {
     }
 
     @Override
-    public List<TrainingDashBoardDTO> getTrainingDashBoard(String dept, String types11, String dates,String typeProportion,String version) throws Exception{
+    public List<TrainingDashBoardDTO> getTrainingDashBoard(String dept, String types11, String dates,String typeProportion,String version){
      // public List<TrainingDashBoardDTO> getTrainingDashBoard(String dept, String types11, String dates,String typeProportion) {
         List<TrainingDashBoardDTO> list = new ArrayList<>();
         TrainingDashBoardDTO dashBoardDTO = new TrainingDashBoardDTO();
@@ -898,7 +898,7 @@ public class StatisticServiceImpl implements StatisticService {
         }
     }
 
-    public TrainGuardAutoPlanDto getPlanRate(String dept,String dateCondition,String version) throws Exception{
+    public TrainGuardAutoPlanDto getPlanRate(String dept,String dateCondition,String version){
     //public TrainGuardAutoPlanDto getPlanRate(String dept,String dateCondition){
         TrainGuardAutoPlanDto planDto = new TrainGuardAutoPlanDto();
         String planSql = "";
@@ -908,7 +908,7 @@ public class StatisticServiceImpl implements StatisticService {
         try {
              ve = settingUtil.getPx();
         }catch (Exception e){
-            throw new Exception("json转换异常");
+            logger.warn("json转换异常");
         }
         if(BeanUtils.isNotEmpty(ve) && "1".equals(ve)){
             planSql = "select count(*) as auto from t_lhrypxjlb where ji_hua_wai_jian_ in(select id_ from t_ndrypxjhzb " +
@@ -938,7 +938,7 @@ public class StatisticServiceImpl implements StatisticService {
         return planDto;
     }
 
-    public List<TrainWeekDto> getLastSeven(String dept,String version)throws Exception{
+    public List<TrainWeekDto> getLastSeven(String dept,String version){
         //public List<TrainWeekDto> getLastSeven(String dept){
         List<TrainWeekDto> weekDtoList = new ArrayList<>();
         List<String> lastWeek = getLastSevenDaysDates();
@@ -951,7 +951,7 @@ public class StatisticServiceImpl implements StatisticService {
             try {
                 ve = settingUtil.getPx();
             }catch (Exception e){
-                throw new Exception("json转换异常");
+                logger.warn("json转换异常");
             }
             if(BeanUtils.isNotEmpty(ve) && "1".equals(ve)){
               sql = "select count(*) value from t_lhrypxjlb where  pei_xun_zhuang_ta='未发布' " +
@@ -987,7 +987,7 @@ public class StatisticServiceImpl implements StatisticService {
     }
 
     //public TrainObjectDto getObjectRate(String dept,String dateCondition){
-    public TrainObjectDto getObjectRate(String dept,String dateCondition,String version)throws Exception{
+    public TrainObjectDto getObjectRate(String dept,String dateCondition,String version){
         TrainObjectDto objectDto = new TrainObjectDto();
         objectDto.setRemark("在岗培训对象占比");
         List<TrainRateDto> rateDtoList = new ArrayList<>();
@@ -997,7 +997,7 @@ public class StatisticServiceImpl implements StatisticService {
         try {
             ve = settingUtil.getPx();
         }catch (Exception e){
-            throw new Exception("json转换异常");
+            logger.warn("json转换异常");
         }
         if(BeanUtils.isNotEmpty(ve) && "1".equals(ve)){
            sql = "select pei_xun_lei_xing_,count(pei_xun_lei_xing_)as nums from t_lhrypxjlb where " +
@@ -1030,7 +1030,7 @@ public class StatisticServiceImpl implements StatisticService {
     }
 
     //public TrainTypeDto getTypeRate(String dept,String dateCondition,String typeProportion){
-    public TrainTypeDto getTypeRate(String dept,String dateCondition,String typeProportion,String version)throws Exception{
+    public TrainTypeDto getTypeRate(String dept,String dateCondition,String typeProportion,String version){
         TrainTypeDto typeDto = new TrainTypeDto();
         typeDto.setRemark("在岗培训类别占比");
         List<TrainRateDto> rateDtoList = new ArrayList<>();
@@ -1051,7 +1051,7 @@ public class StatisticServiceImpl implements StatisticService {
         try {
             ve = settingUtil.getPx();
         }catch (Exception e){
-            throw new Exception("json转换异常");
+            logger.warn("json转换异常");
         }
         if(BeanUtils.isNotEmpty(ve) && "1".equals(ve)){
            sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_lhrypxjlb where " +
@@ -1084,7 +1084,7 @@ public class StatisticServiceImpl implements StatisticService {
     }
 
     //public TrainYearPreWorkDto getYearPre(String dept,String year){
-        public TrainYearPreWorkDto getYearPre(String dept,String year,String version)throws Exception{
+        public TrainYearPreWorkDto getYearPre(String dept,String year,String version){
         TrainYearPreWorkDto preWorkDto = new TrainYearPreWorkDto();
         preWorkDto.setRemark("本年度岗前培训类别占比");
         List<TrainRateDto> rateDtoList = new ArrayList<>();
@@ -1094,7 +1094,7 @@ public class StatisticServiceImpl implements StatisticService {
             try {
                 ve = settingUtil.getPx();
             }catch (Exception e){
-                throw new Exception("json转换异常");
+                logger.warn("json转换异常");
             }
         if(BeanUtils.isNotEmpty(ve) && "1".equals(ve)){
            sql = "select pei_xun_lei_bie_,count(pei_xun_lei_bie_)as nums from t_lhrypxjlb where " +
@@ -1129,13 +1129,13 @@ public class StatisticServiceImpl implements StatisticService {
     }
 
     //public List<Map<String, Object>> getCurrentYearData(List<String> dateStr, String dept,String year) {
-     public List<Map<String, Object>> getCurrentYearData(List<String> dateStr, String dept,String year,String version)throws Exception {
+     public List<Map<String, Object>> getCurrentYearData(List<String> dateStr, String dept,String year,String version) {
         String baseSql ="";
          String ve = "";
          try {
              ve = settingUtil.getPx();
          }catch (Exception e){
-             throw new Exception("json转换异常");
+             logger.warn("json转换异常");
          }
         if(BeanUtils.isNotEmpty(ve) && "1".equals(ve)){
             baseSql = "SELECT count(*) AS total FROM t_lhrypxjlb WHERE pei_xun_zhuang_ta = '已结束' and di_dian_='%s'";
@@ -1162,13 +1162,13 @@ public class StatisticServiceImpl implements StatisticService {
     }
 
     //public List<TrainRankDto> getUserTrainRank(String dept,String dateCondition){
-    public List<TrainRankDto> getUserTrainRank(String dept,String dateCondition,String version) throws Exception{
+    public List<TrainRankDto> getUserTrainRank(String dept,String dateCondition,String version){
         String sql = "";
         String ve = "";
         try {
             ve = settingUtil.getPx();
         }catch (Exception e){
-            throw new Exception("json转换异常");
+            logger.warn("json转换异常");
         }
         if(BeanUtils.isNotEmpty(ve) && "1".equals(ve)){
             sql = "SELECT a.ren_yuan_id_ userId,e.NAME_ userName,a.rank as count from (select ren_yuan_id_,COUNT(ren_yuan_id_)as rank  from t_qdxxb " +

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/untils/settingUtil.java

@@ -1,7 +1,10 @@
 package com.lc.ibps.untils;
 
 import com.lc.ibps.base.web.context.ContextUtil;
+import com.lc.ibps.bpmn.service.impl.BpmProcInstServiceImpl;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,27 +14,28 @@ import java.util.Map;
  * 依据setting配置的层级自行判断转换逻辑
  */
 public class settingUtil {
+    private static final Logger logger = LoggerFactory.getLogger(BpmProcInstServiceImpl.class);
 
     //获取setting
-    public static HashMap<String, Object> getSetting() throws Exception{
+    public static HashMap<String, Object> getSetting(){
         HashMap<String, Object> map = new HashMap<>();
         try {
             String setting = ContextUtil.getSetting();
              map =(HashMap) jsonStringToMap(setting);
         }catch (Exception e){
-            throw new Exception("setting获取异常");
+            logger.warn("setting获取异常");
         }
         return map;
     }
     //获取培训方法
-    public static String getPx() throws Exception{
-        String version;
+    public static String getPx(){
+        String version = "";
         try {
             HashMap<String, Object> setting = getSetting();
             HashMap<String, Object> option = (HashMap)setting.get("pxSpectacularsOption");
             version = option.get("version").toString();
         }catch (Exception e){
-            throw new Exception("setting转换异常");
+            logger.warn("version转换异常或没有配置");
         }
         return version;
     }