孙永军 2 years ago
parent
commit
14f51f125e

+ 1 - 1
src/main/java/com/sxtvs/open/api/clue/entity/Clue.java

@@ -27,7 +27,7 @@ public class Clue implements Serializable {
      * 线索id
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     private Long siteId;
 

+ 2 - 2
src/main/java/com/sxtvs/open/api/h5template/dto/H5OperateParseDTO.java

@@ -13,7 +13,7 @@ import java.util.ArrayList;
 
 @Data
 public class H5OperateParseDTO {
-    private Long operateId;
+    private String operateId;
 
     private String title;
 
@@ -29,7 +29,7 @@ public class H5OperateParseDTO {
 
     private String url;
 
-    private Long templateId;
+    private String templateId;
 
     private String cover;
 

+ 1 - 1
src/main/java/com/sxtvs/open/api/h5template/dto/H5TemplateParseDTO.java

@@ -13,7 +13,7 @@ import java.util.ArrayList;
 
 @Data
 public class H5TemplateParseDTO {
-    private Long templateId;
+    private String templateId;
 
     private String title;
 

+ 2 - 2
src/main/java/com/sxtvs/open/api/h5template/entity/H5Operate.java

@@ -24,7 +24,7 @@ public class H5Operate implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "operate_id", type = IdType.ASSIGN_ID)
-    private Long operateId;
+    private String operateId;
 
     private String title;
 
@@ -40,7 +40,7 @@ public class H5Operate implements Serializable {
 
     private String url;
 
-    private Long templateId;
+    private String templateId;
 
     private String cover;
 

+ 2 - 2
src/main/java/com/sxtvs/open/api/h5template/entity/H5OperateForm.java

@@ -22,7 +22,7 @@ public class H5OperateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long formId;
+    private String formId;
 
     private String columnKey;
 
@@ -30,5 +30,5 @@ public class H5OperateForm implements Serializable {
 
     private String columnType;
 
-    private Long operateId;
+    private String operateId;
 }

+ 3 - 3
src/main/java/com/sxtvs/open/api/h5template/entity/H5OperateFormData.java

@@ -23,9 +23,9 @@ public class H5OperateFormData implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long dataId;
+    private String dataId;
 
-    private Long operateId;
+    private String operateId;
 
     private String columnKey;
 
@@ -37,5 +37,5 @@ public class H5OperateFormData implements Serializable {
 
     private LocalDateTime updateTime;
 
-    private Long formId;
+    private String formId;
 }

+ 1 - 1
src/main/java/com/sxtvs/open/api/h5template/entity/H5Template.java

@@ -24,7 +24,7 @@ public class H5Template implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "template_id", type = IdType.ASSIGN_ID)
-    private Long templateId;
+    private String templateId;
 
     private String title;
 

+ 4 - 4
src/main/java/com/sxtvs/open/api/h5template/service/impl/H5OperateFormDataServiceImpl.java

@@ -36,8 +36,8 @@ public class H5OperateFormDataServiceImpl extends ServiceImpl<H5OperateFormDataM
         if(!map.containsKey("operateId")){
             throw new BizException("缺少活动ID");
         }
-        Long operateId = (Long) map.get("operateId");
-        Long formId = (Long) map.get("formId");
+        String operateId = (String) map.get("operateId");
+        String formId = (String) map.get("formId");
 
         map.forEach((k, v) -> {
             H5OperateFormData h5OperateFormData = new H5OperateFormData();
@@ -58,7 +58,7 @@ public class H5OperateFormDataServiceImpl extends ServiceImpl<H5OperateFormDataM
             ));
 
         }else{
-            long snowflakeNextId = IdUtil.getSnowflakeNextId();
+            String snowflakeNextId = String.valueOf(IdUtil.getSnowflakeNextId());
             saveBatch(h5OperateFormDataList.stream().peek(data -> data.setDataId(snowflakeNextId)).collect(Collectors.toList()));
         }
     }
@@ -71,7 +71,7 @@ public class H5OperateFormDataServiceImpl extends ServiceImpl<H5OperateFormDataM
 
         Page<Map<String, Object>> rs = new Page<>(pageRequestDTO.getPage(), pageRequestDTO.getSize(), page.getTotal());
         rs.setPages(page.getPages());
-        List<Long> ids = page.getRecords().stream().map(H5OperateFormData::getDataId).collect(Collectors.toList());
+        List<String> ids = page.getRecords().stream().map(H5OperateFormData::getDataId).collect(Collectors.toList());
         List<Map<String, Object>> ls = new ArrayList<>();
         lambdaQuery().in(H5OperateFormData::getDataId, ids).list().stream().collect(Collectors.groupingBy(H5OperateFormData::getDataId))
         .forEach((k, v) -> {

+ 1 - 1
src/main/java/com/sxtvs/open/api/h5template/service/impl/H5OperateFormServiceImpl.java

@@ -49,7 +49,7 @@ public class H5OperateFormServiceImpl extends ServiceImpl<H5OperateFormMapper, H
             for (Map<String, Object> hover : hoverList){
                 for (Map<String, Object> component : ((List<Map<String, Object>>)hover.get("components"))){
                     if("fromComponent".equals(component.get("type"))){
-                        Long formId = snowflake.nextId();
+                        String formId = String.valueOf(snowflake.nextId());
                         for (Map<String, Object> form : ((List<Map<String, Object>>)component.get("child_list"))){
 
                             Map<String, Object> attr = (Map<String, Object>) form.get("attr");

+ 1 - 1
src/main/java/com/sxtvs/open/api/h5template/service/impl/H5OperateServiceImpl.java

@@ -53,7 +53,7 @@ public class H5OperateServiceImpl extends ServiceImpl<H5OperateMapper, H5Operate
             updateById(h5Operate);
         }else{
             h5Operate.setCreateTime(LocalDateTime.now());
-            h5Operate.setOperateId(IdUtil.getSnowflakeNextId());
+            h5Operate.setOperateId(String.valueOf(IdUtil.getSnowflakeNextId()));
             h5OperateFormService.store(h5Operate);
             save(h5Operate);
         }