add

src/main/java/com/zfire/jiasm/syncdata/common/OldForNewUploadLogic.java

@@ -562,7 +562,7 @@ public class OldForNewUploadLogic {
 		WebsitSH websitSH;
 		// hxjddido 为空时说明为平台自建的鉴定数据 自生成
 		if (StringUtils.isEmpty(jdd.getHxjddid())){
-			jdd.setHxjddid(UUID.randomUUID().toString());
+			jdd.setHxjddid(publicService.getUUID());
 		}
 		// greeid为同步成来自于于格力总部
 		bean.setId(jdd.getGreeId());
@@ -612,7 +612,7 @@ public class OldForNewUploadLogic {
 		Boolean flag = Boolean.FALSE;
 		// 来自报文请求后的id,
 		if (StringUtils.isEmpty(jdd.getGreeId())){
-			jdd.setGreeId(UUID.randomUUID().toString());
+			jdd.setGreeId(publicService.getUUID());
 			flag=Boolean.TRUE;
 		}
 		bean.setId(jdd.getGreeId());
@@ -628,7 +628,7 @@ public class OldForNewUploadLogic {
 			if (StringUtils.isEmpty(jdd.getGreeFjguid())) {
 				String uuid = "";
 				for (int i = 0; i < imgs.length; i++) {
-					uuid = uuid + UUID.randomUUID().toString() + "#";
+					uuid = uuid + publicService.getUUID() + "#";
 				}
 				// 来自于报文请求后的id
 				jdd.setGreeFjguid(uuid.substring(0, uuid.length() - 1));
@@ -753,7 +753,7 @@ public class OldForNewUploadLogic {
 							if (jddsMap.containsKey(reject.getPgguid())){
 								reject.setDownloadTaskNo(jddsMap.get(reject.getPgguid()).get(0).getDownloadTaskNo());
 							} else {
-								reject.setDownloadTaskNo(UUID.randomUUID().toString());
+								reject.setDownloadTaskNo(publicService.getUUID());
 								reject.setFlag(1);
 							}
 						}
@@ -928,7 +928,7 @@ public class OldForNewUploadLogic {
 			WorderInfo worderInfo = publicService.getWorkerInfo(order.getWorkerId(),
 					websitSH.getWdId(), order.getGroupCompanyId());
 
-			String taskNo = java.util.UUID.randomUUID().toString();
+			String taskNo = publicService.getUUID();
 			// 生成内机条码上传数据
 			if(StringUtils.isNotEmpty(yjhxJdd.getNjtm())) {
 				getItfTblRecycleStockBarcodeInfoUploadNjtm(tradeNewForOldStockBarcodeInfoUploadList, yjhxJdd, order, product, websitSH, worderInfo, taskNo);

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsit.java

@@ -8,6 +8,7 @@ import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.plus.entity.Brand;
 import com.zfire.jiasm.syncdata.plus.service.BrandService;
 import com.zfire.jiasm.syncdata.service.GLPPGFWebsitService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
 import com.zfire.jiasm.syncdata.utils.JSONResult;
 import com.zfire.jiasm.syncdata.utils.TokenCenter;
@@ -43,6 +44,8 @@ public class GLPPGFWebsit {
     GLPPGFWebsitService glppgfWebsitService;
     @Resource
     BrandService brandService;
+    @Resource
+    private PublicService publicService;
 
 
 
@@ -66,7 +69,7 @@ public class GLPPGFWebsit {
         req.add(InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode());
         req.add(InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode());
         req.add(InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode());
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
 
         log.info("开始下载网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
 

src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusinessApiT.java

@@ -0,0 +1,177 @@
+package com.zfire.jiasm.syncdata.download.order;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
+import com.zfire.jiasm.syncdata.constant.SynStatusEnum;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
+import com.zfire.jiasm.syncdata.plus.entity.*;
+import com.zfire.jiasm.syncdata.plus.service.ItfTblAzAssignLcLsDownloadService;
+import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
+import com.zfire.jiasm.syncdata.plus.service.SysDictRefService;
+import com.zfire.jiasm.syncdata.service.AddInstallBusiness;
+import com.zfire.jiasm.syncdata.service.JiasmApi;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/** 接口方式生成工单
+ * 格力品牌安装工单下载后落本地数据表
+ *    落业务表 - 修改下载主表处理结果
+ */
+@Slf4j
+@Component
+public class InstallBusinessApiT {
+    @Value("${installinc}")
+    private String installinc = "";
+
+    @Autowired
+    JiasmApi jiasmApi;
+    @Autowired
+    OrderBaseService orderBaseService;
+    @Resource
+    ItfTblAzAssignLcLsDownloadService itfTblAzAssignLcLsDownloadService;
+    @Resource
+    BaseService baseService;
+    @Resource
+    AddInstallBusiness addInstallBusiness;
+    @Resource
+    SysDictRefService sysDictRefService;
+
+    // 3：工单落入本地表
+    @Scheduled(fixedDelayString = "${installin}")
+    public void inputOrderInstall() {
+        if (installinc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<ItfTblAzAssignLcLsDownload> lcls = new ArrayList<>();
+        List<String> lclslist = new ArrayList<>();
+        List<OrderBase> orderBasesRecs = new ArrayList<>();
+        List<String> orderBaselist = new ArrayList<>();
+        Map<String, List<SysDictRef>> sysDictRefDLMap = new HashMap<>();
+        Map<String, List<SysDictRef>> sysDictRefXLMap = new HashMap<>();
+        Map<String, List<SysDictRef>> sysDictRefXiLieMap = new HashMap<>();
+
+        // 提取品牌信息
+        Brand brand = baseService.getBrand();
+        if (brand == null) {
+            return;
+        }
+        // 提取品牌商对应的大类信息
+        sysDictRefDLMap = getStringListMap(brand);
+        // 提取品牌商对应的小类信息
+        sysDictRefXLMap = getListMap(brand);
+        // 提取品牌商对应的系列信息
+        sysDictRefXiLieMap = getMap(brand);
+
+        // 提取待落本地表的数据
+        lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignLcLsDownload::getSynStatus, SynStatusEnum.UN_SYN.getCode())
+                .ge(ItfTblAzAssignLcLsDownload::getSynTimes, 2)
+                // .eq(ItfTblAzAssignLcLsDownload::getSynReqId,10601L)// 测试使用
+                .orderByAsc(ItfTblAzAssignLcLsDownload::getSynReqId)
+                .list();
+
+        if (lcls.size()<1){
+            log.info("暂无待处理的安装工单: \uF0B7{}",sdf.format(new Date()));
+            return;
+        }
+
+        log.info("安装工单落本地表开始处理: \uF0B7{}",sdf.format(new Date()));
+
+        lclslist = lcls.stream().map(ItfTblAzAssignLcLsDownload::getPgguid).collect(Collectors.toList());
+        // 提取已有的订单数据
+        orderBasesRecs = orderBaseService.lambdaQuery()
+                .select(OrderBase::getPgguid)
+                .in(OrderBase::getPgguid,lclslist).list();
+        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgguid).collect(Collectors.toList());
+
+        // 按任务号download_task_no，按单来处理
+        for (ItfTblAzAssignLcLsDownload item: lcls) {
+            try{
+                if (orderBaselist.contains(item.getPgguid())){
+                    // 修改 TL_SynDataFrom_tbl_az_assign_lc_ls_batch
+                    addInstallBusiness.updateOrderApi(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item,Boolean.FALSE);
+                } else {
+                    // 新增 TL_SynDataFrom_tbl_az_assign_lc_ls_batch
+                    if (addInstallBusiness.addOrderApi(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, brand, item,Boolean.TRUE)){
+                        orderBaselist.add(item.getPgguid());
+                    }
+                }
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                log.info("安装工单创建失败 销售单号-派工单号：【" + item.getXsdh() + "-"+ item.getPgid()+"】");
+                String msg = "接口生成安装工单失败： ";
+                if (ex.getMessage()!=null){
+                    msg = msg + ex.getMessage();
+                }
+                item.setSynErrMsg(msg);
+                if (msg.length()>1020){
+                    item.setSynErrMsg(msg.substring(0,1020));
+                }
+                item.setSynTime(new Date());
+                item.setSynTimes(item.getSynTimes()+1);
+                itfTblAzAssignLcLsDownloadService.updateById(item);
+            }
+        }
+
+        log.info("安装工单落本地表完成: \uF0B7{}",sdf.format(new Date()));
+    }
+
+
+    private Map<String, List<SysDictRef>> getListMap(Brand brand) {
+        List<SysDictRef> sysDictxlRef;
+        Map<String, List<SysDictRef>> sysDictRefXLMap;
+        sysDictxlRef =  sysDictRefService.lambdaQuery()
+                .select(SysDictRef::getDictCode,SysDictRef::getDictValue,SysDictRef::getRefDictCode)
+                .eq(SysDictRef::getBrandId, brand.getBrandId())
+                .eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_SMALL_TYPE.getCode())
+                .list();
+        sysDictRefXLMap = sysDictxlRef.stream().
+                collect(Collectors.groupingBy(SysDictRef::getRefDictCode));
+        return sysDictRefXLMap;
+    }
+
+    private Map<String, List<SysDictRef>> getStringListMap(Brand brand) {
+        List<SysDictRef> sysDictRef;
+        Map<String, List<SysDictRef>> sysDictRefDLMap;
+        sysDictRef =  sysDictRefService.lambdaQuery()
+                .select(SysDictRef::getDictCode,SysDictRef::getDictValue,SysDictRef::getRefDictCode)
+                .eq(SysDictRef::getBrandId, brand.getBrandId())
+                .eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
+                .list();
+        sysDictRefDLMap = sysDictRef.stream().
+                collect(Collectors.groupingBy(SysDictRef::getRefDictCode));
+        return sysDictRefDLMap;
+    }
+
+    private void downInformation(ItfTblAzAssignLcLsDownload item) {
+        ItfGreeToFaDownloadTaskList tl = new ItfGreeToFaDownloadTaskList();
+        tl.setDownloadTaskNo(IdWorker.getIdStr());
+        tl.setDownloadKeyValue(item.getPgguid());
+        tl.setDownloadTaskType(2206);
+        tl.setDownloadStatus(0);
+        tl.insert();
+    }
+    private Map<String, List<SysDictRef>> getMap(Brand brand) {
+        List<SysDictRef> sysDictxilieRef;
+        Map<String, List<SysDictRef>> sysDictRefXiLieMap;
+        sysDictxilieRef =  sysDictRefService.lambdaQuery()
+                .select(SysDictRef::getDictCode,SysDictRef::getDictValue,SysDictRef::getRefDictCode)
+                .eq(SysDictRef::getBrandId, brand.getBrandId())
+                .eq(SysDictRef::getDictType, DictTypeEnum.DICT_TYPE_SERIES.getCode())
+                .list();
+        sysDictRefXiLieMap = sysDictxilieRef.stream().
+                collect(Collectors.groupingBy(SysDictRef::getRefDictCode));
+        return sysDictRefXiLieMap;
+    }
+}

src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusinessApiT.java

@@ -0,0 +1,137 @@
+package com.zfire.jiasm.syncdata.download.order;
+
+import com.zfire.jiasm.syncdata.base.BaseService;
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
+import com.zfire.jiasm.syncdata.plus.entity.Brand;
+import com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignDownload;
+import com.zfire.jiasm.syncdata.plus.entity.OrderBase;
+import com.zfire.jiasm.syncdata.plus.entity.SysDictRef;
+import com.zfire.jiasm.syncdata.plus.service.ItfTblAssignDownloadService;
+import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
+import com.zfire.jiasm.syncdata.service.AddRepairBusinessService;
+import com.zfire.jiasm.syncdata.service.PublicService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/** 接口方式生成工单
+ * 格力品牌维修工单下载后落本地数据表
+ *    落业务表 - 修改下载主表处理结果
+ */
+@Slf4j
+@Component
+public class RepairBusinessApiT {
+    @Value("${repairinc}")
+    private String repairinc = "";
+
+
+    @Resource
+    ItfTblAssignDownloadService itfTblAssignDownloadService;
+    @Resource
+    BaseService baseService;
+    @Resource
+    OrderBaseService orderBaseService;
+    @Resource
+    PublicService publicService;
+    @Resource
+    AddRepairBusinessService addRepairBusinessService;
+
+
+    // 1：工单落入本地表 TL_SynDataFrom_tbl_assign_batch
+    @Scheduled(fixedDelayString = "${repairin}")
+    public void inputOrder() {
+        if (repairinc.equals(TaskConfigEnum.FALSE.getCode())){
+            return;
+        }
+
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<ItfTblAssignDownload> repairRec = new ArrayList<>();
+        List<Long> pgids = new ArrayList<>();
+        List<OrderBase> orderBasesRecs = new ArrayList<>();
+        List<String> orderBaselist = new ArrayList<>();
+
+        // 提取品牌信息
+        Brand brand = baseService.getBrand();
+        if (brand == null) {
+            return;
+        }
+
+        // 提取品牌商对应的大类信息
+        Map<String, List<SysDictRef>> sysDictRefDLMap = publicService.getStringListMap(brand);
+        // 提取品牌商对应的小类信息
+        Map<String, List<SysDictRef>> sysDictRefXLMap = publicService.getListMap(brand);
+        // 提取品牌商对应的系列信息
+        Map<String, List<SysDictRef>> sysDictRefXiLieMap = publicService.getMap(brand);
+
+        // 提取品牌商对应的需求大类信息
+        Map<String, List<SysDictRef>> sysDictRefDLMapXq = publicService.getStringListMapXq(brand);
+        // 提取品牌商对应的需求小类信息
+        Map<String, List<SysDictRef>> sysDictRefXLMapXq = publicService.getListMapXq(brand);
+
+        // 提取待落本地表的数据
+        repairRec = itfTblAssignDownloadService.lambdaQuery()
+                .eq(ItfTblAssignDownload::getSynStatus, 0)
+                // .eq(ItfTblAssignDownload::getSynReqId, 1359)// 测试使用
+                .ge(ItfTblAssignDownload::getSynTimes, 2)
+                .orderByAsc(ItfTblAssignDownload::getSynReqId)
+                .list();
+
+        if (repairRec.size()<1){
+            log.info("暂无待处理的维修工单: \uF0B7{}",sdf.format(new Date()));
+            return;
+        }
+
+        pgids = repairRec.stream().map(ItfTblAssignDownload::getPgid).collect(Collectors.toList());
+
+        // 提取已有的订单数据
+        orderBasesRecs = orderBaseService.lambdaQuery()
+                .select(OrderBase::getPgid)
+                .in(OrderBase::getPgid,pgids).list();
+        orderBaselist = orderBasesRecs.stream().map(OrderBase::getPgid).collect(Collectors.toList());
+
+        log.info("维修工单落本地表开始处理: \uF0B7{}",sdf.format(new Date()));
+
+        // 按任务号download_task_no，按单来处理
+        for (ItfTblAssignDownload item: repairRec){
+            try{
+                if (orderBaselist.contains(String.valueOf(item.getPgid()))){
+                    // 修改
+                    addRepairBusinessService.updateRepairOrderApi(brand, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, item,
+                            sysDictRefDLMapXq, sysDictRefXLMapXq,Boolean.FALSE);
+                } else {
+                    // 新增 TL_SynDataFrom_tbl_assign_batch
+                    if (addRepairBusinessService.addRapairOrderApi(brand, item, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap,
+                            sysDictRefDLMapXq, sysDictRefXLMapXq,Boolean.TRUE)){
+                        orderBaselist.add(String.valueOf(item.getPgid()));
+                    }
+                }
+            }catch (Exception ex) {
+                ex.printStackTrace();
+                log.info("维修工单创建失败 销售单号-派工单号：【" + item.getXsdh() + "-"+ item.getPgid()+"】");
+                String msg = "接口生成维修工单失败： ";
+                if (ex.getMessage()!=null){
+                    msg = msg + ex.getMessage();
+                }
+                item.setSynErrMsg(msg);
+                if (msg.length()>1020){
+                    item.setSynErrMsg(msg.substring(0,1020));
+                }
+                item.setSynTime(new Date());
+                item.setSynTimes(item.getSynTimes()+1);
+                itfTblAssignDownloadService.updateById(item);
+            }
+        }
+        log.info("维修工单落本地表处理完成: \uF0B7{}",sdf.format(new Date()));
+    }
+
+}

src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAcquisitionLogic.java

@@ -286,7 +286,7 @@ public class RecycleAcquisitionLogic {
 					.eq(OrderRecycleUploadEvent::getSynStatus, Constant.SynStatus.UN_SYN.getCode())
 					.eq(OrderRecycleUploadEvent::getTableName, Constant.RecycleOrderType.RECYCLE_ASSIGN_ANNEX).list();
 
-			String batchNo = java.util.UUID.randomUUID().toString();
+			String batchNo = publicService.getUUID();
 			final Map<String, List<OrderRecycleUploadEvent>> collectionEventMap = collectionEventList.stream().collect(Collectors.groupingBy(OrderRecycleUploadEvent::getId));
 			final Map<String, List<OrderRecycleUploadEvent>> annexEventMap = (null == annexEventList || annexEventList.isEmpty()) ? null : annexEventList.stream().collect(Collectors.groupingBy(OrderRecycleUploadEvent::getId));
 			LinkedHashSet<String> collectionIds = new LinkedHashSet<>();
@@ -392,7 +392,7 @@ public class RecycleAcquisitionLogic {
 
 						bean.setTblHsptJjcjVO(feedbackUploadBean);
 						bean.setBatchNo(batchNo);
-						bean.setTaskNo(java.util.UUID.randomUUID().toString());
+						bean.setTaskNo(publicService.getUUID());
                         // 附件
 						List<RecycleHsptJjcjFjUploadBean> tblHsptJjcjFjVO = new ArrayList<>();
 						//条码

src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAssignLogic.java

@@ -109,7 +109,7 @@ public class RecycleAssignLogic {
 
 			if(!pguuidLhs.isEmpty()) {
 				// 每次请求使用相同的批次号
-				String batchNo = UUID.randomUUID().toString();
+				String batchNo = publicService.getUUID();
 
 				// 下载记录表中查看是否存在与本次下载相同的工单 0及99的
 				// 这里的99 为与总部进行确认失败的工单
@@ -214,7 +214,7 @@ public class RecycleAssignLogic {
 			newTaskEntities.forEach(o->{
 				// 下载记录表 单独的任务号，相同的批次号
 				ItfTblRecycleAssignBatchDownloadRec rec = o.getRec();
-				rec.setDownloadTaskNo(UUID.randomUUID().toString());
+				rec.setDownloadTaskNo(publicService.getUUID());
 				rec.setDownloadBatchNo(batchNo);
 				rec.setSynReqTime(new Date());
 				rec.setCreatedDate(new Date());
@@ -1050,7 +1050,7 @@ public class RecycleAssignLogic {
 					// 提取对应的回收工单主表数据
 					List<OrderRecycleAssign> orderRecycleAssignList = orderRecycleAssignService.lambdaQuery()
 							.in(OrderRecycleAssign::getId, orderIds).list();
-					String batchNo = java.util.UUID.randomUUID().toString();
+					String batchNo = publicService.getUUID();
 					// 逐条处理反馈明细表数据同步
 					feedbackList.stream().forEach(feedback->{
 						try {
@@ -1063,7 +1063,7 @@ public class RecycleAssignLogic {
 							// 组装请求参数
 							RecycleAssignFeedbackUploadBean feedbackUploadBean = mapper.readValue(mapper.writeValueAsString(feedback), RecycleAssignFeedbackUploadBean.class);
 							feedbackUploadBean.setBatchNo(batchNo);
-							feedbackUploadBean.setTaskNo(java.util.UUID.randomUUID().toString());
+							feedbackUploadBean.setTaskNo(publicService.getUUID());
 							feedbackUploadBean.setStat(orderRecycleAssignList.stream().filter(orderRecycleAssign->orderRecycleAssign.getId().intValue() == feedback.getOrderId().intValue()).collect(Collectors.toList()).get(0).getStat());
 							feedbackUploadBean.setPgid(orderRecycleAssignList.stream().filter(orderRecycleAssign->orderRecycleAssign.getId().intValue() == feedback.getOrderId().intValue()).collect(Collectors.toList()).get(0).getPgid());
 
@@ -1105,7 +1105,7 @@ public class RecycleAssignLogic {
 				feedbackUpload.setCreatedDate(new Date());
 				feedbackUpload.setLastModifiedDate(new Date());
 				feedbackUpload.setUploadBatchNo(feedbackUploadBean.getBatchNo());
-				feedbackUpload.setUploadTaskNo(UUID.randomUUID().toString());
+				feedbackUpload.setUploadTaskNo(publicService.getUUID());
 				feedbackUpload.setPgguid(feedbackUploadBean.getPgguid());
 				//回收工单请求
 				GreeResponseHelper response = greeLogic.greePost(apiPath, map, 1);

src/main/java/com/zfire/jiasm/syncdata/service/PublicService.java

@@ -147,6 +147,7 @@ public interface PublicService {
     // 网点信息还原，
     void revertFun(OrderBase order,ItfTblAzAssignLcLsDownload lcls);
     void revertRepairFun(OrderBase order,ItfTblAssignDownload lcls);
+    String getUUID();
 
 
 

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddInstallBusinessImpl.java

@@ -1121,7 +1121,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
                                         Map<String, List<SysDictRef>> sysDictRefXiLieMap,
                                         OrderBase newLCLS, ItfTblAzAssignMxDownload mx) {
         OrderProduct op = new OrderProduct();
-        op.setId(UUID.randomUUID().toString());
+        op.setId(publicService.getUUID());
         op.setOrderBaseId(newLCLS.getId());
         // pgmxid主键
         op.setPgmxid(mx.getPgmxid());
@@ -2396,7 +2396,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         if (s.getPjly().equals("3") || s.getPjnr().indexOf("不满意")>=0 || getCppjly(s)){
             if (StringUtils.isNotEmpty(s.getHfwdno()) && !s.getHfwdno().equals("99999999") && StringUtils.isNotEmpty(websitFWS.getWdlxdh())){
                 FaGreeSms fs=new FaGreeSms();
-                fs.setSynTaskNo(UUID.randomUUID().toString());
+                fs.setSynTaskNo(publicService.getUUID());
                 fs.setWorkerOrderNo(order.getId());
                 fs.setAzorwx(2);
                 fs.setFjid(String.valueOf(s.getPgguid()));
@@ -2639,7 +2639,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
                                  Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
                                  Map<String, List<SysDictRef>> sysDictRefXiLieMap, ItfTblAzAssignMxDownload mx) {
         OrderProduct op = new OrderProduct();
-        op.setId(UUID.randomUUID().toString());
+        op.setId(publicService.getUUID());
         op.setOrderBaseId(orderBase.getId());
         // pgmxid主键
         op.setPgmxid(mx.getPgmxid());
@@ -2696,7 +2696,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
     @NotNull
     private OrderInstallDetail getOrderInstallDetail(OrderBase orderBase, List<OrderInstallDetail> oids,
                                                      int outid, OrderProduct op, ItfTblAzAssignMxDownload mx) {
-        String pgwcmxid = UUID.randomUUID().toString();
+        String pgwcmxid = publicService.getUUID();
         OrderInstallDetail add = new OrderInstallDetail();
         add.setId(IdWorker.getIdStr());
         add.setWebsitId(orderBase.getWebsitId());
@@ -2748,7 +2748,7 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         a.setFjguid(IdWorker.getIdStr());
         a.setOrderBaseId(orderBase.getId());
         a.setOrderDetailId(add.getId());
-        a.setPgwcmxid(UUID.randomUUID().toString());
+        a.setPgwcmxid(publicService.getUUID());
         a.setFileName(室外机固定);
         a.setFileType(fileType);
         a.setCreateTime(new Date());

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddRepairBusinessServiceImpl.java

@@ -1743,7 +1743,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         if (s.getPjly().equals("3") || s.getPjnr().indexOf("不满意")>=0 || getCppjly(s)){
             if (StringUtils.isNotEmpty(s.getHfwdno()) && !s.getHfwdno().equals("99999999") && StringUtils.isNotEmpty(websitFWS.getWdlxdh())){
                 FaGreeSms fs=new FaGreeSms();
-                fs.setSynTaskNo(UUID.randomUUID().toString());
+                fs.setSynTaskNo(publicService.getUUID());
                 fs.setWorkerOrderNo(order.getId());
                 fs.setAzorwx(2);
                 fs.setFjid(String.valueOf(s.getPgid()));

src/main/java/com/zfire/jiasm/syncdata/service/impl/BaseDownServiceImpl.java

@@ -56,8 +56,6 @@ public class BaseDownServiceImpl implements BaseDownService {
     @Resource
     GLPPGFWebsitWorkerService glppgfWebsitWorkerService;
     @Resource
-    GLPPGuZhandDaiMaService glppGuZhandDaiMaService;
-    @Resource
     GLPPLeiBieService glppLeiBieService;
     @Resource
     GLPPXSLXDownloadService glppxslxDownloadService;
@@ -73,6 +71,8 @@ public class BaseDownServiceImpl implements BaseDownService {
     ProvinceService provinceService;
     @Resource
     BaseService baseService;
+    @Resource
+    private PublicService publicService;
 
 
 
@@ -461,7 +461,7 @@ public class BaseDownServiceImpl implements BaseDownService {
         req.add(InterFaceTypeEnum.GZXS_WEBSIT_CODE.getCode());
         req.add(InterFaceTypeEnum.FSSH_WEBSIT_CODE.getCode());
         req.add(InterFaceTypeEnum.GSSH_WEBSIT_CODE.getCode());
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
 
         log.info("开始下载网点基础资料信息: \uF0B7{}",sdf.format(new Date()));
 

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitServiceImpl.java

@@ -10,6 +10,7 @@ import com.zfire.jiasm.syncdata.constant.InterFaceTypeEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.service.GLPPGFWebsitService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
@@ -29,13 +30,13 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
     @Resource
     ItfTblXinWangdianDownloadService itfTblXinWangdianDownloadService;
     @Resource
-    BrandService brandService;
-    @Resource
     BrandWebsitService brandWebsitService;
     @Resource
     SysDictService sysDictService;
     @Resource
     BelongcompanyService belongcompanyService;
+    @Resource
+    private PublicService publicService;
 
 
 
@@ -150,8 +151,8 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
         if (oldWebsitRec == null) {
             BrandWebsit v = new BrandWebsit();
 
-            v.setId(UUID.randomUUID().toString());
-            v.setBrandPkId(UUID.randomUUID().toString());
+            v.setId(publicService.getUUID());
+            v.setBrandPkId(publicService.getUUID());
             v.setBelongCompanyId(0);
             v.setBelongCompany(s);
             v.setType(xsWebsitType.getCode());
@@ -739,7 +740,7 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
             v.setBelongCompany(item.getSsxsgs());
         }
 
-        v.setId(UUID.randomUUID().toString());
+        v.setId(publicService.getUUID());
         // 格力商户的网主键id
         v.setBrandPkId(item.getPkGuid());
         v.setSysWebsitNumber(item.getXtwdbh());

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitWorkerServiceImpl.java

@@ -1099,7 +1099,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
 
 
     private void extractedAddOrUpdate(JSONArray jsonArray) {
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
         List<ItfTblWangdianWxgDownload> add = new ArrayList<>();
         List<ItfTblWangdianWxgDownload> update = new ArrayList<>();
         List<Long> oldRecWxgId = new ArrayList<>();

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGuZhandDaiMaServiceImpl.java

@@ -10,6 +10,7 @@ import com.zfire.jiasm.syncdata.plus.service.ItfTblAssignGzdmDowloadService;
 import com.zfire.jiasm.syncdata.plus.service.RepairBugService;
 import com.zfire.jiasm.syncdata.plus.service.SysDictService;
 import com.zfire.jiasm.syncdata.service.GLPPGuZhandDaiMaService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
@@ -30,6 +31,8 @@ public class GLPPGuZhandDaiMaServiceImpl implements GLPPGuZhandDaiMaService {
     SysDictService sysDictService;
     @Resource
     RepairBugService repairBugService;
+    @Resource
+    private PublicService publicService;
 
 
     @Override
@@ -63,7 +66,7 @@ public class GLPPGuZhandDaiMaServiceImpl implements GLPPGuZhandDaiMaService {
     private void addRepairBugCheck(Brand brandRec, List<RepairBug> addRepairBug, Map<String, List<SysDict>> xlMap,
                                    Map<String, List<SysDict>> dlMap, ItfTblAssignGzdmDowload item) {
         RepairBug v = new RepairBug();
-        v.setBugId(UUID.randomUUID().toString());
+        v.setBugId(publicService.getUUID());
         v.setGzid(String.valueOf(item.getGzid()));
         v.setBrandId(brandRec.getBrandId());
         v.setBrandName(brandRec.getBrand());
@@ -100,7 +103,7 @@ public class GLPPGuZhandDaiMaServiceImpl implements GLPPGuZhandDaiMaService {
 
     private void addRepairBugFun(Brand brandRec, List<RepairBug> addRepairBug, ItfTblAssignGzdmDowload item) {
         RepairBug v = new RepairBug();
-        v.setBugId(UUID.randomUUID().toString());
+        v.setBugId(publicService.getUUID());
         v.setGzid(String.valueOf(item.getGzid()));
         v.setBrandId(brandRec.getBrandId());
         v.setBrandName(brandRec.getBrand());
@@ -125,7 +128,7 @@ public class GLPPGuZhandDaiMaServiceImpl implements GLPPGuZhandDaiMaService {
     private Boolean addRepairBugCheckt(@NotNull Brand brandRec, List<RepairBug> addRepairBug, Map<String, List<SysDict>> xlMap,
                                        Map<String, List<SysDict>> dlMap, ItfTblAssignGzdmDowload item) {
         RepairBug v = new RepairBug();
-        v.setBugId(UUID.randomUUID().toString());
+        v.setBugId(publicService.getUUID());
         v.setGzid(String.valueOf(item.getGzid()));
         v.setBrandId(brandRec.getBrandId());
         v.setBrandName(brandRec.getBrand());
@@ -181,7 +184,7 @@ public class GLPPGuZhandDaiMaServiceImpl implements GLPPGuZhandDaiMaService {
     private Boolean addRepairBugCheckd(Brand brandRec, List<RepairBug> addRepairBug, ItfTblAssignGzdmDowload item,
                                        Map<String, List<SysDict>> dlNameMap) {
         RepairBug v = new RepairBug();
-        v.setBugId(UUID.randomUUID().toString());
+        v.setBugId(publicService.getUUID());
         v.setGzid(String.valueOf(item.getGzid()));
         v.setBrandId(brandRec.getBrandId());
         v.setBrandName(brandRec.getBrand());
@@ -304,7 +307,7 @@ public class GLPPGuZhandDaiMaServiceImpl implements GLPPGuZhandDaiMaService {
     }
 
     private void extractedGZDMAddOrUpdate(JSONArray jsonArray, List<ItfTblAssignGzdmDowload> addRec, List<ItfTblAssignGzdmDowload> updateRec) {
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
 
         for (int i = 0; i < jsonArray.size(); i++) {
             JSONObject aData = jsonArray.getJSONObject(i);

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPLeiBieServiceImpl.java

@@ -11,6 +11,7 @@ import com.zfire.jiasm.syncdata.constant.ServiceCategoryEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.service.GLPPLeiBieService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +40,8 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
     ProductService productService;
     @Resource
     BaseService baseService;
+    @Resource
+    private PublicService publicService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -53,7 +56,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
             return;
         }
 
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
 
         // 数据同步落到同步信息表
         extractedDaleiAddOrUpdate(addRec, updateRec,jsonArray, synTaskNo);
@@ -80,7 +83,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
             return;
         }
 
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
 
         // 数据同步落到同步信息表
         extractedGLXLAddOrUpdate(addRec, updateRec, jsonArray, synTaskNo);
@@ -107,7 +110,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
             return;
         }
 
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
 
         // 数据同步落到同步信息表
         extractedPPXLAddOrUpdate(addRec, updateRec, jsonArray, synTaskNo);
@@ -135,7 +138,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
             return;
         }
 
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
 
         // 数据同步落到同步信息表
         extractedJXAddOrUpdate(addAllRec, addRec, updateRec, jsonArray, synTaskNo);
@@ -1064,7 +1067,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
 
     private void addSysDictRef(Brand brandRec, List<SysDictRef> addSysDictRef, ItfTblSplbXilieDownload item) {
         SysDictRef v = new SysDictRef();
-        v.setId(UUID.randomUUID().toString());
+        v.setId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_SERIES.getCode());
         v.setDictCode(String.valueOf(item.getXiid()));
         v.setDictValue(item.getXimc());
@@ -1162,7 +1165,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
 
     private void addSysDict(List<SysDict> addSysDict, ItfTblSplbXilieDownload item) {
         SysDict v = new SysDict();
-        v.setSysDictId(UUID.randomUUID().toString());
+        v.setSysDictId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_SERIES.getCode());
         v.setDictCode(String.valueOf(item.getXiid()));
         v.setDictValue(item.getXimc());
@@ -1410,7 +1413,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
 
     private void addxlSysdRef(Brand brandRec, List<SysDictRef> addSysDictRef, ItfTblSplbXiaoleiDownload item) {
         SysDictRef v = new SysDictRef();
-        v.setId(UUID.randomUUID().toString());
+        v.setId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_SMALL_TYPE.getCode());
         v.setDictCode(String.valueOf(item.getXlid()));
         v.setDictValue(item.getXlmc());
@@ -1454,7 +1457,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
 
     private void addXiaoLei(List<SysDict> addSysDict, ItfTblSplbXiaoleiDownload item) {
         SysDict v = new SysDict();
-        v.setSysDictId(UUID.randomUUID().toString());
+        v.setSysDictId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_SMALL_TYPE.getCode());
         v.setDictCode(String.valueOf(item.getXlid()));
         v.setDictValue(item.getXlmc());
@@ -1658,7 +1661,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
 
     private void addDalei(List<SysDict> addSysDict, ItfTblSplbDaleiDownload item) {
         SysDict v = new SysDict();
-        v.setSysDictId(UUID.randomUUID().toString());
+        v.setSysDictId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode());
         v.setDictCode(String.valueOf(item.getSpid()));
         v.setDictValue(item.getSpmc());
@@ -1843,7 +1846,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
 
     private void addLeibie(Brand brandRec, List<SysDictRef> addSysDictRef, ItfTblSplbDaleiDownload item) {
         SysDictRef v = new SysDictRef();
-        v.setId(UUID.randomUUID().toString());
+        v.setId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode());
         v.setDictCode(String.valueOf(item.getSpid()));
         v.setDictValue(item.getSpmc());

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryAddServiceImpl.java

@@ -868,7 +868,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
     private void addWorkerStreet(WangdianWxgVos wvos, String brandId, List<WorkerStreet> ws, String sfzen) {
         WorkerStreet n = new WorkerStreet();
-        n.setId(UUID.randomUUID().toString());
+        n.setId(publicService.getUUID());
         n.setProvinceId("");
         n.setCityId("");
         n.setAreaId("");
@@ -1190,7 +1190,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     }
 
     private void setAdd(WangdianWxgVos wvos, String workerId, String workerName, ZJInfo zj, WorkerCert add) throws ParseException {
-        add.setId(UUID.randomUUID().toString());
+        add.setId(publicService.getUUID());
         add.setWorkerId(workerId);
         add.setCertName(zj.getZjmc().trim());
         add.setName(workerName);
@@ -1546,7 +1546,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     private void addNewWorkerCert(WangdianWxgVos wvos, List<WorkerCert> addList, String workerId, String workerName,
                                   List<String> workerIdandNames, ZJInfo zj) throws ParseException {
         WorkerCert add = new WorkerCert();
-        add.setId(UUID.randomUUID().toString());
+        add.setId(publicService.getUUID());
         add.setWorkerId(workerId);
         add.setCertName(zj.getZjmc().trim());
         add.setName(workerName);

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryUpdateServiceImpl.java

@@ -404,7 +404,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
 
     private void getAdd(List<WorkerCert> addList, String workerId, String zjmc,String xingb,  ZJInfo zj) throws Exception {
         WorkerCert add = new WorkerCert();
-        add.setId(UUID.randomUUID().toString());
+        add.setId(publicService.getUUID());
         add.setWorkerId(workerId);
         add.setCertName(zjmc);
 

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPXSLXDownloadServiceImpl.java

@@ -9,6 +9,7 @@ import com.zfire.jiasm.syncdata.plus.entity.SysDict;
 import com.zfire.jiasm.syncdata.plus.service.ItfTblAzAssignXslxDowloadService;
 import com.zfire.jiasm.syncdata.plus.service.SysDictService;
 import com.zfire.jiasm.syncdata.service.GLPPXSLXDownloadService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,8 @@ public class GLPPXSLXDownloadServiceImpl implements GLPPXSLXDownloadService {
     SysDictService sysDictService;
     @Resource
     ItfTblAzAssignXslxDowloadService itfTblAzAssignXslxDowloadService;
+    @Resource
+    private PublicService publicService;
 
 
 
@@ -133,7 +136,7 @@ public class GLPPXSLXDownloadServiceImpl implements GLPPXSLXDownloadService {
 
     private void addXslx(List<SysDict> addSysDict, ItfTblAzAssignXslxDowload item) {
         SysDict v = new SysDict();
-        v.setSysDictId(UUID.randomUUID().toString());
+        v.setSysDictId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_SALE_TYPE.getCode());
         v.setDictCode(String.valueOf(item.getXslxid()));
         v.setDictValue(item.getXslxmc());
@@ -151,7 +154,7 @@ public class GLPPXSLXDownloadServiceImpl implements GLPPXSLXDownloadService {
 
     private void extractedXSLXAddOrUpdate(JSONArray jsonArray, List<ItfTblAzAssignXslxDowload> addRec, List<ItfTblAzAssignXslxDowload> updateRec) {
         Boolean flag = Boolean.FALSE;
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
         // 提取现有的数据信息
         List<ItfTblAzAssignXslxDowload> oldRec =  itfTblAzAssignXslxDowloadService.lambdaQuery().list();
         List<Long> oldRecXslxId = oldRec.stream().map(ItfTblAzAssignXslxDowload::getXslxid).collect(Collectors.toList());

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPXuQiuLeiBieServiceImpl.java

@@ -10,6 +10,7 @@ import com.zfire.jiasm.syncdata.plus.service.ItfTblAssignXxlbDowloadService;
 import com.zfire.jiasm.syncdata.plus.service.SysDictRefService;
 import com.zfire.jiasm.syncdata.plus.service.SysDictService;
 import com.zfire.jiasm.syncdata.service.GLPPXuQiuLeiBieService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +30,8 @@ public class GLPPXuQiuLeiBieServiceImpl implements GLPPXuQiuLeiBieService {
     SysDictRefService sysDictRefService;
     @Resource
     ItfTblAssignXqxlDowloadService itfTblAssignXqxlDowloadService;
+    @Resource
+    private PublicService publicService;
 
 
 
@@ -148,7 +151,7 @@ public class GLPPXuQiuLeiBieServiceImpl implements GLPPXuQiuLeiBieService {
 
     private void addXqxlRef(Brand brandRec, List<SysDictRef> addSysDictRef, ItfTblAssignXqxlDowload item) {
         SysDictRef v = new SysDictRef();
-        v.setId(UUID.randomUUID().toString());
+        v.setId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_DEMAND_SMALL_TYPE.getCode());
         v.setDictCode(item.getId());
         v.setDictValue(item.getLbmc());
@@ -246,7 +249,7 @@ public class GLPPXuQiuLeiBieServiceImpl implements GLPPXuQiuLeiBieService {
 
     private void addXqxl(List<SysDict> addSysDict, ItfTblAssignXqxlDowload item) {
         SysDict v = new SysDict();
-        v.setSysDictId(UUID.randomUUID().toString());
+        v.setSysDictId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_DEMAND_SMALL_TYPE.getCode());
         v.setDictCode(item.getId());
         v.setDictValue(item.getLbmc());
@@ -266,7 +269,7 @@ public class GLPPXuQiuLeiBieServiceImpl implements GLPPXuQiuLeiBieService {
 
     private void extractedXQXLAddOrUpdate(JSONArray jsonArray, List<ItfTblAssignXqxlDowload> addRec, List<ItfTblAssignXqxlDowload> updateRec) {
         Boolean flag = Boolean.FALSE;
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
         // 提取现有的数据信息
         List<ItfTblAssignXqxlDowload> oldRec =  itfTblAssignXqxlDowloadService.lambdaQuery().list();
         List<String> oldRecId = oldRec.stream().map(ItfTblAssignXqxlDowload::getId).collect(Collectors.toList());
@@ -432,7 +435,7 @@ public class GLPPXuQiuLeiBieServiceImpl implements GLPPXuQiuLeiBieService {
 
     private void addXxlbRef(Brand brandRec, List<SysDictRef> addSysDictRef, ItfTblAssignXxlbDowload item) {
         SysDictRef v = new SysDictRef();
-        v.setId(UUID.randomUUID().toString());
+        v.setId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_DEMAND_TYPE.getCode());
         v.setDictCode(String.valueOf(item.getLbid()));
         v.setDictValue(item.getLbmc());
@@ -523,7 +526,7 @@ public class GLPPXuQiuLeiBieServiceImpl implements GLPPXuQiuLeiBieService {
 
     private void addXxlb(List<SysDict> addSysDict, ItfTblAssignXxlbDowload item) {
         SysDict v = new SysDict();
-        v.setSysDictId(UUID.randomUUID().toString());
+        v.setSysDictId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_DEMAND_TYPE.getCode());
         v.setDictCode(String.valueOf(item.getLbid()));
         v.setDictValue(item.getLbmc());
@@ -541,7 +544,7 @@ public class GLPPXuQiuLeiBieServiceImpl implements GLPPXuQiuLeiBieService {
 
     private void extractedXQLBAddOrUpdate(JSONArray jsonArray, List<ItfTblAssignXxlbDowload> addRec, List<ItfTblAssignXxlbDowload> updateRec) {
         Boolean flag = Boolean.FALSE;
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
         // 提取现有的数据信息
         List<ItfTblAssignXxlbDowload> oldRec =  itfTblAssignXxlbDowloadService.lambdaQuery().list();
         List<Long> oldRecLbId = oldRec.stream().map(ItfTblAssignXxlbDowload::getLbid).collect(Collectors.toList());

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPYHSXXXQDServiceImpl.java

@@ -7,6 +7,7 @@ import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.service.GLPPYHSXXXQDService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +30,8 @@ public class GLPPYHSXXXQDServiceImpl implements GLPPYHSXXXQDService {
     ItfTblAssignXxlyDowloadService itfTblAssignXxlyDowloadService;
     @Resource
     ItfTblYhsxViprankDowloadService itfTblYhsxViprankDowloadService;
+    @Resource
+    private PublicService publicService;
 
 
 
@@ -166,7 +169,7 @@ public class GLPPYHSXXXQDServiceImpl implements GLPPYHSXXXQDService {
 
     private void addYhsxWip(List<SysDict> addSysDict, ItfTblYhsxViprankDowload item) {
         SysDict v = new SysDict();
-        v.setSysDictId(UUID.randomUUID().toString());
+        v.setSysDictId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_USER_LEVEL.getCode());
         v.setDictCode(String.valueOf(item.getVipid()));
         v.setDictValue(item.getVipmc());
@@ -181,7 +184,7 @@ public class GLPPYHSXXXQDServiceImpl implements GLPPYHSXXXQDService {
 
     private void extractedYHDJAddOrUpdate(JSONArray jsonArray, List<ItfTblYhsxViprankDowload> addRec, List<ItfTblYhsxViprankDowload> updateRec) {
         Boolean flag = Boolean.FALSE;
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
         // 提取现有的数据信息
         List<ItfTblYhsxViprankDowload> oldRec =  itfTblYhsxViprankDowloadService.lambdaQuery().list();
         List<Long> oldRecVipId = oldRec.stream().map(ItfTblYhsxViprankDowload::getVipid).collect(Collectors.toList());
@@ -323,7 +326,7 @@ public class GLPPYHSXXXQDServiceImpl implements GLPPYHSXXXQDService {
 
     private void addXxly(List<SysDict> addSysDict, ItfTblAssignXxlyDowload item) {
         SysDict v = new SysDict();
-        v.setSysDictId(UUID.randomUUID().toString());
+        v.setSysDictId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_XXQD_SOURCE.getCode());
         v.setDictCode(String.valueOf(item.getLyid()));
         v.setDictValue(item.getLymc());
@@ -341,7 +344,7 @@ public class GLPPYHSXXXQDServiceImpl implements GLPPYHSXXXQDService {
 
     private void extractedXXLYAddOrUpdate(JSONArray jsonArray, List<ItfTblAssignXxlyDowload> addRec, List<ItfTblAssignXxlyDowload> updateRec) {
         Boolean flag = Boolean.FALSE;
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
         // 提取现有的数据信息
         List<ItfTblAssignXxlyDowload> oldRec =  itfTblAssignXxlyDowloadService.lambdaQuery().list();
         List<Long> oldRecQdId = oldRec.stream().map(ItfTblAssignXxlyDowload::getLyid).collect(Collectors.toList());
@@ -503,7 +506,7 @@ public class GLPPYHSXXXQDServiceImpl implements GLPPYHSXXXQDService {
 
     private void addXxqd(List<SysDict> addSysDict, ItfTblAssignXxqdDowload item) {
         SysDict v = new SysDict();
-        v.setSysDictId(UUID.randomUUID().toString());
+        v.setSysDictId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_XXQD_CHANNEL.getCode());
         v.setDictCode(String.valueOf(item.getQdid()));
         v.setDictValue(item.getQdmc());
@@ -521,7 +524,7 @@ public class GLPPYHSXXXQDServiceImpl implements GLPPYHSXXXQDService {
 
     private void extractedXXQDAddOrUpdate(JSONArray jsonArray, List<ItfTblAssignXxqdDowload> addRec, List<ItfTblAssignXxqdDowload> updateRec) {
         Boolean flag = Boolean.FALSE;
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
         // 提取现有的数据信息
         List<ItfTblAssignXxqdDowload> oldRec =  itfTblAssignXxqdDowloadService.lambdaQuery().list();
         List<Long> oldRecQdId = oldRec.stream().map(ItfTblAssignXxqdDowload::getQdid).collect(Collectors.toList());
@@ -684,7 +687,7 @@ public class GLPPYHSXXXQDServiceImpl implements GLPPYHSXXXQDService {
 
     private void addYhsxWx(List<SysDict> addSysDict, ItfTblAssignYhsxWxDowload item) {
         SysDict v = new SysDict();
-        v.setSysDictId(UUID.randomUUID().toString());
+        v.setSysDictId(publicService.getUUID());
         v.setDictType(DictTypeEnum.DICT_TYPE_USER_ATTR.getCode());
         v.setDictCode(String.valueOf(item.getYhsxid()));
         v.setDictValue(item.getYhsxmc());
@@ -702,7 +705,7 @@ public class GLPPYHSXXXQDServiceImpl implements GLPPYHSXXXQDService {
 
     private void extractedYHSXAddOrUpdate(JSONArray jsonArray, List<ItfTblAssignYhsxWxDowload> addRec, List<ItfTblAssignYhsxWxDowload> updateRec) {
         Boolean flag = Boolean.FALSE;
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
         // 提取现有的数据信息
         List<ItfTblAssignYhsxWxDowload> oldRec =  itfTblAssignYhsxWxDowloadService.lambdaQuery().list();
         List<Long> oldRecYhsxId = oldRec.stream().map(ItfTblAssignYhsxWxDowload::getYhsxid).collect(Collectors.toList());

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceDataUploadServiceImpl.java

@@ -340,7 +340,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                 if (StringUtils.isEmpty(ite.getOutId())){
                     OrderInformation n = new OrderInformation();
                     n.setId(ite.getId());
-                    n.setOutId(UUID.randomUUID().toString());
+                    n.setOutId(publicService.getUUID());
                     upList.add(n);
                 }
             }
@@ -386,7 +386,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
     private void upPgmix(OutJiasmToGreeUploadTaskList ojtutl, OrderProduct op) {
         OrderPar orderPar = new OrderPar();
         orderPar.setOrderNo(ojtutl.getOrderNo());
-        orderPar.setPgid(UUID.randomUUID().toString());
+        orderPar.setPgid(publicService.getUUID());
         orderPar.setId(op.getId());
         getOrderProductMapper.upPgmxid(orderPar);
         op.setPgmxid(orderPar.getPgid());
@@ -471,7 +471,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
         if (orderBase !=null  && orderBase.getUploadFlag()){
             // 修改fikd
             OperatingLog request = new OperatingLog();
-            request.setFkid(UUID.randomUUID().toString());
+            request.setFkid(publicService.getUUID());
             request.setId(ojtutl.getId());
             operatingLogOrderInstallMapper.upLogfkid(request);
 

src/main/java/com/zfire/jiasm/syncdata/service/impl/MasterDownloadServiceImpl.java

@@ -13,6 +13,7 @@ import com.zfire.jiasm.syncdata.data.Token;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.service.MasterDownloadService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.utils.DataUtil;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
 import com.zfire.jiasm.syncdata.utils.JSONResult;
@@ -61,6 +62,8 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 	ItfGreeToFaSynTaskListService itfGreeToFaSynTaskListService;
 	@Resource
 	BaseService baseService;
+	@Resource
+	private PublicService publicService;
 
 
 	/**
@@ -70,7 +73,7 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 	@Transactional(rollbackFor = Exception.class)
 	public void batchDownload(Token token, String[] arySrcTabName,String[] aryDestTabName,
 							  String belongCompany, int reqId, Integer downloadTaskType) throws Exception {
-		String synTaskNo = UUID.randomUUID().toString();
+		String synTaskNo = publicService.getUUID();
 		for (int i = 0; i < arySrcTabName.length; i++) {
 			String srcTabName = arySrcTabName[i].trim();
 			String serviceName = DataUtil.fromDbName2ServiceName(srcTabName);
@@ -559,7 +562,7 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 				}
 			}
 			RepairBugApp v = new RepairBugApp();
-			v.setBugId(UUID.randomUUID().toString());
+			v.setBugId(publicService.getUUID());
 			v.setBrandId(brandRec.getBrandId());
 			v.setBrandName(brandRec.getBrand());
 			v.setMainName(item.getCpdl());
@@ -639,7 +642,7 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 			}
 
 			RepairBugApp v = new RepairBugApp();
-			v.setBugId(UUID.randomUUID().toString());
+			v.setBugId(publicService.getUUID());
 			v.setBrandId(brandRec.getBrandId());
 			v.setBrandName(brandRec.getBrand());
 			v.setMainId(item.getCpdl());
@@ -691,7 +694,7 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 		}
 
 		RepairBugApp v = new RepairBugApp();
-		v.setBugId(UUID.randomUUID().toString());
+		v.setBugId(publicService.getUUID());
 		v.setBrandId(brandRec.getBrandId());
 		v.setParentId("0");
 		v.setBrandName(brandRec.getBrand());
@@ -738,7 +741,7 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 		}
 
 		RepairBugApp v = new RepairBugApp();
-		v.setBugId(UUID.randomUUID().toString());
+		v.setBugId(publicService.getUUID());
 		v.setBrandId(brandRec.getBrandId());
 		v.setParentId("0");
 		v.setBrandName(brandRec.getBrand());
@@ -777,7 +780,7 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 					.eq(RepairBugApp::getBugObj,item.getSort()).list();
 			if (CollectionUtils.isEmpty(rb)){
 				RepairBugApp o = new RepairBugApp();
-				o.setBugId(UUID.randomUUID().toString());
+				o.setBugId(publicService.getUUID());
 				o.setGzid(String.valueOf(item.getId()));
 				o.setBrandId(brandRec.getBrandId());
 				o.setBrandName(brandRec.getBrand());
@@ -818,7 +821,7 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 					.eq(RepairBugApp::getBugObj,item.getDescription()).list();
 			if (CollectionUtils.isEmpty(rbs)){
 				RepairBugApp v = new RepairBugApp();
-				v.setBugId(UUID.randomUUID().toString());
+				v.setBugId(publicService.getUUID());
 				v.setGzid(String.valueOf(item.getId()));
 				v.setBrandId(brandRec.getBrandId());
 				v.setBrandName(brandRec.getBrand());
@@ -904,7 +907,7 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 				continue;
 			}
 			RepairBugApp v = new RepairBugApp();
-			v.setBugId(UUID.randomUUID().toString());
+			v.setBugId(publicService.getUUID());
 			v.setGzid(String.valueOf(item.getId()));
 			v.setBrandId(brandRec.getBrandId());
 			v.setBrandName(brandRec.getBrand());

src/main/java/com/zfire/jiasm/syncdata/service/impl/OrderBaseInstallCjOrWgServiceImpl.java

@@ -244,7 +244,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 不存在生成新的
             if (detailFiles == null){
                 addFile.setId(IdWorker.getIdStr());
-                addFile.setFjguid(UUID.randomUUID().toString());
+                addFile.setFjguid(publicService.getUUID());
                 addFile.setOrderBaseId(ojtutl.getId());
                 addFile.setOrderDetailId(iods.getId());
                 addFile.setFileName("特殊环境安装确认书");
@@ -355,7 +355,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                     websitSH = publicService.ptshwdToshshwd(addms.getFjwd(), orderBase.getMainId());
                     addms.setFjwd(websitSH.getWdId());
 
-                    String id = UUID.randomUUID().toString();
+                    String id = publicService.getUUID();
                     if (id.length()>32){
                         addms.setSynTaskNo(id.substring(0,32));
                     } else {
@@ -363,7 +363,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                     }
                     addms.setFsma(publicService.getfsma(addms.getSjid()));
                     addms.setFsnr("尊敬的用户：请对本次服务评价：满意回复1；一般回复2；不满意回复3。并注明原因！关注官微“格力售后服务”，为您提供更优质服务！");
-                    addms.setDxguid(UUID.randomUUID().toString());
+                    addms.setDxguid(publicService.getUUID());
                     return publicService.addItfMessagehuifangentity(addms,orderBase.getOrderType(),6);
                 }
             } else if ((orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
@@ -378,7 +378,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                     if (addms==null){
                         return Boolean.TRUE;
                     }
-                    String id = UUID.randomUUID().toString();
+                    String id = publicService.getUUID();
                     if (id.length()>32){
                         addms.setSynTaskNo(id.substring(0,32));
                     } else {
@@ -847,7 +847,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 upf.setPgwcmxid(detailone.getPgwcmxid());
                 // 修改附件的fjguid
                 if (StringUtils.isEmpty(file.getFjguid())){
-                    upf.setFjguid(UUID.randomUUID().toString());
+                    upf.setFjguid(publicService.getUUID());
                 }
                 orderDetailFileService.updateById(upf);
             }
@@ -909,7 +909,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             for (OrderInstallDetailCode code:oidcs){
                 if (StringUtils.isEmpty(code.getPgguid()) || StringUtils.isEmpty(code.getTmguid())){
                     code.setPgguid(orderBase.getPgguid());
-                    code.setTmguid(UUID.randomUUID().toString());
+                    code.setTmguid(publicService.getUUID());
                     oidcsUp.add(code);
                 }
             }
@@ -1993,7 +1993,7 @@ log.info("测试信息a   id={} ",ojtutl.getSynReqId());
                 n.setOutId(outId);
                 // 修改首次提交时间
                 n.setFirstTime(new Date());
-                n.setPgwcmxid(UUID.randomUUID().toString());
+                n.setPgwcmxid(publicService.getUUID());
                 upList.add(n);
             }
             // 修改序

src/main/java/com/zfire/jiasm/syncdata/service/impl/OrderDownloadGDServiceImpl.java

@@ -9,6 +9,7 @@ import com.zfire.jiasm.syncdata.plus.service.ItfGreeToFaInstallSynRuleService;
 import com.zfire.jiasm.syncdata.plus.service.ItfGreeToFaRepairSynRuleService;
 import com.zfire.jiasm.syncdata.pojo.bo.DownRepairOrderGD;
 import com.zfire.jiasm.syncdata.service.OrderDownloadGDService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.utils.DataUtil;
 import com.zfire.jiasm.syncdata.utils.HttpUtil;
 import com.zfire.jiasm.syncdata.utils.TokenCenter;
@@ -42,6 +43,8 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
     ItfGreeToFaInstallSynRuleService itfGreeToFaInstallSynRuleService;
     @Resource
     ItfGreeToFaRepairSynRuleService itfGreeToFaRepairSynRuleService;
+    @Resource
+    private PublicService publicService;
     @Autowired
     private JdbcTemplate jdbcTemplate;
     private Set<String> nullDateCols;
@@ -81,7 +84,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
 
             // 销售公司编码
             String salesWebsitNumber = synRule.getSalesWebsitNumber();
-            String downloadBatchNo = UUID.randomUUID().toString();
+            String downloadBatchNo = publicService.getUUID();
             String id = "";
             // 获取数据 这里的数据为数组，会有多个工单的情况
             data = downloadOrderFromGD("sync/repairorder");
@@ -100,7 +103,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
                     // 维修工单主表必须存在
                     JSONObject mainTableData = sheet.getJSONObject("tblAssign");
                     if (mainTableData != null) {
-                        String downloadTaskNo = UUID.randomUUID().toString();
+                        String downloadTaskNo = publicService.getUUID();
                         DataUtil.initLastModifiedDate(mainTableData,"last_modified_date");
                         addRepairData(mainTableData, downloadBatchNo, downloadTaskNo, sheet,
                                 srcTabnameArray, srcTabColListArray, destTabNameArray, destTabColListArray,
@@ -159,7 +162,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
 
             // 销售公司编码
             String salesWebsitNumber = synRule.getSalesWebsitNumber();
-            String downloadBatchNo = UUID.randomUUID().toString();
+            String downloadBatchNo = publicService.getUUID();
             String id = "";
             // 获取数据 这里的数据为数组，会有多个工单的情况
             data = downloadOrderFromGD("sync/installorder");
@@ -177,7 +180,7 @@ public class OrderDownloadGDServiceImpl implements OrderDownloadGDService {
                     JSONObject sheet = datas.getJSONObject(i);
                     JSONArray mainTableData = sheet.getJSONArray("TBL_AZ_ASSIGN_LC_LS");
                     if (mainTableData != null && mainTableData.size() > 0) {
-                        String downloadTaskNo = UUID.randomUUID().toString();
+                        String downloadTaskNo = publicService.getUUID();
                          DataUtil.initLastModifiedDate(mainTableData.getJSONObject(0),"lastModifiedDate");
                         addInstallData(mainTableData, downloadBatchNo, downloadTaskNo, sheet,
                                 srcTabnameArray, srcTabColListArray, destTabNameArray, destTabColListArray,

src/main/java/com/zfire/jiasm/syncdata/service/impl/ProvinceCityAreaTownServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.service.ProvinceCityAreaTownService;
+import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -38,6 +39,8 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
     AreaService areaService;
     @Resource
     StreetService streetService;
+    @Resource
+    private PublicService publicService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -50,7 +53,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
         List<Long> oldRecsfid = oldRec.stream().map(ItfTblProvinceDownload::getSfid).collect(Collectors.toList());
         Map<Long, List<ItfTblProvinceDownload>> oldRecMap = oldRec.stream().collect(Collectors.groupingBy(ItfTblProvinceDownload::getSfid));
 
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
 
         // 数据同步落到同步信息表
         extracted(addRec, updateRec, oldRecsfid, oldRecMap, jsonArray, synTaskNo);
@@ -73,7 +76,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
         List<Long> oldRecCiid = new ArrayList<>();
         Map<Long, List<ItfTblCityDownload>> oldRecMap = new HashMap<>();
 
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
         // 提取现有的数据信息
         oldRec =  itfTblCityDownloadService.lambdaQuery().list();
         if (CollectionUtils.isNotEmpty(oldRec)){
@@ -114,7 +117,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
         List<ItfTblCountyDownload> addRec = new ArrayList<>();
         List<ItfTblCountyDownload> updateRec = new ArrayList<>();
 
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
 
         // 数据同步落到同步信息表
         extractedCountyAddOrUpdate(addRec, updateRec, jsonArray, synTaskNo);
@@ -279,7 +282,7 @@ public class ProvinceCityAreaTownServiceImpl implements ProvinceCityAreaTownServ
         List<ItfTblCityJdxzDownload> addRec = new ArrayList<>();
         List<ItfTblCityJdxzDownload> updateRecn = new ArrayList<>();
 
-        String synTaskNo = UUID.randomUUID().toString();
+        String synTaskNo = publicService.getUUID();
 
         // 提取现有的数据信息
         List<ItfTblCityJdxzDownload> oldRec =  itfTblCityJdxzDownloadService.lambdaQuery().list();

src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -1693,6 +1693,12 @@ public class PublicServiceImpl implements PublicService {
         }
     }
 
+    @Override
+    public String getUUID(){
+        String uuId = UUID.randomUUID().toString().replace("-","").toUpperCase();
+        return uuId;
+    }
+
     private void setLocationByAddress(OrderBase orderBase) {
         if (StringUtils.isEmpty(orderBase.getLng()) || StringUtils.isEmpty(orderBase.getLat())) {
             String add = "";
@@ -2004,7 +2010,7 @@ public class PublicServiceImpl implements PublicService {
     }
 
     private void getSmsRecord(ItfMessagehuifangentity addms, String orderType, int type, SmsRecord record) {
-        record.setId(UUID.randomUUID().toString());
+        record.setId(publicService.getUUID());
         record.setOrderBaseId(addms.getOrderBaseId());
         record.setOrderType(orderType);
         record.setType(type);

src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadServiceImpl.java

@@ -8,10 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 @Service
 public class UploadServiceImpl implements UploadService {
@@ -75,6 +72,8 @@ public class UploadServiceImpl implements UploadService {
 	}
 
 
+
+
 	@Override
 	public void addAssignLog(JSONArray jsonArray, Map<String, Object> sourceData) throws Exception {
 		Map<String, Object> result = jdbcTemplate.queryForMap(

src/main/java/com/zfire/jiasm/syncdata/test.java

@@ -163,25 +163,14 @@ public class test {
         Date newDate = calendar.getTime();
         System.out.println("减去一年后的日期: " + newDate);*/
 
-        String s="asdfkl.";
-        String t = s.trim();
-        if (substr(t,t.length()-1,t.length()).equals(".")){
-            System.out.println(t+"jpeg");
-        }
-        System.out.println(t);
-        s="asdfkl. ";
-        t = s.trim();
-        if (substr(t,t.length()-1,t.length()).equals(".")){
-            System.out.println(t+"jpeg");
-        }
-        System.out.println(t);
+        String s="1a-2b-3c-d";
+        String x=s.replace("-","");
 
-        s="asdfkl123";
-        t = s.trim();
-        if (substr(t,t.length()-1,t.length()).equals(".")){
-            System.out.println(t+"jpeg");
-        }
-        System.out.println(t);
+
+        System.out.println(UUID.randomUUID().toString());
+
+        String uuId = UUID.randomUUID().toString().replace("-","").toUpperCase();
+        System.out.println(uuId);
 
     }
 

src/main/java/com/zfire/jiasm/syncdata/utils/OLDSystemUtil.java

@@ -100,7 +100,7 @@ public class OLDSystemUtil {
 	private boolean checkTime(Map<String, Object> row,String requestTable) throws ParseException {
 		DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-		if (!"itf_installItem".equals(requestTable)){
+		if (!"itf_installitem".equals(requestTable)){
 			return false;
 		}