From f6322db3982770940b1cdd2b17e210e18b4be1ab Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Wed, 23 Mar 2022 14:04:59 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8C=BA=E5=9F=9F=E7=BC=96=E7=A0=81c?= =?UTF-8?q?ontroller=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=202=E3=80=81=E4=BB=93=E5=BA=93=E6=9C=8D=E5=8A=A1=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BF=A1=E6=81=AF=E5=89=8D=E5=90=8E=E7=AB=AF=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/openapi/commondata/Area.vue | 1 + .../ware/wareinfo/wareinfo-add-or-update.vue | 11 ++-- .../xjs/area/controller/AreaController.java | 4 ++ .../ware/controller/WareInfoController.java | 11 ++-- .../xjs/mall/ware/entity/WareInfoEntity.java | 51 +++++++++++-------- .../service/impl/WareInfoServiceImpl.java | 1 + 6 files changed, 51 insertions(+), 28 deletions(-) diff --git a/ruoyi-ui/src/views/business/openapi/commondata/Area.vue b/ruoyi-ui/src/views/business/openapi/commondata/Area.vue index b6a3a81f..deb0cc24 100644 --- a/ruoyi-ui/src/views/business/openapi/commondata/Area.vue +++ b/ruoyi-ui/src/views/business/openapi/commondata/Area.vue @@ -7,6 +7,7 @@ type="primary" icon="el-icon-arrow-left" :loading="buttonLoading" + v-hasPermi="['openapi:area:rest']" @click="getNewsArea()">联网获取最新区域编码 diff --git a/ruoyi-ui/src/views/mall/ware/wareinfo/wareinfo-add-or-update.vue b/ruoyi-ui/src/views/mall/ware/wareinfo/wareinfo-add-or-update.vue index 747e644e..04014a79 100644 --- a/ruoyi-ui/src/views/mall/ware/wareinfo/wareinfo-add-or-update.vue +++ b/ruoyi-ui/src/views/mall/ware/wareinfo/wareinfo-add-or-update.vue @@ -13,7 +13,7 @@ - + @@ -38,13 +38,16 @@ export default { }, dataRule: { name: [ - {required: true, message: '仓库名不能为空', trigger: 'blur'} + {required: true, message: '仓库名不能为空', trigger: 'blur'}, + { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' } ], address: [ - {required: true, message: '仓库地址不能为空', trigger: 'blur'} + {required: true, message: '仓库地址不能为空', trigger: 'blur'}, + { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], areacode: [ - {required: true, message: '区域编码不能为空', trigger: 'blur'} + {required: true, message: '区域编码不能为空', trigger: 'blur'}, + {type: 'number',min: 100000, max: 999999, message: '区域编码为数字且为6位', trigger: 'blur'} ] } } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/area/controller/AreaController.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/area/controller/AreaController.java index 5df8c6e3..28cd3f38 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/area/controller/AreaController.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/area/controller/AreaController.java @@ -1,6 +1,7 @@ package com.xjs.area.controller; import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.security.annotation.RequiresPermissions; import com.xjs.area.domain.Area; import com.xjs.area.service.AreaService; import com.xjs.web.MyBaseController; @@ -32,6 +33,7 @@ public class AreaController extends MyBaseController { @GetMapping("rest") @ApiOperation("更新获取区域编码信息") + @RequiresPermissions("openapi:area:rest") public AjaxResult restArea() { areaService.truncateArea(); areaService.saveArea(); @@ -41,6 +43,7 @@ public class AreaController extends MyBaseController { @GetMapping("getProvinceArea") @ApiOperation("获取所有省级区域") + @RequiresPermissions("openapi:area:list") public AjaxResult getProvinceArea() { List areaList = areaService.getProvinceArea(); return AjaxResult.success(areaList); @@ -48,6 +51,7 @@ public class AreaController extends MyBaseController { @GetMapping("getAreaByParentId/{pid}") @ApiOperation("根据父ID获取区域") + @RequiresPermissions("openapi:area:list") public AjaxResult getAreaByParentId(@PathVariable Long pid) { List areaList = areaService.getAreaByParentId(pid); return AjaxResult.success(areaList); diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/WareInfoController.java b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/WareInfoController.java index b67ba35a..d391b5c7 100644 --- a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/WareInfoController.java +++ b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/controller/WareInfoController.java @@ -4,9 +4,13 @@ import com.xjs.mall.ware.entity.WareInfoEntity; import com.xjs.mall.ware.service.WareInfoService; import com.xjs.utils.PageUtils; import com.xjs.mall.other.R; +import com.xjs.validation.group.AddGroup; +import com.xjs.validation.group.UpdateGroup; +import com.xjs.web.MyBaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.Arrays; @@ -23,7 +27,7 @@ import java.util.Map; @RestController @RequestMapping("ware/wareinfo") @Api(tags = "商城-仓库-仓库信息") -public class WareInfoController { +public class WareInfoController extends MyBaseController { @Autowired private WareInfoService wareInfoService; @@ -33,6 +37,7 @@ public class WareInfoController { @GetMapping("/list") @ApiOperation("列表") public R list(@RequestParam Map params) { + super.checkParams(params); PageUtils page = wareInfoService.queryPage(params); return R.ok().put("page", page); @@ -55,7 +60,7 @@ public class WareInfoController { */ @PostMapping("/save") @ApiOperation("保存") - public R save(@RequestBody WareInfoEntity wareInfo) { + public R save(@Validated(AddGroup.class) @RequestBody WareInfoEntity wareInfo) { wareInfoService.save(wareInfo); return R.ok(); @@ -66,7 +71,7 @@ public class WareInfoController { */ @PutMapping("/update") @ApiOperation("修改") - public R update(@RequestBody WareInfoEntity wareInfo) { + public R update(@Validated(UpdateGroup.class)@RequestBody WareInfoEntity wareInfo) { wareInfoService.updateById(wareInfo); return R.ok(); diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/entity/WareInfoEntity.java b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/entity/WareInfoEntity.java index 627c04f5..192c3e46 100644 --- a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/entity/WareInfoEntity.java +++ b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/entity/WareInfoEntity.java @@ -2,14 +2,16 @@ package com.xjs.mall.ware.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.xjs.validation.group.AddGroup; +import com.xjs.validation.group.UpdateGroup; +import lombok.Data; +import javax.validation.constraints.*; import java.io.Serializable; -import java.util.Date; -import lombok.Data; /** * 仓库信息 - * + * * @author xiejs * @email 1294405880@qq.com * @date 2022-03-15 09:56:19 @@ -17,24 +19,31 @@ import lombok.Data; @Data @TableName("wms_ware_info") public class WareInfoEntity implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * id - */ - @TableId - private Long id; - /** - * 仓库名 - */ - private String name; - /** - * 仓库地址 - */ - private String address; - /** - * 区域编码 - */ - private String areacode; + /** + * id + */ + @TableId + private Long id; + /** + * 仓库名 + */ + @NotBlank(message = "仓库名不能为空", groups = {UpdateGroup.class, AddGroup.class}) + @Size(max = 20, message = "请控制仓库名长度在20字符", groups = {UpdateGroup.class, AddGroup.class}) + private String name; + /** + * 仓库地址 + */ + @NotBlank(message = "仓库地址不能为空", groups = {UpdateGroup.class, AddGroup.class}) + @Size(max = 100, message = "请控制仓库地址长度在100字符", groups = {UpdateGroup.class, AddGroup.class}) + private String address; + /** + * 区域编码 + */ + @NotNull(message = "区域编码不能为空", groups = {UpdateGroup.class, AddGroup.class}) + @Max(message = "区域编码在六位数", groups = {UpdateGroup.class, AddGroup.class}, value = 999999) + @Min(message = "区域编码在六位数", groups = {UpdateGroup.class, AddGroup.class}, value = 100000) + private Integer areacode; } diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/WareInfoServiceImpl.java b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/WareInfoServiceImpl.java index 88feed4d..2da8db56 100644 --- a/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/WareInfoServiceImpl.java +++ b/xjs-business/xjs-project-mall/mall-ware/src/main/java/com/xjs/mall/ware/service/impl/WareInfoServiceImpl.java @@ -27,6 +27,7 @@ public class WareInfoServiceImpl extends ServiceImpl page = this.page(new Query().getPage(params), wrapper);