CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang

Browse Source 
 Conflicts:
	ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java
This commit is contained in:
闫阳
2022-08-01 13:44:25 +08:00
parent e9e0c47536 0750c9583e
commit 1b01150a7e
19 changed files with 684 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java
View File

@@ -119,7 +119,7 @@ public class MachineController {
public Result changeStatus(@PathVariable("id") Long id){
machineService.changeStatus(id);
return new Result();
return new Result().ok(true);
}
}

15
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java
View File

@@ -1,6 +1,7 @@
package com.cnbm.basic.controller;
import com.cnbm.admin.annotation.LogOperation;
import com.cnbm.admin.params.IdParam;
import com.cnbm.common.constant.Constant;
import com.cnbm.common.page.PageData;
import com.cnbm.common.utils.ExcelUtils;
@@ -13,7 +14,6 @@ import com.cnbm.common.validator.group.UpdateGroup;
import com.cnbm.basic.dto.ProductDTO;
import com.cnbm.basic.excel.ProductExcel;
import com.cnbm.basic.service.IProductService;
import com.google.gson.internal.$Gson$Preconditions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -69,13 +69,13 @@ public class ProductController {
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:product:save')")
public Result<ProductDTO> save(@RequestBody ProductDTO dto){
public Result save(@RequestBody ProductDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
productService.save(dto);
return new Result<ProductDTO>().ok(dto);
return new Result();
}
@PutMapping
@@ -114,12 +114,13 @@ public class ProductController {
ExcelUtils.exportExcelToTarget(response, null, list, ProductExcel.class);
}
@GetMapping("status/{id}")
@PostMapping("status")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){
boolean b = productService.changeStatus(id);
return new Result().ok(b);
public Result changeStatus(@RequestBody IdParam id){
productService.changeStatus(id.getId());
return new Result();
}
}

2
ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java
View File

@@ -90,6 +90,8 @@ public class MachineServiceImpl extends CrudServiceImpl<MachineMapper, Machine,
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
updateById(entity);
//return updateById(entity);
}
}