mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 21:52:07 +08:00
新增webcad生产单导入:复制webcad专用接口,无需权限检查
This commit is contained in:
+3
-3
@@ -96,7 +96,7 @@ public class PlateController {
|
|||||||
@GetMapping("/webcad/page")
|
@GetMapping("/webcad/page")
|
||||||
@Operation(summary = "webcad获得板材信息分页")
|
@Operation(summary = "webcad获得板材信息分页")
|
||||||
public CommonResult<PageResult<PlateRespVO>> webCadGetPlatePage(@Valid PlatePageReqVO pageReqVO) {
|
public CommonResult<PageResult<PlateRespVO>> webCadGetPlatePage(@Valid PlatePageReqVO pageReqVO) {
|
||||||
PageResult<PlateDO> pageResult = plateService.getPlatePage(pageReqVO);
|
PageResult<PlateDO> pageResult = plateService.webCadGetPlatePage(pageReqVO);
|
||||||
return success(BeanUtils.toBean(pageResult, PlateRespVO.class));
|
return success(BeanUtils.toBean(pageResult, PlateRespVO.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -174,8 +174,8 @@ public class PlateController {
|
|||||||
|
|
||||||
@GetMapping("/webcad/all")
|
@GetMapping("/webcad/all")
|
||||||
@Operation(summary = "获取全部板材信息")
|
@Operation(summary = "获取全部板材信息")
|
||||||
public CommonResult<List<PlateRespVO>> webCadGetPlateAll(@RequestParam("organId") Long organId) {
|
public CommonResult<List<PlateRespVO>> webCadGetPlateAll() {
|
||||||
List<PlateDO> list = plateService.getPlateAll(organId);
|
List<PlateDO> list = plateService.getPlateAll();
|
||||||
return success(BeanUtils.toBean(list, PlateRespVO.class));
|
return success(BeanUtils.toBean(list, PlateRespVO.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+9
-1
@@ -67,6 +67,14 @@ public interface PlateService {
|
|||||||
*/
|
*/
|
||||||
PageResult<PlateDO> getPlatePage(PlatePageReqVO pageReqVO);
|
PageResult<PlateDO> getPlatePage(PlatePageReqVO pageReqVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* webcad获取板材信息表 plate_{N}分页
|
||||||
|
*
|
||||||
|
* @param pageReqVO 分页查询
|
||||||
|
* @return 板材信息表 plate_{N}分页
|
||||||
|
*/
|
||||||
|
PageResult<PlateDO> webCadGetPlatePage(PlatePageReqVO pageReqVO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量导入板材
|
* 批量导入板材
|
||||||
*
|
*
|
||||||
@@ -89,5 +97,5 @@ public interface PlateService {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
List<PlateDO> getPlateAll(Long organId);
|
List<PlateDO> getPlateAll();
|
||||||
}
|
}
|
||||||
+7
-3
@@ -130,6 +130,11 @@ public class PlateServiceImpl implements PlateService {
|
|||||||
return plateMapper.selectPage(pageReqVO);
|
return plateMapper.selectPage(pageReqVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PageResult<PlateDO> webCadGetPlatePage(PlatePageReqVO pageReqVO) {
|
||||||
|
return plateMapper.selectPage(pageReqVO);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@OrganIgnore
|
@OrganIgnore
|
||||||
@@ -183,9 +188,8 @@ public class PlateServiceImpl implements PlateService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<PlateDO> getPlateAll(Long organId) {
|
public List<PlateDO> getPlateAll() {
|
||||||
organId = getOrganId(BASE_PLATE_QUERY_PERMISSION, getLoginUser().getId(), organId);
|
return plateMapper.getAllByOrganId(OrganContextHolder.getOrganId());
|
||||||
return plateMapper.getAllByOrganId( organId);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void validateOrganExists(Long organId) {
|
private void validateOrganExists(Long organId) {
|
||||||
|
|||||||
Reference in New Issue
Block a user