UUID修改为平台生成

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/config/SerialConfig.java

@@ -60,7 +60,7 @@ public class SerialConfig {
             }
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
             map.put("create_time_", df.format(new Date()));
-            String addId= UUID.randomUUID().toString().replace("-", "");
+            String addId= UniqueIdUtil.getId();
             map.put("create_by_", ContextUtil.getCurrentUserId()); //添加创建人
             //devncq
             if(!map.containsKey(id)){

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/entrust/services/impl/BgglServerImpl.java

@@ -1,6 +1,7 @@
 package com.lc.ibps.entrust.services.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.config.JcUtils;
 import com.lc.ibps.config.JcjdConfig;
@@ -44,7 +45,7 @@ public class BgglServerImpl implements BgglServer {
         jcspEntity.setBianZhiShiJian(JcUtils.newData()); //添加时间用于排序
         jcspEntity.setShuJuId(jcwtdEntity.getId()); //数据id
         jcspEntity.setChuLiRen(String.valueOf(strMap.get("userName")));
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-",""));
+        jcspEntity.setId(UniqueIdUtil.getId());
         try {
             jcwtdDao.update(jcwtdEntity);
             jcspService.add(jcspEntity);
@@ -73,7 +74,7 @@ public class BgglServerImpl implements BgglServer {
         jcspEntity.setJieDian(JcjdConfig.REPORT_REVIEW);//节点
         jcspEntity.setBianZhiShiJian(JcUtils.newData()); //添加时间用于排序
         jcspEntity.setShuJuId(entity.getId()); //数据id
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-",""));
+        jcspEntity.setId(UniqueIdUtil.getId());
         try {
             jcwtdDao.update(entity);
             jcspService.add(jcspEntity);
@@ -103,7 +104,7 @@ public class BgglServerImpl implements BgglServer {
         jcspEntity.setBianZhiShiJian(JcUtils.newData()); //添加时间用于排序
         jcspEntity.setShuJuId(jcwtdEntity.getId()); //数据id
         jcspEntity.setChuLiRen(String.valueOf(strMap.get("userName")));
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-",""));
+        jcspEntity.setId(UniqueIdUtil.getId());
         try {
             jcwtdDao.update(jcwtdEntity);
             jcspService.add(jcspEntity);
@@ -132,7 +133,7 @@ public class BgglServerImpl implements BgglServer {
         jcspEntity.setChuLiRen((String) parMap.get("userName"));//处理人
         jcspEntity.setJieDian(JcjdConfig.Report_APPROVAL);//节点//报告审批
         jcspEntity.setShuJuId(entity.getId()); //数据id
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-",""));
+        jcspEntity.setId(UniqueIdUtil.getId());
         try {
             jcwtdDao.update(entity);
             jcspService.add(jcspEntity);
@@ -162,7 +163,7 @@ public class BgglServerImpl implements BgglServer {
         jcspEntity.setBianZhiShiJian(JcUtils.newData()); //添加时间用于排序
         jcspEntity.setShuJuId(jcwtdEntity.getId()); //数据id
         jcspEntity.setChuLiRen(String.valueOf(strMap.get("userName")));
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-",""));
+        jcspEntity.setId(UniqueIdUtil.getId());
         try {
             jcwtdDao.update(jcwtdEntity);
             jcspService.add(jcspEntity);
@@ -191,7 +192,7 @@ public class BgglServerImpl implements BgglServer {
         jcspEntity.setChuLiRen((String) parMap.get("userName"));//处理人
         jcspEntity.setJieDian(JcjdConfig.REPORT_ISSUE);//节点报告发放
         jcspEntity.setShuJuId(entity.getId()); //数据id
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-",""));
+        jcspEntity.setId(UniqueIdUtil.getId());
         try {
             jcwtdDao.update(entity);
             jcspService.add(jcspEntity);

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/entrust/services/impl/CcjcServiceImpl.java

@@ -3,6 +3,7 @@ package com.lc.ibps.entrust.services.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.config.JcUtils;
 import com.lc.ibps.config.JcjdConfig;
@@ -92,7 +93,7 @@ public class CcjcServiceImpl implements CcjcService {
                     ccjcDao.update(entity);
                     waijian=entity.getId();
                 } else {
-                    String id = UUID.randomUUID().toString().replace("-", "");
+                    String id = UniqueIdUtil.getId();
                     waijian=id;
                     entity.setId(id);
                     ccjcDao.add(entity);
@@ -106,7 +107,7 @@ public class CcjcServiceImpl implements CcjcService {
                     entity.setParentId(waijian);
                     ccljlDao.update(entity);
                 } else { //新增
-                    String id = UUID.randomUUID().toString().replace("-", "");
+                    String id = UniqueIdUtil.getId();
                     entity.setParentId(waijian);
                     entity.setId(id);
                     ccljlDao.add(entity);
@@ -125,7 +126,7 @@ public class CcjcServiceImpl implements CcjcService {
         entity.setJinDu(JcjdConfig.REPORT_REVIEW_STRING);
         jcwtdDao.update(entity);
         JcspEntity jcspEntity = new JcspEntity();
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-", "")); //生成唯一主键去掉“-”);
+        jcspEntity.setId(UniqueIdUtil.getId()); //生成唯一主键去掉“-”);
         jcspEntity.setChuLiRen(String.valueOf(map.get("userName"))); //处理人
         jcspEntity.setJieDian(JcjdConfig.Report_APPROVAL); //节点待报告审核
         jcspEntity.setShuJuId(entity.getId()); //数据id
@@ -150,7 +151,7 @@ public class CcjcServiceImpl implements CcjcService {
         jcwtdDao.update(entity);
 
         JcspEntity jcspEntity = new JcspEntity();
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-", "")); //生成唯一主键去掉“-”);
+        jcspEntity.setId(UniqueIdUtil.getId()); //生成唯一主键去掉“-”);
         jcspEntity.setChuLiRen(String.valueOf(map.get("userName"))); //处理人
         jcspEntity.setJieDian(JcjdConfig.ACQUISITION); //节点待数据审核
         jcspEntity.setShuJuId(entity.getId()); //数据id

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/entrust/services/impl/GpjcServiceImpl.java

@@ -3,6 +3,7 @@ package com.lc.ibps.entrust.services.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.config.JcUtils;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.config.JcUtils;
@@ -107,7 +108,7 @@ public class GpjcServiceImpl implements GpjcService {
                     gpjcDao.update(gpjcEntity);
                     waiJian=gpjcEntity.getId();
                 } else {
-                    String id = UUID.randomUUID().toString().replace("-", "");
+                    String id = UniqueIdUtil.getId();
                     waiJian=id;
                     gpjcEntity.setId(id);
                     gpjcDao.add(gpjcEntity);
@@ -121,7 +122,7 @@ public class GpjcServiceImpl implements GpjcService {
                 if (gpljl.getId() != null && !gpljl.getId().equals("")) { //更新
                     gpljlDao.update(gpljl);
                 } else { //新增
-                    String id = UUID.randomUUID().toString().replace("-", "");
+                    String id = UniqueIdUtil.getId();
                     gpljl.setId(id);
                     gpljl.setParentId(waiJian);
                     gpljlDao.add(gpljl);
@@ -153,7 +154,7 @@ public class GpjcServiceImpl implements GpjcService {
         entity.setJinDu(JcjdConfig.REPORT_REVIEW_STRING);
         jcwtdDao.update(entity);
         JcspEntity jcspEntity = new JcspEntity();
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-", "")); //生成唯一主键去掉“-”);
+        jcspEntity.setId(UniqueIdUtil.getId()); //生成唯一主键去掉“-”);
         jcspEntity.setChuLiRen(String.valueOf(map.get("userName"))); //处理人
         jcspEntity.setJieDian(JcjdConfig.Report_APPROVAL); //节点待报告审核
         jcspEntity.setShuJuId(entity.getId()); //数据id
@@ -178,7 +179,7 @@ public class GpjcServiceImpl implements GpjcService {
         jcwtdDao.update(entity);
 
         JcspEntity jcspEntity = new JcspEntity();
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-", "")); //生成唯一主键去掉“-”);
+        jcspEntity.setId(UniqueIdUtil.getId()); //生成唯一主键去掉“-”);
         jcspEntity.setChuLiRen(String.valueOf(map.get("userName"))); //处理人
         jcspEntity.setJieDian(JcjdConfig.ACQUISITION); //节点待数据审核
         jcspEntity.setShuJuId(entity.getId()); //数据id

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/entrust/services/impl/JchjServiceImpl.java

@@ -1,6 +1,7 @@
 package com.lc.ibps.entrust.services.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.components.querybuilder.utils.StringUtils;
 import com.lc.ibps.config.JcUtils;
@@ -48,7 +49,7 @@ public class JchjServiceImpl implements JchjService {
                 //修改数据
                 jchjMapper.update(hjjc);
             }else {
-                hjjc.setId(UUID.randomUUID().toString().replace("-",""));
+                hjjc.setId(UniqueIdUtil.getId());
                 add = jchjMapper.add(hjjc);
             }
         }else {
@@ -56,7 +57,7 @@ public class JchjServiceImpl implements JchjService {
                 //修改数据
                 jchjMapper.update(hjjc);
             }else{
-                hjjc.setId(UUID.randomUUID().toString().replace("-",""));
+                hjjc.setId(UniqueIdUtil.getId());
                 add = jchjMapper.add(hjjc);
                 //修改委托单的进度
                 JcwtdEntity entity = new JcwtdEntity();
@@ -70,7 +71,7 @@ public class JchjServiceImpl implements JchjService {
                 jcspEntity.setZhuangTai("已完成"); //状态
                 jcspEntity.setChuLiRen(String.valueOf(mapData.get("userName"))); //处理人
                 jcspEntity.setYiJian("同意");
-                jcspEntity.setId(UUID.randomUUID().toString().replace("-",""));
+                jcspEntity.setId(UniqueIdUtil.getId());
                 jcspMapper.add(jcspEntity);
             }
         }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/entrust/services/impl/JcwtdServiceImpl.java

@@ -4,6 +4,7 @@ package com.lc.ibps.entrust.services.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.cloud.entity.APIPageResult;
 import com.lc.ibps.cloud.entity.APIRequestPage;
 import com.lc.ibps.cloud.entity.APIRequestParameter;
@@ -69,12 +70,12 @@ public class JcwtdServiceImpl implements JcwtdService {
         JcwtdEntity object = JSONObject.parseObject(((JSONObject) parMap.get("weiTuoDan")).toString(), JcwtdEntity.class); //转委托实体
         String yangPing = ((JSONArray) parMap.get("yangPing")).toString();
         List<YangPing> ts = JsonUtilConfig.json2List(yangPing, YangPing.class); //转样品实体数组
-        String id = UUID.randomUUID().toString().replace("-", "");
+        String id = UniqueIdUtil.getId();
         //往样品表中添加数据
         if (!CollectionUtils.isEmpty(ts)) {
             for (int i = 0; i < ts.size(); i++) { //遍历样品表添加外键字段
                 ts.get(i).setParentId(id); //将主表的主键传给样品的外键
-                ts.get(i).setId(UUID.randomUUID().toString().replace("-", ""));
+                ts.get(i).setId(UniqueIdUtil.getId());
                 ts.get(i).setWeiTuoDanHao(object.getWeiTuoDanHao());
                 ts.get(i).setZhuangTai(JcjdConfig.STAGING); //样品当前状态
                 ts.get(i).setBianZhiShiJian(newData);
@@ -90,7 +91,7 @@ public class JcwtdServiceImpl implements JcwtdService {
         }
         //调用审批接口
         JcspEntity jcspEntity = new JcspEntity();
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-", "")); //生成唯一主键去掉“-”);
+        jcspEntity.setId(UniqueIdUtil.getId()); //生成唯一主键去掉“-”);
         jcspEntity.setChuLiRen(String.valueOf(parMap.get("userName"))); //处理人
         jcspEntity.setJieDian(JcjdConfig.ENTRUST); //节点key委托受理
         jcspEntity.setShuJuId(object.getId()); //数据id
@@ -116,7 +117,7 @@ public class JcwtdServiceImpl implements JcwtdService {
                 ypService.delete(object.getId());
                 for (int i = 0; i < ts.size(); i++) { //遍历样品表添加外键字段
                     ts.get(i).setParentId(object.getId()); //将主表的主键传给样品的外键
-                    ts.get(i).setId(UUID.randomUUID().toString().replace("-", ""));
+                    ts.get(i).setId(UniqueIdUtil.getId());
                 }
                 ypService.adds(ts);
             }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/entrust/services/impl/JtsjpzServiceImpl.java

@@ -2,6 +2,7 @@ package com.lc.ibps.entrust.services.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.cloud.entity.APIPageResult;
 import com.lc.ibps.cloud.entity.APIRequestPage;
 import com.lc.ibps.cloud.entity.APIRequestParameter;
@@ -50,7 +51,7 @@ public class JtsjpzServiceImpl implements JtsjpzService {
         Jtsjpz jtsjpz = JSONObject.parseObject(jtsj, Jtsjpz.class);
 
         //生成唯一id和外键
-        String id = UUID.randomUUID().toString().replace("-", "");
+        String id = UniqueIdUtil.getId();
         if(StringUtils.isEmpty(jtsjpz.getId())){
             jtsjpz.setId(id);
         }else{
@@ -76,14 +77,14 @@ public class JtsjpzServiceImpl implements JtsjpzService {
         String jianCeFangFa = "";
         //添加子表
         for (int i=0;i<list.size();i++){
-            String idChil = UUID.randomUUID().toString().replace("-", "");
+            String idChil = UniqueIdUtil.getId();
             list.get(i).setParentId(id);
             list.get(i).setId(idChil);
             if("buZhou2_fangFaWaiJian".equals(list.get(i).getLeiXing())){
                 String val = list.get(i).getValue();
                 if(!StringUtils.isEmpty(val)){
                     JtsjpzFangFaEntity ff = JSONObject.parseObject(val, JtsjpzFangFaEntity.class);
-                    String childId = UUID.randomUUID().toString().replace("-", "");
+                    String childId = UniqueIdUtil.getId();
                     ff.setId(childId);
                     ff.setCreateTime(new Date());
                     ff.setJingTaiShuJuB(id);
@@ -140,14 +141,14 @@ public class JtsjpzServiceImpl implements JtsjpzService {
         //先删除子表数据在添加
         jtsjChildMapper.delete(jtsjpz.getId()); //批量删除
         for (int i=0;i<list.size();i++){
-            String idChil = UUID.randomUUID().toString().replace("-", "");
+            String idChil = UniqueIdUtil.getId();
             list.get(i).setParentId(jtsjpz.getId());
             list.get(i).setId(idChil);
             if("buZhou2_fangFaWaiJian".equals(list.get(i).getLeiXing())){
                 String val = list.get(i).getValue();
                 if(!StringUtils.isEmpty(val)){
                     JtsjpzFangFaEntity ff = JSONObject.parseObject(val, JtsjpzFangFaEntity.class);
-                    String childId = UUID.randomUUID().toString().replace("-", "");
+                    String childId = UniqueIdUtil.getId();
                     ff.setId(childId);
                     ff.setJingTaiShuJuB(jtsjpz.getId());
                     ff.setCreateTime(new Date());

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/entrust/services/impl/WtslServerImpl.java

@@ -1,6 +1,7 @@
 package com.lc.ibps.entrust.services.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.config.JcUtils;
 import com.lc.ibps.config.JcjdConfig;
@@ -46,7 +47,7 @@ public class WtslServerImpl implements WtslServer {
             jcspEntity.setChuLiRen(String.valueOf(parMap.get("userName"))); //处理人
             jcspEntity.setShuJuId(entity.getId()); //数据id
             jcspEntity.setBianZhiShiJian(JcUtils.newData()); //添加时间用于排序
-            jcspEntity.setId(UUID.randomUUID().toString().replace("-",""));
+            jcspEntity.setId(UniqueIdUtil.getId());
             entity.setJinDu(JcjdConfig.CONTRACT_STRING); //待合同评审
         }else{
             entity.setJinDu(JcjdConfig.ALLOCATION_STRING); //待合同评审
@@ -56,7 +57,7 @@ public class WtslServerImpl implements WtslServer {
             jcspEntity.setShuJuId(entity.getId()); //数据id
             jcspEntity.setBianZhiShiJian(JcUtils.newData()); //添加时间用于排序
             jcspEntity.setJieDian(JcjdConfig.ACCEPT); //审批表插入委托
-            jcspEntity.setId(UUID.randomUUID().toString().replace("-",""));
+            jcspEntity.setId(UniqueIdUtil.getId());
             entity.setJinDu(JcjdConfig.ALLOCATION_STRING); //待任务分配
         }
         try {

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/entrust/services/impl/YpServiceImpl.java

@@ -3,6 +3,7 @@ package com.lc.ibps.entrust.services.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.cloud.entity.APIPageResult;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.config.JcUtils;
@@ -129,7 +130,7 @@ public class YpServiceImpl implements YpService {
         }
         //调用审批接口
         JcspEntity jcspEntity = new JcspEntity();
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-", "")); //生成唯一主键去掉“-”);
+        jcspEntity.setId(UniqueIdUtil.getId()); //生成唯一主键去掉“-”);
         jcspEntity.setChuLiRen(parMap.get("userName").toString()); //处理人
         jcspEntity.setJieDian(JcjdConfig.REGISTRATION); //节点key:样品接收
         jcspEntity.setShuJuId(entity.getId()); //数据id
@@ -190,7 +191,7 @@ public class YpServiceImpl implements YpService {
         jcspEntity.setJieDian(JcjdConfig.REGISTRATION); //样品接收
         jcspEntity.setChuLiRen(String.valueOf(strMap.get("userName"))); //处理人
         jcspEntity.setYiJian(jcwtdEntity.getBoHuiYuanYin());//驳回意见
-        jcspEntity.setId(UUID.randomUUID().toString().replace("-", ""));
+        jcspEntity.setId(UniqueIdUtil.getId());
         try {
             jcspMapper.add(jcspEntity);
         } catch (Exception e) {

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/importexcel/service/CkServiceImpl.java

@@ -2,6 +2,7 @@ package com.lc.ibps.importexcel.service;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.components.poi.excel.ExcelImportUtil;
 import com.lc.ibps.components.poi.excel.entity.ImportParams;
 import com.lc.ibps.components.querybuilder.utils.ObjectUtils;
@@ -180,7 +181,7 @@ public class CkServiceImpl implements CkService {
                 return null; //送检人证件号码不存在则跳过此条空数据
             }
             TSjr tSjr = new TSjr(); //创建送检人
-            tSjr.setId(UUID.randomUUID().toString()); //送检人id
+            tSjr.setId(UniqueIdUtil.getId()); //送检人id
             tSjr.setParentId(tWtsqbId); //外键id
             tSjr.setXingMing(due.getCkUserUsername()); //送检人姓名
             tSjr.setZhiWu(due.getJob()); //送检人职务
@@ -222,7 +223,7 @@ public class CkServiceImpl implements CkService {
                 return null; //检材编号不存在则跳过此条空数据
             }
             TDzzyjc tDzzyjc = new TDzzyjc();
-            tDzzyjc.setId(UUID.randomUUID().toString()); //检材id
+            tDzzyjc.setId(UniqueIdUtil.getId()); //检材id
             tDzzyjc.setParentId(tWtsqbId); //外键id
             tDzzyjc.setJianCaiBianHao(mat.getEnNum()); //检材编号
             tDzzyjc.setJianCaiLeiXing(mat.getMaType()); //检材类型

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/mobile/services/impl/ShouHouServiceImpl.java

@@ -2,6 +2,7 @@ package com.lc.ibps.mobile.services.impl;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.cloud.oauth.constants.RedisKey;
 import com.lc.ibps.cloud.redis.utils.RedisUtil;
@@ -42,7 +43,7 @@ public class ShouHouServiceImpl implements ShouHouService {
     public APIResult<Void> addTouSuDengJi(String data)throws Exception{
         APIResult<Void> apiResult = new APIResult<>();
         TouSuDengJi tousudengji = JSONObject.parseObject(data, TouSuDengJi.class);
-        tousudengji.setId(UUID.randomUUID().toString());
+        tousudengji.setId(UniqueIdUtil.getId());
         tousudengji.setNianDu(new SimpleDateFormat("yyyy").format(new Date()));
         String userName = RedisUtil.redisTemplateString.opsForValue().get(RedisKey.USER_NAME);
         if(userName==null){
@@ -75,7 +76,7 @@ public class ShouHouServiceImpl implements ShouHouService {
     public APIResult<Void> addManYiDu(String data)throws Exception{
         APIResult<Void> apiResult = new APIResult<>();
         ManYiDuDiaoCha manyidu = JSONObject.parseObject(data, ManYiDuDiaoCha.class);
-        manyidu.setId(UUID.randomUUID().toString());
+        manyidu.setId(UniqueIdUtil.getId());
         manyidu.setNianDu(manyidu.getPingJiaShiJian().substring(0,4));
         manyidu.setLeiBie("委托方");
         String userName = RedisUtil.redisTemplateString.opsForValue().get(RedisKey.USER_NAME);

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/sysdata/controller/SysDataController.java

@@ -1,6 +1,7 @@
 package com.lc.ibps.sysdata.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.sysdata.entity.SysDataContextEntity;
 import com.lc.ibps.sysdata.services.SysDataContextService;
@@ -54,7 +55,7 @@ class SysDataController extends AbstractController {
     @ApiOperation("保存记忆数据库")
     public APIResult<Void> saveMemoryData(@RequestBody SysDataContextEntity data) {
         APIResult<Void> apiResult = new APIResult<>();
-        data.setUuId(UUID.randomUUID().toString());
+        data.setUuId(UniqueIdUtil.getId());
         if (sysDataContextService.save(data))
             apiResult.setState(200);
         else apiResult.setState(500);

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/sysdata/controller/UpdateDataTableController.java

@@ -12,6 +12,7 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.profile.DefaultProfile;
 import com.lc.ibps.api.base.constants.StateEnum;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.cloud.entity.APIPageList;
 import com.lc.ibps.cloud.entity.APIRequest;
 import com.lc.ibps.cloud.entity.APIResult;
@@ -581,7 +582,7 @@ public class UpdateDataTableController {
         List<JSONObject> jsonObjectList = jsonArray.toJavaList(JSONObject.class);
         for ( JSONObject object:jsonObjectList) {
             ZhuguantixingEntity tixingEntity =new ZhuguantixingEntity();
-            tixingEntity.setId(UUID.randomUUID().toString().replace("-", ""));
+            tixingEntity.setId(UniqueIdUtil.getId());
             tixingEntity.setChuLiRen((String)object.get("chu_li_ren_"));
             tixingEntity.setRenWuKaiShiSh((String)object.get("ren_wu_kai_shi_sh"));
             tixingEntity.setRenWuMingCheng(String.valueOf(object.get("ren_wu_ming_cheng")));

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/sysdata/services/impl/SampleServiceImpl.java

@@ -2,6 +2,7 @@ package com.lc.ibps.sysdata.services.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.sysdata.dao.SampleDao;
 import com.lc.ibps.sysdata.entity.Sample;
 import com.lc.ibps.sysdata.entity.SampleTransfor;
@@ -74,7 +75,7 @@ public class SampleServiceImpl implements SampleService {
 
             // 样品出入库记录表 也要 插入 一条新数据
             Ypcrkjlb ypcrkjlb = new Ypcrkjlb();
-            ypcrkjlb.setId(UUID.randomUUID().toString().replace("-",""));
+            ypcrkjlb.setId(UniqueIdUtil.getId());
             ypcrkjlb.setParentid(sample.getId());
             ypcrkjlb.setTenantId("");
             ypcrkjlb.setIp(InetAddress.getLocalHost().getHostAddress());

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/sysdata/services/impl/UpdateDataTableImpl.java

@@ -7,6 +7,7 @@ import com.lc.ibps.api.base.constants.StateEnum;
 import com.lc.ibps.base.bo.exception.BoBaseException;
 import com.lc.ibps.base.core.util.BeanUtils;
 import com.lc.ibps.base.core.util.I18nUtil;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.base.framework.table.ICommonDao;
 import com.lc.ibps.bpmn.provider.BpmInstProvider;
 import com.lc.ibps.cloud.entity.APIPageList;
@@ -362,7 +363,7 @@ public class UpdateDataTableImpl extends GenericProvider implements UpdateDataTa
         Map mapw = JSONObject.parseObject(data);
         String str = String.valueOf(mapw.get("data"));
         List<Material> list = JSONObject.parseArray(str, Material.class);
-        String uuid = UUID.randomUUID().toString().replace("-","");
+        String uuid = UniqueIdUtil.getId();
         for (Material item: list) {
             item.setLogoKey("xiu_gai_biao_zhi_");
             item.setLogo(uuid);

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/task/service/BatchDataService.java

@@ -3,6 +3,7 @@ package com.lc.ibps.task.service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.lc.ibps.base.core.util.BeanUtils;
+import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.base.framework.table.ICommonDao;
 import com.lc.ibps.base.web.context.ContextUtil;
 import com.lc.ibps.org.party.persistence.entity.DefaultPartyUserPo;
@@ -54,13 +55,13 @@ public class BatchDataService {
                     }
                 }
 
-                String addId = UUID.randomUUID().toString().replace("-", "");
+                String addId = UniqueIdUtil.getId();
                 commonDao.execute(this.buildInsertSql(map, addId, zqrw.getYeWuBiaoMing()));
 
                 // 子表
                 if (BeanUtils.isNotEmpty(subList)){
                     for (LinkedHashMap sub : subList) {
-                        String uid = UUID.randomUUID().toString().replace("-", "");
+                        String uid = UniqueIdUtil.getId();
                         if (BeanUtils.isNotEmpty(associatedField)){
                             sub.put(associatedField, addId);
                         }else {