加参数校验

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/base/BaseModel.java

@@ -1,6 +1,7 @@
 package com.sckw.core.model.base;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -26,6 +27,7 @@ public class BaseModel implements Serializable {
 	/**
 	 * 备注
 	 */
+	@Size(max = 200, message = "备注长度不能超过200")
 	private String remark;
 
 	/**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -84,6 +84,13 @@ public class KwcContractLogisticsService {
      */
     @Transactional(rollbackFor = {})
     public Long addCheckedContract(ContractLogisticsReqVo reqVo) {
+        Long id = reqVo.getId();
+        //不为空时是修改
+        if (Objects.nonNull(id)) {
+            update(reqVo);
+            return id;
+        }
+
         LogisticsBaseInfoReqVo baseInfo = reqVo.getBaseInfo();
 
         //创建合同

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsEnterpriseController.java

@@ -184,7 +184,7 @@ public class KwsEnterpriseController {
      * @date 2023/06/02
      **/
     @PostMapping(value = "/freeze")
-    public HttpResult freeze(@RequestBody FreezeReqVo reqVo) {
+    public HttpResult freeze(@Valid @RequestBody FreezeReqVo reqVo) {
         kwsEntService.freeze(reqVo);
         return HttpResult.ok(HttpStatus.MSG_005);
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsMenuController.java

@@ -30,7 +30,7 @@ public class KwsMenuController {
      * @date 2023/5/30
      **/
     @GetMapping("/detail")
-    public HttpResult selectByKey(@RequestParam("id")Long id) throws SystemException {
+    public HttpResult selectByKey(@RequestParam("id") Long id) throws SystemException {
         return HttpResult.ok(kwsMenuService.selectByKey(id));
     }
 
@@ -70,7 +70,7 @@ public class KwsMenuController {
      * @date 2023/5/30
      **/
     @PostMapping("/update")
-    public HttpResult update(@RequestBody KwsMenu params) throws SystemException {
+    public HttpResult update(@Valid @RequestBody KwsMenu params) throws SystemException {
         kwsMenuService.update(params);
         return HttpResult.ok(HttpStatus.MSG_005);
     }
@@ -83,7 +83,7 @@ public class KwsMenuController {
      * @date 2023/5/30
      **/
     @PostMapping("/dels")
-    public HttpResult del(@RequestBody DelsMenuReqVo ids) throws SystemException {
+    public HttpResult del(@Valid @RequestBody DelsMenuReqVo ids) throws SystemException {
         kwsMenuService.deleteByKey(ids.getIds());
         return HttpResult.ok(HttpStatus.MSG_008);
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/KwsMenu.java

@@ -3,6 +3,7 @@ package com.sckw.system.model;
 import com.sckw.core.model.base.BaseModel;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -29,6 +30,7 @@ public class KwsMenu extends BaseModel {
      * 名称
      */
     @NotBlank(message = "菜单名不能为空")
+    @Size(max = 50, message = "名称长度超长")
     private String name;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/ApprovalReqVo.java

@@ -1,5 +1,6 @@
 package com.sckw.system.model.vo.req;
 
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -30,6 +31,7 @@ public class ApprovalReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注长度不能超过200")
     private String remark;
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/DelsMenuReqVo.java

@@ -1,5 +1,6 @@
 package com.sckw.system.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 import java.io.Serial;
@@ -19,5 +20,6 @@ public class DelsMenuReqVo implements Serializable {
     /**
      * 主键id
      */
+    @NotBlank(message = "id不能为空")
     private String ids;
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EditRoleReqVo.java

@@ -2,6 +2,7 @@ package com.sckw.system.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -23,6 +24,8 @@ public class EditRoleReqVo implements Serializable {
     /**
      * 角色名称
      */
+    @NotBlank(message = "岗位名称不能为空！")
+    @Size(max = 50, message = "名称超长")
     private String name;
 
     /**
@@ -49,5 +52,6 @@ public class EditRoleReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注超长")
     private String remark;
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EntRegisterReqVo.java

@@ -2,6 +2,7 @@ package com.sckw.system.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -111,6 +112,7 @@ public class EntRegisterReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 200, message = "备注长度不能超过200")
     private String remark;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/FindListReqVo.java

@@ -1,5 +1,6 @@
 package com.sckw.system.model.vo.req;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -14,6 +15,7 @@ public class FindListReqVo implements Serializable {
     /**
      * 企业id
      */
+    @NotNull(message = "企业不能为空")
     private Long id;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/FreezeReqVo.java

@@ -1,5 +1,6 @@
 package com.sckw.system.model.vo.req;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,11 +11,13 @@ public class FreezeReqVo implements Serializable {
     /**
      * 企业id
      */
-    private long id;
+    @NotNull(message = "企业不能为空")
+    private Long id;
 
     /**
      * 状态0正常1锁定
      */
-    private int status;
+    @NotNull(message = "状态不能为空")
+    private Integer status;
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/UserAddReqVo.java

@@ -2,6 +2,7 @@ package com.sckw.system.model.vo.req;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -43,6 +44,7 @@ public class UserAddReqVo implements Serializable {
      * 姓名
      */
     @NotBlank(message = "姓名不能为空")
+    @Size(max = 50, message = "姓名超长")
     private String name;
 
     /**
@@ -85,6 +87,7 @@ public class UserAddReqVo implements Serializable {
     /**
      * 备注
      */
+    @Size(max = 50, message = "备注超长")
     private String remark;
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/CommonService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.RegularUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.model.EntCertificateInfo;
@@ -55,4 +56,18 @@ public class CommonService {
         }
     }
 
+
+    /**
+     * @param phone 手机号
+     * @desc: 校验手机号
+     * @author: czh
+     * @date: 2023/7/26
+     */
+    public void checkPhone(String phone) {
+        if (!RegularUtils.matchs(RegularUtils.PHONE_REG, phone)) {
+            throw new SystemException(HttpStatus.PARAMETERS_PATTERN_ERROR_CODE, HttpStatus.CONTACTS_PHONE_ERROR);
+        }
+    }
+
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -201,6 +201,13 @@ public class KwsEnterpriseService {
 //        });
     }
 
+    /**
+     * @param id 主键id
+     * @return  KwsEntCertificate
+     * @desc: 查资质
+     * @author: czh
+     * @date: 2023/7/26
+     */
     public KwsEntCertificate checkEntCertificate(long id) throws SystemException {
         KwsEntCertificate kwsEntCertificate = kwsEntCertificateDao.selectByKey(id);
         if (Objects.isNull(kwsEntCertificate) || kwsEntCertificate.getDelFlag() == Global.YES) {
@@ -277,6 +284,13 @@ public class KwsEnterpriseService {
         return list;
     }
 
+    /**
+     * @param reqVo 分页入参
+     * @return FindEntListPojo
+     * @desc: 分页查企业信息
+     * @author: czh
+     * @date: 2023/7/26
+     */
     public List<FindEntListPojo> findPojo(EntFindPageReqVo reqVo) {
         FindPojoParam findPojoParam = new FindPojoParam();
         BeanUtils.copyProperties(reqVo, findPojoParam);
@@ -457,10 +471,15 @@ public class KwsEnterpriseService {
                 kwsUserService.fillUserRole(String.valueOf(findManagePojo.getRoleId()), userByAccount.getId(), SystemTypeEnum.COMPANY.getCode());
             }
         }
-
-
     }
 
+    /**
+     * @param id 主键id
+     * @return KwsEnterprise
+     * @desc: 查企业
+     * @author: czh
+     * @date: 2023/7/26
+     */
     private KwsEnterprise checkKwsEnterpriseById(long id) throws SystemException {
         KwsEnterprise kwsEnterprise = queryKwsEnterpriseById(id);
         if (Objects.isNull(kwsEnterprise) || kwsEnterprise.getDelFlag() == Global.YES) {
@@ -469,6 +488,13 @@ public class KwsEnterpriseService {
         return kwsEnterprise;
     }
 
+    /**
+     * @param id 主键
+     * @return KwsEnterprise
+     * @desc: 放开接口
+     * @author: czh
+     * @date: 2023/7/26
+     */
     public KwsEnterprise queryKwsEnterpriseById(long id) {
         return kwsEnterpriseDao.selectByKey(id);
     }
@@ -581,7 +607,6 @@ public class KwsEnterpriseService {
      * @date: 2023/7/25
      */
     private void checkAddEntSettleParam(AddEntSettleReqVo reqVo) {
-
         List<BusinessLicense> businessLicenseList = reqVo.getBusinessLicense();
         for (BusinessLicense businessLicense : businessLicenseList) {
             Integer type = businessLicense.getType();
@@ -700,6 +725,13 @@ public class KwsEnterpriseService {
         return findListGroupResVo;
     }
 
+    /**
+     * @param id 企业id
+     * @return EntDetailResVo
+     * @desc: 查详情
+     * @author: czh
+     * @date: 2023/7/26
+     */
     public EntDetailResVo detail(Long id) {
         KwsEnterprise kwsEnterprise = selectByKey(id);
         if (Objects.isNull(kwsEnterprise)) {
@@ -714,6 +746,13 @@ public class KwsEnterpriseService {
         return entDetailResVo;
     }
 
+    /**
+     * @param reqVo 入参
+     * @return FindEntUserPojo
+     * @desc: 查企业用户
+     * @author: czh
+     * @date: 2023/7/26
+     */
     public List<FindEntUserPojo> findEntUser(FindListReqVo reqVo) {
         List<FindEntUserPojo> list = kwsEnterpriseDao.findUserByEntIds(Collections.singletonList(reqVo.getId()));
         if (CollectionUtils.isEmpty(list)) {

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -71,6 +71,7 @@ public class KwsUserService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void add(UserAddReqVo reqVo) {
+        commonService.checkPhone(reqVo.getAccount());
         KwsUser kwsUser = new KwsUser();
         BeanUtils.copyProperties(reqVo, kwsUser);
         kwsUser.setPhone(kwsUser.getAccount());
@@ -271,6 +272,7 @@ public class KwsUserService {
      */
     @Transactional(rollbackFor = {})
     public void update(UserAddReqVo params) throws SystemException {
+        commonService.checkPhone(params.getAccount());
         KwsUser kwsUser = kwsUserDao.selectByKey(params.getId());
         if (Objects.isNull(kwsUser)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ACCOUNT_NOT_EXISTS);