common

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/CommonStatus.java

@@ -0,0 +1,31 @@
+package com.fdkankan.common.constant;
+
+/**
+ * <p>
+        通用状态
+ * </p>
+ * @author dengsixing
+ * @date 2022/1/28
+ **/
+public enum CommonStatus {
+
+    NO((byte)0, "否"),
+    YES((byte)1, "是");
+
+    private Byte code;
+    private String message;
+
+    private CommonStatus(Byte code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Byte code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+
+}

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/ErrorCode.java

@@ -140,7 +140,8 @@ public enum ErrorCode {
 
     FAILURE_CODE_7001(7001, "激光场景状态同步失败，请重试！"),
     FAILURE_CODE_7002(7002, "大场景号不能为空"),
-    FAILURE_CODE_7003(7003, "文件类型不正确！"),
+    FAILURE_CODE_7003(7003, "文件业务类型不正确！"),
+    FAILURE_CODE_7004(7004, "热点数据不能为空！"),
 
 
 

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/FileBizType.java

@@ -7,7 +7,9 @@ public enum FileBizType {
 
     FLOOR_LOGO("floorLogo", "地板logo"),
     MUSIC("music", "背景音乐"),
-    FLOOR_PLAN("floorPlan", "户型图");
+    FLOOR_PLAN("floorPlan", "户型图"),
+    SCREENSHOT("screenshot", "初始画面")
+    ;
 
     private String code;
     private String message;

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/OperationType.java

@@ -0,0 +1,40 @@
+package com.fdkankan.common.constant;
+
+/**
+ * 操作类型枚举
+ */
+public enum OperationType {
+
+    DELETE(-1, "删除"),
+    UPDATE(0, "修改"),
+    ADD(1, "新增");
+
+    private Integer code;
+    private String message;
+
+    private OperationType(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+
+    public static OperationType get(Integer code){
+        OperationType[] values = OperationType.values();
+        Integer enumValue = null;
+        for(OperationType eachValue : values){
+            enumValue = eachValue.code();
+            if(enumValue.equals(code)){
+                return eachValue;
+            }
+        }
+        return null;
+    }
+
+}

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/StrExtUtil.java

@@ -8,9 +8,4 @@ public class StrExtUtil extends StrUtil {
         System.out.println("123");
     }
 
-    public static void main(String[] args) {
-        String test = "";
-        System.out.println(isBlank(test));
-    }
-
 }

4dkankan-utils-db/src/main/java/com/fdkankan/db/config/DruidConfiguration.java

@@ -81,7 +81,7 @@ public class DruidConfiguration {
         datasource.setPassword(password);
         datasource.setDriverClassName(driverClassName);
 
-        //configuration
+        //配置了初始化连接池大小，本地启动初始化连接时会很慢，服务器上启动并不慢
         datasource.setInitialSize(initialSize);
         datasource.setMinIdle(minIdle);
         datasource.setMaxActive(maxActive);

4dkankan-utils-redis/src/main/java/com/fdkankan/redis/constant/RedisKey.java

@@ -72,6 +72,11 @@ public class RedisKey {
      */
     public static final String SCENE_JSON = "scenejson:num:%s";
 
+    /**
+     * 场景热点hash列表
+     */
+    public static final String SCENE_HOT_DATA = "scene:hotdata:num:%s";
+
 
 
 

4dkankan-utils-redis/src/main/java/com/fdkankan/redis/util/RedisUtil.java

@@ -167,9 +167,25 @@ public class RedisUtil<K, V>{
      * @param key 键
      * @return 对应的多个键值
      */
-    public Map<Object, Object> hmget(String key) {
+    public Map<String, String> hmget(String key) {
         return redisTemplate.opsForHash().entries(key);
     }
+
+
+    /**
+     * <p>
+            查询指定key中匹配多项
+     * </p>
+     * @author dengsixing
+     * @date 2022/2/8
+     * @param key
+     * @param items
+     * @return java.util.List<java.lang.String>
+     **/
+    public List<String> hMultiGet(String key, List<String> items) {
+        return redisTemplate.opsForHash().multiGet(key, items);
+    }
+
     /**
      * HashSet
      *