Merge branch 'master' of http://118.31.7.2:3000/tzjy-code/digital_marketing into de'v

src/main/java/com/sztzjy/marketing/service/impl/StuConceptBlockServiceImpl.java

@@ -309,7 +309,13 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService {
             //第一次上传
             String upload = fileUtil.upload(file);
             StuPracticalTrainingReport report = new StuPracticalTrainingReport();
-            report.setId((int) IdUtil.getSnowflakeNextId());
+
+            int uuid = UUID.randomUUID().hashCode();
+            if (uuid < 0) {
+                uuid = -uuid;
+            }
+
+            report.setId(uuid);
             report.setUrl(upload);
             report.setAscription(stuBlockProductWithBLOBs.getCount());
             report.setUploadTime(new Date());
@@ -369,7 +375,6 @@ public class StuConceptBlockServiceImpl implements StuConceptBlockService {
                 arrayList.retainAll(stringList);
 
 
-
                 int size = arrayList.size();
                 BigDecimal bigDecimalSize = BigDecimal.valueOf(size);
                 BigDecimal bigDecimalValue = BigDecimal.valueOf(6);