UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备管理相关代码整理

Browse Source
test
anthonywj 2 years ago
parent ae8c560cde
commit 1b6eb549d8
162 changed files with 554 additions and 616 deletions
Show Stats Download Patch File Download Diff File

14
src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java → src/main/java/com/glxp/api/controller/dev/DeptDeviceDetailController.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo;
@ -8,16 +8,16 @@ import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.inv.DeptDeviceDetailEntity;
import com.glxp.api.entity.dev.DeptDeviceDetailEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
import com.glxp.api.req.inv.AddDeptDeviceRequest;
import com.glxp.api.req.inv.FilterDeptDeviceRequest;
import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest;
import com.glxp.api.req.dev.AddDeptDeviceRequest;
import com.glxp.api.req.dev.FilterDeptDeviceRequest;
import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.inv.DeptDeviceDetailResponse;
import com.glxp.api.service.inv.DeptDeviceDetailService;
import com.glxp.api.res.dev.DeptDeviceDetailResponse;
import com.glxp.api.service.dev.DeptDeviceDetailService;
import com.glxp.api.service.system.SystemPDFModuleService;
import com.glxp.api.service.system.SystemPDFTemplateService;
import com.glxp.api.util.CustomUtil;

8
src/main/java/com/glxp/api/controller/inv/DeviceAssetCertController.java → src/main/java/com/glxp/api/controller/dev/DeviceAssetCertController.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import org.springframework.beans.BeanUtils;
import cn.hutool.core.util.IdUtil;
@ -10,12 +10,12 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.FileConstant;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.inv.DeviceAssetCertEntity;
import com.glxp.api.entity.dev.DeviceAssetCertEntity;
import com.glxp.api.req.inv.FilterInvCertRequest;
import com.glxp.api.req.inv.PostDeviceCertRequest;
import com.glxp.api.req.dev.PostDeviceCertRequest;
import com.glxp.api.req.system.DeleteDeviceFileRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.inv.DeviceAssetCertService;
import com.glxp.api.service.dev.DeviceAssetCertService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;

2
src/main/java/com/glxp/api/controller/inv/DeviceAssetLoacationController.java → src/main/java/com/glxp/api/controller/dev/DeviceAssetLoacationController.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RestController;

2
src/main/java/com/glxp/api/controller/inv/DeviceAssetUserController.java → src/main/java/com/glxp/api/controller/dev/DeviceAssetUserController.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import com.glxp.api.controller.BaseController;
import lombok.extern.slf4j.Slf4j;

12
src/main/java/com/glxp/api/controller/inv/DeviceInspectOrderController.java → src/main/java/com/glxp/api/controller/dev/DeviceInspectOrderController.java
Unescape Escape View File

@ -1,16 +1,16 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.req.UpdateRequest;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inv.DeviceInspectOrderEntity;
import com.glxp.api.req.inv.AddDeviceInspectOrderRequest;
import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest;
import com.glxp.api.entity.dev.DeviceInspectOrderEntity;
import com.glxp.api.req.dev.AddDeviceInspectOrderRequest;
import com.glxp.api.req.dev.FilterDeviceInspectOrderRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.inv.DeviceInspectOrderResponse;
import com.glxp.api.service.inv.DeviceInspectOrderService;
import com.glxp.api.res.dev.DeviceInspectOrderResponse;
import com.glxp.api.service.dev.DeviceInspectOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

12
src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java → src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanController.java
Unescape Escape View File

@ -1,16 +1,16 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.req.UpdateRequest;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inv.DeviceInspectPlanEntity;
import com.glxp.api.req.inv.AddDeviceInspectPlanRequest;
import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest;
import com.glxp.api.entity.dev.DeviceInspectPlanEntity;
import com.glxp.api.req.dev.AddDeviceInspectPlanRequest;
import com.glxp.api.req.dev.FilterDeviceInspectPlanRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.inv.DeviceInspectPlanResponse;
import com.glxp.api.service.inv.DeviceInspectPlanService;
import com.glxp.api.res.dev.DeviceInspectPlanResponse;
import com.glxp.api.service.dev.DeviceInspectPlanService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

11
src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanDelectController.java → src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanDelectController.java
Unescape Escape View File

@ -1,18 +1,13 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.inv.DeviceInspectPlanDelectEntity;
import com.glxp.api.entity.inv.DeviceInspectSetEntity;
import com.glxp.api.req.inv.AddDeviceInspectSetRequest;
import com.glxp.api.res.inv.DeviceInspectSetResponse;
import com.glxp.api.entity.dev.DeviceInspectPlanDelectEntity;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.inv.DeviceInspectPlanDelectService;
import com.glxp.api.service.dev.DeviceInspectPlanDelectService;
import lombok.extern.slf4j.Slf4j;
import org.apache.lucene.util.CollectionUtil;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

10
src/main/java/com/glxp/api/controller/inv/DeviceInspectSetController.java → src/main/java/com/glxp/api/controller/dev/DeviceInspectSetController.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inv.DeviceInspectSetEntity;
import com.glxp.api.req.inv.AddDeviceInspectSetRequest;
import com.glxp.api.res.inv.DeviceInspectSetResponse;
import com.glxp.api.service.inv.DeviceInspectSetService;
import com.glxp.api.entity.dev.DeviceInspectSetEntity;
import com.glxp.api.req.dev.AddDeviceInspectSetRequest;
import com.glxp.api.res.dev.DeviceInspectSetResponse;
import com.glxp.api.service.dev.DeviceInspectSetService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

22
src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java → src/main/java/com/glxp/api/controller/dev/DeviceInspectTakeController.java
Unescape Escape View File

@ -1,7 +1,5 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.thread.ThreadUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.res.BaseResponse;
@ -11,24 +9,18 @@ import com.glxp.api.constant.Constant;
import com.glxp.api.constant.DeviceStatus;
import com.glxp.api.constant.SyncDelType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity;
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
import com.glxp.api.entity.system.SyncDataSetEntity;
import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity;
import com.glxp.api.entity.dev.DeviceInspectTaskEntity;
import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.req.basic.BasicDataRequest;
import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest;
import com.glxp.api.res.inv.DeviceInspectTakeResponse;
import com.glxp.api.res.sync.SpsSyncDeviceTakeResponse;
import com.glxp.api.service.inv.DeviceInspectTaskDetailService;
import com.glxp.api.service.inv.DeviceInspectTaskService;
import com.glxp.api.service.sync.HeartService;
import com.glxp.api.service.sync.SyncDataSetService;
import com.glxp.api.req.dev.FilterDeviceInspectTakeRequest;
import com.glxp.api.res.dev.DeviceInspectTakeResponse;
import com.glxp.api.service.dev.DeviceInspectTaskDetailService;
import com.glxp.api.service.dev.DeviceInspectTaskService;
import com.glxp.api.task.SyncHeartService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OkHttpCli;
import com.glxp.api.util.OrderNoTypeBean;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

12
src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java → src/main/java/com/glxp/api/controller/dev/DeviceMAOrderController.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo;
@ -6,16 +6,16 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inv.DeviceMAOrderEntity;
import com.glxp.api.entity.dev.DeviceMAOrderEntity;
import com.glxp.api.entity.system.SystemPDFModuleEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
import com.glxp.api.req.inv.AddDeviceMAOrderRequest;
import com.glxp.api.req.inv.FilterDeviceMAOrderRequest;
import com.glxp.api.req.dev.AddDeviceMAOrderRequest;
import com.glxp.api.req.dev.FilterDeviceMAOrderRequest;
import com.glxp.api.req.system.FilterPdfModuleRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.inv.DeviceMAOrderResponse;
import com.glxp.api.service.inv.DeviceMAOrderService;
import com.glxp.api.res.dev.DeviceMAOrderResponse;
import com.glxp.api.service.dev.DeviceMAOrderService;
import com.glxp.api.service.system.SystemPDFModuleService;
import com.glxp.api.service.system.SystemPDFTemplateService;
import com.glxp.api.util.JasperUtils;

10
src/main/java/com/glxp/api/controller/inv/DeviceMAOrderDetailCotroller.java → src/main/java/com/glxp/api/controller/dev/DeviceMAOrderDetailCotroller.java
Unescape Escape View File

@ -1,15 +1,15 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inv.DeviceMAOrderDetailEntity;
import com.glxp.api.req.inv.FilterDeviceMAOrderDetailRequest;
import com.glxp.api.entity.dev.DeviceMAOrderDetailEntity;
import com.glxp.api.req.dev.FilterDeviceMAOrderDetailRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.inv.DeviceMAOrderDetailResponse;
import com.glxp.api.service.inv.DeviceMAOrderDetailService;
import com.glxp.api.res.dev.DeviceMAOrderDetailResponse;
import com.glxp.api.service.dev.DeviceMAOrderDetailService;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

8
src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java → src/main/java/com/glxp/api/controller/dev/DeviceProjectSetController.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.req.inv.DeviceProjectSetRequest;
import com.glxp.api.res.inv.DeviceProjectSetResponse;
import com.glxp.api.service.inv.DeviceProjectSetService;
import com.glxp.api.req.dev.DeviceProjectSetRequest;
import com.glxp.api.res.dev.DeviceProjectSetResponse;
import com.glxp.api.service.dev.DeviceProjectSetService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;

12
src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java → src/main/java/com/glxp/api/controller/dev/DeviceReceiveDetailController.java
Unescape Escape View File

@ -1,18 +1,18 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity;
import com.glxp.api.entity.dev.DeviceReceiveOrderDetailEntity;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.req.inv.AddDeviceReceiveOrderDetailRequest;
import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest;
import com.glxp.api.req.dev.AddDeviceReceiveOrderDetailRequest;
import com.glxp.api.req.dev.FilterDeviceReceiveOrderDetailRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse;
import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.inv.DeviceReceiveOrderDetailService;
import com.glxp.api.service.dev.DeviceReceiveOrderDetailService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;

27
src/main/java/com/glxp/api/controller/inv/DeviceReceiveOrderController.java → src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo;
@ -6,25 +6,18 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.FileConstant;
import com.glxp.api.dao.schedule.SystemParamConfigDao;
import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity;
import com.glxp.api.entity.inv.DeviceReceiveOrderEntity;
import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity;
import com.glxp.api.entity.purchase.SupCertEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.entity.dev.DeviceReceiveOrderEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
import com.glxp.api.req.inv.FilterDeptDeviceRequest;
import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest;
import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest;
import com.glxp.api.res.inv.DeptDeviceDetailResponse;
import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse;
import com.glxp.api.res.inv.DeviceReceiveOrderResponse;
import com.glxp.api.service.inv.DeptDeviceDetailService;
import com.glxp.api.service.inv.DeviceReceiveOrderDetailService;
import com.glxp.api.service.inv.DeviceReceiveOrderService;
import com.glxp.api.req.dev.FilterDeptDeviceRequest;
import com.glxp.api.req.dev.FilterDeviceReceiveOrderDetailRequest;
import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest;
import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse;
import com.glxp.api.res.dev.DeviceReceiveOrderResponse;
import com.glxp.api.service.dev.DeptDeviceDetailService;
import com.glxp.api.service.dev.DeviceReceiveOrderDetailService;
import com.glxp.api.service.dev.DeviceReceiveOrderService;
import com.glxp.api.service.system.SystemPDFModuleService;
import com.glxp.api.service.system.SystemPDFTemplateService;
import com.glxp.api.service.system.SystemParamConfigService;

12
src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java → src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderController.java
Unescape Escape View File

@ -1,16 +1,16 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.req.UpdateRequest;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inv.DeviceRepairOrderEntity;
import com.glxp.api.req.inv.AddDeviceRepairOrderRequest;
import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest;
import com.glxp.api.entity.dev.DeviceRepairOrderEntity;
import com.glxp.api.req.dev.AddDeviceRepairOrderRequest;
import com.glxp.api.req.dev.FilterDeviceRepairOrderRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.inv.DeviceRepairOrderResponse;
import com.glxp.api.service.inv.DeviceRepairOrderService;
import com.glxp.api.res.dev.DeviceRepairOrderResponse;
import com.glxp.api.service.dev.DeviceRepairOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

12
src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java → src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderDetailController.java
Unescape Escape View File

@ -1,16 +1,14 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import org.springframework.beans.BeanUtils;
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 com.glxp.api.entity.dev.DeviceRepairOrderDetailEntity;
import com.glxp.api.req.dev.FilterDeviceRepairOrderDetailRequest;
import com.glxp.api.res.dev.DeviceRepairOrderDetailResponse;
import com.glxp.api.service.dev.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;

10
src/main/java/com/glxp/api/controller/inv/InvMAOrderController.java → src/main/java/com/glxp/api/controller/dev/InvMAOrderController.java
Unescape Escape View File

@ -1,14 +1,14 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inv.InvMAOrderEntity;
import com.glxp.api.req.inv.FilterInvMAOrderRequest;
import com.glxp.api.res.inv.InvMAOrderResponse;
import com.glxp.api.service.inv.InvMAOrderService;
import com.glxp.api.entity.dev.InvMAOrderEntity;
import com.glxp.api.req.dev.FilterInvMAOrderRequest;
import com.glxp.api.res.dev.InvMAOrderResponse;
import com.glxp.api.service.dev.InvMAOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;

12
src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java → src/main/java/com/glxp/api/controller/dev/InvMAOrderDetailController.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.controller.inv;
package com.glxp.api.controller.dev;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@ -6,11 +6,11 @@ import com.github.pagehelper.PageInfo;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inv.InvMAOrderDetailEntity;
import com.glxp.api.req.inv.AddInvMAOrderDetailRequest;
import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest;
import com.glxp.api.res.inv.InvMAOrderDetailResponse;
import com.glxp.api.service.inv.InvMAOrderDetailService;
import com.glxp.api.entity.dev.InvMAOrderDetailEntity;
import com.glxp.api.req.dev.AddInvMAOrderDetailRequest;
import com.glxp.api.req.dev.FilterInvMAOrderDetailRequest;
import com.glxp.api.res.dev.InvMAOrderDetailResponse;
import com.glxp.api.service.dev.InvMAOrderDetailService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;

12
src/main/java/com/glxp/api/dao/inv/DeptDeviceDetailDao.java → src/main/java/com/glxp/api/dao/dev/DeptDeviceDetailDao.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeptDeviceDetailEntity;
import com.glxp.api.req.inv.FilterDeptDeviceRequest;
import com.glxp.api.res.inv.DeptDeviceDetailResponse;
import com.glxp.api.res.inv.DeviceInspectSetResponse;
import com.glxp.api.entity.dev.DeptDeviceDetailEntity;
import com.glxp.api.req.dev.FilterDeptDeviceRequest;
import com.glxp.api.res.dev.DeptDeviceDetailResponse;
import com.glxp.api.res.dev.DeviceInspectSetResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -36,4 +36,4 @@ public interface DeptDeviceDetailDao extends BaseMapper<DeptDeviceDetailEntity>
* @return
*/
DeviceInspectSetResponse selectInspectSet(@Param("code") String code);
}
}

4
src/main/java/com/glxp/api/dao/inv/DeviceAssetCertMapper.java → src/main/java/com/glxp/api/dao/dev/DeviceAssetCertMapper.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceAssetCertEntity;
import com.glxp.api.entity.dev.DeviceAssetCertEntity;
import com.glxp.api.req.inv.FilterInvCertRequest;
import org.apache.ibatis.annotations.Mapper;

4
src/main/java/com/glxp/api/dao/inv/DeviceAssetLoacationMapper.java → src/main/java/com/glxp/api/dao/dev/DeviceAssetLoacationMapper.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceAssetLoacationEntity;
import com.glxp.api.entity.dev.DeviceAssetLoacationEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper

4
src/main/java/com/glxp/api/dao/inv/DeviceAssetUsageMapper.java → src/main/java/com/glxp/api/dao/dev/DeviceAssetUsageMapper.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceAssetUsageEntity;
import com.glxp.api.entity.dev.DeviceAssetUsageEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper

4
src/main/java/com/glxp/api/dao/inv/DeviceAssetUserMapper.java → src/main/java/com/glxp/api/dao/dev/DeviceAssetUserMapper.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceAssetUserEntity;
import com.glxp.api.entity.dev.DeviceAssetUserEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper

10
src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java → src/main/java/com/glxp/api/dao/dev/DeviceInspectOrderDao.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceInspectOrderEntity;
import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest;
import com.glxp.api.res.inv.DeviceInspectOrderResponse;
import com.glxp.api.entity.dev.DeviceInspectOrderEntity;
import com.glxp.api.req.dev.FilterDeviceInspectOrderRequest;
import com.glxp.api.res.dev.DeviceInspectOrderResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -28,4 +28,4 @@ public interface DeviceInspectOrderDao extends BaseMapper<DeviceInspectOrderEnti
* @return
*/
DeviceInspectOrderEntity selectByOrderId(@Param("orderId") String orderId);
}
}

9
src/main/java/com/glxp/api/dao/inv/DeviceInspectPlanDao.java → src/main/java/com/glxp/api/dao/dev/DeviceInspectPlanDao.java
Unescape Escape View File

@ -1,10 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.inv.DeviceInspectPlanEntity;
import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest;
import com.glxp.api.res.inv.DeviceInspectPlanResponse;
import com.glxp.api.entity.dev.DeviceInspectPlanEntity;
import com.glxp.api.req.dev.FilterDeviceInspectPlanRequest;
import com.glxp.api.res.dev.DeviceInspectPlanResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
src/main/java/com/glxp/api/dao/inv/DeviceInspectPlanDelectMapper.java → src/main/java/com/glxp/api/dao/dev/DeviceInspectPlanDelectMapper.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceInspectPlanDelectEntity;
import com.glxp.api.entity.dev.DeviceInspectPlanDelectEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface DeviceInspectPlanDelectMapper extends BaseMapper<DeviceInspectPlanDelectEntity> {
}
}

8
src/main/java/com/glxp/api/dao/inv/DeviceInspectSetDao.java → src/main/java/com/glxp/api/dao/dev/DeviceInspectSetDao.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceInspectSetEntity;
import com.glxp.api.res.inv.DeviceInspectSetResponse;
import com.glxp.api.entity.dev.DeviceInspectSetEntity;
import com.glxp.api.res.dev.DeviceInspectSetResponse;
import org.apache.ibatis.annotations.Param;
public interface DeviceInspectSetDao extends BaseMapper<DeviceInspectSetEntity> {
@ -14,4 +14,4 @@ public interface DeviceInspectSetDao extends BaseMapper<DeviceInspectSetEntity>
* @return
*/
DeviceInspectSetResponse selectInspectSet(@Param("code") String code);
}
}

9
src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskDetailMapper.java → src/main/java/com/glxp/api/dao/dev/DeviceInspectTaskDetailMapper.java
Unescape Escape View File

@ -1,12 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.dao.purchase.PurOrderDao;
import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity;
import com.glxp.api.entity.purchase.PurOrderEntity;
import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface DeviceInspectTaskDetailMapper extends BaseMapperPlus<DeviceInspectTaskDetailMapper, DeviceInspectTaskDetailEntity, DeviceInspectTaskDetailEntity> {
}
}

14
src/main/java/com/glxp/api/dao/dev/DeviceInspectTaskMapper.java
Unescape Escape View File

@ -0,0 +1,14 @@
package com.glxp.api.dao.dev;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.dev.DeviceInspectTaskEntity;
import com.glxp.api.req.dev.FilterDeviceInspectTakeRequest;
import com.glxp.api.res.dev.DeviceInspectTakeResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface DeviceInspectTaskMapper extends BaseMapperPlus<DeviceInspectTaskMapper, DeviceInspectTaskEntity, DeviceInspectTaskEntity> {
List<DeviceInspectTakeResponse> filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest);
}

10
src/main/java/com/glxp/api/dao/inv/DeviceMAOrderDao.java → src/main/java/com/glxp/api/dao/dev/DeviceMAOrderDao.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceMAOrderEntity;
import com.glxp.api.req.inv.FilterDeviceMAOrderRequest;
import com.glxp.api.res.inv.DeviceMAOrderResponse;
import com.glxp.api.entity.dev.DeviceMAOrderEntity;
import com.glxp.api.req.dev.FilterDeviceMAOrderRequest;
import com.glxp.api.res.dev.DeviceMAOrderResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -29,4 +29,4 @@ public interface DeviceMAOrderDao extends BaseMapper<DeviceMAOrderEntity> {
*/
DeviceMAOrderEntity selectByOrderId(@Param("orderId") String orderId);
}
}

10
src/main/java/com/glxp/api/dao/inv/DeviceMAOrderDetailDao.java → src/main/java/com/glxp/api/dao/dev/DeviceMAOrderDetailDao.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceMAOrderDetailEntity;
import com.glxp.api.req.inv.FilterDeviceMAOrderDetailRequest;
import com.glxp.api.res.inv.DeviceMAOrderDetailResponse;
import com.glxp.api.entity.dev.DeviceMAOrderDetailEntity;
import com.glxp.api.req.dev.FilterDeviceMAOrderDetailRequest;
import com.glxp.api.res.dev.DeviceMAOrderDetailResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -44,4 +44,4 @@ public interface DeviceMAOrderDetailDao extends BaseMapper<DeviceMAOrderDetailEn
*/
DeviceMAOrderDetailResponse filterMAOrderDetail(@Param("relId") Long relId);
}
}

8
src/main/java/com/glxp/api/dao/inv/DeviceProjectSetMapper.java → src/main/java/com/glxp/api/dao/dev/DeviceProjectSetMapper.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceProjectSet;
import com.glxp.api.req.inv.DeviceProjectSetRequest;
import com.glxp.api.res.inv.DeviceProjectSetResponse;
import com.glxp.api.entity.dev.DeviceProjectSet;
import com.glxp.api.req.dev.DeviceProjectSetRequest;
import com.glxp.api.res.dev.DeviceProjectSetResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

10
src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java → src/main/java/com/glxp/api/dao/dev/DeviceReceiveOrderDao.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceReceiveOrderEntity;
import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest;
import com.glxp.api.res.inv.DeviceReceiveOrderResponse;
import com.glxp.api.entity.dev.DeviceReceiveOrderEntity;
import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest;
import com.glxp.api.res.dev.DeviceReceiveOrderResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -35,4 +35,4 @@ public interface DeviceReceiveOrderDao extends BaseMapper<DeviceReceiveOrderEnti
* @param id
*/
void updateStatusById(@Param("status") int status, @Param("id") Integer id);
}
}

10
src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDetailDao.java → src/main/java/com/glxp/api/dao/dev/DeviceReceiveOrderDetailDao.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity;
import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest;
import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse;
import com.glxp.api.entity.dev.DeviceReceiveOrderDetailEntity;
import com.glxp.api.req.dev.FilterDeviceReceiveOrderDetailRequest;
import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -63,4 +63,4 @@ public interface DeviceReceiveOrderDetailDao extends BaseMapper<DeviceReceiveOrd
* @param orderId
*/
void resetCode(@Param("orderId") String orderId);
}
}

10
src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDao.java → src/main/java/com/glxp/api/dao/dev/DeviceRepairOrderDao.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceRepairOrderEntity;
import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest;
import com.glxp.api.res.inv.DeviceRepairOrderResponse;
import com.glxp.api.entity.dev.DeviceRepairOrderEntity;
import com.glxp.api.req.dev.FilterDeviceRepairOrderRequest;
import com.glxp.api.res.dev.DeviceRepairOrderResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -25,4 +25,4 @@ public interface DeviceRepairOrderDao extends BaseMapper<DeviceRepairOrderEntity
* @return
*/
List<DeviceRepairOrderResponse> filterList(FilterDeviceRepairOrderRequest filterDeviceRepairOrderRequest);
}
}

8
src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java → src/main/java/com/glxp/api/dao/dev/DeviceRepairOrderDetailMapper.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
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 com.glxp.api.entity.dev.DeviceRepairOrderDetailEntity;
import com.glxp.api.req.dev.FilterDeviceRepairOrderDetailRequest;
import com.glxp.api.res.dev.DeviceRepairOrderDetailResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;

6
src/main/java/com/glxp/api/dao/inv/InvMAExplanationDao.java → src/main/java/com/glxp/api/dao/dev/InvMAExplanationDao.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.InvMAExplanationEntity;
import com.glxp.api.entity.dev.InvMAExplanationEntity;
public interface InvMAExplanationDao extends BaseMapper<InvMAExplanationEntity> {
@ -12,4 +12,4 @@ public interface InvMAExplanationDao extends BaseMapper<InvMAExplanationEntity>
* @return
*/
InvMAExplanationEntity selectByStatus(int status);
}
}

10
src/main/java/com/glxp/api/dao/inv/InvMAOrderDao.java → src/main/java/com/glxp/api/dao/dev/InvMAOrderDao.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.InvMAOrderEntity;
import com.glxp.api.req.inv.FilterInvMAOrderRequest;
import com.glxp.api.res.inv.InvMAOrderResponse;
import com.glxp.api.entity.dev.InvMAOrderEntity;
import com.glxp.api.req.dev.FilterInvMAOrderRequest;
import com.glxp.api.res.dev.InvMAOrderResponse;
import java.util.List;
@ -16,4 +16,4 @@ public interface InvMAOrderDao extends BaseMapper<InvMAOrderEntity> {
* @return
*/
List<InvMAOrderResponse> filterList(FilterInvMAOrderRequest filterInvMAOrderRequest);
}
}

10
src/main/java/com/glxp/api/dao/inv/InvMAOrderDetailDao.java → src/main/java/com/glxp/api/dao/dev/InvMAOrderDetailDao.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.glxp.api.dao.inv;
package com.glxp.api.dao.dev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.InvMAOrderDetailEntity;
import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest;
import com.glxp.api.res.inv.InvMAOrderDetailResponse;
import com.glxp.api.entity.dev.InvMAOrderDetailEntity;
import com.glxp.api.req.dev.FilterInvMAOrderDetailRequest;
import com.glxp.api.res.dev.InvMAOrderDetailResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -27,4 +27,4 @@ public interface InvMAOrderDetailDao extends BaseMapper<InvMAOrderDetailEntity>
*/
InvMAOrderDetailEntity selectByOrderIdAndCode(@Param("orderIdFk") String orderIdFk, @Param("code") String code);
}
}

18
src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java
Unescape Escape View File

@ -1,18 +0,0 @@
package com.glxp.api.dao.inv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity;
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest;
import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest;
import com.glxp.api.res.inv.DeviceInspectPlanResponse;
import com.glxp.api.res.inv.DeviceInspectTakeResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface DeviceInspectTaskMapper extends BaseMapperPlus<DeviceInspectTaskMapper, DeviceInspectTaskEntity, DeviceInspectTaskEntity> {
List<DeviceInspectTakeResponse> filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest);
}

2
src/main/java/com/glxp/api/entity/inv/DeptDeviceDetailEntity.java → src/main/java/com/glxp/api/entity/dev/DeptDeviceDetailEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/glxp/api/entity/inv/DeviceAssetCertEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceAssetCertEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/glxp/api/entity/inv/DeviceAssetLoacationEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/glxp/api/entity/inv/DeviceAssetUsageEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/glxp/api/entity/inv/DeviceAssetUserEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

4
src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceInspectOrderEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@ -102,4 +102,4 @@ public class DeviceInspectOrderEntity {
@TableField(value = "remark")
private String remark;
}
}

4
src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanDelectEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@ -51,4 +51,4 @@ public class DeviceInspectPlanDelectEntity {
*/
@TableField(value = "updateTime")
private Date updateTime;
}
}

2
src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

4
src/main/java/com/glxp/api/entity/inv/DeviceInspectSetEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceInspectSetEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@ -60,4 +60,4 @@ public class DeviceInspectSetEntity {
@TableField(value = "remark")
private String remark;
}
}

2
src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskDetailEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

4
src/main/java/com/glxp/api/entity/inv/DeviceMAOrderDetailEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceMAOrderDetailEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@ -134,4 +134,4 @@ public class DeviceMAOrderDetailEntity {
public static final String COL_CREATEUSER = "createUser";
public static final String COL_REMARK = "remark";
}
}

4
src/main/java/com/glxp/api/entity/inv/DeviceMAOrderEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceMAOrderEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@ -83,4 +83,4 @@ public class DeviceMAOrderEntity {
public static final String COL_AUDITUSER = "auditUser";
public static final String COL_REMARK = "remark";
}
}

2
src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java → src/main/java/com/glxp/api/entity/dev/DeviceProjectSet.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderDetailEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderDetailEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java → src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

4
src/main/java/com/glxp/api/entity/inv/InvMAExplanationEntity.java → src/main/java/com/glxp/api/entity/dev/InvMAExplanationEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@ -40,4 +40,4 @@ public class InvMAExplanationEntity {
public static final String COL_STATUS = "status";
public static final String COL_TEXT = "text";
}
}

4
src/main/java/com/glxp/api/entity/inv/InvMAOrderDetailEntity.java → src/main/java/com/glxp/api/entity/dev/InvMAOrderDetailEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@ -126,4 +126,4 @@ public class InvMAOrderDetailEntity {
public static final String COL_UPDATETIME = "updateTime";
public static final String COL_REMARK = "remark";
}
}

4
src/main/java/com/glxp/api/entity/inv/InvMAOrderEntity.java → src/main/java/com/glxp/api/entity/dev/InvMAOrderEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.entity.inv;
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@ -98,4 +98,4 @@ public class InvMAOrderEntity {
public static final String COL_AUDITUSER = "auditUser";
public static final String COL_REMARK = "remark";
}
}

2
src/main/java/com/glxp/api/req/basic/BasicDataRequest.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.glxp.api.req.basic;
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
import com.glxp.api.entity.dev.DeviceInspectTaskEntity;
import com.glxp.api.req.system.DeleteCompanyFileRequest;
import com.glxp.api.req.system.DeleteRequest;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/AddDeptDeviceRequest.java → src/main/java/com/glxp/api/req/dev/AddDeptDeviceRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java → src/main/java/com/glxp/api/req/dev/AddDeviceInspectOrderRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/AddDeviceInspectPlanRequest.java → src/main/java/com/glxp/api/req/dev/AddDeviceInspectPlanRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/AddDeviceInspectSetRequest.java → src/main/java/com/glxp/api/req/dev/AddDeviceInspectSetRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/AddDeviceMAOrderRequest.java → src/main/java/com/glxp/api/req/dev/AddDeviceMAOrderRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java → src/main/java/com/glxp/api/req/dev/AddDeviceReceiveOrderDetailRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/AddDeviceRepairOrderRequest.java → src/main/java/com/glxp/api/req/dev/AddDeviceRepairOrderRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/AddInvMAOrderDetailRequest.java → src/main/java/com/glxp/api/req/dev/AddInvMAOrderDetailRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/DeviceProjectSetRequest.java → src/main/java/com/glxp/api/req/dev/DeviceProjectSetRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/FilterDeptDeviceRequest.java → src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.baomidou.mybatisplus.annotation.TableField;
import com.glxp.api.util.page.ListPageRequest;

2
src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java → src/main/java/com/glxp/api/req/dev/FilterDeviceInspectOrderRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/FilterDeviceInspectPlanRequest.java → src/main/java/com/glxp/api/req/dev/FilterDeviceInspectPlanRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java → src/main/java/com/glxp/api/req/dev/FilterDeviceInspectTakeRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderDetailRequest.java → src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderDetailRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;

2
src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderRequest.java → src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;

4
src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java → src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderDetailRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@ -45,5 +45,5 @@ public class FilterDeviceReceiveOrderDetailRequest extends ListPageRequest {
private Integer status;
private String relId;
}

2
src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderRequest.java → src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;

2
src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java → src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderDetailRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderRequest.java → src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;

2
src/main/java/com/glxp/api/req/inv/FilterInvMAOrderDetailRequest.java → src/main/java/com/glxp/api/req/dev/FilterInvMAOrderDetailRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;

2
src/main/java/com/glxp/api/req/inv/FilterInvMAOrderRequest.java → src/main/java/com/glxp/api/req/dev/FilterInvMAOrderRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;

4
src/main/java/com/glxp/api/req/inv/PostDeviceCertRequest.java → src/main/java/com/glxp/api/req/dev/PostDeviceCertRequest.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.glxp.api.req.inv;
package com.glxp.api.req.dev;
import com.glxp.api.entity.inv.DeviceAssetCertEntity;
import com.glxp.api.entity.dev.DeviceAssetCertEntity;
import lombok.Data;
@Data

2
src/main/java/com/glxp/api/res/inv/DateRequest.java → src/main/java/com/glxp/api/res/dev/DateRequest.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeptDeviceDetailResponse.java → src/main/java/com/glxp/api/res/dev/DeptDeviceDetailResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceInspectOrderResponse.java → src/main/java/com/glxp/api/res/dev/DeviceInspectOrderResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceInspectPlanResponse.java → src/main/java/com/glxp/api/res/dev/DeviceInspectPlanResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceInspectSetResponse.java → src/main/java/com/glxp/api/res/dev/DeviceInspectSetResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java → src/main/java/com/glxp/api/res/dev/DeviceInspectTakeResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceMAOrderDetailResponse.java → src/main/java/com/glxp/api/res/dev/DeviceMAOrderDetailResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceMAOrderResponse.java → src/main/java/com/glxp/api/res/dev/DeviceMAOrderResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceProjectSetResponse.java → src/main/java/com/glxp/api/res/dev/DeviceProjectSetResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderDetailResponse.java → src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderDetailResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java → src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java → src/main/java/com/glxp/api/res/dev/DeviceRepairOrderDetailResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java → src/main/java/com/glxp/api/res/dev/DeviceRepairOrderResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/InvMAOrderDetailResponse.java → src/main/java/com/glxp/api/res/dev/InvMAOrderDetailResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
src/main/java/com/glxp/api/res/inv/InvMAOrderResponse.java → src/main/java/com/glxp/api/res/dev/InvMAOrderResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

2
src/main/java/com/glxp/api/res/inv/InvMAProductResponse.java → src/main/java/com/glxp/api/res/dev/InvMAProductResponse.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.res.inv;
package com.glxp.api.res.dev;
import lombok.Data;

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save