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

mark

Browse Source
This commit is contained in:
caixiang
2023-02-24 14:21:25 +08:00
parent 6e08ff6482
commit cdc06bd733
6 changed files with 553 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java
View File

@@ -1,24 +1,54 @@
package com.cnbm.packing.controller;
import com.cnbm.common.constant.Constant;
import com.cnbm.packing.service.DynamicDataSourceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.cnbm.common.utils.Result;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
/**
* @Author weihongyang
* @Date 2022/6/24 8:57 AM
* @Version 1.0
*/
@RestController
@RequestMapping("/packing")
@RequestMapping("/test")
@Api(tags="测试接口")
public class TestController {
@GetMapping("get")
public Result<Integer> get(){
return new Result<Integer>().ok(1);
@Autowired
DynamicDataSourceService service;
@PostMapping("getPMPPBySubId")
@ApiImplicitParams({
@ApiImplicitParam(name = "subId", value = "基板ID", paramType = "query", required = true, dataTypeClass=Integer.class) ,
})
public Result<Float> getPMPPBySubId(@ApiIgnore @RequestParam Map<String, Object> params){
Object subId = params.get("subId");
return new Result<Float>().ok(service.getPMPPBySubId(subId.toString()));
}
@PostMapping("getOrderNameBySubId")
@ApiImplicitParams({
@ApiImplicitParam(name = "subId", value = "基板ID", paramType = "query", required = true, dataTypeClass=Integer.class) ,
})
public Result<String> getOrderNameBySubId(@ApiIgnore @RequestParam Map<String, Object> params){
Object subId = params.get("subId");
//service.getExtendArgFromCamline()
return new Result<String>().ok(service.getOrderNameBySubId(subId.toString()));
}
@PostMapping("get2")
public Result<Integer> get2(){
return new Result<Integer>().ok(2);
@PostMapping("getExtendArgFromCamline")
@ApiImplicitParams({
@ApiImplicitParam(name = "subId", value = "基板ID", paramType = "query", required = true, dataTypeClass=Integer.class) ,
})
public Result<String> getExtendArgFromCamline(@ApiIgnore @RequestParam Map<String, Object> params){
Object subId = params.get("subId");
return new Result<String>().ok(service.getExtendArgFromCamline(subId.toString()).toString());
}
}

2
ym-packing/src/main/java/com/cnbm/packing/controller/WoCompensationPowerController.java
View File

@@ -49,7 +49,7 @@ public class WoCompensationPowerController {
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class),
@ApiImplicitParam(name = "lineBody", value = "线体", paramType = "query", dataTypeClass = Integer.class)
})
// @PreAuthorize("@ex.hasAuthority('packing:woCompensationPower:page')")
@PreAuthorize("@ex.hasAuthority('packing:woCompensationPower:page')")
public Result<PageData<WoCompensationPowerDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<WoCompensationPowerDTO> page = woCompensationPowerService.page(params);