Merge remote-tracking branch 'origin/dev_upgrade-1225' into dev_upgrade-1225

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/core/enums/AstDataSyncTopic.java → YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/AstDataSyncTopic.java

-package com.yeejoin.dataprocess.common.enums;
+package com.yeejoin.amos.fas.common.enums;
 
 /**
  * @ProjectName: YeeFireDataProcessRoot

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java

@@ -17,6 +17,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import com.yeejoin.amos.fas.business.util.DataSyncUtil;
+import com.yeejoin.amos.fas.common.enums.*;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,14 +57,6 @@ import com.yeejoin.amos.fas.business.vo.ExceptionRegionVo;
 import com.yeejoin.amos.fas.business.vo.SafetyIndexDetailVo;
 import com.yeejoin.amos.fas.business.vo.TodaySafetyIndexVo;
 import com.yeejoin.amos.fas.business.vo.View3dNodeVo;
-import com.yeejoin.amos.fas.common.enums.CheckStatusEnum;
-import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;
-import com.yeejoin.amos.fas.common.enums.PlanTaskDetailStatusEnum;
-import com.yeejoin.amos.fas.common.enums.ResourceTypeDefEnum;
-import com.yeejoin.amos.fas.common.enums.RiskSourceLevelEum;
-import com.yeejoin.amos.fas.common.enums.RiskSourceRegionEum;
-import com.yeejoin.amos.fas.common.enums.RpnChangeTypeEum;
-import com.yeejoin.amos.fas.common.enums.StatisticsErrorTypeEum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.DateUtil;
 import com.yeejoin.amos.fas.core.common.response.CoordDTO;
@@ -252,7 +245,7 @@ public class View3dServiceImpl implements IView3dService {
             if(ue4Rotation != null) riskSource.setUe4Rotation(pointBo.getUe4Rotation());
             if(position3d != null) riskSource.setPosition3d(position3d);
             iRiskSourceDao.save(riskSource);
-            dataSyncUtil.astDataSync(String.join("_", com.yeejoin.dataprocess.common.enums.AstDataSyncTopic.AST_REGION_SAVE.getValue(), String.valueOf(riskSource.getId())), JSON.toJSONString(riskSource));
+            dataSyncUtil.astDataSync(String.join("_", AstDataSyncTopic.AST_REGION_SAVE.getValue(), String.valueOf(riskSource.getId())), JSON.toJSONString(riskSource));
         }
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/RandomUtil.java

+package com.yeejoin.amos.fas.business.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class RandomUtil {
+    private static ThreadLocalRandom threadLocalRandom;
+
+    public static String buildOrderNo() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        String newDate = sdf.format(new Date());
+        String result = "";
+        Random random = new Random();
+        for (int i = 0; i < 3; i++) {
+            result += random.nextInt(10);
+        }
+        return newDate + result;
+    }
+
+    /**
+     * @param resourceType 资源类型
+     * @param companyCode  单位编号
+     * @Description Random存在性能问题可能造成线程阻塞问题，使
+     * 用性能更加卓越的threadLocalRandom（线程安全的单例模式）生成随机数
+     * 四位随机数无法保证不可重复性，如果对不可重复要求高，请使用其他工具
+     * @Author songLei
+     * @Return String
+     * @Date 2020/12/18 11:49
+     */
+    public static String buildNo(String resourceType, String companyCode) {
+        threadLocalRandom = ThreadLocalRandom.current();
+        int num = threadLocalRandom.nextInt(1000, 9999);
+        return resourceType + companyCode + num;
+    }
+
+    public static String buildNo() {
+        threadLocalRandom = ThreadLocalRandom.current();
+        int num = threadLocalRandom.nextInt(1000, 9999);
+        return String.valueOf(num);
+    }
+}