Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrderNoRuleService.java

@@ -31,7 +31,7 @@ public interface ISysOrderNoRuleService {
     @ApiOperation(value = "单号规则复杂查询，分页，排序")
     ListPager querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager);
 
-    @ApiOperation(value = "根据code查询单号规则")
+    @ApiOperation(value = "根据code查询最新单号规则")
     SysOrderNoRule getSysOrderNoRuleCode(String code);
 
     @ApiOperation(value = "根据id修改单号规则状态")

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -10,10 +10,7 @@ import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
-import cn.estsh.i3plus.pojo.platform.bean.SysFile;
-import cn.estsh.i3plus.pojo.platform.bean.SysLogUserLogin;
+import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@@ -74,6 +71,9 @@ public class WhiteController extends CoreBaseController {
     @Autowired
     private FastDFSClient dfsClient;
 
+    @Autowired
+    private ISysOrderNoRuleService sysOrderNoRuleService;
+
     @Resource(name="redisRes")
     private ImppRedis redisRes;
 
@@ -287,4 +287,20 @@ public class WhiteController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+
+    @GetMapping(value = "/sys-order-no-rule/get-order-no/{code}")
+    @ApiOperation(value = "根据单号规则代码，生成单号")
+    public ResultBean getOrderNo(@PathVariable("code") String code) {
+        try {
+            ValidatorBean.checkNotNull(code, "code不能为空");
+
+            SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code);
+            return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java

@@ -360,7 +360,6 @@ public class SysOrderNoRuleController extends CoreBaseController {
                 .checkNotZero("isCycle", sysOrderNoRule.getIsCycle());
     }
 
-
     @GetMapping(value = "/get-order-no/{code}")
     @ApiOperation(value = "根据单号规则代码，生成单号")
     public ResultBean getOrderNo(@PathVariable("code") String code) {

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java

@@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysOrderNoRuleRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,6 +88,7 @@ public class SysOrderNoRuleService implements ISysOrderNoRuleService {
     }
 
     @Override
+    @ApiOperation(value = "根据code查询最新单号规则")
     public synchronized SysOrderNoRule getSysOrderNoRuleCode(String code) {
         SysOrderNoRule sysOrderNoRule = sysOrderNoRuleRDao.getByProperty("orderNoRuleCode",code);