Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/AddSnConfigParam.java

@@ -29,11 +29,6 @@ public class AddSnConfigParam implements Constrained {
     @NotBlank(message = "编码名称不能为空")
     private String sncode;
 
-    /**
-     * 示例
-     */
-    @NotBlank(message = "示例不能为空")
-    private String example;
     /**
      * 配置
      */

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/IncSnService.java

@@ -84,6 +84,7 @@ public class IncSnService extends ServiceImpl<IncSnMapper, IncSnEntity> implemen
 
         if (val == maxVal) {
             Boolean allowOverflow = incCodeEntity.getAllowOverflow();
+            if (allowOverflow == null) allowOverflow = Boolean.TRUE;
             if (allowOverflow) {
                 newVal = incCodeEntity.getInitialVal();
             } else {
@@ -92,9 +93,13 @@ public class IncSnService extends ServiceImpl<IncSnMapper, IncSnEntity> implemen
         }
 
         RollbackMode rollback = incCodeEntity.getRollback();
+        if (rollback == null) rollback = RollbackMode.Wu;
 
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime lastTime = incCodeEntity.getLastTime();
+        if (lastTime == null) {
+            lastTime = now;
+        }
 
         switch (rollback) {
             case Wu: {
@@ -181,9 +186,9 @@ public class IncSnService extends ServiceImpl<IncSnMapper, IncSnEntity> implemen
                 Assert.notBlank(pici, () -> Exceptions.exception("批次号不能为空"));
                 String lastPici = incCodeEntity.getLastPici();
                 if (pici.equals(lastPici)) {
-                    newVal = incCodeEntity.getInitialVal();
-                } else {
                     newVal = val + incCodeEntity.getStep();
+                } else {
+                    newVal = incCodeEntity.getInitialVal();
                 }
             }
             break;

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/ModifySnConfigParam.java

@@ -28,11 +28,6 @@ public class ModifySnConfigParam implements Constrained {
      * 编码名称
      */
     private String sncode;
-
-    /**
-     * 示例
-     */
-    private String example;
     /**
      * 配置
      */

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SnConfigController.java

@@ -32,8 +32,15 @@ public class SnConfigController {
     }
 
     @GetMapping("/next")
-    public R<?> next(@RequestParam(required = false, defaultValue = "Default") String sncode) {
+    public R<?> next(@RequestParam(required = false, defaultValue = "Default") String sncode,
-        return R.success(SnUtil.next(sncode));
+                     @RequestParam(required = false) String pici) {
+        return R.success(SnUtil.next(sncode, pici));
+    }
+
+    @GetMapping("/reset")
+    public R<?> reset(@RequestParam("sncode") String sncode) {
+        snConfigService.reset(sncode);
+        return R.success();
     }
 
     /**

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SnConfigService.java

@@ -53,11 +53,13 @@ public class SnConfigService extends ServiceImpl<SnConfigMapper, SnConfigEntity>
         List<HashMap<String, Object>> configList = addSnConfigParam.getConfig();
         Tuple2<List<SectionConfig>, List<IncSnEntity>> tuple2 = resolveConfig(configList);
 
+        List<SectionConfig> configs = tuple2.get_0();
+        String example = configs.stream().map(SectionConfig::genExample).collect(Collectors.joining());
         this.save(new SnConfigEntity()
                 .setSnname(addSnConfigParam.getSnname())
                 .setSncode(sncode)
-                .setExample(addSnConfigParam.getExample())
+                .setExample(example)
-                .setConfig(tuple2.get_0())
+                .setConfig(configs)
                 .setMemo(addSnConfigParam.getMemo())
         );
 
@@ -125,12 +127,13 @@ public class SnConfigService extends ServiceImpl<SnConfigMapper, SnConfigEntity>
             oldIncSnEntityList = incSnService.list(Wrappers.lambdaQuery(IncSnEntity.class).in(IncSnEntity::getCode, oldIncSectionConfigCodeList));
         }
         modifyIncSnSectionConfig(oldIncSnEntityList, tuple2.get_1());
-
+        List<SectionConfig> configs = tuple2.get_0();
+        String example = configs.stream().map(SectionConfig::genExample).collect(Collectors.joining());
         this.updateById(new SnConfigEntity()
                 .setId(id)
                 .setSnname(modifySnConfigParam.getSnname())
                 .setSncode(modifySnConfigParam.getSncode())
-                .setExample(modifySnConfigParam.getExample())
+                .setExample(example)
                 .setConfig(tuple2.get_0())
                 .setMemo(modifySnConfigParam.getMemo())
         );
@@ -206,4 +209,27 @@ public class SnConfigService extends ServiceImpl<SnConfigMapper, SnConfigEntity>
         return PageResult.of(page.convert(it -> BeanUtil.copyProperties(it, SearchSnConfigResult.class)));
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void reset(String sncode) {
+        SnConfigEntity configEntity = this.getOne(Wrappers.lambdaQuery(SnConfigEntity.class).eq(SnConfigEntity::getSncode, sncode));
+        Assert.notNull(configEntity, () -> Exceptions.clierr("规则不存在"));
+        List<SectionConfig> config = configEntity.getConfig();
+        List<String> codes = config.stream().filter(it -> it instanceof IncSectionConfig)
+                .map(it -> ((IncSectionConfig) it).getCode())
+                .collect(Collectors.toList());
+        if (CollUtil.isEmpty(codes)) return;
+
+        List<IncSnEntity> incSnEntityList = incSnService
+                .list(Wrappers.lambdaQuery(IncSnEntity.class).in(IncSnEntity::getCode, codes))
+                .stream().map(it -> BeanUtil.copyProperties(it, IncSnEntity.class)
+                        .setVal(it.getInitialVal())
+                        .setLastTime(null)
+                        .setLastPici(null)
+                )
+                .collect(Collectors.toList());
+
+        incSnService.remove(Wrappers.lambdaQuery(IncSnEntity.class).in(IncSnEntity::getCode, codes));
+
+        incSnService.saveBatch(incSnEntityList);
+    }
 }

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/FixedSectionConfig.java

@@ -21,6 +21,11 @@ public class FixedSectionConfig implements SectionConfig {
     private String value;
 
 
+    @Override
+    public String genExample() {
+        return value;
+    }
+
     @Override
     public ISnSection section() {
         return new FixedSection(value);

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/IncSectionConfig.java

@@ -2,6 +2,7 @@ package com.njzscloud.common.sn.support;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
 import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.core.ienum.Dict;
 import com.njzscloud.common.sn.contant.PadMode;
@@ -51,6 +52,13 @@ public class IncSectionConfig implements SectionConfig {
      */
     private Boolean allowOverflow;
 
+    @Override
+    public String genExample() {
+        return padMode == PadMode.Zuo ? StrUtil.padPre(initialVal.toString(), padLen, padVal) :
+                padMode == PadMode.You ? StrUtil.padAfter(initialVal.toString(), padLen, padVal) :
+                        initialVal.toString();
+    }
+
     @Override
     public ISnSection section() {
         return new IncSection(code, step, initialVal, padMode, padVal, padLen);
@@ -61,6 +69,9 @@ public class IncSectionConfig implements SectionConfig {
         code = MapUtil.getStr(config, "code");
         step = MapUtil.getInt(config, "step");
         initialVal = MapUtil.getInt(config, "initialVal");
+        rollback = Dict.parse(MapUtil.getStr(config, "rollback"), RollbackMode.values());
+        if (rollback == null) rollback = RollbackMode.Wu;
+        allowOverflow = MapUtil.getBool(config, "allowOverflow", Boolean.TRUE);
         padMode = Dict.parse(MapUtil.getStr(config, "padMode"), PadMode.values());
         if (padMode == null) padMode = PadMode.Wu;
         padVal = MapUtil.getStr(config, "padVal");

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/RandomSectionConfig.java

@@ -2,6 +2,7 @@ package com.njzscloud.common.sn.support;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.IdUtil;
 import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.core.ienum.Dict;
 import com.njzscloud.common.sn.contant.RandomMode;
@@ -34,6 +35,18 @@ public class RandomSectionConfig implements SectionConfig {
      */
     private Integer nanoIdSize;
 
+    @Override
+    public String genExample() {
+        switch (randomMode) {
+            case UUID:
+                return IdUtil.simpleUUID();
+            case NanoId:
+                return nanoIdSize == null ? IdUtil.nanoId() : IdUtil.nanoId(nanoIdSize);
+            default:
+                return workerId == null || datacenterId == null ? IdUtil.getSnowflakeNextIdStr() : IdUtil.getSnowflake(workerId, datacenterId).nextIdStr();
+        }
+    }
+
     @Override
     public ISnSection section() {
         return new RandomSection(randomMode, workerId, datacenterId, nanoIdSize);

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/SectionConfig.java

@@ -12,6 +12,8 @@ public interface SectionConfig {
      */
     SnSection getSectionName();
 
+    String genExample();
+
     /**
      * 编码段实例
      */

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/SnUtil.java

@@ -40,8 +40,12 @@ public final class SnUtil {
         return next("Default");
     }
 
-    public static synchronized String next(String sncode) {
+    public static String next(String sncode) {
+        return next(sncode, null);
+    }
+
+    public static synchronized String next(String sncode, String pici) {
         Assert.notBlank(sncode, () -> Exceptions.clierr("未指定编码规则"));
-        return SN_CONFIG_SERVICE.getSn(sncode).next();
+        return SN_CONFIG_SERVICE.getSn(sncode).next(pici);
     }
 }

njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/TimeSectionConfig.java

@@ -1,5 +1,6 @@
 package com.njzscloud.common.sn.support;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
@@ -10,6 +11,7 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
 import java.util.Map;
 
 @Getter
@@ -31,6 +33,11 @@ public class TimeSectionConfig implements SectionConfig {
      */
     private Integer unit;
 
+    @Override
+    public String genExample() {
+        return timestamp ? new Date().getTime() / unit + "" : DateUtil.format(new Date(), pattern);
+    }
+
     @Override
     public ISnSection section() {
         return new TimeSection(pattern, timestamp, unit);

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/controller/OrderInfoController.java

@@ -35,7 +35,7 @@ public class OrderInfoController {
      * 新增
      */
     @PostMapping("/add")
-    public R<?> add(@RequestBody AddOrderInfoParam addOrderInfoParam) {
+    public synchronized R<?> add(@RequestBody AddOrderInfoParam addOrderInfoParam) {
         OrderCategory orderCategory = addOrderInfoParam.getOrderCategory();
         Assert.isTrue(orderCategory == OrderCategory.PuTong
                         || orderCategory == OrderCategory.DuanBoChu

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -105,6 +105,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
      * 新增
      */
     public void add(AddOrderInfoParam addOrderInfoParam, String orderSn) {
+        Assert.isFalse(this.exists(Wrappers.<OrderInfoEntity>lambdaQuery().eq(OrderInfoEntity::getSn, addOrderInfoParam.getSn())), () -> Exceptions.exception("订单创建失败，订单号重复"));
         AddOrderCargoPlaceParam cargoPlace = addOrderInfoParam.getCargoPlace();
         long cargoPlaceId = orderCargoPlaceService.add(cargoPlace);
         Long userId = SecurityUtil.currentUserId();