Merge remote-tracking branch 'origin/master'

boman-api/boman-domain/src/main/java/com.boman.domain/dto/FormDataDto.java

@@ -23,6 +23,8 @@ public class FormDataDto implements Serializable {
     @JSONField(name = "table")
     private String table;
 
+    private String sumbitToken;
+
     /**
      * 逻辑删除，数据库对应的属性名称
      */
@@ -280,6 +282,14 @@ public class FormDataDto implements Serializable {
     public void setShowData(List<String> showData) {
         this.showData = showData;
     }
+
+    public String getSumbitToken() {
+        return sumbitToken;
+    }
+
+    public void setSumbitToken(String sumbitToken) {
+        this.sumbitToken = sumbitToken;
+    }
 }
 
 

boman-common/boman-common-redis/src/main/java/com/boman/common/redis/RedisKey.java

@@ -34,4 +34,9 @@ public class RedisKey {
     public static final String BILL_SQE = "BILL:SEQ:";
 
     public static final String USER_OPPEN_ID_AND_SESSION_KEY_PREFIX = "openId:sessionKey:";
+
+    /**
+     * 幂等性标识
+     */
+    public static final String IDEMPOTENT = "IDEMPOTENT:";
 }

boman-report/src/main/resources/bootstrap-prod.yml

@@ -6,14 +6,14 @@ spring:
     name: boman-report
   profiles:
     active: prod
-#  cloud:
-#    nacos:
-#      discovery:
-#        server-addr: 127.0.0.1:8848
-#        namespace: bbba8691-596e-436f-9b72-a28e8db0da40
-#      config:
-#        server-addr: 127.0.0.1:8848
-#        file-extension: yml
-#        shared-configs:
-#          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-#        namespace: bbba8691-596e-436f-9b72-a28e8db0da40
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+        namespace: bbba8691-596e-436f-9b72-a28e8db0da40
+      config:
+        server-addr: 127.0.0.1:8848
+        file-extension: yml
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: bbba8691-596e-436f-9b72-a28e8db0da40

boman-report/src/main/resources/mapper/StatisticReportMapper.xml

@@ -78,6 +78,7 @@
     <select id="selectList" parameterType="com.boman.domain.entity.StatisticReport" resultMap="StatisticReportResult">
         <include refid="selectReportVo"/>
         <where>
+            is_del = 'N'
             <if test="id != null and id != ''">
                 AND id = #{id}
             </if>

boman-web-core/src/main/java/com/boman/web/core/controller/CommonController.java

@@ -134,4 +134,9 @@ public class CommonController {
         return commonService.insertList(dto);
     }
 
+
+    @GetMapping("genSubmitToken/{tableName}/{username}")
+    public AjaxResult genSubmitToken(@PathVariable("tableName") String tableName, @PathVariable("username")String username) {
+        return commonService.genSubmitToken(tableName, username);
+    }
 }

boman-web-core/src/main/java/com/boman/web/core/service/common/CommonServiceImpl.java

@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
 import com.boman.domain.GenTable;
-import com.boman.domain.dto.DeleteDto;
-import com.boman.domain.dto.FormDataDto;
-import com.boman.domain.dto.InsertListDto;
-import com.boman.domain.dto.UpdateDto;
+import com.boman.domain.dto.*;
 import com.boman.web.core.domain.RowResult;
 import com.boman.web.core.service.TableServiceCmdService;
 import com.boman.web.core.service.delete.IBaseDeleteService;
@@ -16,11 +13,17 @@ import com.boman.web.core.service.select.IBaseSelectService;
 import com.boman.web.core.service.update.IBaseUpdateService;
 import com.boman.web.core.utils.ColumnUtils;
 import com.boman.web.core.utils.IdUtils;
+import com.google.protobuf.DescriptorProtos;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import javax.annotation.Resource;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import static com.boman.common.core.utils.obj.ObjectUtils.requireNonNull;
 
@@ -176,4 +179,12 @@ public class CommonServiceImpl implements ICommonService {
 
         return updateService.update(tableName, commitData, condition);
     }
+
+    @Override
+    public AjaxResult genSubmitToken(String tableName, String username) {
+        String uuid = UUID.randomUUID() + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+
+        redisService.setCacheObject(uuid, uuid, 1L, TimeUnit.HOURS);
+        return AjaxResult.success(uuid);
+    }
 }

boman-web-core/src/main/java/com/boman/web/core/service/common/ICommonService.java

@@ -1,11 +1,9 @@
 package com.boman.web.core.service.common;
 
 import com.alibaba.fastjson.JSONObject;
-import com.boman.domain.dto.DeleteDto;
-import com.boman.domain.dto.FormDataDto;
-import com.boman.domain.dto.InsertListDto;
-import com.boman.domain.dto.UpdateDto;
+import com.boman.domain.dto.*;
 import com.boman.web.core.domain.RowResult;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -92,4 +90,10 @@ public interface ICommonService {
      * @return int
      */
     List<RowResult> insertList(InsertListDto dto);
+
+    /**
+     * 获取提交接口德尔token
+     * @return
+     */
+    AjaxResult genSubmitToken(String tableName, @PathVariable("username")String username);
 }