From 4bff52e938ae2c260fe54d32ef680908868bb27e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 07 六月 2024 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
index c9941ec..989116c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
@@ -6,41 +6,36 @@
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
-import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
-import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
-import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
-import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
+import com.zt.life.modules.mainPart.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.oss.service.SysOssService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* product_model
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2024-02-29
*/
@RestController
@RequestMapping("/basicInfo/XhProductModel/")
-@Api(tags="product_model")
+@Api(tags = "product_model")
public class XhProductModelController {
@Autowired
private XhProductModelService xhProductModelService;
@@ -54,34 +49,32 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"),
- @ApiImplicitParam(name = "nodeType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING, format = "node_type^EQ"),
- @ApiImplicitParam(name = "pid", value = "涓婄骇ID", dataType = Constant.QT.STRING)
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"),
+ @ApiImplicitParam(name = "productType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING, format = "product_type^EQ"),
+ @ApiImplicitParam(name = "pid", value = "涓婄骇ID", dataType = Constant.QT.STRING)
})
- public Result<List<XhProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ public Result<List<XhProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return Result.ok(xhProductModelService.page(queryFilter));
}
@GetMapping("tree")
- public Result<List<XhProductModel>> getTreeList() {
- List<XhProductModel> list = xhProductModelService.getAllTree();
+ public Result<List<XhProductModel>> getTreeList(Boolean showXdy) {
+ List<XhProductModel> list = xhProductModelService.getAllTree(showXdy);
return Result.ok(list);
}
@GetMapping("getProduct")
public Result<List<ProductImg>> getProduct(Long productId) {
-
List<ProductImg> list = xhProductModelService.getProduct(productId);
-
return Result.ok(list);
}
@GetMapping("{id}")
@ApiOperation("淇℃伅")
- public Result<XhProductModel> get(@PathVariable("id") Long id){
+ public Result<XhProductModel> get(@PathVariable("id") Long id) {
XhProductModel data = xhProductModelService.get(id);
if (data.getOperatImg() != null) {
data.setOperatImgName(sysPictureBaseService.get(data.getOperatImg()).getName());
@@ -104,22 +97,25 @@
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody XhProductModel xhProductModel){
+ public Result insert(@RequestBody XhProductModel xhProductModel) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(xhProductModel, AddGroup.class, DefaultGroup.class);
- Integer no = xhProductModelService.getNo(xhProductModel.getPid());
- xhProductModel.setSort(no + 1);
+ Integer no = xhProductModelService.getNo(xhProductModel.getPid(),xhProductModel.getProductType());
+ if (xhProductModel.getSort() < no) {
+ xhProductModel.setSort(no + 1);
+ }
xhProductModelService.insert(xhProductModel);
return Result.ok();
}
@PostMapping("get")
- public Result getSelect(@RequestBody List<XhProductModel> list){
- for(XhProductModel xhProductModel:list){
+ public Result getSelect(@RequestBody List<XhProductModel> list) {
+ for (XhProductModel xhProductModel : list) {
xhProductModel.setSrcId(xhProductModel.getId());
xhProductModel.setId(null);
+ xhProductModel.setSort(xhProductModel.getSort());
xhProductModel.setProductType(xhProductModel.getNodeType());
this.insert(xhProductModel);
}
@@ -129,7 +125,7 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody XhProductModel xhProductModel){
+ public Result update(@RequestBody XhProductModel xhProductModel) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(xhProductModel, UpdateGroup.class, DefaultGroup.class);
xhProductModelService.update(xhProductModel);
@@ -140,7 +136,7 @@
@DeleteMapping
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
xhProductModelService.delete(ids);
--
Gitblit v1.9.1