年平均周温度

src/main/java/com/chinaitop/depot/DatePermissionInterceptor.java

@@ -61,7 +61,8 @@ public class DatePermissionInterceptor implements Interceptor {
 		String bouString = boundSql.getSql();// 获取执行sql 
 		
 		//sql是查询的才进行权限过滤
-	    if(mappedStatement.getSqlCommandType().toString().equals("select".toUpperCase())) {
+	    if(mappedStatement.getSqlCommandType().toString().equals("select".toUpperCase())&&
+				!"com.chinaitop.depot.supervise.mapper.TestDatasMapper.selectByYear".equals(mappedStatement.getId())) {
 	    
 			//通过本地线程获取库id
 			Object threadLocalObj = DataPolicyEngine.get();

src/main/java/com/chinaitop/depot/supervise/controller/GrainConditionController.java

@@ -82,6 +82,22 @@ public class GrainConditionController {
     }
 
     /**
+     * 通过cfbh获取当年的三温数据
+     * @param orgId 库id
+     * @param barnNumber 仓房编号
+     * @return
+     */
+    @RequestMapping(value = "/getThreeConditionYear", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="当年的三温数据", notes = "通过cfbh获取当年的三温数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query"),
+            @ApiImplicitParam(name = "barnNumber", value = "仓房编号", paramType = "query")
+    })
+    public List<Map<String, Object>> getThreeConditionYear(Integer orgId,String barnNumber) {
+        return grainConditionService.getThreeConditionYear(orgId,barnNumber);
+    }
+
+    /**
      * 通过cfbh获取当天的三温数据，查询当天的列表数据，按时间排序--首页用到
      * @param orgId 库id
      * @param barnNumber 仓房编号
@@ -102,11 +118,11 @@ public class GrainConditionController {
     }
 
     /**
-     *根据仓房编号查询对应测温数据
+     *根据仓房id查询品种,性质
      * 传入仓id
      */
     @RequestMapping(value = "/getTempByHouseNo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
-    @ApiOperation(value="测温数据", notes = "根据仓房编号查询对应测温数据")
+    @ApiOperation(value="仓房数据", notes = "根据仓房编号查询品种,性质")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "houseNo", value = "仓房ID", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query"),

src/main/java/com/chinaitop/depot/supervise/mapper/TestDatasMapper.java

@@ -11,8 +11,6 @@ public interface TestDatasMapper {
 
     //根据仓房编号获取仓房温度数据
     Map<String,Object> getTempByHouseNo(Map<String,String> map);
-    Map<String,Object> getYGTempByHouseNo(Map<String,String> map);
-
     //获取仓温列表
     List<Map<String,Object>> getDataList(Map<String,String> map);
 
@@ -22,6 +20,7 @@ public interface TestDatasMapper {
     //获取指定仓房的三温
     List<Map<String,Object>> selectByDays(Map<String,Object> map);
     List<Map<String,Object>> selectYGByDays(Map<String,Object> map);
+    List<Map<String,Object>> selectByYear(Map<String,Object> map);
 
     //给pad端提供的三温图的接口
     List<Map<String,Object>> getThreeConditionForPad(Map<String,Object> map);

src/main/java/com/chinaitop/depot/supervise/mapper/TestDatasMapper.xml

@@ -3,98 +3,14 @@
 <mapper namespace="com.chinaitop.depot.supervise.mapper.TestDatasMapper">
     
     <select id="getTempByHouseNo" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT t2.id,
-               si.storehouse_name HouseNo,
-               si.storehouse_id   house,
-               t2.time            TestDate,
-               t2.inTemp _InT,
-                t2.outTemp OutT,
-                t2.inH InH,
-                t2.OutH OutH,
-                t2.avg AvgT,
-                t2.min MinT,
-                t2.max MaxT,
-                kcsw.pz sub_type,
-                kcsw.hwxz quality
-        FROM
-            basic_storehouse si
-            LEFT JOIN (
-            SELECT
-            id,
-            time,
-            inTemp,
-            outTemp,
-            inH,
-            OutH,
-            avg,
-            min,
-            max,
-            storehouse
-            FROM
-            t_testdata
-            WHERE
-            iLq_yq = 0
-            AND org_id = #{orgId,jdbcType=VARCHAR}
-            AND storehouse = #{houseCode,jdbcType=VARCHAR}
-            ORDER BY
-            time DESC
-            LIMIT 1
-            ) t2
-        ON t2.storehouse = si.storehouse_code
-            LEFT JOIN lsreport_ts.data_kcgl_kcsw_default kcsw ON si.storehouse_id = kcsw.ch
-        WHERE
-            si.org_id = #{orgId,jdbcType=VARCHAR}
-          AND si.storehouse_id = #{houseId,jdbcType=VARCHAR}
-    </select>
-
-    <select id="getYGTempByHouseNo" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT
-        t2.id,
-        tank.storageTank_name HouseNo,
-        tank.id house,
-        t2.time TestDate,
-        t2.inTemp _InT,
-        t2.outTemp OutT,
-        t2.inH InH,
-        t2.OutH OutH,
-        t2.avg AvgT,
-        t2.min MinT,
-        t2.max MaxT,
-        foodbasic.record_unite,
-        foodbasic.sub_type,
-        foodbasic.quality
+            pz sub_type,
+            hwxz quality
         FROM
-        (
-        SELECT
-        t.*
-        FROM
-        (
-        SELECT
-        *
-        FROM
-        t_testdata
-        WHERE iLq_yq = 0
-        <if test="orgId != null" >
-            AND org_id = #{orgId,jdbcType=VARCHAR}
-        </if>
-        ORDER BY time DESC
-        ) t
-        GROUP BY t.storehouse
-        ) t2
-        LEFT JOIN basic_tank tank ON t2.storehouse = tank.storageTank_code
-        <if test="orgId != null" >
-            AND tank.org_id = #{orgId,jdbcType=VARCHAR}
-        </if>
-        LEFT JOIN storage_foodbasicinfo foodbasic ON tank.id = foodbasic.house_id AND foodbasic.history_status = 0
-        <if test="orgId != null" >
-            AND foodbasic.org_id = #{orgId,jdbcType=VARCHAR}
-        </if>
-        WHERE t2.storehouse = tank.storageTank_code
-        <if test="houseId != null" >
-            AND tank.id=#{houseId,jdbcType=VARCHAR}
-        </if>
-        ORDER BY t2.storehouse
-        LIMIT 1
+            lsreport_ts.data_kcgl_kcsw_default
+        WHERE
+            UnitID = #{orgId,jdbcType=VARCHAR}
+          AND ch = #{houseId,jdbcType=VARCHAR}
     </select>
 
   <select id="getDataList" resultType="java.util.Map" parameterType="java.util.Map">
@@ -229,6 +145,22 @@
             DATE_FORMAT(t.time, '%Y-%m-%d');
   </select>
 
+  <select id="selectByYear" resultType="java.util.Map" parameterType="java.util.Map" >
+      SELECT
+          WEEKOFYEAR(time) djz,
+          cast(AVG(`avg`) as decimal(20,2)) lswd,
+          cast(AVG(`inTemp`) as decimal(20,2)) cnwd,
+          cast(AVG(`outTemp`) as decimal(20,2)) cwwd
+      FROM
+          t_testdata
+      WHERE
+              org_id = #{orgid,jdbcType=VARCHAR}
+          AND storehouse = #{houseCode,jdbcType=VARCHAR}
+          AND YEAR (time) = YEAR (CURDATE())
+      GROUP BY
+          WEEKOFYEAR(time)
+  </select>
+
     <select id="selectByHours" resultType="java.util.Map" parameterType="java.util.Map" >
         SELECT
             Max(DATE_FORMAT(t.time, '%Y-%m-%d')) check_date,

src/main/java/com/chinaitop/depot/supervise/service/GrainConditionService.java

@@ -10,6 +10,7 @@ public interface GrainConditionService {
     List<Map<String,Object>> getDataList(String houseNo, String orgId);
 
     List<Map<String,Object>> getThreeCondition(Map<String,Object> example);
+    List<Map<String,Object>> getThreeConditionYear(Integer orgId,String barnNumber);
 
     List<Map<String,Object>> getThreeConditionHomePage(Map<String,Object> example);
 

src/main/java/com/chinaitop/depot/supervise/service/impl/GrainConditionServiceImpl.java

@@ -1,7 +1,10 @@
 package com.chinaitop.depot.supervise.service.impl;
 
 
+import com.chinaitop.depot.supervise.mapper.TTestdataYearMapper;
 import com.chinaitop.depot.supervise.mapper.TestDatasMapper;
+import com.chinaitop.depot.supervise.model.TTestdataYear;
+import com.chinaitop.depot.supervise.model.TTestdataYearExample;
 import com.chinaitop.depot.supervise.service.GrainConditionService;
 import com.chinaitop.utils.ParameterUtil;
 import com.chinaitop.utils.activiti.StringUtils;
@@ -18,6 +21,8 @@ public class GrainConditionServiceImpl implements GrainConditionService {
 
     @Resource
     private TestDatasMapper testDatasMapper;
+    @Resource
+    private TTestdataYearMapper tTestdataYearMapper;
 
     /**
      * 获取最新仓房温度列表
@@ -35,7 +40,7 @@ public class GrainConditionServiceImpl implements GrainConditionService {
     }
 
     /**
-     * 根据仓房id查询对应仓房温度
+     * 根据仓房id查询品种,性质
      * @param houseId
      * @return
      */
@@ -45,11 +50,7 @@ public class GrainConditionServiceImpl implements GrainConditionService {
         map.put("houseId",houseId);
         map.put("orgId",orgId);
         map.put("houseCode",houseCode);
-        if(ParameterUtil.isnotnull(houseId) && ParameterUtil.isequal("YG",houseId.substring(0,2))){
-            return testDatasMapper.getYGTempByHouseNo(map);
-        }else{
-            return testDatasMapper.getTempByHouseNo(map);
-        }
+        return testDatasMapper.getTempByHouseNo(map);
     }
 
     /**
@@ -66,6 +67,45 @@ public class GrainConditionServiceImpl implements GrainConditionService {
         }
     }
 
+    @Override
+    public List<Map<String,Object>> getThreeConditionYear(Integer orgId,String barnNumber) {
+        List<Map<String, Object>> testYear = new ArrayList<Map<String,Object>>();
+        Map<String, Object> byMonth = new HashMap<String, Object>();//基础信息
+        TTestdataYearExample example = new TTestdataYearExample();
+        TTestdataYearExample.Criteria criteria = example.createCriteria();
+
+        //添加查询条件
+        byMonth.put("orgid", orgId);
+        criteria.andOrgIdEqualTo(orgId.toString());
+        byMonth.put("houseCode", barnNumber);
+        criteria.andStorehouseEqualTo(barnNumber);
+
+        //判断年粮情表是否有数据
+        //如果没有数据则重新查询并存储到年粮情表，以便下回使用
+        //有数据，并且数据和查询时间在同一周就直接用
+        //否则就，查询最新数据，并存储到年粮情表，以便下回使用
+        List<TTestdataYear> tTestdataYears = tTestdataYearMapper.selectByExample(example);
+        if (ParameterUtil.isequal(0, tTestdataYears.size())) {
+            testYear = testDatasMapper.selectByYear(byMonth);
+            TTestdataYear tTestdataYear = new TTestdataYear();
+            tTestdataYear.setOrgId(orgId.toString());
+            tTestdataYear.setStorehouse(barnNumber);
+            tTestdataYear.setQueryTime(new Date());
+            tTestdataYear.setTemperatureData(ParameterUtil.ListToString(testYear));
+
+            tTestdataYearMapper.insert(tTestdataYear);
+        } else if (ParameterUtil.isSameDate(tTestdataYears.get(0).getQueryTime(), new Date())) {
+            testYear = ParameterUtil.StringToList(tTestdataYears.get(0).getTemperatureData());
+        } else {
+            testYear = testDatasMapper.selectByYear(byMonth);
+            tTestdataYears.get(0).setQueryTime(new Date());
+            tTestdataYears.get(0).setTemperatureData(ParameterUtil.ListToString(testYear));
+            tTestdataYearMapper.updateByPrimaryKeySelective(tTestdataYears.get(0));
+        }
+
+        return testYear;
+    }
+
     /**
      * 根据仓房BH获取三温曲线图--首页用到
      * @param example

src/main/java/com/chinaitop/utils/ParameterUtil.java

@@ -4,39 +4,36 @@ import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
+import java.util.*;
 
 public class ParameterUtil {
 
-    public static String getSysDateTime(){
-        String temp_str="";
+    public static String getSysDateTime() {
+        String temp_str = "";
         Date dt = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        temp_str=sdf.format(dt);
-        System.out.println("获取当前时间"+temp_str);
+        temp_str = sdf.format(dt);
+        System.out.println("获取当前时间" + temp_str);
         return temp_str;
     }
-    
+
     public static String getDateYMDHMS(Date date) {
-    	String str = "";
+        String str = "";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-        str=sdf.format(date);
-        System.out.println("获取当前时间"+str);
+        str = sdf.format(date);
+        System.out.println("获取当前时间" + str);
         return str;
     }
-    
-    public static String getSysDate(){
-        String temp_str="";
+
+    public static String getSysDate() {
+        String temp_str = "";
         Date dt = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        temp_str=sdf.format(dt);
+        temp_str = sdf.format(dt);
         return temp_str;
     }
 
-    public static Date string2datetime(String dateTime){
+    public static Date string2datetime(String dateTime) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = null;
         try {
@@ -46,7 +43,8 @@ public class ParameterUtil {
         }
         return date;
     }
-    public static Date string2date(String dateTime){
+
+    public static Date string2date(String dateTime) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date = null;
         try {
@@ -57,20 +55,21 @@ public class ParameterUtil {
         return date;
     }
 
-    public static String date2string(Date date){
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-        String str=sdf.format(date);
+    public static String date2string(Date date) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String str = sdf.format(date);
         return str;
     }
 
     /**
      * 获取指定时间的时间戳
+     *
      * @param datatime
      * @return
      */
-    public static String getTimeStamp(String datatime){
+    public static String getTimeStamp(String datatime) {
         long timeStamp = 0;
-        SimpleDateFormat format =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             Date date = format.parse(datatime);
             timeStamp = date.getTime();
@@ -83,7 +82,7 @@ public class ParameterUtil {
     /*
      * 将时间戳转换为时间
      */
-    public static String stampToDate(String s){
+    public static String stampToDate(String s) {
         String res;
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         long lt = new Long(s);
@@ -92,34 +91,34 @@ public class ParameterUtil {
         return res;
     }
 
-//    public static void main(String[] args) {
+    //    public static void main(String[] args) {
 //        System.out.println(stampToDate("1504689208643"));
 //        System.out.println(getTimeStamp(getSysDateTime()));
 //    }
-    public static String getBHS(String BHS){
+    public static String getBHS(String BHS) {
         String[] str = BHS.split(",");
         StringBuffer sb = new StringBuffer();
-        for(int i=0;i<str.length;i++){
+        for (int i = 0; i < str.length; i++) {
             sb.append("'").append(str[i]).append("'").append(",");
         }
-        String s=sb.toString();
-        String t=s.substring(0,s.length()-1);
+        String s = sb.toString();
+        String t = s.substring(0, s.length() - 1);
         return t;
     }
 
     //判断字段值是为空 不为空返回ture
-    public static boolean isnotnull(Object name){
-        return (null!=name&&!"".equals(name) && !"null".equals(name) && "null" != name);
+    public static boolean isnotnull(Object name) {
+        return (null != name && !"".equals(name) && !"null".equals(name) && "null" != name);
     }
-    
+
     //判断字段值是为空,为空返回ture
-    public static boolean isnull(Object name){
-        return (null==name || "".equals(name) || "null".equals(name) || "null" == name);
+    public static boolean isnull(Object name) {
+        return (null == name || "".equals(name) || "null".equals(name) || "null" == name);
     }
 
     //判断字段值是相等  相等返回ture
-    public static boolean isequal(Object name,Object value){
-        if(name==value||name.equals(value)){
+    public static boolean isequal(Object name, Object value) {
+        if (name == value || name.equals(value)) {
             return true;
         }
         return false;
@@ -127,14 +126,15 @@ public class ParameterUtil {
 
     /**
      * 判断list和str数组是否全等
+     *
      * @param list
      * @param str
      * @return
      */
-    public static boolean isAllequal(List<String> list,String[] str){
+    public static boolean isAllequal(List<String> list, String[] str) {
         boolean isbz = true;
-        for(int z=0;z<str.length;z++){
-            if(!isequal(list.get(z),str[z])){
+        for (int z = 0; z < str.length; z++) {
+            if (!isequal(list.get(z), str[z])) {
                 isbz = false;
                 break;
             }
@@ -143,9 +143,9 @@ public class ParameterUtil {
     }
 
     //判断字段值是否在某个集合里  在返回ture
-    public static boolean isallequal(Object name,String[] value){
-        for(int i=0;i<value.length;i++){
-            if(name==value[i]||name.equals(value[i])){
+    public static boolean isallequal(Object name, String[] value) {
+        for (int i = 0; i < value.length; i++) {
+            if (name == value[i] || name.equals(value[i])) {
                 return true;
             }
         }
@@ -154,6 +154,7 @@ public class ParameterUtil {
 
     /**
      * 从properties得到路径
+     *
      * @param filePath
      * @return
      */
@@ -168,15 +169,14 @@ public class ParameterUtil {
         return props;
     }
 
-    public static String dellOneDay(String time)
-    {
+    public static String dellOneDay(String time) {
         String add = null;
         try {
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             java.util.Date timeNow = df.parse(time);
-            Calendar begin=Calendar.getInstance();
+            Calendar begin = Calendar.getInstance();
             begin.setTime(timeNow);
-            begin.add(Calendar.DAY_OF_MONTH,-1);
+            begin.add(Calendar.DAY_OF_MONTH, -1);
             add = df.format(begin.getTime());
         } catch (Exception e) {
             e.printStackTrace();
@@ -184,4 +184,158 @@ public class ParameterUtil {
         return add;
     }
 
+    //判断两个时间是否是同一周
+    public static boolean isSameDate(Date d1, Date d2) {
+        Calendar cal1 = Calendar.getInstance();
+        Calendar cal2 = Calendar.getInstance();
+        cal1.setTime(d1);
+        cal2.setTime(d2);
+        int subYear = cal1.get(Calendar.YEAR) - cal2.get(Calendar.YEAR);
+        //subYear==0,说明是同一年
+        if (subYear == 0) {
+            if (cal1.get(Calendar.WEEK_OF_YEAR) == cal2.get(Calendar.WEEK_OF_YEAR))
+                return true;
+        }
+        //例子:cal1是"2005-1-1"，cal2是"2004-12-25"
+        //java对"2004-12-25"处理成第52周
+        // "2004-12-26"它处理成了第1周，和"2005-1-1"相同了
+        //大家可以查一下自己的日历
+        //处理的比较好
+        //说明:java的一月用"0"标识，那么12月用"11"
+        else if (subYear == 1 && cal2.get(Calendar.MONTH) == 11) {
+            if (cal1.get(Calendar.WEEK_OF_YEAR) == cal2.get(Calendar.WEEK_OF_YEAR))
+                return true;
+        }
+        //例子:cal1是"2004-12-31"，cal2是"2005-1-1"
+        else if (subYear == -1 && cal1.get(Calendar.MONTH) == 11) {
+            if (cal1.get(Calendar.WEEK_OF_YEAR) == cal2.get(Calendar.WEEK_OF_YEAR))
+                return true;
+        }
+        return false;
+    }
+
+    /**
+     * List转换String
+     *
+     * @param list :需要转换的List
+     * @return String转换后的字符串
+     */
+    public static String ListToString(List<?> list) {
+        StringBuffer sb = new StringBuffer();
+        if (list != null && list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                if (list.get(i) == null || list.get(i) == "") {
+                    continue;
+                }
+                // 如果值是list类型则调用自己
+                if (list.get(i) instanceof List) {
+                    sb.append(ListToString((List<?>) list.get(i)));
+                    sb.append(",");
+                } else if (list.get(i) instanceof Map) {
+                    sb.append(MapToString((Map<?, ?>) list.get(i)));
+                    sb.append(",");
+                } else {
+                    sb.append(list.get(i));
+                    sb.append(",");
+                }
+            }
+        }
+        return "L" + sb.toString();
+    }
+
+    /**
+     * Map转换String
+     *
+     * @param map :需要转换的Map
+     * @return String转换后的字符串
+     */
+    public static String MapToString(Map<?, ?> map) {
+        StringBuffer sb = new StringBuffer();
+        // 遍历map
+        for (Object obj : map.keySet()) {
+            if (obj == null) {
+                continue;
+            }
+            Object key = obj;
+            Object value = map.get(key);
+            if (value instanceof List<?>) {
+                sb.append(key.toString() + "," + ListToString((List<?>) value));
+                sb.append("|");
+            } else if (value instanceof Map<?, ?>) {
+                sb.append(key.toString() + "," + MapToString((Map<?, ?>) value));
+                sb.append("|");
+            } else {
+                sb.append(key.toString() + "=" + value.toString());
+                sb.append("|");
+            }
+        }
+        return "M" + sb.toString();
+    }
+
+    /**
+     * String转换List
+     *
+     * @param listText
+     *            :需要转换的文本
+     * @return List<?>
+     */
+    public static List<Map<String,Object>> StringToList(String listText) {
+        if (listText == null || listText.equals("")) {
+            return null;
+        }
+        listText = listText.substring(1);
+
+        List<Map<String,Object>> list = new ArrayList<Map<String,Object>>();
+        String[] text = listText.split("\\" + ",");
+        String listStr = "";
+        boolean flag = false;
+        for (String str : text) {
+            if (!str.equals("")) {
+                if (str.charAt(0) == 'M') {
+                    Map<String,Object> map = StringToMap(str);
+                    list.add(map);
+                } else if (str.charAt(0) == 'L' || flag) {
+                    flag = true;
+                    listStr += str + ",";
+                }
+            }
+        }
+        return list;
+    }
+
+    /**
+     * String转换Map
+     *
+     * @param mapText
+     *            :需要转换的字符串
+     * @return Map<?,?>
+     */
+    public static Map<String, Object> StringToMap(String mapText) {
+
+        if (mapText == null || mapText.equals("")) {
+            return null;
+        }
+        mapText = mapText.substring(1);
+
+        Map<String, Object> map = new HashMap<String, Object>();
+        String[] text = mapText.split("\\" + "|"); // 转换为数组
+        for (String str : text) {
+            String[] keyText = str.split("="); // 转换key与value的数组
+            if (keyText.length < 1) {
+                continue;
+            }
+            String key = keyText[0]; // key
+            String value = keyText[1]; // value
+            if (value.charAt(0) == 'M') {
+                Map<?, ?> map1 = StringToMap(value);
+                map.put(key, map1);
+            } else if (value.charAt(0) == 'L') {
+                List<?> list = StringToList(value);
+                map.put(key, list);
+            } else {
+                map.put(key, value);
+            }
+        }
+        return map;
+    }
 }