Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/date_snapshot/service/SysDateSnapshotService.java

@@ -29,4 +29,6 @@ public interface SysDateSnapshotService extends CrudService<SysDateSnapshotEntit
      * @param type
      */
     void snapshotResourceAction(Integer type);
+
+    SysDateSnapshotDTO selectForFlag(Integer type);
 }

renren-admin/src/main/java/io/renren/modules/date_snapshot/service/impl/SysDateSnapshotServiceImpl.java

@@ -106,4 +106,9 @@ public class SysDateSnapshotServiceImpl extends CrudServiceImpl<SysDateSnapshotD
         sysDateSnapshotDTO.setSnapshot(snapshot);
         save(sysDateSnapshotDTO);
     }
+
+    @Override
+    public SysDateSnapshotDTO selectForFlag(Integer type) {
+        return null;
+    }
 }

renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java

@@ -1,5 +1,6 @@
 package io.renren.modules.fuse.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -104,12 +105,13 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
                     wrapper.eq(params.get("district") != null, "district", params.get("district"));
                     break;
                 case "areas": { // 区域
-                    List<String> areas = (List<String>) params.get("areas");
+                    logger.info("areas传参：{}", params.get("area").toString());
+                    List<String> areas = JSONArray.parseArray(params.get("area").toString()).toJavaList(String.class);
                     wrapper.in(!areas.isEmpty(), "area", areas);
                 }
                 break;
                 case "senses": {
-                    List<String> senses = (List<String>) params.get("senses");
+                    List<String> senses = JSONArray.parseArray(params.get("senses").toString()).toJavaList(String.class);
                     wrapper.in(!senses.isEmpty(), "application_area", senses);
                 }
                 break;

renren-admin/src/main/resources/mapper/date_snapshot/SysDateSnapshotDao.xml

@@ -12,4 +12,13 @@
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
     </resultMap>
 
+    <resultMap type="io.renren.modules.date_snapshot.dto.SysDateSnapshotDTO" id="sysDateSnapshotDtoMap">
+        <result property="id" column="id"/>
+        <result property="type" column="type"/>
+        <result property="creator" column="creator"/>
+        <result property="createDate" column="create_date"/>
+        <result property="snapshot" column="snapshot"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+    </resultMap>
+
 </mapper>