1.添加设备领用养护记录接口和对应实现基础代码

feature-order-fix
x_z 2 years ago
parent 3a8288df0b
commit aab56b818d

@ -0,0 +1,104 @@
package com.glxp.api.admin.controller.inventory;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity;
import com.glxp.api.admin.req.inventory.AddDeviceCollectOrderDetailRequest;
import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderDetailRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.DeviceCollectOrderDetailResponse;
import com.glxp.api.admin.service.inventory.DeviceCollectOrderDetailService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
*
*/
@Slf4j
@RestController
public class DeviceCollectDetailController {
@Resource
private DeviceCollectOrderDetailService detailService;
/**
*
*
* @param detailRequest
* @return
*/
@GetMapping("/device/collect/order/detail/filterList")
public BaseResponse filterList(FilterDeviceCollectOrderDetailRequest detailRequest) {
List<DeviceCollectOrderDetailResponse> list = detailService.filterList(detailRequest);
PageInfo<DeviceCollectOrderDetailResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<DeviceCollectOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(list);
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*
* @param addDetailRequest
* @param bindingResult
* @return
*/
@PostMapping("/device/collect/order/detail/addOrderDetail")
public BaseResponse addOrderDetail(@RequestBody AddDeviceCollectOrderDetailRequest addDetailRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (null == addDetailRequest || StrUtil.isBlank(addDetailRequest.getOrderIdFk())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return detailService.addOrderDetail(addDetailRequest);
}
/**
*
*
* @param detailEntity
* @param bindingResult
* @return
*/
@PostMapping("/device/collect/order/detail/updateOrderDetail")
public BaseResponse updateOrderDetail(@RequestBody DeviceCollectOrderDetailEntity detailEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (null == detailEntity || null == detailEntity.getId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return detailService.updateOrderDetail(detailEntity);
}
/**
*
*
* @param detailRequest
* @param bindingResult
* @return
*/
@PostMapping("/device/collect/order/detail/deleteOrderDetail")
public BaseResponse deleteOrderDetail(@RequestBody FilterDeviceCollectOrderDetailRequest detailRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (null == detailRequest || null == detailRequest.getId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return detailService.deleteOrderDetail(detailRequest.getId());
}
}

@ -0,0 +1,134 @@
package com.glxp.api.admin.controller.inventory;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity;
import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse;
import com.glxp.api.admin.service.inventory.DeviceCollectOrderService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
*
*/
@Slf4j
@RestController
public class DeviceCollectOrderController {
@Resource
private DeviceCollectOrderService deviceCollectOrderService;
/**
*
*
* @param deviceCollectOrderRequest
* @return
*/
@GetMapping("/device/collect/order/filterList")
public BaseResponse filterList(FilterDeviceCollectOrderRequest deviceCollectOrderRequest) {
List<DeviceCollectOrderResponse> list = deviceCollectOrderService.filterList(deviceCollectOrderRequest);
PageInfo<DeviceCollectOrderResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<DeviceCollectOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(list);
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*
* @param deviceCollectOrderEntity
*/
@PostMapping("/device/collect/order/addOrder")
public BaseResponse addOrder(@RequestBody DeviceCollectOrderEntity deviceCollectOrderEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors() || null == deviceCollectOrderEntity) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
return deviceCollectOrderService.addDeviceCollectOrder(deviceCollectOrderEntity);
}
/**
*
*
* @param deviceCollectOrderEntity
* @param bindingResult
* @return
*/
@PostMapping("/device/collect/order/update")
public BaseResponse update(@RequestBody DeviceCollectOrderEntity deviceCollectOrderEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
if (null == deviceCollectOrderEntity || null == deviceCollectOrderEntity.getId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return deviceCollectOrderService.updateDeviceCollectOrder(deviceCollectOrderEntity);
}
/**
*
*
* @param filterDeviceCollectOrderRequest
* @param bindingResult
* @return
*/
@PostMapping("/device/collect/order/submitAudit")
public BaseResponse submitAudit(@RequestBody FilterDeviceCollectOrderRequest filterDeviceCollectOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
if (null == filterDeviceCollectOrderRequest || null == filterDeviceCollectOrderRequest.getId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return deviceCollectOrderService.submitAudit(filterDeviceCollectOrderRequest.getId());
}
/**
*
*
* @param filterDeviceCollectOrderRequest
* @param bindingResult
* @return
*/
@PostMapping("/device/collect/order/updateStatus")
public BaseResponse updateStatus(@RequestBody FilterDeviceCollectOrderRequest filterDeviceCollectOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
if (null == filterDeviceCollectOrderRequest || null == filterDeviceCollectOrderRequest.getId() || null == filterDeviceCollectOrderRequest.getStatus()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return deviceCollectOrderService.updateStatus(filterDeviceCollectOrderRequest.getId(), filterDeviceCollectOrderRequest.getStatus());
}
/**
*
* @param filterDeviceCollectOrderRequest
* @param bindingResult
* @return
*/
@PostMapping("/device/collect/order/delete")
public BaseResponse delete(@RequestBody FilterDeviceCollectOrderRequest filterDeviceCollectOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
if (null == filterDeviceCollectOrderRequest || null == filterDeviceCollectOrderRequest.getId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return deviceCollectOrderService.deleteDeviceCollectOrder(filterDeviceCollectOrderRequest.getId());
}
}

@ -0,0 +1,97 @@
package com.glxp.api.admin.controller.inventory;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity;
import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse;
import com.glxp.api.admin.service.inventory.DeviceMAOrderService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
*
*/
@Slf4j
@RestController
public class DeviceMAOrderController {
@Resource
private DeviceMAOrderService deviceMAOrderService;
/**
*
*
* @param filterDeviceMAOrderRequest
* @return
*/
@GetMapping("/device/MA/order/filterList")
public BaseResponse filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest) {
List<DeviceMAOrderResponse> list = deviceMAOrderService.filterList(filterDeviceMAOrderRequest);
PageInfo<DeviceMAOrderResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<DeviceMAOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(list);
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*
* @param deviceMAOrderEntity
* @param bindingResult
* @return
*/
@PostMapping("/device/MA/order/addMAOrder")
public BaseResponse addMAOrder(@RequestBody DeviceMAOrderEntity deviceMAOrderEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
return deviceMAOrderService.addDeviceMAOrder(deviceMAOrderEntity);
}
/**
*
*
* @param deviceMAOrderEntity
* @param bindingResult
* @return
*/
@PostMapping("/device/MA/order/updateMAOrder")
public BaseResponse updateMAOrder(@RequestBody DeviceMAOrderEntity deviceMAOrderEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
return deviceMAOrderService.updateDeviceMAOrder(deviceMAOrderEntity);
}
/**
*
*
* @param filterDeviceMAOrderRequest
* @param bindingResult
* @return
*/
@PostMapping("/device/MA/order/deleteMAOrder")
public BaseResponse deleteMAOrder(@RequestBody FilterDeviceMAOrderRequest filterDeviceMAOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (null == filterDeviceMAOrderRequest || null == filterDeviceMAOrderRequest.getId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return deviceMAOrderService.deleteDeviceMAOrder(filterDeviceMAOrderRequest.getId());
}
}

@ -0,0 +1,16 @@
package com.glxp.api.admin.req.inventory;
import lombok.Data;
/**
*
*/
@Data
public class AddDeviceCollectOrderDetailRequest {
/**
*
*/
private String orderIdFk;
}

@ -0,0 +1,21 @@
package com.glxp.api.admin.req.inventory;
import lombok.Data;
/**
*
*/
@Data
public class FilterDeviceCollectOrderDetailRequest {
/**
* ID
*/
private Integer id;
/**
*
*/
private String orderIdFk;
}

@ -0,0 +1,27 @@
package com.glxp.api.admin.req.inventory;
import lombok.Data;
/**
*
*/
@Data
public class FilterDeviceCollectOrderRequest {
/**
* ID
*/
private Integer id;
/**
*
*/
private String orderId;
/**
* 0稿 1 2
*/
private Integer status;
}

@ -0,0 +1,18 @@
package com.glxp.api.admin.req.inventory;
import lombok.Data;
@Data
public class FilterDeviceMAOrderRequest {
/**
* ID
*/
private Integer id;
/**
*
*/
private String orderId;
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.res.inventory;
import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity;
import lombok.Data;
/**
*
*/
@Data
public class DeviceCollectOrderDetailResponse extends DeviceCollectOrderDetailEntity {
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.res.inventory;
import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity;
import lombok.Data;
/**
*
*/
@Data
public class DeviceCollectOrderResponse extends DeviceCollectOrderEntity {
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.res.inventory;
import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity;
import lombok.Data;
/**
*
*/
@Data
public class DeviceMAOrderResponse extends DeviceMAOrderEntity {
}

@ -0,0 +1,48 @@
package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity;
import com.glxp.api.admin.req.inventory.AddDeviceCollectOrderDetailRequest;
import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderDetailRequest;
import com.glxp.api.admin.res.inventory.DeviceCollectOrderDetailResponse;
import com.glxp.api.common.res.BaseResponse;
import java.util.List;
/**
* Service
*/
public interface DeviceCollectOrderDetailService {
/**
*
*
* @param detailRequest
* @return
*/
List<DeviceCollectOrderDetailResponse> filterList(FilterDeviceCollectOrderDetailRequest detailRequest);
/**
*
*
* @param addDetailRequest
* @return
*/
BaseResponse addOrderDetail(AddDeviceCollectOrderDetailRequest addDetailRequest);
/**
*
*
* @param detailEntity
* @return
*/
BaseResponse updateOrderDetail(DeviceCollectOrderDetailEntity detailEntity);
/**
*
*
* @param detailRequest
* @return
*/
BaseResponse deleteOrderDetail(Integer id);
}

@ -0,0 +1,61 @@
package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity;
import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest;
import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse;
import com.glxp.api.common.res.BaseResponse;
import java.util.List;
public interface DeviceCollectOrderService {
/**
*
*
* @param deviceCollectOrderRequest
* @return
*/
List<DeviceCollectOrderResponse> filterList(FilterDeviceCollectOrderRequest deviceCollectOrderRequest);
/**
*
*
* @param deviceCollectOrderEntity
* @return
*/
BaseResponse addDeviceCollectOrder(DeviceCollectOrderEntity deviceCollectOrderEntity);
/**
*
*
* @param deviceCollectOrderEntity
* @return
*/
BaseResponse updateDeviceCollectOrder(DeviceCollectOrderEntity deviceCollectOrderEntity);
/**
*
*
* @param id
* @return
*/
BaseResponse submitAudit(Integer id);
/**
*
*
* @param id
* @param status
* @return
*/
BaseResponse updateStatus(Integer id, Integer status);
/**
*
*
* @param id
* @return
*/
BaseResponse deleteDeviceCollectOrder(Integer id);
}

@ -0,0 +1,47 @@
package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity;
import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest;
import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse;
import com.glxp.api.common.res.BaseResponse;
import java.util.List;
/**
* Service
*/
public interface DeviceMAOrderService {
/**
*
*
* @param filterDeviceMAOrderRequest
* @return
*/
List<DeviceMAOrderResponse> filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest);
/**
*
*
* @param deviceMAOrderEntity
* @return
*/
BaseResponse addDeviceMAOrder(DeviceMAOrderEntity deviceMAOrderEntity);
/**
*
*
* @param deviceMAOrderEntity
* @return
*/
BaseResponse updateDeviceMAOrder(DeviceMAOrderEntity deviceMAOrderEntity);
/**
*
*
* @param id
* @return
*/
BaseResponse deleteDeviceMAOrder(Integer id);
}

@ -0,0 +1,40 @@
package com.glxp.api.admin.service.inventory.impl;
import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity;
import com.glxp.api.admin.req.inventory.AddDeviceCollectOrderDetailRequest;
import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderDetailRequest;
import com.glxp.api.admin.res.inventory.DeviceCollectOrderDetailResponse;
import com.glxp.api.admin.service.inventory.DeviceCollectOrderDetailService;
import com.glxp.api.common.res.BaseResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class DeviceCollectOrderDetailServiceImpl implements DeviceCollectOrderDetailService{
@Override
public List<DeviceCollectOrderDetailResponse> filterList(FilterDeviceCollectOrderDetailRequest detailRequest) {
return null;
}
@Override
public BaseResponse addOrderDetail(AddDeviceCollectOrderDetailRequest addDetailRequest) {
return null;
}
@Override
public BaseResponse updateOrderDetail(DeviceCollectOrderDetailEntity detailEntity) {
return null;
}
@Override
public BaseResponse deleteOrderDetail(Integer id) {
return null;
}
}

@ -0,0 +1,53 @@
package com.glxp.api.admin.service.inventory.impl;
import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity;
import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest;
import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse;
import com.glxp.api.admin.service.inventory.DeviceCollectOrderService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class DeviceCollectOrderServiceImpl implements DeviceCollectOrderService {
@Override
public List<DeviceCollectOrderResponse> filterList(FilterDeviceCollectOrderRequest deviceCollectOrderRequest) {
return null;
}
@Override
public BaseResponse addDeviceCollectOrder(DeviceCollectOrderEntity deviceCollectOrderEntity) {
return null;
}
@Override
public BaseResponse updateDeviceCollectOrder(DeviceCollectOrderEntity deviceCollectOrderEntity) {
return null;
}
@Override
public BaseResponse submitAudit(Integer id) {
return null;
}
@Override
public BaseResponse updateStatus(Integer id, Integer status) {
return null;
}
@Override
public BaseResponse deleteDeviceCollectOrder(Integer id) {
return null;
}
}

@ -0,0 +1,47 @@
package com.glxp.api.admin.service.inventory.impl;
import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity;
import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest;
import com.glxp.api.admin.res.inventory.DeviceMAOrderResponse;
import com.glxp.api.admin.service.inventory.DeviceMAOrderService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class DeviceMAOrderServiceImpl implements DeviceMAOrderService {
@Override
public List<DeviceMAOrderResponse> filterList(FilterDeviceMAOrderRequest filterDeviceMAOrderRequest) {
return null;
}
@Override
public BaseResponse addDeviceMAOrder(DeviceMAOrderEntity deviceMAOrderEntity) {
if (null == deviceMAOrderEntity) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return null;
}
@Override
public BaseResponse updateDeviceMAOrder(DeviceMAOrderEntity deviceMAOrderEntity) {
if (null == deviceMAOrderEntity) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return null;
}
@Override
public BaseResponse deleteDeviceMAOrder(Integer id) {
return null;
}
}
Loading…
Cancel
Save