parent
6d2a8ab59e
commit
3c00d58841
@ -4,10 +4,13 @@ import com.foreverwin.iep.qms.entity.QmsQcPlanTarget;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class QmsQcPlanTargetDTO extends QmsQcPlanTarget {
|
||||
|
||||
private String userGroup;
|
||||
private String qcPlanDesc;
|
||||
private List<QmsQcPlanTarget> qmsQcPlanTargets;
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package com.foreverwin.iep.qms.feign;
|
||||
|
||||
import com.foreverwin.iep.qms.dto.QmsQcPlanTargetDTO;
|
||||
import com.foreverwin.iep.qms.entity.QmsQcPlanTarget;
|
||||
import com.foreverwin.mom.common.core.constant.SecurityConstants;
|
||||
import com.foreverwin.mom.common.core.util.R;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -11,12 +11,13 @@ import java.util.List;
|
||||
@FeignClient(contextId = "remoteQmsQcPlanTargetService", value = "iep-qms")
|
||||
public interface RemoteQmsQcPlanTargetService {
|
||||
|
||||
@PostMapping("/qc-plan-target/{targetBo}")
|
||||
R<Boolean> save( @PathVariable("targetBo") String targetBo, @RequestBody List<QmsQcPlanTarget> qmsQcPlanTargetList);
|
||||
@PostMapping("/qc-plan-target/api")
|
||||
R<Boolean> save(@RequestBody QmsQcPlanTargetDTO dto, @RequestHeader(SecurityConstants.FROM) String from);
|
||||
|
||||
@GetMapping("/qc-plan-target/{targetBo}")
|
||||
R<List<QmsQcPlanTargetDTO>> getByTargetBo( @PathVariable("targetBo") String targetBo);
|
||||
R<List<QmsQcPlanTargetDTO>> getByTargetBo(@PathVariable("targetBo") String targetBo);
|
||||
|
||||
@GetMapping("/qc-plan-target/{targetBo}/{inspectLevel}")
|
||||
R<List<QmsQcPlanTargetDTO>> getByTargetBoAndInspectLevel( @PathVariable("targetBo") String targetBo, @PathVariable("inspectLevel") String inspectLevel);
|
||||
R<List<QmsQcPlanTargetDTO>> getByTargetBoAndInspectLevel(@PathVariable("targetBo") String targetBo,
|
||||
@PathVariable("inspectLevel") String inspectLevel);
|
||||
}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
package com.foreverwin.iep.qms.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.foreverwin.mom.common.core.util.R;
|
||||
import com.foreverwin.mom.common.log.annotation.SysLog;
|
||||
import com.foreverwin.iep.qms.dto.QmsQcPlanTargetDTO;
|
||||
import com.foreverwin.iep.qms.entity.QmsQcPlanTarget;
|
||||
import com.foreverwin.iep.qms.service.QmsQcPlanTargetService;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import com.foreverwin.mom.common.excel.annotation.ResponseExcel;
|
||||
import com.foreverwin.mom.common.core.util.R;
|
||||
import com.foreverwin.mom.common.data.tenant.TenantContextHolder;
|
||||
import com.foreverwin.mom.common.log.annotation.SysLog;
|
||||
import com.foreverwin.mom.common.security.annotation.Inner;
|
||||
import com.foreverwin.mom.common.security.util.SecurityUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@ -23,30 +23,43 @@ import java.util.List;
|
||||
*/
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/qc-plan-target" )
|
||||
@RequestMapping("/qc-plan-target")
|
||||
@Api(value = "qc-plan-target", tags = "检验计划使用对象管理")
|
||||
public class QmsQcPlanTargetController {
|
||||
|
||||
private final QmsQcPlanTargetService qmsQcPlanTargetService;
|
||||
private final QmsQcPlanTargetService qmsQcPlanTargetService;
|
||||
|
||||
@ApiOperation(value = "检验计划使用对象-检索", notes = "检验计划使用对象-检索")
|
||||
@SysLog("检验计划使用对象-检索" )
|
||||
@SysLog("检验计划使用对象-检索")
|
||||
@GetMapping("/{targetBo}")
|
||||
public R getByTargetBo(@PathVariable String targetBo) {
|
||||
return R.ok(qmsQcPlanTargetService.getByTargetBo(targetBo));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "储存检验计划使用对象", notes = "储存检验计划使用对象")
|
||||
@SysLog("储存检验计划使用对象" )
|
||||
@SysLog("储存检验计划使用对象")
|
||||
@PostMapping("/{targetBo}")
|
||||
public R save(@PathVariable String targetBo, @RequestBody List<QmsQcPlanTarget> qmsQcPlanTargetList) {
|
||||
return R.ok(qmsQcPlanTargetService.saveFullByTargetBo(targetBo, qmsQcPlanTargetList));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "检验计划使用对象-检索", notes = "检验计划使用对象-检索")
|
||||
@SysLog("检验计划使用对象-检索" )
|
||||
@SysLog("检验计划使用对象-检索")
|
||||
@GetMapping("/{targetBo}/{inspectLevel}")
|
||||
public R getByTargetBoAndInspectLevel(@PathVariable String targetBo, @PathVariable String inspectLevel) {
|
||||
return R.ok(qmsQcPlanTargetService.getByTargetBoAndInspectLevel(targetBo, inspectLevel));
|
||||
}
|
||||
|
||||
@Inner
|
||||
@ApiOperation(value = "储存检验计划使用对象", notes = "储存检验计划使用对象")
|
||||
@SysLog("储存检验计划使用对象")
|
||||
@PostMapping("/api")
|
||||
public R saveApi(@RequestBody QmsQcPlanTargetDTO dto) {
|
||||
TenantContextHolder.setTenantId(dto.getSite());
|
||||
SecurityUtils.setUserName(dto.getCreator());
|
||||
|
||||
String targetBo = dto.getTargetBo();
|
||||
List<QmsQcPlanTarget> qmsQcPlanTargetList = dto.getQmsQcPlanTargets();
|
||||
return R.ok(qmsQcPlanTargetService.saveFullByTargetBo(targetBo, qmsQcPlanTargetList));
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user