From 7501d7f9a8c33f01356f0e35bbc271139c5059f7 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 24 Jun 2022 13:51:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E8=A3=85=E9=85=8D=E7=BD=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=20=E4=B8=8A?= =?UTF-8?q?=E8=A3=85=E5=8F=B0=E8=B4=A6=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehinstallmodelFeign.java | 3 ++- .../BaseVehinstallmodelMapper.java | 4 +++ .../BaseVehinstallmodelRest.java | 27 +++++++++++++++++-- .../BaseVehinstallmodelService.java | 7 +++++ 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelFeign.java index 4cf7abd2f9..ef38afa8b7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelFeign.java @@ -33,6 +33,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; /** @@ -64,7 +65,7 @@ public interface BaseVehinstallmodelFeign { @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody - public ResultBean save(@RequestBody BaseVehinstallmodelDto dto); + public ResultBean save(@Valid @RequestBody BaseVehinstallmodelDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelMapper.java index 422a7d9dad..86b5cbeae5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelMapper.java @@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel; import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -62,4 +63,7 @@ public interface BaseVehinstallmodelMapper extends BaseMapper selectListVo(); + + @Update("update base_vehinstallmodel set isDelete = 1 where sid = #{sid}") + int updateBySid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java index 625b183ba9..1030d8d069 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.base.biz.basevehinstallmodel; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -41,6 +42,8 @@ import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo; import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDto; import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign; +import javax.validation.Valid; + /** * Project: anrui-base(上装配置管理)
* File: BaseVehinstallmodelFeignFallback.java
@@ -74,8 +77,28 @@ public class BaseVehinstallmodelRest implements BaseVehinstallmodelFeign { @Override @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody BaseVehinstallmodelDto dto){ + public ResultBean save(@Valid @RequestBody BaseVehinstallmodelDto dto){ ResultBean rb = ResultBean.fireFail(); + String wk_long = dto.getWk_long(); + String wk_wide = dto.getWk_wide(); + String wk_high = dto.getWk_high(); + String plateThicknessBottom = dto.getPlateThicknessBottom(); + String plateThicknessEdge = dto.getPlateThicknessEdge(); + if (StringUtils.isBlank(wk_long)){ + return rb.setMsg("外廓尺寸长不能为空"); + } + if (StringUtils.isBlank(wk_wide)){ + return rb.setMsg("外廓尺寸宽不能为空"); + } + if (StringUtils.isBlank(wk_high)){ + return rb.setMsg("外廓尺寸高不能为空"); + } + if (StringUtils.isBlank(plateThicknessBottom)){ + return rb.setMsg("板材厚度底不能为空"); + } + if (StringUtils.isBlank(plateThicknessEdge)){ + return rb.setMsg("板材厚度边不能为空"); + } baseVehinstallmodelService.saveOrUpdateDto(dto); return rb.success(); } @@ -85,7 +108,7 @@ public class BaseVehinstallmodelRest implements BaseVehinstallmodelFeign { @PostMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); - baseVehinstallmodelService.delBySids(sids); + baseVehinstallmodelService.updateBySids(sids); return rb.success(); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java index aced7bc693..33fb373d41 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java @@ -65,6 +65,7 @@ public class BaseVehinstallmodelService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("createOrgSid",query.getCreateOrgSid()); + qw.eq("isDelete",0); if (StringUtils.isNotBlank(query.getVehicleTypeKey())){ qw.eq("vehicleTypeKey",query.getVehicleTypeKey()); } @@ -130,4 +131,10 @@ public class BaseVehinstallmodelService extends MybatisBaseService