From 6d8e7bdf87cf495cb8ab59964c4dbab1b8157c3a Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 9 Aug 2023 16:42:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E8=AF=A6=E6=83=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceRepairOrderDetailController.java | 92 +++++++++++++++++++ .../inv/DeviceRepairOrderDetailMapper.java | 8 +- .../FilterDeviceRepairOrderDetailRequest.java | 48 ++++++++++ .../inv/DeviceRepairOrderDetailResponse.java | 48 ++++++++++ .../inv/DeviceRepairOrderDetailService.java | 16 +++- .../DeviceRepairOrderDetailServiceImpl.java | 38 +++++++- .../inv/DeviceRepairOrderDetailMapper.xml | 24 ++++- 7 files changed, 270 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java create mode 100644 src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java create mode 100644 src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java new file mode 100644 index 000000000..48e5dc856 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java @@ -0,0 +1,92 @@ +package com.glxp.api.controller.inv; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; +import com.glxp.api.service.inv.DeviceRepairOrderDetailService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +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 DeviceRepairOrderDetailController { + + @Resource + private DeviceRepairOrderDetailService deviceRepairOrderDetailService; + + /** + * 查询设备报修单列表 + * + * @param filterDeviceRepairOrderDetailRequest + * @return + */ + @GetMapping("/udiwms/inv/device/repairDetail/order/filter") + public BaseResponse filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + List list = deviceRepairOrderDetailService.filterList(filterDeviceRepairOrderDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 添加设备报修单详情 + * + * @param filterDeviceRepairOrderDetailRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/addDeviceRepairOrderDetail") + public BaseResponse addDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + if (null == filterDeviceRepairOrderDetailRequest || StrUtil.isBlank(filterDeviceRepairOrderDetailRequest.getCode())) { + return ResultVOUtils.paramVerifyFail(); + } + DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity(); + BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); + + deviceRepairOrderDetailService.addDeviceRepairOrderDetail(deviceRepairOrderDetailEntity); + return ResultVOUtils.success(); + } + + /** + * 更新设备报修单信息详情 + * + * @param filterDeviceRepairOrderDetailRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/updateDeviceRepairOrderDetail") + public BaseResponse updateDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + if (null == filterDeviceRepairOrderDetailRequest || StrUtil.isBlank(filterDeviceRepairOrderDetailRequest.getCode())) { + return ResultVOUtils.paramVerifyFail(); + } + DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity(); + BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); + deviceRepairOrderDetailService.updateDeviceRepairOrderDetail(deviceRepairOrderDetailEntity); + return ResultVOUtils.success(); + } + + + /** + * 删除报修单详情 + * + * @param id + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/deleteRepairOrderDetail") + public BaseResponse deleteRepairOrderDetail( String id) { + deviceRepairOrderDetailService.deleteRepairOrderDetail(id); + return ResultVOUtils.success(); + } + +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java index 0e5e4b37c..49366c773 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java @@ -2,8 +2,14 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface DeviceRepairOrderDetailMapper extends BaseMapper { -} \ No newline at end of file + List filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest); + +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java new file mode 100644 index 000000000..f3d36467c --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java @@ -0,0 +1,48 @@ +package com.glxp.api.req.inv; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +/** + * 查询部门设备报修单接口参数 + */ +@Data +public class FilterDeviceRepairOrderDetailRequest extends ListPageRequest { + + private Long id; + + private String orderIdFk; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + +} diff --git a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java new file mode 100644 index 000000000..30f419857 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java @@ -0,0 +1,48 @@ +package com.glxp.api.res.inv; + +import lombok.Data; + +import java.util.Date; + +/** + * 设备报修单VO + */ +@Data +public class DeviceRepairOrderDetailResponse { + private Long id; + + private String orderIdFk; + + /** + * 项目编号 + */ + private String code; + + /** + * 项目内容 + */ + private String content; + + /** + * 项目类型：1：巡检；2：养护 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 更新人 + */ + private String updateUser; + + /** + * 更新时间 + */ + private Date updateTime; + + + +} diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java index 8f5944716..5afd31c93 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java @@ -1,8 +1,22 @@ package com.glxp.api.service.inv; -import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; + +import java.util.List; + public interface DeviceRepairOrderDetailService extends IService{ + List filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest); + + boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); + + boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); + + boolean deleteRepairOrderDetail(String id); + + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java index d64e3bed1..c3723ffc0 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java @@ -1,11 +1,47 @@ package com.glxp.api.service.inv.impl; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; import com.glxp.api.service.inv.DeviceRepairOrderDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + @Service public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl implements DeviceRepairOrderDetailService{ + @Resource + DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper; + @Override + public List filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { + if (null == filterDeviceRepairOrderDetailRequest) { + return Collections.emptyList(); + } + if (null != filterDeviceRepairOrderDetailRequest.getPage() && null != filterDeviceRepairOrderDetailRequest.getLimit()) { + PageHelper.offsetPage((filterDeviceRepairOrderDetailRequest.getPage() - 1) * filterDeviceRepairOrderDetailRequest.getLimit(), filterDeviceRepairOrderDetailRequest.getLimit()); + } + return deviceRepairOrderDetailMapper.filterList(filterDeviceRepairOrderDetailRequest); + } + + @Override + public boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity) { + + return deviceRepairOrderDetailMapper.insert(deviceRepairOrderDetailEntity)>0; + } + + @Override + public boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity) { + return deviceRepairOrderDetailMapper.updateById(deviceRepairOrderDetailEntity)>0; + } + + @Override + public boolean deleteRepairOrderDetail(String id) { + return deviceRepairOrderDetailMapper.deleteById(id)>0; + } } diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml index 4866e735e..58eae9db2 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml @@ -17,4 +17,26 @@ id, orderIdFk, code, content, `type`, remark, updateUser, updateTime - \ No newline at end of file + + + + +