update

gjjs-bd-business/src/main/java/com/ceb/gjjs/mda/resource/base/AbstractCommonResource.java

@@ -8,6 +8,7 @@ import com.brilliance.mda.support.td.BDAuthInfo;
 import com.ceb.gjjs.mda.bo.Usr;
 import com.ceb.gjjs.mda.dao.UsrMapper;
 import com.ceb.gjjs.mda.special.vo.RequestBaseVo;
+import com.ceb.gjjs.mda.special.vo.RequestPageBaseVo;
 import com.ceb.gjjs.mda.util.ReflectUtil;
 import com.ceb.gjjs.mda.util.ValidatorUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -159,6 +160,31 @@ public abstract class AbstractCommonResource<V extends BaseVO> {
         return ValidatorUtil.check(baseVO);
     }
 
+    protected <T> ResponseSet<T> executeRule(RequestPageBaseVo requestPageBaseVo, Class<T> respondVoClass, String rule) {
+        V baseVO = getVo();
+        T t = null;
+        try {
+            t = respondVoClass.newInstance();
+        } catch (Exception e) {
+        }
+        String s = resetAndcheckBaseParam(requestPageBaseVo, baseVO);
+        if (!StringUtils.isBlank(s)) {
+            return new ResponseSet<>(ResponseSet.CODE_FAILURE, s, t);
+        }
+        String checkResult = resetAndcheckParam(requestPageBaseVo, baseVO);
+        if (StringUtils.isNotBlank(checkResult)) {
+            return new ResponseSet<>(ResponseSet.CODE_FAILURE, checkResult, t);
+        }
+        String[] ruleArr = new String[]{rule};
+        ResponseSet responseSet = getCommonService().executeRule(baseVO, ruleArr);
+        Object data = responseSet.getData();
+        if (data != null) {
+            ReflectUtil.setValue2RespondVo(t, respondVoClass, data, baseVO.getClass());
+            setTotal(t, baseVO);
+            responseSet.setData(t);
+        }
+        return responseSet;
+    }
 
     protected <T> ResponseSet<T> executeRule(RequestBaseVo requestBaseVo, Class<T> respondVoClass, String rule) {
         V baseVO = getVo();
@@ -239,31 +265,40 @@ public abstract class AbstractCommonResource<V extends BaseVO> {
     private String resetAndcheckBaseParam(RequestBaseVo requestBaseVo, V baseVO) {
         String cifno = requestBaseVo.getCifno();
         if (StringUtils.isBlank(cifno)) {
-            return "客户号cifno不能为空";
+            return "客户号不能为空";
         }
         baseVO.setCifno(cifno);
         if (cifno.length() > 10) {
-            return "客户号cifno不能超过10";
+            return "客户号长度过长";
         }
         String userid = requestBaseVo.getUserid();
         if (StringUtils.isBlank(userid)) {
-            return "用户userid不能为空";
+            return "用户号不能为空";
         }
         baseVO.setUserid(userid);
         if (userid.length() > 8) {
-            return "用户userid不能超过8";
+            return "用户号长度过长";
         }
         String src = requestBaseVo.getSrc();
         if (StringUtils.isBlank(src)) {
-            return "业务来源src不能为空";
+            return "业务来源不能为空";
         }
         baseVO.setSrc(src);
         if (src.length() > 12) {
-            return "业务来源src不能超过12";
+            return "业务来源长度过长";
         }
         baseVO.setTransid(requestBaseVo.getTransid());
-        baseVO.setPageNum(requestBaseVo.getPageNum());
-        baseVO.setPageSize(requestBaseVo.getPageSize());
+        if (requestBaseVo instanceof RequestPageBaseVo) {
+            RequestPageBaseVo requestPageBaseVo = (RequestPageBaseVo) requestBaseVo;
+            if (requestPageBaseVo.getPageNum() <= 0) {
+                return "分页页码必须大于0";
+            }
+            if (requestPageBaseVo.getPageSize() <= 0) {
+                return "分页每页大小必须大于0";
+            }
+            baseVO.setPageNum(requestPageBaseVo.getPageNum());
+            baseVO.setPageSize(requestPageBaseVo.getPageSize());
+        }
         before(baseVO);
         return "";
     }

gjjs-bd-business/src/main/java/com/ceb/gjjs/mda/special/vo/RequestBaseVo.java

@@ -18,21 +18,21 @@ import java.io.Serializable;
 @Data
 public class RequestBaseVo implements Serializable {
 
-    @Length(max = 10, message = "长度最大10")
-    @Need
+    @Length(max = 10, message = "客户号长度过长")
+    @Need(message = "客户号不能为空")
     private String cifno;
 
-    @Length(max = 8, message = "长度最大8")
-    @Need
+    @Length(max = 8, message = "用户号长度过长")
+    @Need(message = "用户号不能为空")
     private String userid;
 
-    @Length(max = 12, message = "长度最大12")
-    @Need
+    @Length(max = 12, message = "来源长度过长")
+    @Need(message = "来源不能为空")
     private String src;
 
     private String transid;
 
-    private int pageNum;
-
-    private int pageSize;
+//    private int pageNum;
+//
+//    private int pageSize;
 }

gjjs-bd-business/src/main/java/com/ceb/gjjs/mda/special/vo/RequestPageBaseVo.java

+package com.ceb.gjjs.mda.special.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+/**
+ * @Description 请求定制vo的基类 需要传分页参数的vo继承
+ * @Author s_guodong
+ * @Date 2023/8/10
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+public class RequestPageBaseVo extends RequestBaseVo {
+
+    private int pageNum;
+
+    private int pageSize;
+}