Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-11-07 5e1cfd9032785dbe6438c830acad294d346f2734

 server/services/src/main/java/com/doumee/core/constants/Constants.java

@@ -1,5 +1,6 @@
package com.doumee.core.constants;

import ch.qos.logback.core.util.COWArrayList;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.StringUtils;

@@ -33,8 +34,12 @@
    public static final String PROJECTS = "PROJECTS";
    public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
    public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
    //车辆类型数据
    public static final String  BIKE_TYPE ="0,1,2,3,4,5,6,7,8" ;
    public static String REDIS_DEBUG_STR="test_";
    public static final String AD = "AD";
    public static String REPAIR = "REPAIR";

    public  interface MqttTopic{

        String topic_index = "device/lock/";
@@ -44,6 +49,9 @@
        String sub_lockInfo = "device/lock/+/+/info";
        //还车锁头（订阅）
        String sub_closeLock = "device/lock/+/+/bike";
        String sub_health= "device/lock/+/health";

        String sub_brokers = "$SYS/brokers/+/clients/#";
        //实时获取锁信息（发布）
        String pub_getLockInfo = "device/lock/{siteId}/{lockId}/getInfo";
    }
@@ -58,11 +66,12 @@
        int partful = 3;
  }
    public interface LockStatus{
      //  //状态，0闭合, 1打开，2运行中, 3异常
      //  //状态，0闭合, 1打开，2运行中, 3异常 -1自检
        int closed =0;
        int open =1;
        int running =2;
        int error= 3;
        int checking= -1;
    }
    public interface goodsorderStatus{
        int waitPay =0;
@@ -165,6 +174,8 @@
        public static final String RENT_DEPOSIT = "RENT_DEPOSIT";
        //温馨提示
        public static final String TIPS = "TIPS";
        //温馨提示
        public static final String RENT_NOTICE = "RENT_NOTICE";
        //小程序停止服务提示
        public static final String STOP_SERVE_TIPS = "STOP_SERVE_TIPS";
        //小程序是否停止服务 0否 1是
@@ -202,6 +213,14 @@
            }
            return num;
        }
        public static Integer formatIntegerFromStr(String num) {
            try {
                return  Integer.parseInt(num);
            }catch (Exception e){

            }
            return null;
        }

        public interface UserActionsType {
            String cancelPrePay = "CANCEL_PRE_PAY";