上装配置管理接口开发

上装台账管理接口开发

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")

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<BaseVehinstallmode
 	
 	@Select("select * from base_vehinstallmodel")
 	List<BaseVehinstallmodelVo> selectListVo();
+
+	@Update("update base_vehinstallmodel set isDelete = 1 where sid = #{sid}")
+    int updateBySid(String sid);
 }

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(上装配置管理) <br/>
  * File: BaseVehinstallmodelFeignFallback.java <br/>
@@ -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();
 	}
 

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<BaseVehinstal
 		BaseVehinstallmodelQuery query = pq.getParams();
 		QueryWrapper<BaseVehinstallmodel> 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<BaseVehinstal
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public void updateBySids(String[] sids) {
+		for (String sid : sids) {
+			baseMapper.updateBySid(sid);
+		}
+	}
 }