diff --git a/src/main/java/com/glxp/api/ApiAdminApplication.java b/src/main/java/com/glxp/api/ApiAdminApplication.java index b1e1f3aa2..4e002d71e 100644 --- a/src/main/java/com/glxp/api/ApiAdminApplication.java +++ b/src/main/java/com/glxp/api/ApiAdminApplication.java @@ -1,14 +1,11 @@ package com.glxp.api; import org.mybatis.spring.annotation.MapperScan; -import org.redisson.api.RedissonClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; diff --git a/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java index 293cea8ca..cb037189a 100644 --- a/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java +++ b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java @@ -2,11 +2,11 @@ package com.glxp.api.aspect; import cn.hutool.core.util.StrUtil; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.dao.auth.AuthLicenseDao; import com.glxp.api.entity.auth.AuthLicense; import com.glxp.api.exception.JsonException; import com.glxp.api.util.JwtUtils; -import com.glxp.api.common.enums.ResultEnum; import io.jsonwebtoken.Claims; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; diff --git a/src/main/java/com/glxp/api/aspect/LogAspect.java b/src/main/java/com/glxp/api/aspect/LogAspect.java index 49bb3b0f9..3efdd638f 100644 --- a/src/main/java/com/glxp/api/aspect/LogAspect.java +++ b/src/main/java/com/glxp/api/aspect/LogAspect.java @@ -4,6 +4,7 @@ import cn.hutool.core.lang.Dict; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.constant.BusinessStatus; import com.glxp.api.entity.monitor.OperLogDTO; import com.glxp.api.exception.JsonException; @@ -11,7 +12,6 @@ import com.glxp.api.service.monitor.OperLogService; import com.glxp.api.util.JsonUtils; import com.glxp.api.util.ServletUtils; import com.glxp.api.util.SpringUtils; -import com.glxp.api.common.enums.ResultEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.JoinPoint; diff --git a/src/main/java/com/glxp/api/aspect/RedissonAspect.java b/src/main/java/com/glxp/api/aspect/RedissonAspect.java index 98cc81a14..d1594125a 100644 --- a/src/main/java/com/glxp/api/aspect/RedissonAspect.java +++ b/src/main/java/com/glxp/api/aspect/RedissonAspect.java @@ -12,7 +12,6 @@ import org.aspectj.lang.annotation.Before; import org.aspectj.lang.reflect.MethodSignature; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; diff --git a/src/main/java/com/glxp/api/aspect/RepeatSubmitAspect.java b/src/main/java/com/glxp/api/aspect/RepeatSubmitAspect.java index e4a9b1b9c..e45594e47 100644 --- a/src/main/java/com/glxp/api/aspect/RepeatSubmitAspect.java +++ b/src/main/java/com/glxp/api/aspect/RepeatSubmitAspect.java @@ -2,21 +2,19 @@ package com.glxp.api.aspect; import cn.dev33.satoken.SaManager; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.exception.ServiceException; -import com.glxp.api.util.*; -import lombok.RequiredArgsConstructor; +import com.glxp.api.util.JsonUtils; +import com.glxp.api.util.RedisUtil; +import com.glxp.api.util.ServletUtils; +import com.glxp.api.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; -import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java b/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java index 94b54c263..b696753f3 100644 --- a/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java +++ b/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java @@ -3,7 +3,9 @@ package com.glxp.api.common.converter; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * Long 类型的 List 转为字符串 diff --git a/src/main/java/com/glxp/api/config/JacksonConfig.java b/src/main/java/com/glxp/api/config/JacksonConfig.java index 73d2e8d8f..cdb0d5399 100644 --- a/src/main/java/com/glxp/api/config/JacksonConfig.java +++ b/src/main/java/com/glxp/api/config/JacksonConfig.java @@ -3,7 +3,6 @@ package com.glxp.api.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.glxp.api.config.serializer.*; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; diff --git a/src/main/java/com/glxp/api/config/Knife4jConfiguration.java b/src/main/java/com/glxp/api/config/Knife4jConfiguration.java index e90d2ce85..98d47f5e8 100644 --- a/src/main/java/com/glxp/api/config/Knife4jConfiguration.java +++ b/src/main/java/com/glxp/api/config/Knife4jConfiguration.java @@ -1,7 +1,6 @@ package com.glxp.api.config; -import com.glxp.api.common.enums.ResultEnum; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/com/glxp/api/config/YudaoMybatisAutoConfiguration.java b/src/main/java/com/glxp/api/config/YudaoMybatisAutoConfiguration.java index d581bd820..874b1522a 100644 --- a/src/main/java/com/glxp/api/config/YudaoMybatisAutoConfiguration.java +++ b/src/main/java/com/glxp/api/config/YudaoMybatisAutoConfiguration.java @@ -1,10 +1,6 @@ package com.glxp.api.config; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Slf4j diff --git a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java index 81e8a0dd7..741c8d5c5 100644 --- a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java +++ b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java @@ -1,35 +1,22 @@ package com.glxp.api.controller.alihealth; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; - import com.glxp.api.dao.collect.IoCollectCodeBackMapper; import com.glxp.api.entity.collect.IoCollectCodeBackup; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.alihealth.local.AlihealthGetRelCodeReqeust; import com.glxp.api.req.collect.IoCollectCodeRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; 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.ArrayList; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @Slf4j @RestController diff --git a/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java b/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java index cb760528b..ab73d8dec 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java @@ -1,14 +1,14 @@ package com.glxp.api.controller.auth; 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.auth.AuthCheckEntity; import com.glxp.api.req.auth.FilterAuthCheckRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.AuthCheckService; import com.glxp.api.util.RsaUtils; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index c58455a2b..85c5e7736 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -1,27 +1,36 @@ package com.glxp.api.controller.auth; -import com.glxp.api.util.PasswordUtils; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; +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.BusinessType; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.auth.*; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.entity.auth.WarehouseUserEntity; import com.glxp.api.req.auth.*; import com.glxp.api.res.PageSimpleResponse; -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.service.auth.*; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.auth.DeptService; +import com.glxp.api.service.auth.WarehouseUserService; +import com.glxp.api.util.PasswordUtils; import com.glxp.api.util.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +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 javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * 管理员相关 diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index e3fdea9da..6c21b9c06 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -1,7 +1,5 @@ package com.glxp.api.controller.auth; -import com.glxp.api.dto.DictDto; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -12,10 +10,13 @@ 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.controller.BaseController; +import com.glxp.api.dto.DictDto; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; -import com.glxp.api.req.auth.*; +import com.glxp.api.req.auth.FilterInvLinkDataRequest; +import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; +import com.glxp.api.req.auth.FilterInvWarehouseRequest; +import com.glxp.api.req.auth.UpdateInvRelBusRequest; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; @@ -25,7 +26,6 @@ import com.glxp.api.res.auth.InvWarehouseThirdSysResponse; import com.glxp.api.res.basic.BasicBussinessTypeResponse; import com.glxp.api.service.auth.*; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.system.SystemParamConfigService; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -35,7 +35,10 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @RestController diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index e8b5e9783..509dabac4 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -1,14 +1,12 @@ package com.glxp.api.controller.auth; import cn.hutool.core.date.DateUnit; -import cn.hutool.crypto.SecureUtil; -import com.glxp.api.constant.FileConstant; -import com.glxp.api.res.basic.UserWorkResponse; -import com.glxp.api.res.basic.WorkBindWorkResponse; -import com.glxp.api.service.basic.BasicCollectUserService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; +import cn.hutool.crypto.SecureUtil; 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.Constant; import com.glxp.api.controller.BaseController; import com.glxp.api.dao.auth.AuthLicenseDao; @@ -22,12 +20,11 @@ import com.glxp.api.req.auth.UpdatePasswordRequest; import com.glxp.api.res.auth.LoginResponse; import com.glxp.api.res.auth.LoginUserInfoResponse; import com.glxp.api.res.auth.WebTitleResponse; -import com.glxp.api.service.system.CompanyService; -import com.glxp.api.service.monitor.LogininforService; -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.res.basic.UserWorkResponse; import com.glxp.api.service.auth.*; +import com.glxp.api.service.basic.BasicCollectUserService; +import com.glxp.api.service.monitor.LogininforService; +import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java index f3181d6fc..4d4fe38da 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java @@ -2,13 +2,13 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.SysDictData; import com.glxp.api.req.auth.SysDictDataRequest; import com.glxp.api.service.auth.ISysDictDataService; import com.glxp.api.service.auth.ISysDictTypeService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java index ba7a2d577..2945117f2 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java @@ -3,14 +3,14 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.SysDictType; import com.glxp.api.req.auth.SysDictTypeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.ISysDictTypeService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/auth/SysMenuController.java b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java index 64a31a4c9..f315a91d7 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysMenuController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java @@ -2,14 +2,12 @@ package com.glxp.api.controller.auth; import cn.hutool.core.lang.tree.Tree; import cn.hutool.http.HttpUtil; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.SysMenu; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.ISysMenuService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/auth/SysRoleController.java b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java index 99d6766c0..1297b36c4 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysRoleController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java @@ -2,6 +2,8 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; @@ -12,8 +14,6 @@ import com.glxp.api.req.auth.FilterRoleRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.auth.ISysRoleService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 1b0094d18..a1ea75cb6 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java index c0807f207..987068f8d 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -2,58 +2,41 @@ package com.glxp.api.controller.auth; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; - import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; 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.controller.BaseController; import com.glxp.api.dto.DictDto; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.SysWorkplace; -import com.glxp.api.entity.auth.WarehouseUserEntity; -import com.glxp.api.entity.basic.BasicCollectPointEntity; -import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.basic.SysWorkplaceQueue; -import com.glxp.api.entity.purchase.SupCertEntity; -import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; -import com.glxp.api.exception.JsonException; -import com.glxp.api.req.auth.FilterAuthUserRequest; -import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.req.auth.SysWorkplaceRequest; import com.glxp.api.req.basic.BasicCollectUserRequest; import com.glxp.api.req.basic.SysWorkplaceFreightRequest; import com.glxp.api.req.basic.WorkBindBusTypeRequest; -import com.glxp.api.req.dev.DeviceInfoDetailQuery; -import com.glxp.api.req.purchase.purPlanPrintRequest; import com.glxp.api.req.system.PrintLabelRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.*; -import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse; +import com.glxp.api.res.basic.SysWorkplaceFreightResponse; +import com.glxp.api.res.basic.SysWorkplaceResponse; +import com.glxp.api.res.basic.UserWorkResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.auth.DeptService; import com.glxp.api.service.auth.SysWorkplaceService; -import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.service.basic.BasicCollectUserService; -import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.basic.SysWorkplaceFreightService; import com.glxp.api.service.basic.SysWorkplaceQueueService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.JasperUtils; -import com.glxp.api.vo.dev.DeviceInfoVo; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.Offset; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -63,7 +46,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceFreightController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceFreightController.java index d5f654f98..177573e64 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceFreightController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceFreightController.java @@ -1,32 +1,21 @@ package com.glxp.api.controller.auth; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.controller.BaseController; -import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.basic.SysWorkplaceFreight; -import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.basic.SysWorkplaceFreightRequest; -import com.glxp.api.req.basic.SysWorkplaceQueueRequest; -import com.glxp.api.req.inout.FilterOrderDetailResultRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.*; -import com.glxp.api.res.inout.IoOrderDetailResultResponse; -import com.glxp.api.res.inout.IoOrderDetailVo; -import com.glxp.api.res.inout.IoSplitInvResponse; +import com.glxp.api.res.basic.SysWorkplaceFreightPrintResponse; +import com.glxp.api.res.basic.SysWorkplaceFreightResponse; +import com.glxp.api.res.basic.SysWorkplaceFreightViewResponse; import com.glxp.api.service.basic.SysWorkplaceFreightService; -import com.glxp.api.service.basic.SysWorkplaceQueueService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.JasperUtils; @@ -40,9 +29,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.util.*; /** diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java index e0661d98a..5483e7671 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java @@ -11,10 +11,8 @@ import com.glxp.api.entity.basic.SysWorkplaceLayer; import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.req.basic.SysWorkplaceLayerRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.SysWorkplaceFreightResponse; import com.glxp.api.res.basic.SysWorkplaceLayerResponse; import com.glxp.api.res.basic.SysWorkplaceQueueViewResponse; -import com.glxp.api.service.basic.SysWorkplaceFreightService; import com.glxp.api.service.basic.SysWorkplaceLayerService; import com.glxp.api.service.basic.SysWorkplaceQueueService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java index 4d3720fc7..7b0407a52 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java @@ -2,8 +2,8 @@ package com.glxp.api.controller.auth; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; @@ -11,21 +11,16 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.SysWorkplace; -import com.glxp.api.entity.basic.SysWorkplaceLayer; import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.collect.IoCollectLedGroup; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; -import com.glxp.api.req.basic.SysWorkplaceFreightRequest; -import com.glxp.api.req.basic.SysWorkplaceLayerRequest; import com.glxp.api.req.basic.SysWorkplaceQueueBindRequest; import com.glxp.api.req.basic.SysWorkplaceQueueRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.SysWorkplaceFreightResponse; import com.glxp.api.res.basic.SysWorkplaceQueueResponse; -import com.glxp.api.res.basic.SysWorkplaceResponse; import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.basic.SysWorkplaceQueueService; import com.glxp.api.service.basic.UdiProductService; @@ -35,7 +30,6 @@ import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.JasperUtils; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.bcel.generic.IF_ACMPEQ; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index e353dfa3b..650970cbe 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -1,11 +1,6 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; -import com.glxp.api.constant.Constant; -import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.dto.DictDto; -import com.glxp.api.service.auth.InvWarehouseService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -21,6 +16,8 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantType; import com.glxp.api.constant.SyncDelType; import com.glxp.api.controller.BaseController; +import com.glxp.api.dto.DictDto; +import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.basic.BasicDataRequest; @@ -33,6 +30,7 @@ import com.glxp.api.res.basic.BasicBussinessTypeResponse; import com.glxp.api.res.basic.BussinessTypExportResponse; import com.glxp.api.res.basic.CandidateRequest; import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.FileUtils; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectPointCategoryController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectPointCategoryController.java index 1d9cac5e9..b1cf16b7a 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCollectPointCategoryController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectPointCategoryController.java @@ -9,15 +9,13 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.basic.BasicCollectPointCategory; import com.glxp.api.req.basic.BasicCollectgoryRequest; -import com.glxp.api.req.basic.BasicProductTypeRequest; import com.glxp.api.res.basic.BasicCollectGoryResponse; -import com.glxp.api.res.basic.BasicProductCategoryTypeResponse; import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.basic.BasicCollectPointCategoryService; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +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.Date; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectPointController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectPointController.java index d811e8820..95efbb5a4 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCollectPointController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectPointController.java @@ -1,31 +1,22 @@ package com.glxp.api.controller.basic; import cn.hutool.core.util.IdUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.auth.WarehouseUserEntity; import com.glxp.api.entity.basic.BasicCollectPointEntity; import com.glxp.api.entity.basic.BasicCollectUserEntity; import com.glxp.api.req.auth.FilterInvLinkDataRequest; -import com.glxp.api.req.auth.SysWorkplaceRequest; import com.glxp.api.req.basic.BasicCollectRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.auth.DeptUserResponse; -import com.glxp.api.res.inout.ReceiveResponse; import com.glxp.api.service.auth.AuthAdminService; -import com.glxp.api.service.auth.DeptService; -import com.glxp.api.service.auth.DeptUserService; import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.service.basic.BasicCollectPointService; import com.glxp.api.service.basic.BasicCollectUserService; import lombok.extern.slf4j.Slf4j; -import org.aspectj.weaver.ast.Var; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java index 54ade4cf2..19e5936ac 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java @@ -5,16 +5,12 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.basic.BasicCollectPointEntity; import com.glxp.api.entity.basic.BasicCollectUserEntity; -import com.glxp.api.req.basic.BasicCollectRequest; import com.glxp.api.req.basic.BasicCollectUserRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.SysWorkplaceResponse; import com.glxp.api.res.basic.UserWorkResponse; import com.glxp.api.service.basic.BasicCollectUserService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.Offset; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 20b38b6bc..5d35c5baf 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -1,12 +1,6 @@ package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.dto.DictDto; -import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; -import com.glxp.api.res.basic.FromCorpResponse; -import com.glxp.api.service.auth.InvWarehouseService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -16,12 +10,15 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.SyncDelType; import com.glxp.api.controller.BaseController; +import com.glxp.api.dto.DictDto; +import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.http.sync.SpGetHttpClient; +import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; import com.glxp.api.req.basic.*; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; @@ -30,6 +27,8 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicErpUnitsResponse; import com.glxp.api.res.basic.BasicProductThirdSysResponse; import com.glxp.api.res.basic.BasicUnitMaintainResponse; +import com.glxp.api.res.basic.FromCorpResponse; +import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.system.CompanyService; import com.glxp.api.service.system.SystemParamConfigService; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java index 623882e89..fc50d65a9 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java @@ -7,7 +7,6 @@ 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.BasicProcessStatus; -import com.glxp.api.entity.basic.BasicCorpsImportDetailEntity; import com.glxp.api.entity.basic.BasicCorpsImportLogEntity; import com.glxp.api.req.basic.FilterCorpImportLogRequest; import com.glxp.api.req.system.DeleteRequest; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java index a338a3095..07404d750 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.basic; -import org.springframework.beans.BeanUtils; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java index ccb497a6b..d5a472b90 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java @@ -1,13 +1,10 @@ package com.glxp.api.controller.basic; -import com.glxp.api.service.basic.UdiRelevanceService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.file.FileWriter; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; - import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.basic.UdiRelevanceDao; @@ -15,7 +12,10 @@ import com.glxp.api.dao.thrsys.ThrCorpDao; import com.glxp.api.dao.thrsys.ThrProductsDao; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.thrsys.ThrProductsEntity; -import com.glxp.api.req.basic.*; +import com.glxp.api.req.basic.BasicCorpsExportRequest; +import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.basic.UdiInfoExportRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.basic.BasicCorpExportLogResponse; @@ -25,7 +25,9 @@ import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.service.basic.BasicCorpExportLogService; import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.basic.BasicProductsExportLogService; +import com.glxp.api.service.basic.UdiRelevanceService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java b/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java index a4e944593..683fc24c1 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java @@ -4,13 +4,9 @@ package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; -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.BusinessType; -import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; -import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inv.invInnerOrderprintReques; @@ -21,7 +17,6 @@ import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inv.InvInnerOrderPrintService; 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; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicManufacturerController.java b/src/main/java/com/glxp/api/controller/basic/BasicManufacturerController.java index a872bb425..8c4d8d99c 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicManufacturerController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.basic; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -8,13 +7,10 @@ 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.ConstantStatus; -import com.glxp.api.constant.SyncDelType; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicManufacturerEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.req.basic.BasicDataRequest; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.req.basic.CombineSingleUnitRequest; import com.glxp.api.req.basic.CombineUnitRequest; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java index f91f315d8..579f5a7ef 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java @@ -1,7 +1,5 @@ package com.glxp.api.controller.basic; -import com.glxp.api.service.basic.UdiRelevanceService; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -17,7 +15,9 @@ import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlDlResponse; import com.glxp.api.service.basic.BasicProductsExportLogService; +import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.util.CustomUtil; +import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java index fe3ad2969..924ea65d6 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.basic; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.thread.ThreadUtil; import com.github.pagehelper.PageInfo; @@ -10,13 +9,10 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.RedissonCacheKey; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.basic.BasicSkPrescribeEntity; -import com.glxp.api.entity.basic.BasicSkSickerEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.basic.BasicSkSickerRequest; import com.glxp.api.req.basic.GetSickPrescribeRequest; import com.glxp.api.req.basic.GetSickRequest; -import com.glxp.api.req.basic.SickerPrescribeSaveRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkSickerResponse; import com.glxp.api.service.basic.BasicSkSickerService; @@ -29,7 +25,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; @Slf4j diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java index f5cde49bf..bb7701493 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java @@ -15,7 +15,10 @@ import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import com.glxp.api.entity.basic.BasicSkSickerEntity; import com.glxp.api.entity.collect.IoCollectOrder; -import com.glxp.api.req.basic.*; +import com.glxp.api.req.basic.BasicSkPrescribeRequest; +import com.glxp.api.req.basic.GetSickPrescribeRequest; +import com.glxp.api.req.basic.PrescribeBindWorkRequest; +import com.glxp.api.req.basic.SickerPrescribeSaveRequest; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkPrescribeResponse; @@ -23,15 +26,14 @@ import com.glxp.api.res.basic.BasicSkSickerResponse; import com.glxp.api.service.BasicSkPrescribeItemService; import com.glxp.api.service.basic.BasicSkPrescribeService; import com.glxp.api.service.basic.BasicSkSickerService; +import com.glxp.api.service.collect.DownloadFactory; import com.glxp.api.service.collect.IoCollectOriginService; import com.glxp.api.vo.basic.BasicSkPrescribeDetailVo; -import org.apache.poi.ss.formula.functions.Offset; 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 com.glxp.api.service.collect.DownloadFactory; import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java b/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java index d1c3e07fb..c35d7f526 100644 --- a/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java +++ b/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java @@ -9,13 +9,11 @@ import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.DlEntrustReceEntity; import com.glxp.api.entity.basic.EntrustReceEntity; -import com.glxp.api.req.auth.BussinessTypeFilterRequest; import com.glxp.api.req.basic.BasicEntrustRecRequest; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.EntrustReceResponse; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBussinessTypeService; diff --git a/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowController.java b/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowController.java index 7acc26386..fd53c7331 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -16,7 +15,6 @@ import com.glxp.api.enums.ApprovalFlowEnum; import com.glxp.api.enums.dev.DeviceChangeStatusEnum; import com.glxp.api.enums.dev.DeviceChangeTypeEnum; import com.glxp.api.enums.dev.DeviceStatusEnum; -import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.SubmitApprovalFlowRequest; import com.glxp.api.res.basic.SysApprovalFlowDetailResponse; import com.glxp.api.service.auth.CustomerService; diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java index 0f3f928f1..82e9e199b 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java @@ -1,9 +1,7 @@ package com.glxp.api.controller.basic; -import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.common.res.BaseResponse; @@ -15,12 +13,13 @@ import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; -import com.glxp.api.res.basic.UserWorkResponse; -import com.glxp.api.res.basic.WorkBindWorkResponse; import com.glxp.api.service.basic.SysWorkplaceBusService; import com.glxp.api.service.basic.SysWorkplaceDocumentService; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; +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.ArrayList; diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java index dfd6f35bc..b5f935898 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java @@ -5,11 +5,8 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.basic.BasicCollectPointEntity; import com.glxp.api.entity.basic.SysWorkplacePutRel; -import com.glxp.api.req.basic.BasicCollectRequest; import com.glxp.api.req.basic.CargowWorkplaceRequest; -import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.SysWorkplacePutRelResponse; import com.glxp.api.service.thrsys.SysWorkplacePutRelService; diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java index 790c16049..fddc60607 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java @@ -1,7 +1,6 @@ package com.glxp.api.controller.basic; import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; @@ -9,15 +8,10 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.SysWorkplaceRegion; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; -import com.glxp.api.entity.system.SystemPDFTemplateEntity; -import com.glxp.api.req.basic.SysWorkplaceFreightRequest; import com.glxp.api.req.basic.SysWorkplaceRegionRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.SysWorkplaceFreightPrintResponse; import com.glxp.api.res.basic.SysWorkplaceRegionResponse; import com.glxp.api.service.basic.SysWorkplaceRegionService; -import com.glxp.api.util.JasperUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -27,7 +21,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.Date; +import java.util.List; /** * @author : zhuzhu diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index b439e849f..e307c37e7 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.basic; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 6fe13316c..860f61587 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -1,19 +1,8 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.thread.ThreadUtil; -import com.glxp.api.dao.basic.UdiRelevanceDao; -import com.glxp.api.dto.DictDto; -import com.glxp.api.entity.thrsys.CodeRel; -import com.glxp.api.entity.thrsys.YbDrug; -import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.http.sync.SpsDirectClient; -import com.glxp.api.res.chs.YbHcflEntityResponse; -import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.inv.impl.InvProductService; -import com.glxp.api.service.thrsys.YbDrugService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -23,27 +12,36 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.constant.SyncDelType; import com.glxp.api.controller.BaseController; +import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.dto.DictDto; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.system.SystemParamConfigEntity; +import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.sync.SpGetHttpClient; +import com.glxp.api.entity.thrsys.YbDrug; +import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.http.sync.SpsDirectClient; import com.glxp.api.req.basic.*; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicProductThirdSysResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.chs.YbHcflEntityResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.*; +import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.InvPreProductService; +import com.glxp.api.service.inv.impl.InvProductService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrDataService; import com.glxp.api.service.thrsys.ThrSystemService; +import com.glxp.api.service.thrsys.YbDrugService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.udi.FilterUdiUtils; +import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 354a5ea43..6b8b6ba59 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -25,10 +25,8 @@ import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.basic.*; import com.glxp.api.service.purchase.impl.PurApplyDetailService; -import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.IntUtil; -import com.glxp.api.util.SupplementVailUtil; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index b6b9781cf..6414abc4f 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -1,27 +1,24 @@ package com.glxp.api.controller.basic; -import com.github.pagehelper.Page; -import com.glxp.api.dto.DictDto; -import com.glxp.api.entity.thrsys.CodeRel; -import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.http.sync.SpsDirectClient; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.Page; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.AsyncDiDlHelper; import com.glxp.api.dao.basic.BasicProductsDao; -import com.glxp.api.dao.basic.UdiProductDao; +import com.glxp.api.dto.DictDto; import com.glxp.api.entity.basic.*; -import com.glxp.api.req.basic.*; -import com.glxp.api.http.sync.SpGetHttpClient; -import com.glxp.api.req.basic.*; +import com.glxp.api.entity.thrsys.CodeRel; +import com.glxp.api.http.sync.SpsDirectClient; +import com.glxp.api.req.basic.FilterUdiInfoRequest; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.basic.ProductInfoFilterRequest; +import com.glxp.api.req.basic.UdiCompanyRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.basic.*; -import com.glxp.api.util.OkHttpCli; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import net.sourceforge.pinyin4j.PinyinHelper; @@ -36,7 +33,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java index 3b3a37f81..c7e99a7d2 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java @@ -3,9 +3,7 @@ package com.glxp.api.controller.collect; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; -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; @@ -15,18 +13,12 @@ import com.glxp.api.entity.collect.IoCollectCodeBackup; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBackup; import com.glxp.api.entity.collect.IoCollectOrderCheckCode; -import com.glxp.api.req.collect.CollectOrderCodeAutoRequest; -import com.glxp.api.req.collect.CollectOrderCodeManRequest; import com.glxp.api.req.collect.IoCollectCodeRequest; -import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.collect.CollectOrderCodeAutoResponse; -import com.glxp.api.res.collect.CollectOrderCodeManResponse; import com.glxp.api.res.collect.IoCollectCodeResponse; import com.glxp.api.service.collect.*; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; -import org.aspectj.weaver.ast.Var; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -35,9 +27,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java index d3af03b5b..032a18cd0 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java @@ -6,19 +6,13 @@ 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.controller.BaseController; -import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBackup; -import com.glxp.api.req.collect.CollectOrderCodeManRequest; import com.glxp.api.req.collect.IoCollectCodeRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.collect.CollectOrderCodeManResponse; import com.glxp.api.res.collect.IoCollectCodeResponse; import com.glxp.api.service.collect.IoCollectCodeService; import com.glxp.api.service.collect.IoCollectOrderBackupService; -import com.glxp.api.service.collect.IoCollectOrderBizService; -import com.glxp.api.service.collect.IoCollectOrderService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.Offset; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java index 65ad289c6..c73a8ddcf 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java @@ -1,8 +1,6 @@ package com.glxp.api.controller.collect; import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; @@ -10,21 +8,13 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.entity.collect.IoCollectLedGroup; -import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.SysOrderLed; -import com.glxp.api.req.basic.BasicCollectUserRequest; import com.glxp.api.req.collect.CollectLedConfirmRequest; import com.glxp.api.req.collect.CollectLedGroupRequest; -import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.UserWorkResponse; import com.glxp.api.res.collect.IoCollectLedGroupResponse; -import com.glxp.api.res.collect.IoCollectOrderResponse; -import com.glxp.api.res.collect.LedResponse; import com.glxp.api.service.basic.SysWorkplaceQueueService; -import com.glxp.api.service.collect.IoCollectCodeService; import com.glxp.api.service.collect.IoCollectLedGroupService; -import com.glxp.api.service.collect.IoCollectOrderBizService; import com.glxp.api.service.collect.SysOrderLedService; import com.glxp.api.service.inout.IoSplitCodeService; import com.glxp.api.util.IntUtil; @@ -37,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; /** * @author : zhuzhu diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeAutoController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeAutoController.java index c00005d56..f4a451f77 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeAutoController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeAutoController.java @@ -6,7 +6,6 @@ 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.controller.BaseController; -import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; import com.glxp.api.entity.inout.IoSplitCodeEntity; import com.glxp.api.req.collect.CollectOrderBizRequest; diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 2c7009e2d..c76392b7d 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -2,24 +2,16 @@ package com.glxp.api.controller.collect; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; -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.controller.BaseController; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderCodeMan; -import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectOrderCodeManRequest; -import com.glxp.api.req.collect.IoCollectCodeRequest; import com.glxp.api.req.inout.AddTagCodeReqeust; import com.glxp.api.req.inout.DeleteTageCodeRequest; import com.glxp.api.res.PageSimpleResponse; @@ -46,7 +38,6 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.stream.Collectors; @Slf4j @RestController diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 7d3fd707d..62521e0a0 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -1,12 +1,9 @@ package com.glxp.api.controller.collect; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.annotation.RepeatSubmit; @@ -16,15 +13,10 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.RedissonCacheKey; import com.glxp.api.constant.WorkOperType; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.collect.*; -import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity; -import com.glxp.api.entity.inout.ExcelVO; -import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.BasicCollectUserRequest; -import com.glxp.api.req.basic.PrescribeBindWorkRequest; import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.req.collect.*; import com.glxp.api.req.system.DeleteRequest; @@ -39,17 +31,13 @@ import com.glxp.api.service.basic.BasicCollectUserService; import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.collect.*; -import com.glxp.api.service.inout.ExcelService; import com.glxp.api.service.inout.IoSplitCodeService; import com.glxp.api.util.Excel.ExcelHandler; import com.glxp.api.util.Excel.Exception.RenException; import com.glxp.api.util.IntUtil; -import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index d338620d7..2a3669b7b 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -25,8 +25,10 @@ import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.service.basic.BasicCollectUserService; import com.glxp.api.service.basic.SysWorkplaceDocumentService; -import com.glxp.api.service.collect.*; -import com.glxp.api.util.IntUtil; +import com.glxp.api.service.collect.IoCollectOrderBizOriginService; +import com.glxp.api.service.collect.IoCollectOrderOriginService; +import com.glxp.api.service.collect.IoCollectOrderService; +import com.glxp.api.service.collect.IoCollectOriginService; import org.springframework.dao.CannotAcquireLockException; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java index 307d00265..2678b767a 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import java.util.List; @Slf4j @RestController diff --git a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java index 9a71d942f..006a1db90 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java @@ -6,13 +6,11 @@ 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.controller.BaseController; -import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoSplitDesOrder; import com.glxp.api.req.collect.AddInvDesDetaiRequest; import com.glxp.api.req.collect.IoSplitDesOrderCodeDetailRequest; import com.glxp.api.req.collect.IoSplitDesOrderDetailRequest; import com.glxp.api.req.collect.IoSplitDesOrderRequest; -import com.glxp.api.req.inout.AddTagCodeReqeust; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.collect.IoSplitDesOrderCodeDetailResponse; import com.glxp.api.res.collect.IoSplitDesOrderDetailResponse; @@ -27,7 +25,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.validation.Valid; import java.util.List; @RestController diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java index 2525a6b10..45420eb9b 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.collect; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.CusRedissonAnnotation; diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java index 3a6ee4e49..a4bd2cb84 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java @@ -6,12 +6,9 @@ import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.collect.IoCollectSet; import com.glxp.api.entity.collect.RelCodeDetail; -import com.glxp.api.req.collect.RelCodeBatchRequest; import com.glxp.api.req.collect.RelCodeDetailRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.collect.RelCodeBatchResponse; import com.glxp.api.res.collect.RelCodeDetailResponse; import com.glxp.api.service.collect.RelCodeDetailService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/controller/dev/DeptDeviceDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeptDeviceDetailController.java index 7aa1dfdcb..e19a73501 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeptDeviceDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeptDeviceDetailController.java @@ -11,10 +11,10 @@ import com.glxp.api.entity.basic.UdiEntity; 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.dev.AddDeptDeviceRequest; import com.glxp.api.req.dev.FilterDeptDeviceRequest; import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest; +import com.glxp.api.req.inout.InspectionPDFTemplateRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.dev.DeptDeviceDetailResponse; import com.glxp.api.service.dev.DeptDeviceDetailService; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceAssetCertController.java b/src/main/java/com/glxp/api/controller/dev/DeviceAssetCertController.java index 026373a10..db09ce6fb 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceAssetCertController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceAssetCertController.java @@ -1,8 +1,5 @@ package com.glxp.api.controller.dev; -import com.glxp.api.service.CustomService; -import com.glxp.api.service.auth.CustomerService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -13,12 +10,14 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.FileConstant; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.dev.DeviceAssetCertEntity; -import com.glxp.api.req.inv.FilterInvCertRequest; import com.glxp.api.req.dev.PostDeviceCertRequest; +import com.glxp.api.req.inv.FilterInvCertRequest; import com.glxp.api.req.system.DeleteDeviceFileRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.dev.DeviceAssetCertService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceChangeOrderController.java b/src/main/java/com/glxp/api/controller/dev/DeviceChangeOrderController.java index 5acd4dc26..bf5232e2e 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceChangeOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceChangeOrderController.java @@ -22,7 +22,6 @@ import com.glxp.api.vo.dev.DeviceChangeOrderVo; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Delete; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceCheckController.java b/src/main/java/com/glxp/api/controller/dev/DeviceCheckController.java index d31727c0b..ea46dca35 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceCheckController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceCheckController.java @@ -6,10 +6,8 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.dev.DeviceCheckEntity; import com.glxp.api.req.dev.DeviceCheckQuery; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.service.dev.DeviceCheckItemDictService; import com.glxp.api.service.dev.DeviceCheckService; import com.glxp.api.vo.dev.DeviceCheckPrintVo; import com.glxp.api.vo.dev.DeviceCheckVo; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java index 3e9ce72b4..4b4549840 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java @@ -1,9 +1,5 @@ package com.glxp.api.controller.dev; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; @@ -11,16 +7,18 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; -import com.glxp.api.entity.dev.DevicePlanDetailEntity; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceCheckDetailParam; +import com.glxp.api.req.dev.DeviceCheckDetailQuery; +import com.glxp.api.req.dev.DeviceCheckDetailRepairParam; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.dev.DeviceCheckDetailItemService; import com.glxp.api.service.dev.DeviceCheckDetailService; -import com.glxp.api.vo.dev.DeviceCheckDetailVo; -import com.glxp.api.vo.dev.DeviceUpkeepDetailVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java index 55fb51eb8..fb91f7cb9 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.dev; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; @@ -13,14 +12,14 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceChangeLogEntity; -import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery; +import com.glxp.api.req.dev.DeviceInfoDetailQuery; +import com.glxp.api.req.dev.DeviceInfoQuery; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.dev.DeptDeviceDetailResponse; import com.glxp.api.service.dev.DeviceChangeLogService; import com.glxp.api.service.dev.DeviceInfoService; import com.glxp.api.service.system.SystemPDFModuleService; @@ -41,19 +40,18 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.imageio.ImageIO; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.awt.*; -import java.awt.font.LineMetrics; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.util.*; +import java.util.Base64; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceMAOrderController.java b/src/main/java/com/glxp/api/controller/dev/DeviceMAOrderController.java index e2341512e..c2458f7c6 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceMAOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceMAOrderController.java @@ -9,9 +9,9 @@ import com.glxp.api.common.util.ResultVOUtils; 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.dev.AddDeviceMAOrderRequest; import com.glxp.api.req.dev.FilterDeviceMAOrderRequest; +import com.glxp.api.req.inout.InspectionPDFTemplateRequest; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.dev.DeviceMAOrderResponse; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceMiniController.java b/src/main/java/com/glxp/api/controller/dev/DeviceMiniController.java index d9f9bfc08..439205105 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceMiniController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceMiniController.java @@ -7,7 +7,8 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceCheckDetailMiniQuery; +import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse; import com.glxp.api.service.dev.DeviceCheckDetailService; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java b/src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java index 8b71744fa..f2a3981d6 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java @@ -9,13 +9,11 @@ import com.glxp.api.common.util.ResultVOUtils; 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.dev.FilterDeptDeviceRequest; import com.glxp.api.req.dev.FilterDeviceReceiveOrderDetailRequest; import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest; +import com.glxp.api.req.inout.InspectionPDFTemplateRequest; 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; @@ -33,8 +31,10 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 设备领用记录接口 diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java b/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java index f50702d38..ab4c9c319 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java @@ -9,13 +9,19 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceRepairApplyEntity; import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceRepairApplyAddParam; +import com.glxp.api.req.dev.DeviceRepairApplyConfirmParam; +import com.glxp.api.req.dev.DeviceRepairApplyHallQuery; +import com.glxp.api.req.dev.DeviceRepairApplyQuery; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.dev.DeviceRepairApplyService; import com.glxp.api.vo.dev.DeviceRepairApplyVo; import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.ArrayList; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyDetailController.java index 0128fa63e..99f7df778 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyDetailController.java @@ -8,13 +8,12 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; -import com.glxp.api.entity.dev.DeviceRepairApplyEntity; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceRepairApplyDetailDiagnosisParam; +import com.glxp.api.req.dev.DeviceRepairApplyDetailQuery; +import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.dev.DeviceRepairApplyDetailService; -import com.glxp.api.service.dev.DeviceRepairApplyService; import com.glxp.api.vo.dev.DeviceRepairApplyDetailVo; -import com.glxp.api.vo.dev.DeviceRepairApplyVo; import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java b/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java index 72a95e593..5892f54a0 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java @@ -1,25 +1,19 @@ package com.glxp.api.controller.dev; -import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.dev.DeviceRepairApplyEntity; import com.glxp.api.entity.dev.DeviceRepairEntity; -import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceRepairQuery; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.service.dev.DeviceRepairApplyService; import com.glxp.api.service.dev.DeviceRepairService; -import com.glxp.api.vo.dev.DeviceRepairApplyVo; import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.List; @Slf4j diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderDetailController.java index 8f57409a5..7e6681efc 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderDetailController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.dev; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -9,6 +8,7 @@ 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; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepController.java b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepController.java index 639289a96..a436bb3bc 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepController.java @@ -6,13 +6,12 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.dev.DeviceRepairEntity; -import com.glxp.api.req.dev.DeviceCheckQuery; -import com.glxp.api.req.dev.DeviceRepairQuery; import com.glxp.api.req.dev.DeviceUpkeepQuery; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.dev.DeviceUpkeepService; -import com.glxp.api.vo.dev.*; +import com.glxp.api.vo.dev.DeviceUpkeepDetailVo; +import com.glxp.api.vo.dev.DeviceUpkeepPrintVo; +import com.glxp.api.vo.dev.DeviceUpkeepVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java index ca98f7694..5de45d335 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java @@ -6,8 +6,12 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.dev.*; -import com.glxp.api.req.dev.*; +import com.glxp.api.entity.dev.DevicePlanDetailEntity; +import com.glxp.api.entity.dev.DevicePlanEntity; +import com.glxp.api.entity.dev.DeviceUpkeepDetailEntity; +import com.glxp.api.req.dev.DevicePlanDetailParam; +import com.glxp.api.req.dev.DeviceUpkeepDetailParam; +import com.glxp.api.req.dev.DeviceUpkeepDetailQuery; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.dev.*; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailItemController.java b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailItemController.java index c88218dec..01244368c 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailItemController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailItemController.java @@ -6,14 +6,10 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity; import com.glxp.api.entity.dev.DeviceUpkeepDetailItemEntity; -import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam; -import com.glxp.api.req.dev.DeviceCheckDetailItemQuery; import com.glxp.api.req.dev.DeviceUpkeepDetailItemFinishParam; import com.glxp.api.req.dev.DeviceUpkeepDetailItemQuery; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.service.dev.DeviceCheckDetailItemService; import com.glxp.api.service.dev.DeviceUpkeepDetailItemService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java index 5bc480ff7..70466d54c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java @@ -1,27 +1,20 @@ package com.glxp.api.controller.inout; -import cn.hutool.core.thread.ThreadUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.inout.IoCodeEntity; -import com.glxp.api.exception.JsonException; import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.service.inout.impl.IoCodeService; 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; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; /** * UDI出入库单据-扫码模块 * author：苏荣彬 diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java index 201a107da..9d8af02a7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.inout; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -11,7 +10,6 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.inout.IoCodeLostEntity; -import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.req.inout.IoCodeLostRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.IoCodeLostResponse; @@ -24,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import java.util.Date; import java.util.List; @RestController diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index dede34a91..ea13baa0b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1,60 +1,55 @@ package com.glxp.api.controller.inout; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.glxp.api.annotation.CusRedissonAnnotation; -import com.glxp.api.constant.*; -import com.glxp.api.dao.inout.IoOrderDetailCodeDao; -import com.glxp.api.entity.auth.SysWorkplace; -import com.glxp.api.entity.basic.*; -import com.glxp.api.entity.collect.*; -import com.glxp.api.exception.JsonException; -import com.glxp.api.req.collect.AddInvDesDetaiRequest; -import com.glxp.api.req.collect.CollectOrderBizRequest; -import com.glxp.api.req.collect.CollectOrderRequest; -import com.glxp.api.res.collect.CollectOrderBizResponse; -import com.glxp.api.res.collect.IoCollectOrderResponse; -import com.glxp.api.res.collect.RelCodeDetailResponse; -import com.glxp.api.res.inout.*; -import com.glxp.api.service.auth.SysWorkplaceService; -import com.glxp.api.service.collect.*; -import com.glxp.api.service.collect.RelCodeDetailService; -import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.inv.impl.InvProductServiceNew; -import com.glxp.api.vo.basic.InvProductNewVo; -import org.apache.poi.ss.formula.functions.Offset; -import org.aspectj.weaver.ast.Var; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.annotation.Log; import com.glxp.api.annotation.RepeatSubmit; 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.*; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; +import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.collect.*; import com.glxp.api.entity.inout.*; +import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.req.collect.CollectOrderBizRequest; +import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.inout.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; +import com.glxp.api.res.collect.CollectOrderBizResponse; +import com.glxp.api.res.collect.IoCollectOrderResponse; +import com.glxp.api.res.collect.RelCodeDetailResponse; +import com.glxp.api.res.inout.AddCodeResult; +import com.glxp.api.res.inout.AddEnterCodeResponse; +import com.glxp.api.res.inout.IoCodeTempResponse; +import com.glxp.api.res.inout.VailCodeResultResponse; import com.glxp.api.service.auth.InvWarehouseService; +import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.basic.*; +import com.glxp.api.service.collect.*; import com.glxp.api.service.inout.*; -import com.glxp.api.service.inv.*; +import com.glxp.api.service.inout.impl.IoCodeService; +import com.glxp.api.service.inv.InvPreinProductDetailService; +import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; +import com.glxp.api.vo.basic.InvProductNewVo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Isolation; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 38165de37..152d19c68 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -1,7 +1,6 @@ package com.glxp.api.controller.inout; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 3a9d5d9ab..8428a980a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -26,7 +26,6 @@ import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; @@ -38,7 +37,10 @@ import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; -import com.glxp.api.res.inout.*; +import com.glxp.api.res.inout.IoOrderDetailBizResponse; +import com.glxp.api.res.inout.IoOrderDetailResultResponse; +import com.glxp.api.res.inout.IoOrderInvoiceResponse; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.service.alihealth.AlihealthBusService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java index 83b3147f7..efd646e6c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java @@ -11,7 +11,6 @@ import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderDetailBizService; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index ba2674c87..6f2a9fab9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -17,7 +17,6 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.dao.dev.DeviceInfoMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; @@ -31,13 +30,11 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; -import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.system.CompanyService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.service.thrsys.ThrProductsService; -import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.JasperUtils; import com.glxp.api.util.MsDateUtil; import com.glxp.api.vo.dev.DeviceInfoVo; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index a73bd91c3..9742b317c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.inout; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -21,10 +20,12 @@ import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.req.inout.IoOrderInvoiceRequest; import com.glxp.api.req.inout.RefreshInoiceRequest; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.res.inout.*; +import com.glxp.api.res.inout.IoOrderDetailResultResponse; +import com.glxp.api.res.inout.IoOrderInvoiceResponse; +import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.res.inout.RefreshInoiceResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inout.IoOrderDetailBizService; -import com.glxp.api.service.inout.IoOrderDetailCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java index ecbd4a967..6418ea979 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java @@ -1,8 +1,5 @@ package com.glxp.api.controller.inout; -import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.service.basic.UdiRelevanceService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,24 +9,30 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inout.IoOrderMutiEntity; +import com.glxp.api.entity.inout.IoOrderMutiSetEntity; +import com.glxp.api.entity.inout.IoOrderMutiUseEntity; import com.glxp.api.req.inout.IoOrderMutiRequest; import com.glxp.api.res.inout.IoOrderMutiResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.auth.InvWarehouseService; -import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.inout.*; +import com.glxp.api.service.basic.UdiProductService; +import com.glxp.api.service.inout.IoOrderMutiService; +import com.glxp.api.service.inout.IoOrderMutiSetService; +import com.glxp.api.service.inout.IoOrderMutiUseService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; -import com.glxp.api.util.RedisUtil; import com.glxp.api.util.udi.FilterUdiUtils; +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.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @RestController public class IoOrderMutiController { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiSetController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiSetController.java index 4a03f3018..5574c9121 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiSetController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiSetController.java @@ -6,9 +6,7 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.inout.IoOrderMutiSetEntity; -import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.req.inout.IoOrderMutiSetRequest; -import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoOrderMutiSetResponse; import com.glxp.api.service.inout.IoOrderMutiSetService; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 0e17c3e5e..39a614314 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -1,11 +1,6 @@ package com.glxp.api.controller.inout; -import com.glxp.api.service.inout.impl.IoCodeService; -import org.apache.regexp.RE; -import org.eclipse.jdt.internal.compiler.apt.dispatch.HookedJavaFileObject; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -35,12 +30,13 @@ import com.glxp.api.service.auth.InvBusUserService; import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.sync.HeartService; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; +import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java index e41c659a9..58259a40c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -9,28 +9,22 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.collect.IoCollectOrder; -import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoSplitCodeEntity; -import com.glxp.api.entity.thrsys.BasicInsChdrugEntity; import com.glxp.api.req.inout.AddTagCodeReqeust; import com.glxp.api.req.inout.IoSplitCodeRequest; import com.glxp.api.req.inout.IoSplitDetailCodeRequest; -import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoSplitCodeDetailResponse; import com.glxp.api.service.basic.*; import com.glxp.api.service.collect.IoCollectOrderService; -import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.service.inout.IoSplitCodeDetailService; import com.glxp.api.service.inout.IoSplitCodeService; import com.glxp.api.service.inout.IoSplitFifoCodeService; -import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java index 59ff6afc2..25bbf7b03 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java @@ -6,16 +6,12 @@ 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.controller.BaseController; -import com.glxp.api.entity.basic.SysWorkplaceQueue; -import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; import com.glxp.api.req.inout.IoAutoPutRequest; import com.glxp.api.req.inout.IoSplitFifoCodeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.IoSplitCodeResponse; -import com.glxp.api.service.basic.SysWorkplaceQueueService; import com.glxp.api.service.inout.IoSplitFifoCodeService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java index 6b7e23c3b..ce899e418 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java @@ -4,27 +4,19 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.controller.BaseController; -import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; import com.glxp.api.entity.auth.SysWorkplace; -import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.basic.SysWorkplacePutRel; import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; -import com.glxp.api.entity.inout.IoSplitFifoInv; -import com.glxp.api.req.basic.SysWorkplaceFreightRequest; import com.glxp.api.req.inout.IoSplitFifoInvRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.SysWorkplaceFreightViewResponse; -import com.glxp.api.res.inout.IoOrderDetailVo; import com.glxp.api.res.inout.IoSplitInvResponse; import com.glxp.api.res.inout.IoSplitInvViewResponse; import com.glxp.api.service.auth.SysWorkplaceService; -import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.inout.IoSplitFifoCodeService; import com.glxp.api.service.inout.IoSplitFifoInvService; import com.glxp.api.service.thrsys.SysWorkplacePutRelService; diff --git a/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java b/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java index c981aa6bb..66fbe6f2f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java @@ -9,7 +9,6 @@ import com.glxp.api.req.inout.FilterStatDataRequest; import com.glxp.api.res.inout.IoStatOrderResponse; import com.glxp.api.service.inout.*; import lombok.extern.slf4j.Slf4j; -import org.apache.regexp.RE; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/inout/PlatformController.java b/src/main/java/com/glxp/api/controller/inout/PlatformController.java index 2eb981e7e..97be86a0d 100644 --- a/src/main/java/com/glxp/api/controller/inout/PlatformController.java +++ b/src/main/java/com/glxp/api/controller/inout/PlatformController.java @@ -1,9 +1,7 @@ package com.glxp.api.controller.inout; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageInfo; @@ -22,6 +20,7 @@ import com.glxp.api.res.inout.PlatformLinkResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inout.PlatformService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; -import javax.security.auth.AuthPermission; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java b/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java index 8d5d533ec..6308f54fe 100644 --- a/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java +++ b/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java @@ -1,17 +1,17 @@ package com.glxp.api.controller.inv; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inout.IoStatDayEntity; -import com.glxp.api.req.inout.FilterStatDataDetailRequest; import com.glxp.api.service.inout.ExcelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.List; /** * @author : zhangsan diff --git a/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java b/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java index 290f9236c..381863a3c 100644 --- a/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java @@ -25,7 +25,6 @@ import com.glxp.api.service.inv.InnerOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java index 427e51236..b87558c9a 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.inv; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.github.pagehelper.PageInfo; @@ -19,7 +18,6 @@ import com.glxp.api.entity.inv.InvCountOrderEntity; 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.inout.SystemPDFModuleRequest; import com.glxp.api.req.inv.FilterInvCountOrderDetailRequest; import com.glxp.api.req.inv.FilterInvCountOrderRequest; import com.glxp.api.req.inv.FilterInvCountOrderSaveRequest; @@ -27,7 +25,6 @@ import com.glxp.api.req.inv.InvCountOrderPrintRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.inout.ReceiveDetailResponse; import com.glxp.api.res.inv.InvCountOrderDetailResponse; import com.glxp.api.res.inv.InvCountOrderResponse; import com.glxp.api.service.inv.InvCountOrderDetailService; @@ -47,7 +44,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 盘点单接口 diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountSettingController.java b/src/main/java/com/glxp/api/controller/inv/InvCountSettingController.java index 895d662b0..01d07f16e 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountSettingController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountSettingController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.inv; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; -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.BusinessType; diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index 38b9816fc..1970963c3 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.inv; -import org.springframework.beans.BeanUtils; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; diff --git a/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java b/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java index 7ce799bfb..03459c54e 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java @@ -1,13 +1,10 @@ package com.glxp.api.controller.inv; -import cn.hutool.core.collection.CollUtil; 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.dao.inv.InvPlaceOrderDetailDao; -import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity; import com.glxp.api.req.inv.FilterInvPlaceOrderRequest; import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.res.inout.IoOrderResponse; @@ -24,8 +21,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import java.lang.reflect.Array; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java index 753a5d73c..141102af3 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.inv; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -33,9 +32,9 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inv.InvPreProductDetailService; import com.glxp.api.service.inv.InvPreProductService; import com.glxp.api.service.inv.InvPreinProductDetailService; -import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java index 06eeeebed..a66d5bc57 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java @@ -19,7 +19,6 @@ import com.glxp.api.res.inv.InvPreinDetailResponse; import com.glxp.api.res.inv.InvPreinOrderResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinOrderService; diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java index 4e12b6e70..74409d1a2 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.inv; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -20,6 +19,7 @@ import com.glxp.api.service.inv.InvPreinProductDetailService; import com.glxp.api.service.inv.InvPreinProductService; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index af6c21091..e653c2991 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -1,11 +1,5 @@ package com.glxp.api.controller.inv; -import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.service.inout.IoOrderDetailResultService; -import com.glxp.api.service.inv.impl.InvProductService; -import com.glxp.api.service.inv.impl.InvProductServiceNew; -import com.glxp.api.vo.basic.InvProductNewVo; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -17,6 +11,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inv.InvProductEntity; @@ -32,8 +27,13 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.inout.IoOrderDetailResultService; +import com.glxp.api.service.inv.impl.InvProductService; +import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.util.udi.FilterUdiUtils; +import com.glxp.api.vo.basic.InvProductNewVo; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/inv/StockCompareController.java b/src/main/java/com/glxp/api/controller/inv/StockCompareController.java index 5eb16b4b1..efa7516d3 100644 --- a/src/main/java/com/glxp/api/controller/inv/StockCompareController.java +++ b/src/main/java/com/glxp/api/controller/inv/StockCompareController.java @@ -12,23 +12,16 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.inv.InvCpLocalProductEntity; -import com.glxp.api.entity.inv.InvCpThrProuductEntity; import com.glxp.api.entity.inv.StockCompareDetailEntity; import com.glxp.api.entity.inv.StockCompareEntity; -import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.enums.StockCompareStatusEnum; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.inout.FilterOrderDetailResultRequest; import com.glxp.api.req.inv.*; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.inout.IoOrderDetailResultResponse; -import com.glxp.api.res.inout.IoOrderDetailVo; import com.glxp.api.res.inv.StockCompareDetailVo; import com.glxp.api.service.inv.InvCpLocalProductService; -import com.glxp.api.service.inv.InvCpThrProuductService; import com.glxp.api.service.inv.StockCompareDetailService; import com.glxp.api.service.inv.StockCompareService; -import com.glxp.api.util.IntUtil; import com.glxp.api.vo.inv.InvProductDetailSelectVo; import com.glxp.api.vo.inv.StockCompareVo; import lombok.RequiredArgsConstructor; @@ -41,8 +34,8 @@ import javax.validation.Valid; import java.io.IOException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.stream.Collectors; +import java.util.Date; +import java.util.List; @RestController @RequestMapping diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index e3c4e837a..1a52c04a3 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.inv; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,12 +11,10 @@ import com.glxp.api.dao.inout.IoCodeDao; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.IoCodeEntity; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inv.FilterCodeTraceRequest; -import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoOrderResponse; @@ -28,7 +25,6 @@ import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.udi.FilterUdiUtils; -import com.glxp.api.vo.basic.InvProductNewVo; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index 4a228b7ef..e2b9e75dd 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -22,7 +22,8 @@ import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.impl.ReceiveDetailService; import com.glxp.api.service.inout.impl.ReceiveService; -import com.glxp.api.service.purchase.*; +import com.glxp.api.service.purchase.PurOrderService; +import com.glxp.api.service.purchase.PurPlanService; import com.glxp.api.service.purchase.impl.PurApplyDetailService; import com.glxp.api.service.purchase.impl.PurApplyService; import com.glxp.api.service.purchase.impl.PurOrderDetailService; @@ -32,7 +33,6 @@ import com.glxp.api.util.*; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java index 918982693..2c8fb51a3 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java @@ -2,22 +2,16 @@ package com.glxp.api.controller.purchase; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; -import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.purchase.PurApplyArgument; -import com.glxp.api.entity.purchase.PurInquiryItemEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; -import com.glxp.api.req.dev.DeviceInfoDetailQuery; import com.glxp.api.req.purchase.PurApplyArgumentRequest; -import com.glxp.api.req.purchase.PurInquiryOfferRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.purchase.PurInquiryOfferEntityResponse; import com.glxp.api.service.purchase.impl.PurApplyArgumentService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.EntityToMapConverter; import com.glxp.api.util.JasperUtils; -import com.glxp.api.vo.dev.DeviceInfoVo; import lombok.RequiredArgsConstructor; import net.sf.jasperreports.engine.JRException; import org.springframework.beans.factory.annotation.Value; @@ -27,11 +21,12 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.IOException; -import java.math.RoundingMode; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Validated @RequiredArgsConstructor diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index ed12a9efa..5b7af1085 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -1,10 +1,5 @@ package com.glxp.api.controller.purchase; -import com.glxp.api.req.purchase.AddDetailByWarlockBagRequest; -import com.glxp.api.service.basic.SysApprovalFlowService; -import com.glxp.api.service.purchase.impl.*; -import com.glxp.api.service.system.SystemParamConfigService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -21,6 +16,7 @@ import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.purchase.*; +import com.glxp.api.req.purchase.AddDetailByWarlockBagRequest; import com.glxp.api.req.purchase.PostPurApplyRequest; import com.glxp.api.req.purchase.PurApplyDetailRequest; import com.glxp.api.req.purchase.PurApplyRequest; @@ -29,19 +25,23 @@ import com.glxp.api.res.purchase.PurApplyResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.IBasicBusTypeChangeService; +import com.glxp.api.service.basic.SysApprovalFlowService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; -import com.glxp.api.service.purchase.*; +import com.glxp.api.service.purchase.PurOrderService; +import com.glxp.api.service.purchase.PurPlanService; +import com.glxp.api.service.purchase.impl.*; +import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; -import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurContractController.java b/src/main/java/com/glxp/api/controller/purchase/PurContractController.java index da7d1c85e..4cd146504 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurContractController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurContractController.java @@ -8,10 +8,12 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.purchase.PurContractDetailEntity; import com.glxp.api.entity.purchase.PurContractEntity; import com.glxp.api.entity.purchase.PurPlanEntity; -import com.glxp.api.req.purchase.*; +import com.glxp.api.req.purchase.AddPurPlanDetailRequest; +import com.glxp.api.req.purchase.PostPurContractRequest; +import com.glxp.api.req.purchase.PurContractDetailRequest; +import com.glxp.api.req.purchase.PurContractRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.PurContractEntityResponse; -import com.glxp.api.res.purchase.PurOrderResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.SysApprovalFlowService; import com.glxp.api.service.purchase.impl.PurContractDetailService; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurInquiryController.java b/src/main/java/com/glxp/api/controller/purchase/PurInquiryController.java index ff7af88f8..01c4f0be9 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurInquiryController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurInquiryController.java @@ -1,13 +1,16 @@ package com.glxp.api.controller.purchase; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.purchase.*; -import com.glxp.api.req.purchase.*; +import com.glxp.api.entity.purchase.PurInquiryEntity; +import com.glxp.api.entity.purchase.PurInquiryItemDetailEntity; +import com.glxp.api.entity.purchase.PurInquiryItemEntity; +import com.glxp.api.req.purchase.AddPurInquiryItemRequest; +import com.glxp.api.req.purchase.PostPurInquiryRequest; +import com.glxp.api.req.purchase.PurContractDetailRequest; +import com.glxp.api.req.purchase.PurInquiryRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.purchase.PurContractEntityResponse; import com.glxp.api.res.purchase.PurInquiryEntityResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.SysApprovalFlowService; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 75062879c..8074c2ee5 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -1,13 +1,5 @@ package com.glxp.api.controller.purchase; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.glxp.api.req.purchase.*; -import com.glxp.api.res.purchase.PurOrderByBillNoResponse; -import com.glxp.api.service.basic.SysApprovalFlowService; -import com.glxp.api.service.purchase.impl.PurOrderDetailService; -import com.glxp.api.service.purchase.impl.PurPlanDetailService; -import com.glxp.api.service.system.SystemParamConfigService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -22,16 +14,22 @@ import com.glxp.api.entity.purchase.PurApplyEntity; import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.entity.purchase.PurOrderEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.req.purchase.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.res.purchase.PurOrderResponse; import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.SysApprovalFlowService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.purchase.PurOrderService; +import com.glxp.api.service.purchase.impl.PurOrderDetailService; +import com.glxp.api.service.purchase.impl.PurPlanDetailService; +import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java index fd779d8e7..6782811b2 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java @@ -1,15 +1,9 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; -import cn.hutool.json.JSONConfig; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.glxp.api.annotation.AuthRuleAnnotation; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 788130ddd..2cea25aa0 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -10,8 +10,6 @@ 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.Constant; -import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.constant.ConstantType; import com.glxp.api.controller.BaseController; import com.glxp.api.controller.inv.InvPreProductController; import com.glxp.api.controller.inv.InvPreinProductController; @@ -20,17 +18,16 @@ import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.BasicDestinyRelMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; -import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.entity.inout.PurReceiveEntity; -import com.glxp.api.entity.purchase.*; +import com.glxp.api.entity.purchase.PurApplyDetailEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.req.inout.*; +import com.glxp.api.req.inout.AddReceiveDetailRequest; +import com.glxp.api.req.inout.FilterReceiveDetailRequest; +import com.glxp.api.req.inout.FilterReceiveRequest; +import com.glxp.api.req.inout.UpdateReceiveDetailRequest; import com.glxp.api.req.inv.FilterInvPreProductRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.req.inv.FilterInvProductRequest; @@ -55,13 +52,17 @@ import com.glxp.api.service.inout.impl.ReceiveService; import com.glxp.api.service.inv.InvPreProductService; import com.glxp.api.service.inv.InvPreinProductService; import com.glxp.api.service.inv.impl.InvProductService; -import com.glxp.api.service.purchase.*; +import com.glxp.api.service.purchase.PurOrderService; +import com.glxp.api.service.purchase.PurPlanService; import com.glxp.api.service.purchase.impl.PurApplyDetailService; import com.glxp.api.service.purchase.impl.PurApplyService; import com.glxp.api.service.purchase.impl.PurOrderDetailService; import com.glxp.api.service.purchase.impl.PurPlanDetailService; import com.glxp.api.service.system.SystemParamConfigService; -import com.glxp.api.util.*; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.IntUtil; +import com.glxp.api.util.OrderNoTypeBean; +import com.glxp.api.util.StringUtils; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -70,8 +71,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; @RestController diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index a74d15eb1..5508a4258 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -1,14 +1,5 @@ package com.glxp.api.controller.purchase; -import com.glxp.api.req.purchase.*; -import com.glxp.api.service.basic.SysApprovalFlowService; -import com.glxp.api.service.purchase.impl.PurApplyDetailService; -import com.glxp.api.service.purchase.impl.PurApplyService; -import com.glxp.api.service.purchase.impl.PurOrderDetailService; -import com.glxp.api.service.purchase.impl.PurPlanDetailService; -import com.glxp.api.service.system.SystemParamConfigService; -import org.springframework.beans.BeanUtils; -import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.RepeatSubmit; @@ -16,31 +7,39 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.constant.ConstantType; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; -import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.purchase.*; +import com.glxp.api.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.entity.purchase.PurApplyEntity; +import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.entity.purchase.PurPlanEntity; +import com.glxp.api.req.purchase.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.res.purchase.PurPlanResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.IBasicBusTypeChangeService; +import com.glxp.api.service.basic.SysApprovalFlowService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; -import com.glxp.api.service.purchase.*; -import com.glxp.api.util.CustomUtil; +import com.glxp.api.service.purchase.PurOrderService; +import com.glxp.api.service.purchase.PurPlanService; +import com.glxp.api.service.purchase.impl.PurApplyDetailService; +import com.glxp.api.service.purchase.impl.PurApplyService; +import com.glxp.api.service.purchase.impl.PurOrderDetailService; +import com.glxp.api.service.purchase.impl.PurPlanDetailService; +import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; -import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 59b9aaf41..1c6a00644 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.purchase; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -32,6 +31,7 @@ import com.glxp.api.service.purchase.SupProductService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.JasperUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index ad41d5862..d9c0a2a36 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -30,8 +30,6 @@ import com.glxp.api.service.purchase.CustomerContactService; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupCertSetService; import com.glxp.api.service.purchase.SupCompanyService; -import com.glxp.api.util.CustomUtil; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index a208813fd..2ae213400 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -1,7 +1,5 @@ package com.glxp.api.controller.purchase; -import com.glxp.api.service.basic.UdiRelevanceService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -29,10 +27,12 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.purchase.SupProductResponse; import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupCertSetService; import com.glxp.api.service.purchase.SupManufacturerService; import com.glxp.api.service.purchase.SupProductService; +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; diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index 1e8c1762d..21f48c2fb 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.sync; 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.sync.BasicDownloadStatusEntity; diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index 2b95af2b1..8fda979bf 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.sync; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index 51c58146a..ac559832d 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -1,26 +1,21 @@ package com.glxp.api.controller.sync; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; 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.Constant; import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.http.sync.SpGetHttpClient; -import com.glxp.api.req.basic.FilterBussinessTypeRequest; -import com.glxp.api.res.basic.BasicBussinessTypeResponse; import com.glxp.api.res.system.SyncDataSetResponse; import com.glxp.api.service.sync.SyncDataBustypeService; import com.glxp.api.service.sync.SyncDataChangeBustypeService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.RedisUtil; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -28,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java b/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java index 7ce3e5545..b775beabe 100644 --- a/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java +++ b/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java @@ -1,12 +1,12 @@ package com.glxp.api.controller.system; import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.system.ClassifyCodeEntity; import com.glxp.api.req.system.FilterClassifyCodeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.system.ClassifyCodeService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/system/CompanyController.java b/src/main/java/com/glxp/api/controller/system/CompanyController.java index cb1d34de3..e123fbfe0 100644 --- a/src/main/java/com/glxp/api/controller/system/CompanyController.java +++ b/src/main/java/com/glxp/api/controller/system/CompanyController.java @@ -1,9 +1,9 @@ package com.glxp.api.controller.system; -import com.glxp.api.entity.system.CompanyEntity; -import com.glxp.api.service.system.CompanyService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.system.CompanyEntity; +import com.glxp.api.service.system.CompanyService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/system/ConnectTestController.java b/src/main/java/com/glxp/api/controller/system/ConnectTestController.java index 248419e99..cf96d79b7 100644 --- a/src/main/java/com/glxp/api/controller/system/ConnectTestController.java +++ b/src/main/java/com/glxp/api/controller/system/ConnectTestController.java @@ -1,11 +1,11 @@ package com.glxp.api.controller.system; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.auth.AuthConnectEntity; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.req.auth.FilterConnectRequest; import com.glxp.api.service.system.CompanyService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java index 9366a0c1a..bb9940dda 100644 --- a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java +++ b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java @@ -1,15 +1,15 @@ package com.glxp.api.controller.system; 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.system.SysPdaKeyEntity; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.FilterDeviceKeyRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.SysPdaKeyService; import com.glxp.api.util.MsDateUtil; -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; diff --git a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java index fc8d6b12e..6f1f51bf3 100644 --- a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java +++ b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.system; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index 1345f2972..7ee279c17 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -1,10 +1,12 @@ package com.glxp.api.controller.system; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import com.github.pagehelper.PageInfo; 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.dao.schedule.ScheduledDao; import com.glxp.api.entity.system.ProductRemarkSetEntity; import com.glxp.api.entity.system.ScheduledEntity; @@ -15,9 +17,6 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.system.SystemParamConfigResponse; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CronUtils; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java index f95968a3d..048d00286 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.system; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; @@ -12,8 +11,8 @@ import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.FilterPdfModuleRequest; -import com.glxp.api.req.system.SysPdfModuleSaveRequest; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; +import com.glxp.api.req.system.SysPdfModuleSaveRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.system.SystemPDFModuleResponse; import com.glxp.api.res.system.SystemPDFModuleSelectResponse; diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java index 579daa9f3..818627621 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.system; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; diff --git a/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java b/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java index c58534329..ed80888b0 100644 --- a/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java +++ b/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java @@ -5,7 +5,6 @@ import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.system.SysRemindMsgEntity; -import com.glxp.api.entity.system.SysRemindSetEntity; import com.glxp.api.req.system.FilterSysRemindMsgRequest; import com.glxp.api.service.system.SysRemindMsgService; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/thrsys/DrugMachineController.java b/src/main/java/com/glxp/api/controller/thrsys/DrugMachineController.java index 8a801d38e..9158b67e2 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/DrugMachineController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/DrugMachineController.java @@ -1,8 +1,6 @@ package com.glxp.api.controller.thrsys; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.req.drugMachine.PutGoodsA001Request; import com.glxp.api.req.drugMachine.PutGoodsB001Request; import com.glxp.api.req.drugMachine.SendGoodsB002Request; import com.glxp.api.service.thrsys.DrugMachineService; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java index f37c67fd9..450063891 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java @@ -4,12 +4,9 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; -import com.glxp.api.annotation.CusRedissonAnnotation; -import com.glxp.api.annotation.RepeatSubmit; 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.RedissonCacheKey; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAliUser; import com.glxp.api.entity.basic.UdiProductEntity; @@ -27,10 +24,7 @@ import com.glxp.api.util.StringUtils; 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.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.ArrayList; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java index d435a43ce..826b42d46 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java @@ -1,12 +1,12 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.system.ThirdSysApiEntity; import com.glxp.api.req.system.FilterSysApiRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.system.ThirdSysApiService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java index cd992752f..4fab1de60 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java @@ -5,11 +5,9 @@ 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.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncUploadDataSetEntity; import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.service.system.SyncUploadDataSetService; import com.glxp.api.service.thrsys.ThrOrderUploadBustypesService; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrConsumeMaterialCategoryController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrConsumeMaterialCategoryController.java index 7edc3f2d4..d5dbb90bc 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrConsumeMaterialCategoryController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrConsumeMaterialCategoryController.java @@ -2,19 +2,13 @@ package com.glxp.api.controller.thrsys; 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.auth.SysMenu; import com.glxp.api.entity.thrsys.ThrConsumeMaterialCategory; -import com.glxp.api.entity.thrsys.ThrConsumeMaterialCategoryTree; import com.glxp.api.req.thrsys.UpdateBindCategoryRequest; -import com.glxp.api.service.thrsys.DeptMaterialCategoryService; import com.glxp.api.service.thrsys.ThrConsumeMaterialCategoryService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index e99fffacf..198277a2f 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -1,8 +1,6 @@ package com.glxp.api.controller.thrsys; -import org.springframework.beans.BeanUtils; 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; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java index c6d58c1a4..8dec2b933 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.thrsys; -import org.springframework.beans.BeanUtils; import cn.hutool.core.thread.ThreadUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java index 4bb8376f2..a98dcce4d 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java @@ -5,7 +5,7 @@ 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.thrsys.*; +import com.glxp.api.entity.thrsys.ThrInvOrderDetail; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java index 331ec5c66..6f822d499 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.thrsys; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -11,7 +10,10 @@ import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpInvClient; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.req.thrsys.*; +import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.req.thrsys.ThrInvProductsExportRequest; +import com.glxp.api.req.thrsys.ThrOnhandRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; import com.glxp.api.service.thrsys.ThrInvProductsDlService; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java index fc73a597f..27a48da56 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java @@ -7,9 +7,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; -import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.thrsys.ThrInvProductsDetailService; import com.glxp.api.service.thrsys.ThrInvProductsImportLogService; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java index 06e6bbb1f..46c0b061e 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java @@ -11,7 +11,6 @@ import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; import com.glxp.api.service.thrsys.ThrDeptService; import com.glxp.api.service.thrsys.ThrInvWarehouseService; import org.springframework.validation.BindingResult; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java index e9a9fd258..37a8772fe 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java @@ -14,14 +14,10 @@ import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicProducstRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.req.thrsys.ThrManuFilterRequest; -import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.thrsys.ThrCorpsResponse; -import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import com.glxp.api.service.thrsys.ThrManufacturerService; import com.glxp.api.service.thrsys.ThrSystemDetailService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -30,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; -import java.util.stream.Collectors; @Slf4j @RestController diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 5be44c450..9e8c2d847 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -1,7 +1,6 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.collection.CollUtil; -import org.springframework.beans.BeanUtils; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java index 62866bf80..402ed4c8c 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.thrsys; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -12,7 +11,10 @@ import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpOrderClient; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.req.thrsys.*; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.req.thrsys.ThrOrderExportRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.service.thrsys.ThrOrderDetailService; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java index def9965cd..2081a117a 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java @@ -5,12 +5,9 @@ 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.thrsys.ThrHslbEntity; import com.glxp.api.entity.thrsys.ThrProductTypeEntity; -import com.glxp.api.req.thrsys.FilterThrHslbRequest; import com.glxp.api.req.thrsys.FilterThrProductTypeRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.service.thrsys.ThrHslbService; import com.glxp.api.service.thrsys.ThrProductTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 0e6d7651d..a477e7ebe 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -1,10 +1,6 @@ package com.glxp.api.controller.thrsys; -import com.glxp.api.res.basic.UdiRelevanceResponse; -import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.util.IntUtil; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; @@ -22,12 +18,15 @@ import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.req.thrsys.PostThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.thrsys.ThrSystemDetailService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java index 116261b67..32ff60d40 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.thrsys; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java index a2b4fe93b..27b33985c 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java @@ -4,9 +4,8 @@ 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.thrsys.ThrCorpImportLogEntity; -import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; import com.glxp.api.res.PageSimpleResponse; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java index 48a62382b..963ff8ce7 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.thrsys; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -9,8 +8,8 @@ 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.thrsys.ThrSystemBusApiEntity; -import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAliUserDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAliUserDao.java index 56daa0f8c..c6a08e3ab 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAliUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAliUserDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.AuthAliUser; -import com.glxp.api.entity.auth.InvSpace; public interface AuthAliUserDao extends BaseMapperPlus { diff --git a/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java b/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java index 412a794f2..fec2dbc0e 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java @@ -2,10 +2,8 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.InvBusUserEntity; -import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusUserRequest; -import com.glxp.api.res.auth.InvBusUserResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java index 6d1ee199d..8d8d6e639 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; import com.glxp.api.req.auth.FilterInvWarehouseRequest; @@ -9,7 +8,6 @@ import com.glxp.api.res.auth.InvSubWarehouseResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; @Mapper diff --git a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java index d6842d4ab..7c5b80aef 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.entity.auth.SysCustomConfigEntity; import com.glxp.api.req.auth.SysCustomConfigRequest; -import com.glxp.api.req.system.DeleteRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java index 82bd73cee..91817935b 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; import com.glxp.api.req.auth.SysCustomConfigDetailRequest; -import com.glxp.api.req.system.DeleteRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java b/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java index 80b3e831d..ed9349593 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java @@ -1,8 +1,6 @@ package com.glxp.api.dao.auth; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.req.auth.SysWorkplaceRequest; import com.glxp.api.req.collect.CollectOrderRequest; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java index 576bd48b1..db0b6c655 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java index 3aec53d70..f323eb836 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBussinessTypeRequest; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCollectPointCategoryMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicCollectPointCategoryMapper.java index afd64c829..daf6ffc32 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCollectPointCategoryMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCollectPointCategoryMapper.java @@ -5,8 +5,7 @@ import com.glxp.api.entity.basic.BasicCollectPointCategory; import com.glxp.api.req.basic.BasicCollectgoryRequest; import com.glxp.api.res.basic.BasicCollectGoryResponse; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; + import java.util.List; /** diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCollectPointMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicCollectPointMapper.java index 7199dba75..0687b8021 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCollectPointMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCollectPointMapper.java @@ -1,11 +1,9 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.api.entity.basic.BasicCollectPointEntity; import com.glxp.api.req.basic.BasicCollectRequest; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index b4f73c061..48b75d5e5 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -4,7 +4,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpExportLogDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpExportLogDao.java index 885d83e29..4fbb419f7 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpExportLogDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpExportLogDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.basic; -import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.req.basic.FilterCorpExportLogRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicDestinyRelMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicDestinyRelMapper.java index c243c69fc..de2d3e386 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicDestinyRelMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicDestinyRelMapper.java @@ -7,7 +7,6 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.math.BigDecimal; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java index 9b15e6b21..9ff4866ea 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java @@ -1,15 +1,13 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicHospTypeEntity; - -import java.util.List; - import com.glxp.api.res.basic.BasicHospTypeResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface BasicHospTypeDao extends BaseMapperPlus { diff --git a/src/main/java/com/glxp/api/dao/basic/BasicManufacturerMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicManufacturerMapper.java index 953c4db0e..e731f942a 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicManufacturerMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicManufacturerMapper.java @@ -1,8 +1,6 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicManufacturerEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescirbeDetailMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescirbeDetailMapper.java index 038dacc27..aa2204aa4 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescirbeDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescirbeDetailMapper.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeDiMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeDiMapper.java index f4b346bfa..6a8f47982 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeDiMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeDiMapper.java @@ -1,7 +1,7 @@ package com.glxp.api.dao.basic; -import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity; import com.glxp.api.req.basic.BasicSkPrescribeDiRequest; import com.glxp.api.res.basic.BasicSkPrescribeDiResponse; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemMapper.java index 50c4c31d1..dfd53f626 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemMapper.java @@ -1,7 +1,7 @@ package com.glxp.api.dao.basic; -import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; /** * 针对表【basic_sk_prescribe_item(处方用药信息表)】的数据库操作Mapper diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeMapper.java index b494daaf7..d258152bf 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeMapper.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.req.basic.BasicSkPrescribeRequest; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkProjectMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkProjectMapper.java index 3ec47617a..ff000baa2 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicSkProjectMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkProjectMapper.java @@ -3,9 +3,7 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.basic.BasicSkProjectEntity; import com.glxp.api.req.basic.BasicSkProjectRequest; -import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.res.basic.BasicSkProjectResponse; -import com.glxp.api.res.inout.IoOrderResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkSickerMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkSickerMapper.java index ada9fcdb7..df4dd2c3c 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicSkSickerMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkSickerMapper.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicSkSickerEntity; import com.glxp.api.req.basic.BasicSkSickerRequest; diff --git a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java index e6c39113f..0f9e0cfa7 100644 --- a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java @@ -1,12 +1,10 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.res.basic.CompanyProductRelevanceResponse; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java index dd280676f..d42ed2a7e 100644 --- a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java +++ b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.ProductInfoEntity; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.req.basic.ProductInfoFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMapper.java b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMapper.java index 583ee18a3..31cba94a2 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMapper.java @@ -3,9 +3,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.SysApprovalFlowConfig; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; @Mapper public interface SysApprovalFlowConfigMapper extends BaseMapperPlus { diff --git a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMxMapper.java b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMxMapper.java index 96636c6e6..e443c13c1 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMxMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowConfigMxMapper.java @@ -3,9 +3,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.SysApprovalFlowConfigMx; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; @Mapper public interface SysApprovalFlowConfigMxMapper extends BaseMapperPlus { diff --git a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMapper.java b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMapper.java index 68509d298..cc8058362 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMapper.java @@ -2,11 +2,7 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.SysApprovalFlow; -import com.glxp.api.entity.basic.SysApprovalFlowConfig; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; @Mapper diff --git a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMxMapper.java b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMxMapper.java index c289d23fb..c0142681f 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMxMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysApprovalFlowMxMapper.java @@ -3,9 +3,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.SysApprovalFlowMx; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; @Mapper public interface SysApprovalFlowMxMapper extends BaseMapperPlus { diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java index 527391829..85b808db3 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java @@ -4,7 +4,6 @@ import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; -import com.glxp.api.res.basic.WorkBindWorkResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java index 8a8c2ddb5..bb71cae56 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.basic.UdiInfoRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index 498a28772..b5f477c7c 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBackupMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBackupMapper.java index 6711851fd..276097939 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBackupMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBackupMapper.java @@ -1,12 +1,10 @@ package com.glxp.api.dao.collect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBackup; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.res.collect.IoCollectOrderResponse; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java index 847969628..1895864ff 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java @@ -1,13 +1,11 @@ package com.glxp.api.dao.collect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; - import com.glxp.api.entity.collect.IoCollectOrderBizBackup; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderUploadCountRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeManMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeManMapper.java index 746e852ed..191ab5982 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeManMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderCodeManMapper.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.collect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.collect.IoCollectOrderCodeMan; import com.glxp.api.req.collect.CollectOrderCodeManRequest; -import com.glxp.api.res.collect.CollectOrderCodeAutoResponse; import com.glxp.api.res.collect.CollectOrderCodeManResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderDetailMapper.java index b185dffcc..400593a86 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderDetailMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.collect.IoSplitDesOrderDetail; import com.glxp.api.req.collect.IoSplitDesOrderDetailRequest; import com.glxp.api.res.collect.IoSplitDesOrderDetailResponse; -import com.glxp.api.res.collect.IoSplitDesOrderResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -13,4 +12,4 @@ import java.util.List; public interface IoSplitDesOrderDetailMapper extends BaseMapper { List filterList(IoSplitDesOrderDetailRequest splitDesOrderDetailRequest); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderMapper.java b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderMapper.java index 5b812cf1a..26dae672c 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderMapper.java @@ -2,9 +2,7 @@ package com.glxp.api.dao.collect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.collect.IoSplitDesOrder; -import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.collect.IoSplitDesOrderRequest; -import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.res.collect.IoSplitDesOrderResponse; import org.apache.ibatis.annotations.Mapper; @@ -14,4 +12,4 @@ import java.util.List; public interface IoSplitDesOrderMapper extends BaseMapper { List filterList(IoSplitDesOrderRequest splitDesOrderRequest); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java b/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java index d6570cf96..33adc7610 100644 --- a/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.collect; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.req.collect.RelCodeBatchRequest; diff --git a/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java b/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java index 1b7aecefe..41a827548 100644 --- a/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java @@ -1,8 +1,6 @@ package com.glxp.api.dao.collect; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.req.collect.RelCodeDetailRequest; import com.glxp.api.res.collect.RelCodeDetailResponse; diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceAssetUserMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceAssetUserMapper.java index c586b0e72..d319c12b4 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceAssetUserMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceAssetUserMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.dev.DeviceAssetUserEntity; -import com.glxp.api.entity.dev.DeviceAssetUserEntity; import com.glxp.api.req.inv.FilterInvUserRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceChangeLogMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceChangeLogMapper.java index 64aee7ff8..e1ba1fc8b 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceChangeLogMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceChangeLogMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceChangeLogEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 针对表【device_change_log(设备变更日志表)】的数据库操作Mapper diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceChangeOrderItemMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceChangeOrderItemMapper.java index c2e3047b9..2832d22e3 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceChangeOrderItemMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceChangeOrderItemMapper.java @@ -1,7 +1,7 @@ package com.glxp.api.dao.dev; -import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; /** * 针对表【device_change_order_item(设备变更单明细)】的数据库操作Mapper diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceChangeOrderMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceChangeOrderMapper.java index f5d770b7e..a5cb2a68d 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceChangeOrderMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceChangeOrderMapper.java @@ -1,8 +1,8 @@ package com.glxp.api.dao.dev; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceChangeOrderEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.req.dev.DeviceChangeOrderDetailQuery; import com.glxp.api.req.dev.DeviceChangeOrderQuery; diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailItemMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailItemMapper.java index 542d71d20..0d30bfbe6 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailItemMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailItemMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 针对表【device_check_detail_item(设备巡检项目)】的数据库操作Mapper diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java index dd6d912f4..1b6fe0183 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java @@ -2,12 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.req.dev.CheckDetailQuery; -import com.glxp.api.req.dev.DeviceCheckDetailMiniQuery; -import com.glxp.api.vo.dev.DeviceCheckDetailVo; - -import java.util.List; /** * 针对表【device_check_detail(巡检任务明细)】的数据库操作Mapper diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceCheckItemDictMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceCheckItemDictMapper.java index 6bdbdab40..30acd478c 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceCheckItemDictMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceCheckItemDictMapper.java @@ -2,8 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceCheckItemDictEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.vo.dev.DeviceCheckItemDictVo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceCheckMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceCheckMapper.java index 2bfcb2b60..643aee0b0 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceCheckMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceCheckMapper.java @@ -2,9 +2,7 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceCheckEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.req.dev.DeviceCheckQuery; -import com.glxp.api.vo.dev.DeviceCheckPrintVo; import com.glxp.api.vo.dev.DeviceCheckVo; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java index d74d9b76c..848bbd2d8 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceInfoEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery; import com.glxp.api.req.dev.DeviceInfoDetailQuery; @@ -11,7 +10,6 @@ import com.glxp.api.vo.dev.DeviceInfoVo; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Set; /** * 针对表【device_info(设备表)】的数据库操作Mapper diff --git a/src/main/java/com/glxp/api/dao/dev/DevicePlanDetailItemMapper.java b/src/main/java/com/glxp/api/dao/dev/DevicePlanDetailItemMapper.java index 84e4e4fa5..cf78aab89 100644 --- a/src/main/java/com/glxp/api/dao/dev/DevicePlanDetailItemMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DevicePlanDetailItemMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DevicePlanDetailItemEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 针对表【device_plan_detail_item(巡检设备的项目)】的数据库操作Mapper diff --git a/src/main/java/com/glxp/api/dao/dev/DevicePlanMapper.java b/src/main/java/com/glxp/api/dao/dev/DevicePlanMapper.java index ff59e6326..461d550d2 100644 --- a/src/main/java/com/glxp/api/dao/dev/DevicePlanMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DevicePlanMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DevicePlanEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.req.dev.DevicePlanQuery; import com.glxp.api.vo.dev.DevicePlanVo; diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java index 2decd42fc..263a6f5a0 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery; import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyMapper.java index 206dafcf0..1a89f1854 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceRepairApplyEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceRepairMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceRepairMapper.java index 0729ac6c2..8ab3d9862 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceRepairMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceRepairMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceRepairEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java index 562e701a0..579d963cf 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java @@ -1,11 +1,8 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.dev.DeviceCheckEntity; import com.glxp.api.entity.dev.DeviceUpkeepEntity; -import com.glxp.api.req.dev.DeviceCheckQuery; import com.glxp.api.req.dev.DeviceUpkeepQuery; -import com.glxp.api.vo.dev.DeviceCheckVo; import com.glxp.api.vo.dev.DeviceUpkeepDetailVo; import com.glxp.api.vo.dev.DeviceUpkeepVo; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java index 8be0ca5a0..84e3889c2 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.inout; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoCodeRelEntity; import com.glxp.api.req.inout.IoOrderRelRequest; diff --git a/src/main/java/com/glxp/api/dao/inout/IoDestinyProcessDetailMapper.java b/src/main/java/com/glxp/api/dao/inout/IoDestinyProcessDetailMapper.java index 3c59f7e55..a94feaab5 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoDestinyProcessDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoDestinyProcessDetailMapper.java @@ -1,8 +1,6 @@ package com.glxp.api.dao.inout; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoDestinyProcessDetailEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.IodestinyProcessRequest; @@ -20,4 +18,4 @@ public interface IoDestinyProcessDetailMapper extends BaseMapperPlus filterDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index 403713486..aed60b449 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; -import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.res.inout.IoOrderDetailBizResponse; diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderSkPrescribeMapper.java b/src/main/java/com/glxp/api/dao/inout/IoOrderSkPrescribeMapper.java index d73c60f1c..55370446d 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderSkPrescribeMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderSkPrescribeMapper.java @@ -2,12 +2,8 @@ package com.glxp.api.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inout.IoOrderSkPrescribeEntity; -import com.glxp.api.req.inout.FilterOrderDetailBizRequest; -import com.glxp.api.res.inout.IoOrderDetailBizResponse; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - @Mapper public interface IoOrderSkPrescribeMapper extends BaseMapper { diff --git a/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java index a912fb09a..863f3bf4e 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java @@ -2,8 +2,6 @@ package com.glxp.api.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inout.IoSplitCodeDetailEntity; -import com.glxp.api.entity.inout.IoSplitCodeEntity; -import com.glxp.api.req.inout.IoSplitCodeRequest; import com.glxp.api.req.inout.IoSplitDetailCodeRequest; import com.glxp.api.res.inout.IoSplitCodeDetailResponse; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java index a755b3342..314ce3c10 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java @@ -1,10 +1,7 @@ package com.glxp.api.dao.inout; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.dao.thrsys.ThrOrderDetailDao; import com.glxp.api.entity.inout.IoSplitCodeEntity; -import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.req.inout.IoSplitCodeRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/inout/IoSplitFifoCodeMapper.java b/src/main/java/com/glxp/api/dao/inout/IoSplitFifoCodeMapper.java index cc432fb33..1a91e5a17 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoSplitFifoCodeMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoSplitFifoCodeMapper.java @@ -1,14 +1,11 @@ package com.glxp.api.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inout.IoSplitCodeEntity; import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; import com.glxp.api.req.inout.IoAutoPutRequest; -import com.glxp.api.req.inout.IoSplitCodeRequest; import com.glxp.api.req.inout.IoSplitFifoCodeRequest; import com.glxp.api.res.inout.IoSplitCodeResponse; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/inout/IoStatDetailMapper.java b/src/main/java/com/glxp/api/dao/inout/IoStatDetailMapper.java index bfba26e39..31826ba93 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoStatDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoStatDetailMapper.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.inout; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inout.IoStatDayEntity; import com.glxp.api.entity.inout.IoStatDetailEntity; import com.glxp.api.req.inout.FilterStatDataDetailRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java b/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java index ea88180fe..ec3258473 100644 --- a/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java +++ b/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java @@ -1,11 +1,8 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.entity.inout.PurReceiveEntity; -import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inout.FilterReceiveRequest; -import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.ReceiveResponse; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java index 4ce35b6bd..1b199de07 100644 --- a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java @@ -6,7 +6,6 @@ import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; import com.glxp.api.res.inout.ReceiveDetailResponse; -import com.glxp.api.res.inout.ReceiveResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/inv/InvCountCodesMapper.java b/src/main/java/com/glxp/api/dao/inv/InvCountCodesMapper.java index 6cacfb3cd..cfdf4e638 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvCountCodesMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/InvCountCodesMapper.java @@ -1,9 +1,7 @@ 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.InvCountCodesEntity; -import com.glxp.api.entity.inv.InvCountSettingEntity; import com.glxp.api.req.inv.FilterInvCountCodesRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/inv/InvCountOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/inv/InvCountOrderDetailMapper.java index 629149279..64d6dabc3 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvCountOrderDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/InvCountOrderDetailMapper.java @@ -1,12 +1,9 @@ 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.InvCountOrderDetailEntity; import com.glxp.api.req.inv.FilterInvCountOrderDetailRequest; -import com.glxp.api.req.inv.FilterInvCountOrderRequest; import com.glxp.api.res.inv.InvCountOrderDetailResponse; -import com.glxp.api.res.inv.InvCountOrderResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/inv/InvPlaceOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPlaceOrderDetailDao.java index 73fbd679d..e69ec9ba5 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPlaceOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPlaceOrderDetailDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity; -import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.InvPlaceOrderDetailResponse; import org.apache.ibatis.annotations.Param; @@ -12,4 +11,4 @@ public interface InvPlaceOrderDetailDao extends BaseMapper selectDetailList(@Param("recordId") String recordId); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java index 599e1e93b..9ffe52aaf 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java @@ -2,11 +2,8 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvPreinDetailEntity; -import com.glxp.api.entity.inv.InvPreinOrderEntity; import com.glxp.api.req.inv.FilterInvPreinDetailRequest; -import com.glxp.api.req.inv.FilterInvPreinRequest; import com.glxp.api.res.inv.InvPreinDetailResponse; -import com.glxp.api.res.inv.InvPreinOrderResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java index 3a5c177fa..3b44a6c00 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java @@ -5,7 +5,6 @@ import com.glxp.api.entity.inv.InvPreinProductEntity; import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.res.inv.InvPreinProductResponse; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductBatchDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductBatchDao.java index fc5b7cec5..a8bbc6593 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductBatchDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductBatchDao.java @@ -2,13 +2,7 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvProductBatchEntity; -import com.glxp.api.entity.inv.InvProductEntity; -import com.glxp.api.req.inv.FilterInvProductRequest; -import com.glxp.api.res.inv.InvProductResponse; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; @Mapper public interface InvProductBatchDao extends BaseMapperPlus { diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java index 404b98c88..bc0d3b5b5 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java @@ -1,8 +1,6 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.vo.basic.InvProductNewVo; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.req.inv.FilterInvProductRequest; diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductRationMapper.java b/src/main/java/com/glxp/api/dao/inv/InvProductRationMapper.java index c7a0d5562..f0ec171c5 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductRationMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductRationMapper.java @@ -1,6 +1,5 @@ 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.InvProductRationEntity; import com.glxp.api.req.inv.InvProductRationRequest; diff --git a/src/main/java/com/glxp/api/dao/inv/InvUserProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvUserProductDetailDao.java index 882c9a250..5a59c0e3c 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvUserProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvUserProductDetailDao.java @@ -1,7 +1,6 @@ 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.InvUserProductDetailEntity; diff --git a/src/main/java/com/glxp/api/dao/inv/StockCompareDetailMapper.java b/src/main/java/com/glxp/api/dao/inv/StockCompareDetailMapper.java index 586f44e5b..8bba68897 100644 --- a/src/main/java/com/glxp/api/dao/inv/StockCompareDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/StockCompareDetailMapper.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.StockCompareDetailEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.req.inv.InvProductDetailSelectQuery; import com.glxp.api.req.inv.InvProductDetailSelectRequest; import com.glxp.api.res.inv.StockCompareDetailResponse; diff --git a/src/main/java/com/glxp/api/dao/inv/StockCompareMapper.java b/src/main/java/com/glxp/api/dao/inv/StockCompareMapper.java index bb45e5925..5fe520488 100644 --- a/src/main/java/com/glxp/api/dao/inv/StockCompareMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/StockCompareMapper.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.StockCompareEntity; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.req.inv.StockCompareQuery; import com.glxp.api.vo.inv.StockCompareVo; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/purchase/CustomerContacDao.java b/src/main/java/com/glxp/api/dao/purchase/CustomerContacDao.java index f57bce4c7..f736c1648 100644 --- a/src/main/java/com/glxp/api/dao/purchase/CustomerContacDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/CustomerContacDao.java @@ -2,8 +2,8 @@ package com.glxp.api.dao.purchase; import com.glxp.api.entity.purchase.CustomerContactEntity; -import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.purchase.CustomerContactFilterRequest; +import com.glxp.api.req.system.DeleteRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java index c4a0ee47f..b1f6fc958 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java @@ -2,8 +2,6 @@ package com.glxp.api.dao.purchase; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.dao.inout.ReceiveDao; -import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.PurApplyEntity; import com.glxp.api.req.purchase.PurApplyRequest; import com.glxp.api.res.purchase.PurApplyResponse; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java index 4b104916a..cfe0aa24c 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.InvProductRationEntity; import com.glxp.api.entity.purchase.PurApplyDetailEntity; import com.glxp.api.req.purchase.PurApplyDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurContractMapper.java b/src/main/java/com/glxp/api/dao/purchase/PurContractMapper.java index f734c141f..0be0b8af9 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurContractMapper.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurContractMapper.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.api.entity.purchase.PurContractEntity; import com.glxp.api.req.purchase.PurContractRequest; import com.glxp.api.res.purchase.PurContractEntityResponse; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurInquiryItemDetailMapper.java b/src/main/java/com/glxp/api/dao/purchase/PurInquiryItemDetailMapper.java index b0c727120..bcdc2c426 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurInquiryItemDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurInquiryItemDetailMapper.java @@ -3,8 +3,6 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.purchase.PurInquiryItemDetailEntity; import com.glxp.api.req.purchase.PurContractDetailRequest; -import com.glxp.api.req.purchase.PurInquiryRequest; -import com.glxp.api.res.purchase.PurInquiryEntityResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurInquiryItemMapper.java b/src/main/java/com/glxp/api/dao/purchase/PurInquiryItemMapper.java index 68f570e8a..821ac6e6d 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurInquiryItemMapper.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurInquiryItemMapper.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.purchase.PurInquiryItemDetailEntity; import com.glxp.api.entity.purchase.PurInquiryItemEntity; import com.glxp.api.req.purchase.PurContractDetailRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurInquiryMapper.java b/src/main/java/com/glxp/api/dao/purchase/PurInquiryMapper.java index 9eafb7fba..854ed8575 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurInquiryMapper.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurInquiryMapper.java @@ -1,8 +1,6 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.glxp.api.entity.purchase.PurContractEntity; import com.glxp.api.entity.purchase.PurInquiryEntity; import com.glxp.api.req.purchase.PurInquiryRequest; import com.glxp.api.res.purchase.PurInquiryEntityResponse; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferItemDetailMapper.java b/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferItemDetailMapper.java index 0d7bbaf66..0e5e60792 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferItemDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferItemDetailMapper.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.purchase.PurInquiryItemDetailEntity; import com.glxp.api.entity.purchase.PurInquiryOfferItemDetailEntity; import com.glxp.api.req.purchase.PurContractDetailRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferItemMapper.java b/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferItemMapper.java index ae96d81e7..bec2abd03 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferItemMapper.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferItemMapper.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.purchase.PurInquiryItemEntity; import com.glxp.api.entity.purchase.PurInquiryOfferItemEntity; import com.glxp.api.req.purchase.PurContractDetailRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferMapper.java b/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferMapper.java index 971081b83..2491ebeaa 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferMapper.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurInquiryOfferMapper.java @@ -1,11 +1,8 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.purchase.PurInquiryEntity; import com.glxp.api.entity.purchase.PurInquiryOfferEntity; import com.glxp.api.req.purchase.PurInquiryOfferRequest; -import com.glxp.api.req.purchase.PurInquiryRequest; -import com.glxp.api.res.purchase.PurInquiryEntityResponse; import com.glxp.api.res.purchase.PurInquiryOfferEntityResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java index fce1de01f..17c81fc1d 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.purchase; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.purchase.PurOrderEntity; import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurPlanResponse; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java index 9ab130259..141ea4f85 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.inv.InvProductRationEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java index bba55d1f5..e1a813cfa 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.req.inout.AddBizProductReqeust; diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java index ada5a734a..8db484ebe 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java @@ -2,11 +2,9 @@ package com.glxp.api.dao.purchase; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.req.purchase.FilterSupCompanyRequest; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/sync/SyncDataBustypeDao.java b/src/main/java/com/glxp/api/dao/sync/SyncDataBustypeDao.java index d1789f3df..076f18d04 100644 --- a/src/main/java/com/glxp/api/dao/sync/SyncDataBustypeDao.java +++ b/src/main/java/com/glxp/api/dao/sync/SyncDataBustypeDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.sync; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/system/CompanyDao.java b/src/main/java/com/glxp/api/dao/system/CompanyDao.java index d58ffbb97..4710c0eea 100644 --- a/src/main/java/com/glxp/api/dao/system/CompanyDao.java +++ b/src/main/java/com/glxp/api/dao/system/CompanyDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.system; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.CompanyEntity; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/glxp/api/dao/system/SetupDao.java b/src/main/java/com/glxp/api/dao/system/SetupDao.java index 359f44669..506663b79 100644 --- a/src/main/java/com/glxp/api/dao/system/SetupDao.java +++ b/src/main/java/com/glxp/api/dao/system/SetupDao.java @@ -1,7 +1,5 @@ package com.glxp.api.dao.system; -import com.glxp.api.entity.system.SetupEntity; -import com.glxp.api.req.system.FilterSetupRequest; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java b/src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java index e4dafdb55..e3528ce3e 100644 --- a/src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java +++ b/src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java @@ -3,8 +3,6 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; -import java.util.List; - public interface SyncDataChangeBustypesDao extends BaseMapper { } diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java index 35748d3e4..cdaf0678e 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.system; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -13,4 +12,4 @@ public interface SysPdfTemplateRelevanceBizDao extends BaseMapperPlus filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); boolean upInsert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java index fb4049c94..a94d49c6b 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java @@ -1,11 +1,9 @@ package com.glxp.api.dao.system; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceLabelDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceLabelDao.java index 4a1f3c5eb..ee9b05ae3 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceLabelDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceLabelDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.system; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -11,4 +10,4 @@ import java.util.List; public interface SysPdfTemplateRelevanceLabelDao extends BaseMapperPlus { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java index 7730caa58..a9f3a22e8 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.system; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -12,4 +11,4 @@ public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapperPlus filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java b/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java index 343138f6b..ad26b02e9 100644 --- a/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java +++ b/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java @@ -2,9 +2,7 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.system.SysRemindMsgEntity; -import com.glxp.api.entity.system.SysRemindSetEntity; import com.glxp.api.req.system.FilterSysRemindMsgRequest; -import com.glxp.api.req.system.FilterSysRemindSetRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/system/SysRemindSetMapper.java b/src/main/java/com/glxp/api/dao/system/SysRemindSetMapper.java index fdfa08306..6e55404c5 100644 --- a/src/main/java/com/glxp/api/dao/system/SysRemindSetMapper.java +++ b/src/main/java/com/glxp/api/dao/system/SysRemindSetMapper.java @@ -1,9 +1,6 @@ package com.glxp.api.dao.system; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.dao.inv.InvPreProductDao; -import com.glxp.api.entity.inv.InvPreProductEntity; import com.glxp.api.entity.system.SysRemindSetEntity; import com.glxp.api.req.system.FilterSysRemindSetRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/system/SysServerLogDao.java b/src/main/java/com/glxp/api/dao/system/SysServerLogDao.java index 68a7083d7..a181c126f 100644 --- a/src/main/java/com/glxp/api/dao/system/SysServerLogDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysServerLogDao.java @@ -1,11 +1,7 @@ package com.glxp.api.dao.system; -import com.glxp.api.entity.system.SysServerLogEntity; -import com.glxp.api.req.system.FilterSetupRequest; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - @Mapper public interface SysServerLogDao { diff --git a/src/main/java/com/glxp/api/dao/system/SysTableHeadMapper.java b/src/main/java/com/glxp/api/dao/system/SysTableHeadMapper.java index 145d9b46b..645207ed9 100644 --- a/src/main/java/com/glxp/api/dao/system/SysTableHeadMapper.java +++ b/src/main/java/com/glxp/api/dao/system/SysTableHeadMapper.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.system; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysTableHeadEntity; import com.glxp.api.req.system.SysTableHeadRequest; diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java index 70f329f95..4957f94ca 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.system; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; diff --git a/src/main/java/com/glxp/api/dao/thrsys/BasicInsDrugMapper.java b/src/main/java/com/glxp/api/dao/thrsys/BasicInsDrugMapper.java index 5b3352fd7..9b6c645b0 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/BasicInsDrugMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/BasicInsDrugMapper.java @@ -1,9 +1,7 @@ package com.glxp.api.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.thrsys.BasicInsChdrugEntity; import com.glxp.api.entity.thrsys.BasicInsDrugEntity; -import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest; import com.glxp.api.req.thrsys.ThrInsDrugFeeRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java b/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java index b29a2eb33..ec0adabe4 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.thrsys.BasicInsMaterialEntity; -import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest; import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/thrsys/DeptMaterialCategoryMapper.java b/src/main/java/com/glxp/api/dao/thrsys/DeptMaterialCategoryMapper.java index f9254c10a..2afab9d8f 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/DeptMaterialCategoryMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/DeptMaterialCategoryMapper.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.thrsys; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.thrsys.DeptMaterialCategory; import com.glxp.api.entity.thrsys.ThrConsumeMaterialCategory; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java index 85b5b1c5b..cdcbf8dcb 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.thrsys; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.req.thrsys.FilterThrBusTypeOriginRequest; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java index 5ec4f844f..9b1c5a58c 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java @@ -1,8 +1,6 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.dao.inout.IoOrderDetailBizDao; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.thrsys.ThrInvOrderDetail; import com.glxp.api.req.thrsys.FilterThrInvOrderDetailRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java index b37adfbe2..f84e4d601 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.thrsys.ThrInvOrder; -import com.glxp.api.entity.thrsys.ThrInvOrderDetail; import com.glxp.api.req.thrsys.FilterThrInvOrderRequest; import com.glxp.api.res.thrsys.ThrInvOrderResponse; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrManufacturerMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrManufacturerMapper.java index 8f0bf345f..b57516f0a 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrManufacturerMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrManufacturerMapper.java @@ -1,12 +1,9 @@ package com.glxp.api.dao.thrsys; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrManufacturerEntity; import com.glxp.api.req.thrsys.FilterBasicProducstRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; -import com.glxp.api.res.thrsys.ThrCorpsResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java index a6e95642a..bc2ac77df 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java @@ -2,10 +2,8 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.res.thrsys.ThrBusTypeOriginResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java index 3d51bdf3a..6a3d3b0c3 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductTypeMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductTypeMapper.java index c3112ab22..abf7f12f6 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrProductTypeMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductTypeMapper.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.thrsys.ThrProductTypeEntity; -import com.glxp.api.req.thrsys.FilterThrHslbRequest; import com.glxp.api.req.thrsys.FilterThrProductTypeRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java index 7f9d137a8..278b30636 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/entity/auth/InvSpace.java b/src/main/java/com/glxp/api/entity/auth/InvSpace.java index 80884f4ee..042d18f4e 100644 --- a/src/main/java/com/glxp/api/entity/auth/InvSpace.java +++ b/src/main/java/com/glxp/api/entity/auth/InvSpace.java @@ -1,6 +1,5 @@ package com.glxp.api.entity.auth; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/src/main/java/com/glxp/api/entity/auth/SysDictData.java b/src/main/java/com/glxp/api/entity/auth/SysDictData.java index 3d9647dc1..a442613b2 100644 --- a/src/main/java/com/glxp/api/entity/auth/SysDictData.java +++ b/src/main/java/com/glxp/api/entity/auth/SysDictData.java @@ -1,8 +1,6 @@ package com.glxp.api.entity.auth; -import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.glxp.api.constant.Constant; import com.glxp.api.entity.BaseEntity; diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index 033320e6e..f82c3a6c6 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.glxp.api.constant.ConstantType; import lombok.Data; -import org.apache.xpath.operations.Bool; import java.util.Date; diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCollectBustypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCollectBustypeEntity.java index f7931ab38..f7317ee9b 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCollectBustypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCollectBustypeEntity.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - /** * 单据类型表 */ diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCollectPointCategory.java b/src/main/java/com/glxp/api/entity/basic/BasicCollectPointCategory.java index a238b15ea..3e14d8801 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCollectPointCategory.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCollectPointCategory.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * 工位关联表(BasicCollectPointCategory)实体类 diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCollectPointEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCollectPointEntity.java index 72aca9f5e..5f1994a0e 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCollectPointEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCollectPointEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 扫码采集点 diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCollectUserEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCollectUserEntity.java index 77093bc8d..f510226aa 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCollectUserEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCollectUserEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 采集点与用户的关联表 diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCorpsExportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCorpsExportLogEntity.java index ffbbe8654..a76c7aba1 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCorpsExportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCorpsExportLogEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "basic_corps_export_log") public class BasicCorpsExportLogEntity { @@ -94,4 +95,4 @@ public class BasicCorpsExportLogEntity { public static final String COL_UPDATETIME = "updateTime"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportDetailEntity.java index cec9747b8..7d29aa097 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportDetailEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "basic_corps_import_detail") public class BasicCorpsImportDetailEntity { @@ -133,4 +134,4 @@ public class BasicCorpsImportDetailEntity { @TableField(value = "remark") private String remark; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportLogEntity.java index 4c96518f4..211770c38 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportLogEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "basic_corps_import_log") public class BasicCorpsImportLogEntity { @@ -53,4 +54,4 @@ public class BasicCorpsImportLogEntity { private String remark; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java index 1c16991f8..01e1113a8 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java @@ -1,14 +1,12 @@ package com.glxp.api.entity.basic; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "basic_hosp_type") public class BasicHospTypeEntity { diff --git a/src/main/java/com/glxp/api/entity/basic/BasicManufacturerEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicManufacturerEntity.java index a38d193b9..83dc4f980 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicManufacturerEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicManufacturerEntity.java @@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "basic_manufacturer") public class BasicManufacturerEntity implements Serializable { diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductCategory.java b/src/main/java/com/glxp/api/entity/basic/BasicProductCategory.java index 26e77e69e..669407710 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductCategory.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductCategory.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.util.Date; -import lombok.Data; - /** * 物资类别表 */ diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java index 51d9ebd11..bb88c3c1b 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "basic_products_import_detail") public class BasicProductsImportDetailEntity { @@ -112,4 +113,4 @@ public class BasicProductsImportDetailEntity { public static final String COL_UPDATETIME = "updateTime"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java index a13054ba9..c29543c7c 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "basic_products_import_log") public class BasicProductsImportLogEntity { @@ -77,4 +78,4 @@ public class BasicProductsImportLogEntity { public static final String COL_UPDATETIME = "updateTime"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java index ce6aad5c3..ac449c3f9 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeDiEntity.java @@ -3,7 +3,6 @@ package com.glxp.api.entity.basic; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java index 6728dcbaf..86a2ef34d 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java @@ -4,20 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.glxp.api.util.BigDecimalUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** * 患者处方 */ diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemCode.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemCode.java index c78ebeffb..45fac407c 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemCode.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemCode.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** * 处方手动赋码表 */ diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemEntity.java index 31da14fc6..e317443a5 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemEntity.java @@ -1,16 +1,13 @@ package com.glxp.api.entity.basic; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 处方用药信息表 * diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkProjectDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkProjectDetailEntity.java index ac15ed93d..1bef634ad 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkProjectDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkProjectDetailEntity.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java index b6c395c28..f6f247cbe 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java @@ -6,16 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + @ApiModel(value = "com-glxp-api-entity-basic-BasicSkProject") @Data @Builder diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java index dc34f78b6..cf82f165b 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java @@ -1,20 +1,17 @@ package com.glxp.api.entity.basic; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + /** * 患者信息 */ diff --git a/src/main/java/com/glxp/api/entity/basic/BasicUdirelTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicUdirelTypeEntity.java index 20addbdcd..ec44339df 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicUdirelTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicUdirelTypeEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + /** * 耗材字典菜单表 */ @@ -64,4 +65,4 @@ public class BasicUdirelTypeEntity { public static final String COL_CREATEUSER = "createUser"; public static final String COL_UPDATEUSER = "updateUser"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java index 700212341..181bf5ee1 100644 --- a/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.math.BigDecimal; import java.util.Date; -import lombok.Data; @Data @TableName(value = "company_product_relevance") diff --git a/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java index b04b2be4a..219bcc4e0 100644 --- a/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import org.apache.xpath.operations.Bool; import java.util.Date; diff --git a/src/main/java/com/glxp/api/entity/basic/SupEvaluateDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/SupEvaluateDetailEntity.java index bcbc3c55f..5ecd095d7 100644 --- a/src/main/java/com/glxp/api/entity/basic/SupEvaluateDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SupEvaluateDetailEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; @ApiModel(value="com-glxp-api-entity-basic-SupEvaluateDetail") @Data diff --git a/src/main/java/com/glxp/api/entity/basic/SupEvaluateEntity.java b/src/main/java/com/glxp/api/entity/basic/SupEvaluateEntity.java index 829f5d69b..9e9b9e468 100644 --- a/src/main/java/com/glxp/api/entity/basic/SupEvaluateEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SupEvaluateEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 供应商评价明细 diff --git a/src/main/java/com/glxp/api/entity/basic/SupEvaluatePlanDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/SupEvaluatePlanDetailEntity.java index 6c0331d1d..4c35c7df8 100644 --- a/src/main/java/com/glxp/api/entity/basic/SupEvaluatePlanDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SupEvaluatePlanDetailEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; @ApiModel(value="com-glxp-api-entity-basic-SupEvaluatePlanDetail") @Data diff --git a/src/main/java/com/glxp/api/entity/basic/SupEvaluatePlanEntity.java b/src/main/java/com/glxp/api/entity/basic/SupEvaluatePlanEntity.java index 9a0c33a25..a728ba211 100644 --- a/src/main/java/com/glxp/api/entity/basic/SupEvaluatePlanEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SupEvaluatePlanEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 供应商评价方案模版 diff --git a/src/main/java/com/glxp/api/entity/basic/SupEvaluateSystemEntity.java b/src/main/java/com/glxp/api/entity/basic/SupEvaluateSystemEntity.java index 9e23690d6..2039a2ef5 100644 --- a/src/main/java/com/glxp/api/entity/basic/SupEvaluateSystemEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SupEvaluateSystemEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 供应商评价体系 diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceBus.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceBus.java index 70ba0d717..fdf5f9b0f 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceBus.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceBus.java @@ -6,11 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; -import lombok.Data; - /** * 工位单据类型表 */ diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java index 4ec1f6915..4c14275fc 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java @@ -1,12 +1,12 @@ package com.glxp.api.entity.basic; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * 工位单据类型 * diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplacePutRel.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplacePutRel.java index 4d07a5d84..111252b74 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplacePutRel.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplacePutRel.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - /** * 上货工位绑定采集工与业务类型 */ diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java index 139d8ce26..43524d942 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - @ApiModel(description = "sys_workplace_queue") @Data @TableName(value = "sys_workplace_queue") diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java index 7bf66655e..762bfce83 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java @@ -1,8 +1,5 @@ package com.glxp.api.entity.basic; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,6 +8,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + @ApiModel(description = "sys_workplace_region") @Data diff --git a/src/main/java/com/glxp/api/entity/basic/UdiEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiEntity.java index ea51e5053..b77561028 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiEntity.java @@ -1,6 +1,5 @@ package com.glxp.api.entity.basic; -import cn.hutool.core.util.StrUtil; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 492542f8c..4ad2100a7 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; /** diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java index 0d538023a..cbdb02e7f 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java @@ -1,6 +1,5 @@ package com.glxp.api.entity.basic; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java b/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java index d5ce79b62..bf18b9d9a 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + @ApiModel(value = "com-glxp-api-entity-collect-IoCollectCode") @Data @Builder diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectLedGroup.java b/src/main/java/com/glxp/api/entity/collect/IoCollectLedGroup.java index fc944a75f..5190b46c8 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectLedGroup.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectLedGroup.java @@ -3,14 +3,12 @@ package com.glxp.api.entity.collect; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - @Data public class IoCollectLedGroup implements Serializable { diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index 660bd7e47..0b54021df 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java @@ -7,16 +7,15 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.glxp.api.res.collect.CollectOrderBizResponse; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + /** * 采集点单据主表 */ diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java index 3bc57242f..f0642c2e6 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** * 采集点单据详情 */ diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java index b9369f091..f9772ad79 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - /** * 采集点单据详情 */ diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCheckCode.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCheckCode.java index 4cf9e48ff..956a75164 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCheckCode.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCheckCode.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + @ApiModel(value = "com-glxp-api-entity-collect-IoCollectOrderCheckCode") @Builder @AllArgsConstructor diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCodeAuto.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCodeAuto.java index 3e93f4285..70a7ef397 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCodeAuto.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCodeAuto.java @@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - -import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** * 采集点单据自动赋码 */ diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCodeMan.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCodeMan.java index dc0d2720a..51fb548f1 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCodeMan.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderCodeMan.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** * 采集点单据手动赋码 */ diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java index 26f0b02e6..546af6651 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 采集点单据主表 diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java index 6ad6aff13..28e1ad214 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - @ApiModel(value = "io_collect_set") @Data @TableName(value = "io_collect_set") diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java index b23395c00..69f2f7c5d 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** * 损耗出库 */ diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java index 927a432c5..9a815f8c4 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderCode.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + @ApiModel(value = "io_split_des_order_code") @Data @Builder diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java index dbb56c1f0..e4961fed7 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** * 销毁出库详情 */ @@ -82,4 +81,4 @@ public class IoSplitDesOrderDetail implements Serializable { private String remark; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitFifoInvRel.java b/src/main/java/com/glxp/api/entity/collect/IoSplitFifoInvRel.java index 9c4a42c6b..8cb75c003 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoSplitFifoInvRel.java +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitFifoInvRel.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - /** * 工位库存关联业务类型 */ diff --git a/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java b/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java index 8a98bc271..0f90b530c 100644 --- a/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java +++ b/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; @ApiModel(value="com-glxp-api-entity-collect-RelCodeBatch") @Data diff --git a/src/main/java/com/glxp/api/entity/collect/RelCodeDetail.java b/src/main/java/com/glxp/api/entity/collect/RelCodeDetail.java index c1a10d0e0..bc41c1d91 100644 --- a/src/main/java/com/glxp/api/entity/collect/RelCodeDetail.java +++ b/src/main/java/com/glxp/api/entity/collect/RelCodeDetail.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; import lombok.Data; +import java.io.Serializable; + @ApiModel(value="com-glxp-api-entity-collect-RelCodeDetail") @Data @TableName(value = "rel_code_detail") diff --git a/src/main/java/com/glxp/api/entity/collect/SysOrderLed.java b/src/main/java/com/glxp/api/entity/collect/SysOrderLed.java index 57d88db59..9da625fb8 100644 --- a/src/main/java/com/glxp/api/entity/collect/SysOrderLed.java +++ b/src/main/java/com/glxp/api/entity/collect/SysOrderLed.java @@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java index 3890e32d8..e8e808f38 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 设备资产位置字典表 diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java index 98d8d9a70..7db8052c8 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; @Data @TableName(value = "device_asset_usage") diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java index 617f0007d..18c607a18 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; @Data @TableName(value = "device_asset_user") diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceChangeLogEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceChangeLogEntity.java index 8783b9ada..fa5808f2a 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceChangeLogEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceChangeLogEntity.java @@ -3,10 +3,6 @@ package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.time.LocalDateTime; - import com.glxp.api.enums.dev.DeviceChangeTypeEnum; import com.glxp.api.util.SnowflakeUtil; import com.glxp.api.vo.dev.DeviceChangeOrderVo; @@ -15,6 +11,9 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.time.LocalDateTime; + /** * 设备变更日志表 * @@ -153,4 +152,4 @@ public class DeviceChangeLogEntity implements Serializable { .createUser(order.getCreateUser()) .build(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java index 169cfe362..34a771661 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java @@ -3,10 +3,6 @@ package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.time.LocalDateTime; - import com.glxp.api.enums.dev.DeviceChangeStatusEnum; import com.glxp.api.enums.dev.DeviceChangeTypeEnum; import lombok.AllArgsConstructor; @@ -15,6 +11,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.time.LocalDateTime; + /** * 设备变更单 * diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java index b1772a70a..98814ee16 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java @@ -1,19 +1,15 @@ package com.glxp.api.entity.dev; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.time.LocalDateTime; + /** * 巡检任务明细 * diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailItemEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailItemEntity.java index 322d094e0..e8a308ddc 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailItemEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailItemEntity.java @@ -1,19 +1,15 @@ package com.glxp.api.entity.dev; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.time.LocalDateTime; + /** * 设备巡检项目 * diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceCheckEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceCheckEntity.java index ed7a5ef3c..9375d3eee 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceCheckEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceCheckEntity.java @@ -1,19 +1,16 @@ package com.glxp.api.entity.dev; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.time.LocalDateTime; + /** * 巡检任务表 * diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java index 64b3924ff..72b399559 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java @@ -3,20 +3,18 @@ package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import com.glxp.api.enums.dev.DeviceStatusEnum; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; + /** * 设备表 * diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java index 7999b069b..c3a37daff 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "device_inspect_plan_delect") public class DeviceInspectPlanDelectEntity { diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java index 53a96c2e9..b0c276a46 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java @@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "device_inspect_task_detail") public class DeviceInspectTaskDetailEntity implements Serializable { diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java index 3d3ae83e4..5b3bb483f 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import java.io.Serializable; import java.util.Date; @Data diff --git a/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailEntity.java index 8f9d08a7a..9e8f6bb42 100644 --- a/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailEntity.java @@ -1,12 +1,7 @@ package com.glxp.api.entity.dev; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -43,4 +38,4 @@ public class DevicePlanDetailEntity { */ @TableField(value = "productId") private Long productId; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailItemEntity.java b/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailItemEntity.java index 9ae2cbf59..3820e0215 100644 --- a/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailItemEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DevicePlanDetailItemEntity.java @@ -2,8 +2,6 @@ package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java b/src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java index 7dd4fbbc6..ec464aa48 100644 --- a/src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java @@ -1,20 +1,17 @@ package com.glxp.api.entity.dev; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 设备巡检计划 * diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java index 91711dd15..df3e314b0 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java @@ -2,15 +2,14 @@ package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; - -import java.time.LocalDateTime; - import com.glxp.api.enums.dev.DeviceRepairApplyDetailStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.LocalDateTime; + /** * 设备报修单明细 * diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java index 9ca2d7da4..37dc2ece4 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java @@ -1,19 +1,16 @@ package com.glxp.api.entity.dev; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.time.LocalDateTime; + /** * 设备维修单 * diff --git a/src/main/java/com/glxp/api/entity/inout/ExcelVO.java b/src/main/java/com/glxp/api/entity/inout/ExcelVO.java index 740b0c05b..78d7f7cd1 100644 --- a/src/main/java/com/glxp/api/entity/inout/ExcelVO.java +++ b/src/main/java/com/glxp/api/entity/inout/ExcelVO.java @@ -1,7 +1,6 @@ package com.glxp.api.entity.inout; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java index 35526ffa6..b842db97b 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.util.Date; -import lombok.Data; - /** * 扫码缺失字段信息补齐表 */ diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeRelEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeRelEntity.java index dfd055a0d..060886210 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeRelEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeRelEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + /** * 多级包装关联关系表 */ diff --git a/src/main/java/com/glxp/api/entity/inout/IoDestinyProcessCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoDestinyProcessCodeEntity.java index ab955ed8d..6904735ad 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoDestinyProcessCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoDestinyProcessCodeEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.math.BigDecimal; import java.util.Date; -import lombok.Data; /** * 定速包加工明细表 @@ -90,4 +91,4 @@ public class IoDestinyProcessCodeEntity { @TableField(value = "reCount") private int reCount; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inout/IoDestinyProcessEntity.java b/src/main/java/com/glxp/api/entity/inout/IoDestinyProcessEntity.java index 96da4722a..5947c2ddd 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoDestinyProcessEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoDestinyProcessEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + /** * 定数包表 */ @@ -81,4 +82,4 @@ public class IoDestinyProcessEntity { */ @TableField(value = "`status`") private Integer status; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java index 908168aa2..d8ebe48d9 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java @@ -1,11 +1,7 @@ package com.glxp.api.entity.inout; import com.baomidou.mybatisplus.annotation.*; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; -import org.apache.poi.ss.formula.functions.Count; import java.math.BigDecimal; @Data diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailResultEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailResultEntity.java index 4661c75db..25a6447c1 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailResultEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailResultEntity.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import javax.validation.Valid; import java.math.BigDecimal; @Data diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderMutiEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderMutiEntity.java index 0792e6ee0..9cb48b110 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderMutiEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderMutiEntity.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "io_order_muti") public class IoOrderMutiEntity { diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderMutiSetEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderMutiSetEntity.java index d11443c4e..b8304dab0 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderMutiSetEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderMutiSetEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "io_order_muti_set") public class IoOrderMutiSetEntity { diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderMutiUseEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderMutiUseEntity.java index f7989c410..d9408ae4a 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderMutiUseEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderMutiUseEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "io_order_muti_use") public class IoOrderMutiUseEntity { diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderSkPrescribeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderSkPrescribeEntity.java index 51b25a5d9..e3f391590 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderSkPrescribeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderSkPrescribeEntity.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import lombok.Data; - /** * 出库单据处方用药耗材对照 */ diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java index 858836eb9..aae6c0430 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java @@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - /** * 拆零出库明细表 */ diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java index 0598091cd..3b8ea23d7 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** * 拆零队列码明细 */ diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java index 94a99f68c..63c37017d 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** * 工位队列码明细 */ diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java index 5b8d3d542..b65e4405e 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + @ApiModel(value = "io_split_fifo_inv") @Data @Builder diff --git a/src/main/java/com/glxp/api/entity/inout/IoStatDetailEntity.java b/src/main/java/com/glxp/api/entity/inout/IoStatDetailEntity.java index ef84c3a3c..8786dd39b 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoStatDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoStatDetailEntity.java @@ -6,13 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; - @ApiModel(value = "com-glxp-api-entity-inout-IoStatDetail") @Data @TableName(value = "io_stat_detail") diff --git a/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java b/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java index b6cd45446..2020576de 100644 --- a/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "pur_receive") public class PurReceiveEntity { diff --git a/src/main/java/com/glxp/api/entity/inv/InvCountCodesEntity.java b/src/main/java/com/glxp/api/entity/inv/InvCountCodesEntity.java index fd4a38dfd..d64b8fffa 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvCountCodesEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvCountCodesEntity.java @@ -6,14 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** * 盘点单据码表 */ diff --git a/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java index f33c0cd6d..8cdf658cf 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java @@ -6,14 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** * 盘点单详情 */ diff --git a/src/main/java/com/glxp/api/entity/inv/InvCountOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/InvCountOrderEntity.java index 0138ed7c8..a4d36b907 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvCountOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvCountOrderEntity.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + /** * 盘点单据表 */ diff --git a/src/main/java/com/glxp/api/entity/inv/InvCountSettingEntity.java b/src/main/java/com/glxp/api/entity/inv/InvCountSettingEntity.java index 38b433045..e200d5ca6 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvCountSettingEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvCountSettingEntity.java @@ -6,14 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** * 盘点设置表 */ diff --git a/src/main/java/com/glxp/api/entity/inv/InvCpLocalProductEntity.java b/src/main/java/com/glxp/api/entity/inv/InvCpLocalProductEntity.java index 8a38aff01..1d4655115 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvCpLocalProductEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvCpLocalProductEntity.java @@ -6,16 +6,15 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + @ApiModel(value = "com-glxp-api-entity-inv-InvCpLocalProduct") @Data @Builder diff --git a/src/main/java/com/glxp/api/entity/inv/InvCpThrProuductEntity.java b/src/main/java/com/glxp/api/entity/inv/InvCpThrProuductEntity.java index 4583b8081..657d19597 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvCpThrProuductEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvCpThrProuductEntity.java @@ -6,13 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; - @ApiModel(value = "com-glxp-api-entity-inv-InvCpThrProuduct") @Data @TableName(value = "inv_cp_thr_prouduct") diff --git a/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderDetailEntity.java index 6f725fa58..cbdcd86fb 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderDetailEntity.java @@ -1,8 +1,6 @@ package com.glxp.api.entity.inv; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -79,4 +77,4 @@ public class InvPlaceOrderDetailEntity { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderEntity.java index 7915d2ad1..db32b50e4 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderEntity.java @@ -1,8 +1,6 @@ package com.glxp.api.entity.inv; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -64,4 +62,4 @@ public class InvPlaceOrderEntity { private int count; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/InvProductRationEntity.java b/src/main/java/com/glxp/api/entity/inv/InvProductRationEntity.java index 19be944ae..36407c647 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvProductRationEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvProductRationEntity.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + @ApiModel(value = "com-glxp-api-entity-inv-InvProductRationEntity") @Data @Builder diff --git a/src/main/java/com/glxp/api/entity/inv/InvUserProductDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvUserProductDetailEntity.java index 59434006c..27047e201 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvUserProductDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvUserProductDetailEntity.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import java.io.Serializable; import java.util.Date; /** @@ -132,4 +131,4 @@ public class InvUserProductDetailEntity { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/InvUserProductEntity.java b/src/main/java/com/glxp/api/entity/inv/InvUserProductEntity.java index 0291023a8..b690c358f 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvUserProductEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvUserProductEntity.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import java.io.Serializable; import java.util.Date; /** @@ -112,32 +111,32 @@ public class InvUserProductEntity { private Date updateTime; /** - * + * */ private Integer nowStock; /** - * + * */ private Integer frozenCount; /** - * + * */ private Integer planInCount; /** - * + * */ private Integer planOutCount; /** - * + * */ private Integer onWayCount; /** - * + * */ private Integer availableStock; @@ -149,4 +148,4 @@ public class InvUserProductEntity { private String userId; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyArgument.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyArgument.java index 04313b768..3d1626259 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyArgument.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyArgument.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; @ApiModel(description="pur_apply_argument") @Data diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java index 52c0c5758..559e84735 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "pur_apply") public class PurApplyEntity { diff --git a/src/main/java/com/glxp/api/entity/purchase/PurInquiryEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurInquiryEntity.java index a4c38c594..7ccde65ed 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurInquiryEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurInquiryEntity.java @@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; -import org.springframework.data.annotation.Transient; /** * 询价业务 diff --git a/src/main/java/com/glxp/api/entity/purchase/PurInquiryItemDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurInquiryItemDetailEntity.java index d8853a92f..114c9db26 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurInquiryItemDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurInquiryItemDetailEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.math.BigDecimal; -import lombok.Data; /** * 询价业务明细详情表 diff --git a/src/main/java/com/glxp/api/entity/purchase/PurInquiryItemEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurInquiryItemEntity.java index 81a990cc1..0b05bac01 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurInquiryItemEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurInquiryItemEntity.java @@ -6,10 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; /** * 询价业务明细表 diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java index b22521b90..60006fb4d 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "pur_order") public class PurOrderEntity { diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java index b12ba494b..0da023e99 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "pur_plan") public class PurPlanEntity { diff --git a/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java index 420da974f..433a6410b 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java @@ -1,7 +1,6 @@ package com.glxp.api.entity.sync; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java index 8bab4ea74..a2651b69e 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -1,7 +1,5 @@ package com.glxp.api.entity.sync; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,6 +9,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + @Data @TableName("basic_export_status") @Builder diff --git a/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java b/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java index 2a5fdc1b0..a1ad79095 100644 --- a/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; +import java.io.Serializable; + @Data @TableName(value = "sync_edit_type") public class SyncEditTypeEntity implements Serializable { diff --git a/src/main/java/com/glxp/api/entity/system/SysRemindMsgEntity.java b/src/main/java/com/glxp/api/entity/system/SysRemindMsgEntity.java index 7dacec60f..ffe89a057 100644 --- a/src/main/java/com/glxp/api/entity/system/SysRemindMsgEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysRemindMsgEntity.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "sys_remind_msg") public class SysRemindMsgEntity { diff --git a/src/main/java/com/glxp/api/entity/system/SysTableHeadEntity.java b/src/main/java/com/glxp/api/entity/system/SysTableHeadEntity.java index 7b0190b89..42bc1e637 100644 --- a/src/main/java/com/glxp/api/entity/system/SysTableHeadEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysTableHeadEntity.java @@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "sys_table_head") public class SysTableHeadEntity implements Serializable { diff --git a/src/main/java/com/glxp/api/entity/thrsys/BasicInsChdrugEntity.java b/src/main/java/com/glxp/api/entity/thrsys/BasicInsChdrugEntity.java index 3277cc004..85c1b63ad 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/BasicInsChdrugEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/BasicInsChdrugEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 中药饮片目录 diff --git a/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java b/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java index 43a33d73e..482dcbdfe 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 西药中成药目录 diff --git a/src/main/java/com/glxp/api/entity/thrsys/BasicInsMaterialEntity.java b/src/main/java/com/glxp/api/entity/thrsys/BasicInsMaterialEntity.java index 8cd05f1aa..847a9ac60 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/BasicInsMaterialEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/BasicInsMaterialEntity.java @@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 医用耗材目录 diff --git a/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java b/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java index 87d4b1c42..f11e5a2ab 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java +++ b/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -77,4 +76,4 @@ public class CodeRel { @TableField(value = "fromType") public Integer fromType; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/DeptMaterialCategory.java b/src/main/java/com/glxp/api/entity/thrsys/DeptMaterialCategory.java index 16af1d80b..acbc9ccfa 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/DeptMaterialCategory.java +++ b/src/main/java/com/glxp/api/entity/thrsys/DeptMaterialCategory.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; import lombok.Data; +import java.io.Serializable; + /** * 部门医保耗材分类关系表 */ diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrConsumeMaterialCategory.java b/src/main/java/com/glxp/api/entity/thrsys/ThrConsumeMaterialCategory.java index 1ad1a9786..8fbf7ad19 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrConsumeMaterialCategory.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrConsumeMaterialCategory.java @@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.glxp.api.entity.auth.SysMenu; -import com.glxp.api.entity.auth.TreeEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 医保耗材分类表 diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrHslbEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrHslbEntity.java index 74c64d603..2f0ed34d2 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrHslbEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrHslbEntity.java @@ -4,17 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + @Data @Builder @AllArgsConstructor diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetail.java b/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetail.java index 67683abfb..afd69e7c8 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetail.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetail.java @@ -10,7 +10,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; @Data @Builder diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrManufacturerEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrManufacturerEntity.java index f3fe936fb..160aa498e 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrManufacturerEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrManufacturerEntity.java @@ -4,14 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - /** * 第三方往来单位类型 */ diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java index 0217e5c39..b963e12ec 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java @@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "thr_order_detail") public class ThrOrderDetailEntity implements Serializable { diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java index f61ee0144..f1b747f0d 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java @@ -4,16 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.io.Serializable; import java.util.Date; import java.util.List; -import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - @Data @TableName(value = "thr_order_upload_bustypes", autoResultMap = true) public class ThrOrderUploadBustypesEntity implements Serializable { diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductTypeEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductTypeEntity.java index febde5a88..4d730169b 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductTypeEntity.java @@ -6,12 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + @ApiModel(value="com-glxp-api-entity-thrsys-ThrProductType") @Data @Builder diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java index 978064425..1b6d1ca76 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java @@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "thr_products_import_detail") public class ThrProductsImportDetailEntity { @@ -154,4 +155,4 @@ public class ThrProductsImportDetailEntity { public static final String COL_UPDATEUSER = "updateUser"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java b/src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java index 2bca957fa..b3b894036 100644 --- a/src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java @@ -1,9 +1,9 @@ package com.glxp.api.handler; -import com.glxp.api.exception.JsonException; 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.exception.JsonException; import lombok.extern.slf4j.Slf4j; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.validation.BindException; diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index 219b9a962..5b10503ed 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -1,7 +1,6 @@ package com.glxp.api.http; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; @@ -9,7 +8,10 @@ import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.collect.IoCollectOrder; -import com.glxp.api.entity.thrsys.*; +import com.glxp.api.entity.thrsys.ThrManufacturerEntity; +import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; +import com.glxp.api.entity.thrsys.YbDrug; import com.glxp.api.http.req.UdiwmsBusTypeRequest; import com.glxp.api.http.req.UdiwmsUnitRequest; import com.glxp.api.req.basic.*; diff --git a/src/main/java/com/glxp/api/http/ErpInvClient.java b/src/main/java/com/glxp/api/http/ErpInvClient.java index 4cb166f12..bb8d54818 100644 --- a/src/main/java/com/glxp/api/http/ErpInvClient.java +++ b/src/main/java/com/glxp/api/http/ErpInvClient.java @@ -4,15 +4,12 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.req.inv.FilterInvProductRequest; import com.glxp.api.req.thrsys.ThrOnhandRequest; -import com.glxp.api.req.thrsys.UdiwmsWarehouseRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inv.ThrInvResultResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; -import com.glxp.api.res.thrsys.UdiwmsWarehouseDetail; import com.glxp.api.service.thrsys.ThrSystemService; import com.google.common.base.Throwables; import lombok.extern.slf4j.Slf4j; @@ -20,7 +17,6 @@ import okhttp3.OkHttpClient; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/glxp/api/http/ErpOrderClient.java b/src/main/java/com/glxp/api/http/ErpOrderClient.java index 55a522d13..cdd538c7d 100644 --- a/src/main/java/com/glxp/api/http/ErpOrderClient.java +++ b/src/main/java/com/glxp/api/http/ErpOrderClient.java @@ -3,11 +3,9 @@ package com.glxp.api.http; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.req.thrsys.FilterThrOrderRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.thrsys.ThrErpOrderResponse; import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.service.thrsys.ThrSystemService; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/http/NmpaUdiClient.java b/src/main/java/com/glxp/api/http/NmpaUdiClient.java index c61ef2fc4..98d44ad7b 100644 --- a/src/main/java/com/glxp/api/http/NmpaUdiClient.java +++ b/src/main/java/com/glxp/api/http/NmpaUdiClient.java @@ -1,13 +1,13 @@ package com.glxp.api.http; -import com.glxp.api.service.basic.UdiProductService; -import org.springframework.beans.BeanUtils; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.req.basic.ProductInfoFilterRequest; import com.glxp.api.service.basic.ProductInfoService; +import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.util.UuidUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index 14acd1891..500a5f2b0 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -17,7 +17,6 @@ import com.glxp.api.entity.sync.IOOrderStatusEntity; import com.glxp.api.entity.sync.SyncEditLogEntity; import com.glxp.api.entity.sync.SyncEditTypeEntity; import com.glxp.api.entity.system.SyncDataSetEntity; -import com.glxp.api.entity.thrsys.ThirdAliDrug; import com.glxp.api.idc.service.FileService; import com.glxp.api.req.alihealth.AlihealthRelCodeInsertReqeust; import com.glxp.api.req.alihealth.local.AliBillsDisposeReqeust; @@ -34,7 +33,6 @@ import com.glxp.api.req.sync.OrderStatusFilterRequest; import com.glxp.api.req.sync.SyncUpLoadRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.alihealth.AlihealthKytSinglerelationResponse; import com.glxp.api.res.inout.RefreshInoiceResponse; import com.glxp.api.res.inv.InvPreProductResponse; import com.glxp.api.res.inv.InvPreinProductResponse; diff --git a/src/main/java/com/glxp/api/http/sync/SpsDirectClient.java b/src/main/java/com/glxp/api/http/sync/SpsDirectClient.java index 725377b8d..ea47c8be7 100644 --- a/src/main/java/com/glxp/api/http/sync/SpsDirectClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpsDirectClient.java @@ -10,7 +10,6 @@ import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.req.inout.PostOrderRequest; import com.glxp.api.res.collect.RelCodeDetailByParentCodeResponse; import com.glxp.api.service.sync.SyncDataSetService; -import com.glxp.api.util.HttpClient; import com.glxp.api.util.OkHttpCli; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/idc/controller/ConnectController.java b/src/main/java/com/glxp/api/idc/controller/ConnectController.java index 434eb64d0..b27f5c561 100644 --- a/src/main/java/com/glxp/api/idc/controller/ConnectController.java +++ b/src/main/java/com/glxp/api/idc/controller/ConnectController.java @@ -1,17 +1,15 @@ package com.glxp.api.idc.controller; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.idc.service.ConnectService; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.idc.service.ConnectService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; @@ -28,7 +26,7 @@ public class ConnectController { @RequestMapping(value = "/spssync/common/connect") @ResponseBody public BaseResponse connect(HttpServletRequest request, @RequestBody Map params) { - + return connectService.connectStatus(request,params); } diff --git a/src/main/java/com/glxp/api/idc/controller/DeleteController.java b/src/main/java/com/glxp/api/idc/controller/DeleteController.java index 913487f83..4d6809598 100644 --- a/src/main/java/com/glxp/api/idc/controller/DeleteController.java +++ b/src/main/java/com/glxp/api/idc/controller/DeleteController.java @@ -1,18 +1,16 @@ package com.glxp.api.idc.controller; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.idc.service.DeleteService; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.idc.service.DeleteService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; diff --git a/src/main/java/com/glxp/api/idc/controller/FileController.java b/src/main/java/com/glxp/api/idc/controller/FileController.java index 69c4fd6b6..c68be81f8 100644 --- a/src/main/java/com/glxp/api/idc/controller/FileController.java +++ b/src/main/java/com/glxp/api/idc/controller/FileController.java @@ -1,19 +1,13 @@ package com.glxp.api.idc.controller; -import java.util.Map; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.idc.service.FileService; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.idc.service.FileService; +import java.util.Map; /** diff --git a/src/main/java/com/glxp/api/idc/controller/IdcController.java b/src/main/java/com/glxp/api/idc/controller/IdcController.java index ae07bdb9d..3a5c0f7d6 100644 --- a/src/main/java/com/glxp/api/idc/controller/IdcController.java +++ b/src/main/java/com/glxp/api/idc/controller/IdcController.java @@ -1,27 +1,6 @@ package com.glxp.api.idc.controller; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.RestTemplate; -import org.springframework.web.multipart.MultipartFile; - +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.glxp.api.common.res.BaseResponse; @@ -29,9 +8,23 @@ import com.glxp.api.dao.idc.DbDao; import com.glxp.api.idc.service.IdcService; import com.glxp.api.idc.utils.UriUtils; import com.glxp.api.service.system.SystemParamConfigService; - -import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; /** @@ -64,7 +57,7 @@ public class IdcController { boolean isUpload = params.get("isUpload")!=null && params.get("isUpload").equals("1") ? true : false ; return idcService.onceSync( params.get("tableName").toString(), isUpload); } - + //@Log("数据同步测试") @RequestMapping(value = "/spssync/common/test") public BaseResponse test(HttpServletRequest request, @RequestBody Map params) { @@ -90,7 +83,7 @@ public class IdcController { public BaseResponse uploadStatus(HttpServletRequest request, @RequestBody Map params) { return idcService.uploadStatus(request, params); } - + @RequestMapping(value = "/spssync/common/downloadStatus") @ResponseBody public BaseResponse downloadStatus(HttpServletRequest request, @RequestBody Map params) { @@ -110,10 +103,10 @@ public class IdcController { response.setContentType("application/force-download"); idcService.downloadFile(fileName, response); } - + } - - + + @RequestMapping("/mapi/**") public Object mapi(HttpServletRequest request, HttpServletResponse httpServletResponse) { String uri = uriUtils.parseUri(request.getRequestURL().toString()); diff --git a/src/main/java/com/glxp/api/idc/service/ConnectService.java b/src/main/java/com/glxp/api/idc/service/ConnectService.java index 0b6f402c0..9de34e3f5 100644 --- a/src/main/java/com/glxp/api/idc/service/ConnectService.java +++ b/src/main/java/com/glxp/api/idc/service/ConnectService.java @@ -1,10 +1,9 @@ package com.glxp.api.idc.service; -import java.util.Map; +import com.glxp.api.common.res.BaseResponse; import javax.servlet.http.HttpServletRequest; - -import com.glxp.api.common.res.BaseResponse; +import java.util.Map; /*连通状态服务*/ public interface ConnectService { diff --git a/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java b/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java index 205d08beb..31b37a7de 100644 --- a/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java +++ b/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java @@ -1,21 +1,15 @@ package com.glxp.api.idc.service; -import java.io.IOException; -import java.net.URI; - +import cn.hutool.core.lang.Assert; +import com.beust.jcommander.internal.Nullable; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpResponse; -import org.springframework.web.client.RequestCallback; -import org.springframework.web.client.ResourceAccessException; -import org.springframework.web.client.ResponseExtractor; -import org.springframework.web.client.RestClientException; -import org.springframework.web.client.RestTemplate; +import org.springframework.web.client.*; -import com.beust.jcommander.internal.Nullable; - -import cn.hutool.core.lang.Assert; +import java.io.IOException; +import java.net.URI; public class DownloadRestTemplate extends RestTemplate { public DownloadRestTemplate(ClientHttpRequestFactory requestFactory) { diff --git a/src/main/java/com/glxp/api/idc/service/FileService.java b/src/main/java/com/glxp/api/idc/service/FileService.java index a0e7115a8..804de404f 100644 --- a/src/main/java/com/glxp/api/idc/service/FileService.java +++ b/src/main/java/com/glxp/api/idc/service/FileService.java @@ -1,16 +1,14 @@ package com.glxp.api.idc.service; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - +import com.glxp.api.common.res.BaseResponse; import org.springframework.web.multipart.MultipartFile; -import com.glxp.api.common.res.BaseResponse; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; -/*文件服务*/ +/*文件服务*/ public interface FileService { BaseResponse upload(List list); BaseResponse download(List list); diff --git a/src/main/java/com/glxp/api/idc/service/IdcService.java b/src/main/java/com/glxp/api/idc/service/IdcService.java index d135a909e..743fef9a8 100644 --- a/src/main/java/com/glxp/api/idc/service/IdcService.java +++ b/src/main/java/com/glxp/api/idc/service/IdcService.java @@ -1,13 +1,11 @@ package com.glxp.api.idc.service; -import java.util.Map; +import com.glxp.api.common.res.BaseResponse; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.multipart.MultipartFile; - -import com.glxp.api.common.res.BaseResponse; +import java.util.Map; /*数据中继数据中心(接收)*/ @@ -21,7 +19,7 @@ public interface IdcService { String content,MultipartFile[] files); BaseResponse send(Map params); BaseResponse send(String messageType,String tableName,Map params); - + BaseResponse taskList(HttpServletRequest request,Map params); BaseResponse download(HttpServletRequest request,Map params); @@ -31,12 +29,12 @@ public interface IdcService { public void asyncFetchUdiTask(); BaseResponse downlaodSuccess(HttpServletRequest request,Map params); - + void asyncUdiTask(); void asyncSpsTask(); - + void downloadFile(String fileName,HttpServletResponse response) ; - + BaseResponse onceSync(String tableName,boolean isUpload); boolean signleDownloadFile(String syncIp, String fileName); diff --git a/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java index f83aad1f6..04be754c2 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java @@ -1,16 +1,5 @@ package com.glxp.api.idc.service.impl; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.glxp.api.common.res.BaseResponse; @@ -18,6 +7,15 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.idc.DbDao; import com.glxp.api.idc.service.ConnectService; import com.glxp.api.idc.utils.IDCUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; /*连通检测*/ diff --git a/src/main/java/com/glxp/api/idc/service/impl/DeleteServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/DeleteServiceImpl.java index d5a5b18fb..f9f90f827 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/DeleteServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/DeleteServiceImpl.java @@ -1,19 +1,17 @@ package com.glxp.api.idc.service.impl; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.Resource; - +import com.alibaba.fastjson2.JSON; +import com.glxp.api.dao.idc.DbDao; +import com.glxp.api.idc.service.DeleteService; +import com.glxp.api.util.CustomUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; -import com.alibaba.fastjson2.JSON; -import com.glxp.api.dao.idc.DbDao; -import com.glxp.api.idc.service.DeleteService; -import com.glxp.api.util.CustomUtil; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; @Service @@ -23,7 +21,7 @@ public class DeleteServiceImpl implements DeleteService { private JdbcTemplate jdbcTemplate; @Resource private DbDao dbDao; - + @Override public boolean syncDelete(String tableName,String uniqueValue) { Map map = new HashMap<>(); @@ -35,12 +33,12 @@ public class DeleteServiceImpl implements DeleteService { public boolean syncDelete(Map params) { createTable(); String sql = "insert into idc_delete (id,tableName,updateTime,uniqueValue) values ('"+CustomUtil.getId()+"','"+params.get("tableName").toString().toLowerCase()+"',now(),'"+JSON.toJSONString(params.get("uniqueValue"))+"')"; - + if(dbDao.save(sql)>0) return true; return false; } - + private void createTable() { try { jdbcTemplate.execute("create table idc_delete (id varchar(36),tableName varchar(100),uniqueValue varchar(600),updateTime datetime,PRIMARY KEY (id))"); @@ -55,4 +53,4 @@ public class DeleteServiceImpl implements DeleteService { } } -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java index 83ab5dea5..7c608e198 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java @@ -1,47 +1,31 @@ package com.glxp.api.idc.service.impl; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import com.glxp.api.constant.FileConstant; - -import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; -import groovy.util.logging.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.apache.tools.ant.util.DateUtils; -import org.hibernate.validator.internal.util.logging.Log; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; 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.idc.DbDao; import com.glxp.api.idc.service.FileService; import com.glxp.api.idc.service.IdcService; import com.glxp.api.idc.utils.IDCUtils; import com.glxp.api.util.FileUtils; +import groovy.util.logging.Slf4j; +import okhttp3.*; +import org.apache.commons.lang3.StringUtils; +import org.apache.tools.ant.util.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; -import okhttp3.MediaType; -import okhttp3.MultipartBody; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.TimeUnit; /*文件服务*/ diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 6461b5ef9..5569443a3 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -1,39 +1,10 @@ package com.glxp.api.idc.service.impl; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.glxp.api.constant.FileConstant; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.text.WordUtils; -import org.apache.tools.ant.util.DateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.support.CronSequenceGenerator; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; 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.idc.DbDao; import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.system.ScheduledEntity; @@ -45,16 +16,28 @@ import com.glxp.api.idc.utils.TableUtils; import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.FileUtils; - +import com.glxp.api.util.MsDateUtil; import lombok.extern.slf4j.Slf4j; -import okhttp3.MediaType; -import okhttp3.MultipartBody; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; +import okhttp3.*; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.WordUtils; +import org.apache.tools.ant.util.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.support.CronSequenceGenerator; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.*; +import java.util.concurrent.TimeUnit; /*数据中继数据中心(接收)*/ @Slf4j diff --git a/src/main/java/com/glxp/api/idc/utils/DBAUtils.java b/src/main/java/com/glxp/api/idc/utils/DBAUtils.java index ab175b388..046e7533c 100644 --- a/src/main/java/com/glxp/api/idc/utils/DBAUtils.java +++ b/src/main/java/com/glxp/api/idc/utils/DBAUtils.java @@ -1,15 +1,14 @@ package com.glxp.api.idc.utils; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - +import com.glxp.api.util.MsDateUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.glxp.api.util.MsDateUtil; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; diff --git a/src/main/java/com/glxp/api/idc/utils/IDCUtils.java b/src/main/java/com/glxp/api/idc/utils/IDCUtils.java index 4b0b47b92..2fa5e17b8 100644 --- a/src/main/java/com/glxp/api/idc/utils/IDCUtils.java +++ b/src/main/java/com/glxp/api/idc/utils/IDCUtils.java @@ -1,5 +1,11 @@ package com.glxp.api.idc.utils; +import com.alibaba.fastjson.JSON; +import okhttp3.*; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -8,18 +14,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.alibaba.fastjson.JSON; - -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; - @@ -31,13 +25,13 @@ public class IDCUtils { private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210"; private static String realNamechars = "abcdefghijklmnopqrstuvwxyz_0123456789"; private final static String MONTH_EN = "JanFebMarAprMayJunJulAugSepOctNovDec"; - + //判断是否json字符串 public static boolean isJson(String json) { if(json!=null&&json.contains("{")&&json.contains("}")&&json.contains("\"")) return true; return false; - } + } public static Date parseDate(String str) { return parseDate(str,"yyyy-MM-dd HH:mm:ss"); } @@ -110,11 +104,11 @@ public class IDCUtils { dateStr=df.format(new Date(Long.valueOf(str))); } dateStr = dateStr.replace("T", " "); - + Date date = null; try { date = df.parse(dateStr); - + } catch (ParseException e) { logger.error(e.getMessage()); } @@ -138,9 +132,9 @@ public class IDCUtils { } } } - + } - + public static String post(String url, Map params) { OkHttpClient client = new OkHttpClient().newBuilder() .build(); @@ -163,7 +157,7 @@ public class IDCUtils { } return result; } - + public static void writeFile(byte[] file, String filePath, String fileName) throws Exception { File targetFile = new File(filePath); if (!targetFile.exists()) { diff --git a/src/main/java/com/glxp/api/idc/utils/UriUtils.java b/src/main/java/com/glxp/api/idc/utils/UriUtils.java index 1478eb257..3806ecf99 100644 --- a/src/main/java/com/glxp/api/idc/utils/UriUtils.java +++ b/src/main/java/com/glxp/api/idc/utils/UriUtils.java @@ -1,5 +1,14 @@ package com.glxp.api.idc.utils; +import cn.hutool.core.io.IoUtil; +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -7,18 +16,6 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSON; - -import cn.hutool.core.io.IoUtil; -import lombok.extern.slf4j.Slf4j; - @Slf4j @Service public class UriUtils { diff --git a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java index 7406f4d41..294a004f6 100644 --- a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java @@ -2,7 +2,6 @@ package com.glxp.api.req.alihealth.local; import com.glxp.api.entity.thrsys.YbDrug; import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust; -import com.glxp.api.req.thrsys.ThirdAliDrugRequest; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java b/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java index cf47565de..d89b5ac02 100644 --- a/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java @@ -2,7 +2,6 @@ package com.glxp.api.req.auth; import lombok.Data; -import javax.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java b/src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java index 6e9ee19ae..eb931b33c 100644 --- a/src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java +++ b/src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java @@ -1,6 +1,5 @@ package com.glxp.api.req.auth; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.constant.Constant; import com.glxp.api.entity.auth.SysRole; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/basic/AddDrugRequest.java b/src/main/java/com/glxp/api/req/basic/AddDrugRequest.java index 5b99f7d59..613052a25 100644 --- a/src/main/java/com/glxp/api/req/basic/AddDrugRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddDrugRequest.java @@ -2,12 +2,10 @@ package com.glxp.api.req.basic; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java index 8bf36623a..318d45038 100644 --- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java @@ -3,12 +3,10 @@ package com.glxp.api.req.basic; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import com.glxp.api.vo.basic.DrugLevelList; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.Valid; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/req/basic/BasicDestinyRelRequest.java b/src/main/java/com/glxp/api/req/basic/BasicDestinyRelRequest.java index 8a07f61e7..a5ec8cf76 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicDestinyRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicDestinyRelRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.basic; -import com.alibaba.fastjson.annotation.JSONField; import com.glxp.api.entity.basic.UdiRlSupEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java index 23a2a8415..8fa1f0c44 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java @@ -1,11 +1,8 @@ package com.glxp.api.req.basic; -import com.glxp.api.res.basic.BasicErpUnitsResponse; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import java.util.List; - @Data public class BasicHospTypeFilterRequest extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java b/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java index fd4fc10fe..98d69506e 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java @@ -1,7 +1,5 @@ package com.glxp.api.req.basic; -import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeDiRequest.java b/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeDiRequest.java index e324554b4..74a8d6196 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeDiRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeDiRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.basic; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeRequest.java b/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeRequest.java index 121b1a67c..6b784a32e 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeRequest.java @@ -1,8 +1,6 @@ package com.glxp.api.req.basic; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/req/basic/BasicSkProjectRequest.java b/src/main/java/com/glxp/api/req/basic/BasicSkProjectRequest.java index 5c6b81c80..513eeeff8 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicSkProjectRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicSkProjectRequest.java @@ -1,8 +1,6 @@ package com.glxp.api.req.basic; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java index d53b175f4..c15e636f1 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.basic; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.basic.BasicErpUnitsResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index 656518b96..3a5d7a356 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.basic; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java b/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java index ee95b9c89..cacbf29a8 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.basic; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java index b48a37b74..6ca1b5218 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java @@ -1,7 +1,6 @@ package com.glxp.api.req.basic; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/basic/PrescribeBindWorkRequest.java b/src/main/java/com/glxp/api/req/basic/PrescribeBindWorkRequest.java index 64514e581..293c13b10 100644 --- a/src/main/java/com/glxp/api/req/basic/PrescribeBindWorkRequest.java +++ b/src/main/java/com/glxp/api/req/basic/PrescribeBindWorkRequest.java @@ -3,8 +3,6 @@ package com.glxp.api.req.basic; import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import lombok.Data; -import java.util.List; - @Data public class PrescribeBindWorkRequest { diff --git a/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java index 8d6f589f3..9a53681b1 100644 --- a/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java @@ -1,8 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.collect.IoCollectOrder; -import com.glxp.api.res.basic.BasicSkSickerResponse; import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueBindRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueBindRequest.java index 3fb93679d..d955b7278 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueBindRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueBindRequest.java @@ -1,10 +1,7 @@ package com.glxp.api.req.basic; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import java.util.List; - /** * @author : zhangsan * @date : 2024/10/30 10:42 diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java index fe695c1d2..d2f73a819 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java @@ -1,8 +1,6 @@ package com.glxp.api.req.basic; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/req/basic/YbDrugDetailFilterRequest.java b/src/main/java/com/glxp/api/req/basic/YbDrugDetailFilterRequest.java index b76aefaa9..a7d206e06 100644 --- a/src/main/java/com/glxp/api/req/basic/YbDrugDetailFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/YbDrugDetailFilterRequest.java @@ -1,7 +1,6 @@ package com.glxp.api.req.basic; import lombok.Data; -import org.hibernate.validator.constraints.Length; @Data public class YbDrugDetailFilterRequest { diff --git a/src/main/java/com/glxp/api/req/basic/YbHcflDetailFilterRequest.java b/src/main/java/com/glxp/api/req/basic/YbHcflDetailFilterRequest.java index d5c3abd18..f22ca5788 100644 --- a/src/main/java/com/glxp/api/req/basic/YbHcflDetailFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/YbHcflDetailFilterRequest.java @@ -3,8 +3,6 @@ package com.glxp.api.req.basic; import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; - @Data public class YbHcflDetailFilterRequest { diff --git a/src/main/java/com/glxp/api/req/collect/CollectLedGroupRequest.java b/src/main/java/com/glxp/api/req/collect/CollectLedGroupRequest.java index bad788f3a..c98b00d10 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectLedGroupRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectLedGroupRequest.java @@ -1,7 +1,6 @@ package com.glxp.api.req.collect; import com.glxp.api.util.page.ListPageRequest; -import io.swagger.models.auth.In; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index 962efd2ba..4d67fc668 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -3,7 +3,6 @@ package com.glxp.api.req.collect; import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderUploadCountRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderUploadCountRequest.java index fbfbd5404..81ad7fe8e 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderUploadCountRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderUploadCountRequest.java @@ -1,13 +1,7 @@ package com.glxp.api.req.collect; -import com.baomidou.mybatisplus.annotation.TableField; -import com.glxp.api.util.page.ListPageRequest; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; -import java.util.List; - @Data public class CollectOrderUploadCountRequest { diff --git a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java index 91e3a5cbd..4cbd35dd8 100644 --- a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java @@ -1,10 +1,6 @@ package com.glxp.api.req.collect; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.glxp.api.util.page.ListPageRequest; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java index d60f6ad57..970f2e33a 100644 --- a/src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.collect; -import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBackup; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java b/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java index 3881a799e..61b12d15a 100644 --- a/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java +++ b/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java @@ -1,8 +1,6 @@ package com.glxp.api.req.collect; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java b/src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java index 53a1fe0f6..3ae8301c2 100644 --- a/src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java +++ b/src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java @@ -3,8 +3,6 @@ package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import javax.validation.constraints.NotNull; - @Data public class CheckDetailQuery extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java index 24a93881c..08223a7c8 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java @@ -5,15 +5,12 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import com.glxp.api.constant.Constant; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceChangeOrderEntity; import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.enums.dev.DeviceChangeStatusEnum; import com.glxp.api.enums.dev.DeviceChangeTypeEnum; import com.glxp.api.exception.JsonException; -import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.SnowflakeUtil; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -24,7 +21,6 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailItemQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailItemQuery.java index 5ff987e4f..907a8754f 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailItemQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailItemQuery.java @@ -4,7 +4,6 @@ import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; @Data public class DeviceCheckDetailItemQuery extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailMiniQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailMiniQuery.java index aef28b8c5..7251813fd 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailMiniQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailMiniQuery.java @@ -1,6 +1,5 @@ package com.glxp.api.req.dev; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailParam.java b/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailParam.java index 4c800baef..15882713a 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailParam.java @@ -1,6 +1,5 @@ package com.glxp.api.req.dev; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailRepairParam.java b/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailRepairParam.java index f299381ca..80c6e16f6 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailRepairParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceCheckDetailRepairParam.java @@ -1,6 +1,5 @@ package com.glxp.api.req.dev; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java index dbf5317f6..f12ec0530 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java @@ -4,9 +4,6 @@ import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - @Data public class DeviceInfoDetailByDeptCodeQuery extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java index fd3391bd4..6f44e3768 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java @@ -1,7 +1,6 @@ package com.glxp.api.req.dev; import com.glxp.api.enums.dev.DeviceStatusEnum; -import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.vo.dev.DeviceInfoVo; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java b/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java index 5b341ecfc..416b87444 100644 --- a/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java +++ b/src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java @@ -10,8 +10,6 @@ import com.glxp.api.service.dev.DevicePlanService; import lombok.Data; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailQuery.java index 80a6119fc..78c17d91b 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailQuery.java @@ -1,6 +1,5 @@ package com.glxp.api.req.dev; -import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyHallQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyHallQuery.java index e08f0a304..a1acff240 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyHallQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyHallQuery.java @@ -1,6 +1,5 @@ package com.glxp.api.req.dev; -import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceRepairQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceRepairQuery.java index cb1882fdb..595a0ac8a 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceRepairQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceRepairQuery.java @@ -1,6 +1,5 @@ package com.glxp.api.req.dev; -import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemQuery.java index fc2546b75..a6c077168 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemQuery.java @@ -3,8 +3,6 @@ package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import javax.validation.constraints.NotBlank; - @Data public class DeviceUpkeepDetailItemQuery extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java index 59fa775c4..aa128e478 100644 --- a/src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.dev; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/forthird/ForInvOutScanCodeRequest.java b/src/main/java/com/glxp/api/req/forthird/ForInvOutScanCodeRequest.java index 4ce558324..7fb4fbb54 100644 --- a/src/main/java/com/glxp/api/req/forthird/ForInvOutScanCodeRequest.java +++ b/src/main/java/com/glxp/api/req/forthird/ForInvOutScanCodeRequest.java @@ -1,6 +1,7 @@ package com.glxp.api.req.forthird; import lombok.Data; + import java.util.List; @Data diff --git a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java index d7a2915ed..8896b4e3c 100644 --- a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java +++ b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java @@ -2,7 +2,6 @@ package com.glxp.api.req.inout; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.alihealth.AliYljgSearchbill; import com.glxp.api.entity.inout.IoOrderEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java b/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java index 2e434d0da..afac5e512 100644 --- a/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java @@ -4,7 +4,6 @@ import com.glxp.api.entity.inout.PurReceiveEntity; import lombok.Data; import java.math.BigDecimal; -import java.util.Date; import java.util.List; @Data diff --git a/src/main/java/com/glxp/api/req/inout/AddSkSiackerListRequest.java b/src/main/java/com/glxp/api/req/inout/AddSkSiackerListRequest.java index 64e6a3b72..a0d0c4963 100644 --- a/src/main/java/com/glxp/api/req/inout/AddSkSiackerListRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddSkSiackerListRequest.java @@ -1,7 +1,6 @@ package com.glxp.api.req.inout; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java b/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java index 7abb1617f..bafab8d99 100644 --- a/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java +++ b/src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java @@ -3,7 +3,6 @@ package com.glxp.api.req.inout; import com.glxp.api.entity.collect.IoCollectOrderCodeMan; import lombok.Data; -import javax.validation.constraints.NotNull; import java.util.List; @Data diff --git a/src/main/java/com/glxp/api/req/inout/AddWarlockBagProductReqeust.java b/src/main/java/com/glxp/api/req/inout/AddWarlockBagProductReqeust.java index 54aff56a0..3292f83f7 100644 --- a/src/main/java/com/glxp/api/req/inout/AddWarlockBagProductReqeust.java +++ b/src/main/java/com/glxp/api/req/inout/AddWarlockBagProductReqeust.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.inout.IoOrderEntity; import lombok.Data; -import java.util.List; - @Data public class AddWarlockBagProductReqeust { diff --git a/src/main/java/com/glxp/api/req/inout/CheckPreInInvRequest.java b/src/main/java/com/glxp/api/req/inout/CheckPreInInvRequest.java index 49b23c8ef..4b7961cef 100644 --- a/src/main/java/com/glxp/api/req/inout/CheckPreInInvRequest.java +++ b/src/main/java/com/glxp/api/req/inout/CheckPreInInvRequest.java @@ -1,8 +1,5 @@ package com.glxp.api.req.inout; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/req/inout/FilterStatDataDetailRequest.java b/src/main/java/com/glxp/api/req/inout/FilterStatDataDetailRequest.java index b5c3925ff..b87136d53 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterStatDataDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterStatDataDetailRequest.java @@ -3,8 +3,6 @@ package com.glxp.api.req.inout; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import java.util.Date; - /** * 查询出入库汇总记录详情接口参数 */ diff --git a/src/main/java/com/glxp/api/req/inout/IoOrderRelRequest.java b/src/main/java/com/glxp/api/req/inout/IoOrderRelRequest.java index a4792a492..25dfcc582 100644 --- a/src/main/java/com/glxp/api/req/inout/IoOrderRelRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoOrderRelRequest.java @@ -3,8 +3,6 @@ package com.glxp.api.req.inout; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import java.util.Date; - @Data public class IoOrderRelRequest extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java index 259f73457..8b918985c 100644 --- a/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java @@ -1,8 +1,6 @@ package com.glxp.api.req.inout; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvUserRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvUserRequest.java index 326290ad7..78f154301 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvUserRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvUserRequest.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import java.time.LocalDateTime; import java.util.Date; /** diff --git a/src/main/java/com/glxp/api/req/inv/InvProductDetailSelectRequest.java b/src/main/java/com/glxp/api/req/inv/InvProductDetailSelectRequest.java index 99b03c18f..489d47e1e 100644 --- a/src/main/java/com/glxp/api/req/inv/InvProductDetailSelectRequest.java +++ b/src/main/java/com/glxp/api/req/inv/InvProductDetailSelectRequest.java @@ -6,8 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.NotNull; -import java.time.LocalDate; -import java.util.Set; @Data @AllArgsConstructor diff --git a/src/main/java/com/glxp/api/req/inv/StockCompareDetailParam.java b/src/main/java/com/glxp/api/req/inv/StockCompareDetailParam.java index 33170edf9..fe9edce78 100644 --- a/src/main/java/com/glxp/api/req/inv/StockCompareDetailParam.java +++ b/src/main/java/com/glxp/api/req/inv/StockCompareDetailParam.java @@ -5,7 +5,6 @@ import com.glxp.api.exception.JsonException; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.Set; diff --git a/src/main/java/com/glxp/api/req/inv/invInnerOrderprintReques.java b/src/main/java/com/glxp/api/req/inv/invInnerOrderprintReques.java index 7cfb9bbd5..fb7237240 100644 --- a/src/main/java/com/glxp/api/req/inv/invInnerOrderprintReques.java +++ b/src/main/java/com/glxp/api/req/inv/invInnerOrderprintReques.java @@ -1,7 +1,6 @@ package com.glxp.api.req.inv; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/purchase/AddPurInquiryItemRequest.java b/src/main/java/com/glxp/api/req/purchase/AddPurInquiryItemRequest.java index a519e8817..32503a9e1 100644 --- a/src/main/java/com/glxp/api/req/purchase/AddPurInquiryItemRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/AddPurInquiryItemRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.purchase; -import com.glxp.api.entity.purchase.PurInquiryItemEntity; import com.glxp.api.res.basic.UdiRelevanceResponse; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurInquiryOfferRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurInquiryOfferRequest.java index f85966e31..bd8cccf46 100644 --- a/src/main/java/com/glxp/api/req/purchase/PostPurInquiryOfferRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PostPurInquiryOfferRequest.java @@ -1,7 +1,5 @@ package com.glxp.api.req.purchase; -import com.glxp.api.entity.purchase.PurInquiryEntity; -import com.glxp.api.entity.purchase.PurInquiryItemEntity; import com.glxp.api.entity.purchase.PurInquiryOfferEntity; import com.glxp.api.entity.purchase.PurInquiryOfferItemEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java index 170118cd4..8b8a5ef6a 100644 --- a/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java @@ -3,8 +3,6 @@ package com.glxp.api.req.purchase; import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.entity.purchase.PurPlanEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/purchase/PurContractDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurContractDetailRequest.java index 2e25d3ce4..a515ba354 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurContractDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurContractDetailRequest.java @@ -3,8 +3,6 @@ package com.glxp.api.req.purchase; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import javax.validation.constraints.NotBlank; - @Data public class PurContractDetailRequest extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/system/SysTableHeadRequest.java b/src/main/java/com/glxp/api/req/system/SysTableHeadRequest.java index db9ad0b8d..d4fc209bd 100644 --- a/src/main/java/com/glxp/api/req/system/SysTableHeadRequest.java +++ b/src/main/java/com/glxp/api/req/system/SysTableHeadRequest.java @@ -1,8 +1,5 @@ package com.glxp.api.req.system; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java index 9847bf3a4..9603fbbb6 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java @@ -1,8 +1,8 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrCorpsResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrInvOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvOrderRequest.java index 937890f4f..c0f8eaef0 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrInvOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvOrderRequest.java @@ -1,11 +1,8 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import java.util.List; - @Data public class FilterThrInvOrderRequest extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java index 5b1c72f75..c686a2d2d 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java @@ -1,8 +1,8 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrInvProductResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java index 45a1fa630..b353e0ca1 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java @@ -1,8 +1,8 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrOrderResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductTypeRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductTypeRequest.java index 1a33d253d..0ba5bfd06 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductTypeRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductTypeRequest.java @@ -1,8 +1,6 @@ package com.glxp.api.req.thrsys; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrInsDrugFeeRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrInsDrugFeeRequest.java index 9b0f4cd25..de72aa05f 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrInsDrugFeeRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrInsDrugFeeRequest.java @@ -1,8 +1,6 @@ package com.glxp.api.req.thrsys; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrInsMaterialFeeRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrInsMaterialFeeRequest.java index e759412d8..6abd86471 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrInsMaterialFeeRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrInsMaterialFeeRequest.java @@ -1,8 +1,6 @@ package com.glxp.api.req.thrsys; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java index e60a0a7bc..f7b2a6374 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java @@ -1,8 +1,8 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrInvProductResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrProductsRequest.java index a63507272..147a3d9ac 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrProductsRequest.java @@ -3,11 +3,9 @@ package com.glxp.api.req.thrsys; import lombok.Data; -import java.util.Date; - /** *

- * + * *

* * @author ${author} diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java index 24a55904b..b7a0615d5 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java @@ -2,8 +2,8 @@ package com.glxp.api.req.thrsys; import cn.hutool.core.util.StrUtil; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrCorpsResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/UpdateBindCategoryRequest.java b/src/main/java/com/glxp/api/req/thrsys/UpdateBindCategoryRequest.java index 54060200d..54bb4208c 100644 --- a/src/main/java/com/glxp/api/req/thrsys/UpdateBindCategoryRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/UpdateBindCategoryRequest.java @@ -3,7 +3,6 @@ package com.glxp.api.req.thrsys; import lombok.Data; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; @Data public class UpdateBindCategoryRequest { diff --git a/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java b/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java index ec3dd912e..ad4376e1d 100644 --- a/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java +++ b/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java @@ -1,7 +1,6 @@ package com.glxp.api.res.auth; import com.glxp.api.res.basic.UserWorkResponse; -import com.glxp.api.res.basic.WorkBindWorkResponse; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/res/basic/BasicCollectPointResponse.java b/src/main/java/com/glxp/api/res/basic/BasicCollectPointResponse.java index 9e967b1d4..8ee0a9d92 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicCollectPointResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicCollectPointResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.basic; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.basic.BasicCollectPointEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/basic/BasicCorpExportLogResponse.java b/src/main/java/com/glxp/api/res/basic/BasicCorpExportLogResponse.java index 1bff49024..1729589a0 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicCorpExportLogResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicCorpExportLogResponse.java @@ -2,7 +2,6 @@ package com.glxp.api.res.basic; import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.res.thrsys.ThrCorpsResponse; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java index 24a4646cc..f40b97960 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java @@ -1,9 +1,5 @@ package com.glxp.api.res.basic; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeDiResponse.java b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeDiResponse.java index e7527fe04..c16e96e9b 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeDiResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeDiResponse.java @@ -1,7 +1,5 @@ package com.glxp.api.res.basic; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java index aa86c130c..cb1d0757c 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java @@ -1,12 +1,10 @@ package com.glxp.api.res.basic; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; @Data diff --git a/src/main/java/com/glxp/api/res/basic/BasicSkProjectResponse.java b/src/main/java/com/glxp/api/res/basic/BasicSkProjectResponse.java index b77d98375..166133f5c 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicSkProjectResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicSkProjectResponse.java @@ -2,7 +2,6 @@ package com.glxp.api.res.basic; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java index 5fa0aa97d..2a138abf8 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java @@ -1,7 +1,5 @@ package com.glxp.api.res.basic; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueViewResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueViewResponse.java index 0116c9523..9b00427f1 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueViewResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueViewResponse.java @@ -2,10 +2,8 @@ package com.glxp.api.res.basic; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; import lombok.Data; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java index d5aeef8ae..025281671 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java @@ -1,9 +1,5 @@ package com.glxp.api.res.basic; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java index 097c944f2..fad28843d 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java @@ -1,7 +1,6 @@ package com.glxp.api.res.basic; import com.baomidou.mybatisplus.annotation.TableField; -import com.glxp.api.entity.auth.SysWorkplace; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java index e2b441753..08176cbec 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java @@ -1,7 +1,9 @@ package com.glxp.api.res.basic; -import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java index 87229f458..f526092b8 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - @Data public class UdiRlSupResponse { diff --git a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java index c45260db2..aefeb9c86 100644 --- a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java @@ -1,12 +1,7 @@ package com.glxp.api.res.basic; -import com.baomidou.mybatisplus.annotation.TableField; -import com.glxp.api.entity.auth.SysWorkplace; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.Size; import java.util.Date; /** diff --git a/src/main/java/com/glxp/api/res/chs/YbHcflEntityResponse.java b/src/main/java/com/glxp/api/res/chs/YbHcflEntityResponse.java index b343e7684..11dcaf03d 100644 --- a/src/main/java/com/glxp/api/res/chs/YbHcflEntityResponse.java +++ b/src/main/java/com/glxp/api/res/chs/YbHcflEntityResponse.java @@ -3,8 +3,6 @@ package com.glxp.api.res.chs; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/chs/YbHcxxEntityResponse.java b/src/main/java/com/glxp/api/res/chs/YbHcxxEntityResponse.java index db6565f59..f957de2c6 100644 --- a/src/main/java/com/glxp/api/res/chs/YbHcxxEntityResponse.java +++ b/src/main/java/com/glxp/api/res/chs/YbHcxxEntityResponse.java @@ -3,8 +3,6 @@ package com.glxp.api.res.chs; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/chs/YbHcxxGgEntityResponse.java b/src/main/java/com/glxp/api/res/chs/YbHcxxGgEntityResponse.java index b18e02e44..5a8bce8d7 100644 --- a/src/main/java/com/glxp/api/res/chs/YbHcxxGgEntityResponse.java +++ b/src/main/java/com/glxp/api/res/chs/YbHcxxGgEntityResponse.java @@ -3,8 +3,6 @@ package com.glxp.api.res.chs; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index 1cf399b47..1ee36690f 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -1,7 +1,5 @@ package com.glxp.api.res.collect; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java index e6fb77b21..d8da91894 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.collect; -import io.swagger.models.auth.In; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java index 3fdbeeff0..d9d9c8b20 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectCodeResponse.java @@ -1,9 +1,5 @@ package com.glxp.api.res.collect; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectLedGroupResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectLedGroupResponse.java index 704d976e6..e986e8a88 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectLedGroupResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectLedGroupResponse.java @@ -1,9 +1,5 @@ package com.glxp.api.res.collect; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/collect/RelCodeDetailResponse.java b/src/main/java/com/glxp/api/res/collect/RelCodeDetailResponse.java index 4a19dc2ff..6d9b6de5f 100644 --- a/src/main/java/com/glxp/api/res/collect/RelCodeDetailResponse.java +++ b/src/main/java/com/glxp/api/res/collect/RelCodeDetailResponse.java @@ -1,7 +1,5 @@ package com.glxp.api.res.collect; -import com.baomidou.mybatisplus.annotation.TableField; -import com.glxp.api.entity.basic.BasicProductsEntity; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/dev/DeviceRepairApplyDetailMiniResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceRepairApplyDetailMiniResponse.java index 435266928..f35674321 100644 --- a/src/main/java/com/glxp/api/res/dev/DeviceRepairApplyDetailMiniResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceRepairApplyDetailMiniResponse.java @@ -3,7 +3,6 @@ package com.glxp.api.res.dev; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.glxp.api.enums.dev.DeviceRepairApplyDetailStatusEnum; -import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; import lombok.Data; import java.time.LocalDateTime; diff --git a/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java b/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java index a4f431da3..c9a92f8a7 100644 --- a/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java @@ -1,7 +1,5 @@ package com.glxp.api.res.inout; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; -import com.glxp.api.entity.inout.IoOrderEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java index 9a1b9fe7c..b899b53fa 100644 --- a/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java @@ -1,8 +1,5 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java index efe2b278b..18a23c667 100644 --- a/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/inout/IoExOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoExOrderDetailResultResponse.java index c94ddec4f..0c597d4f6 100644 --- a/src/main/java/com/glxp/api/res/inout/IoExOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoExOrderDetailResultResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inout; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderCheckResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderCheckResultResponse.java index 6c7b3e5bf..a65e6ff99 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderCheckResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderCheckResultResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java index 46c004b02..b22041142 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java index 315d274b4..481b63136 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 5c47ac70f..33d2dc4c4 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -2,7 +2,6 @@ package com.glxp.api.res.inout; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderMutiResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderMutiResponse.java index 5e7d14e0f..3734033e4 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderMutiResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderMutiResponse.java @@ -1,9 +1,6 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index aa4525ac9..c8eb948bd 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -1,7 +1,6 @@ package com.glxp.api.res.inout; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java index 3fe687bc4..21b3f7dcc 100644 --- a/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inout; -import com.glxp.api.entity.basic.BasicProductsEntity; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java index 9b65a1c35..810aa559a 100644 --- a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java @@ -1,10 +1,5 @@ package com.glxp.api.res.inout; -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java index cdc83282c..d5f5a224b 100644 --- a/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java @@ -2,12 +2,8 @@ package com.glxp.api.res.inout; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.alibaba.excel.annotation.write.style.ContentFontStyle; -import com.alibaba.excel.annotation.write.style.ContentStyle; import lombok.Data; -import java.util.Date; - @Data public class IoSplitInvViewResponse { diff --git a/src/main/java/com/glxp/api/res/inout/IodestinyProcessResponse.java b/src/main/java/com/glxp/api/res/inout/IodestinyProcessResponse.java index 0701fa134..822c1d128 100644 --- a/src/main/java/com/glxp/api/res/inout/IodestinyProcessResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IodestinyProcessResponse.java @@ -1,9 +1,5 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java b/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java index 704d273bd..a048425bb 100644 --- a/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java +++ b/src/main/java/com/glxp/api/res/inout/ReceiveResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/inv/InvCountOrderResponse.java b/src/main/java/com/glxp/api/res/inv/InvCountOrderResponse.java index 9205db1a0..163add9a7 100644 --- a/src/main/java/com/glxp/api/res/inv/InvCountOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvCountOrderResponse.java @@ -3,8 +3,6 @@ package com.glxp.api.res.inv; import com.glxp.api.entity.inv.InvCountOrderEntity; import lombok.Data; -import java.util.Date; - /** * 盘点单详情 */ diff --git a/src/main/java/com/glxp/api/res/inv/InvPreinDetailResponse.java b/src/main/java/com/glxp/api/res/inv/InvPreinDetailResponse.java index bc8e413a4..061c8e03f 100644 --- a/src/main/java/com/glxp/api/res/inv/InvPreinDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvPreinDetailResponse.java @@ -1,8 +1,5 @@ package com.glxp.api.res.inv; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/res/inv/InvProductRationResponse.java b/src/main/java/com/glxp/api/res/inv/InvProductRationResponse.java index 033d85a98..e453bac40 100644 --- a/src/main/java/com/glxp/api/res/inv/InvProductRationResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvProductRationResponse.java @@ -1,8 +1,6 @@ package com.glxp.api.res.inv; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/inv/StockCompareDetailVo.java b/src/main/java/com/glxp/api/res/inv/StockCompareDetailVo.java index ea0e76165..782816788 100644 --- a/src/main/java/com/glxp/api/res/inv/StockCompareDetailVo.java +++ b/src/main/java/com/glxp/api/res/inv/StockCompareDetailVo.java @@ -1,7 +1,6 @@ package com.glxp.api.res.inv; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/inv/ThrInvResultResponse.java b/src/main/java/com/glxp/api/res/inv/ThrInvResultResponse.java index 9f8ed28a6..00917493c 100644 --- a/src/main/java/com/glxp/api/res/inv/ThrInvResultResponse.java +++ b/src/main/java/com/glxp/api/res/inv/ThrInvResultResponse.java @@ -1,10 +1,8 @@ package com.glxp.api.res.inv; -import cn.hutool.core.date.DateTime; import lombok.Data; import java.math.BigDecimal; -import java.util.Date; @Data public class ThrInvResultResponse { diff --git a/src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java b/src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java index 161ece164..112c75146 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.purchase; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/purchase/PurInquiryEntityResponse.java b/src/main/java/com/glxp/api/res/purchase/PurInquiryEntityResponse.java index ca5bb3fd8..246971b94 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurInquiryEntityResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurInquiryEntityResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.purchase; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.purchase.PurInquiryEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/sync/DlOrderResponse.java b/src/main/java/com/glxp/api/res/sync/DlOrderResponse.java index 475c5611c..4a980b879 100644 --- a/src/main/java/com/glxp/api/res/sync/DlOrderResponse.java +++ b/src/main/java/com/glxp/api/res/sync/DlOrderResponse.java @@ -2,8 +2,6 @@ package com.glxp.api.res.sync; import lombok.Data; -import java.util.List; - @Data public class DlOrderResponse { diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java index 9a8006e23..822356a7f 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java @@ -2,7 +2,6 @@ package com.glxp.api.res.sync; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java index 1d0c28da6..65c2fc900 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java @@ -1,8 +1,5 @@ package com.glxp.api.res.thrsys; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java index 8d0a582ae..e9d80fb05 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.thrsys; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java index 435eab3cc..5662638d8 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java @@ -1,7 +1,6 @@ package com.glxp.api.res.thrsys; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/service/BasicSkPrescribeItemService.java b/src/main/java/com/glxp/api/service/BasicSkPrescribeItemService.java index d1131da4a..5dfbced39 100644 --- a/src/main/java/com/glxp/api/service/BasicSkPrescribeItemService.java +++ b/src/main/java/com/glxp/api/service/BasicSkPrescribeItemService.java @@ -1,7 +1,7 @@ package com.glxp.api.service; -import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java b/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java index cfb4a1c5e..8727b7631 100644 --- a/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java +++ b/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java @@ -2,12 +2,9 @@ package com.glxp.api.service.alihealth; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.alihealth.AliYljgBillDetail; -import com.glxp.api.entity.alihealth.AliYljgSearchbill; import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust; import org.springframework.web.multipart.MultipartFile; -import java.util.List; - public interface AlihealthBusService { AliYljgBillDetail aliYljgBillDetail(AliYljgSearchbillReqeust aliYljgSearchbillReqeust); diff --git a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java index 17100c50d..71fe6e27a 100644 --- a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java +++ b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java @@ -11,9 +11,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.dao.basic.CompanyProductRelevanceDao; -import com.glxp.api.dao.inout.IoOrderDao; import com.glxp.api.entity.alihealth.AliYljgBillDetail; -import com.glxp.api.entity.alihealth.AliYljgSearchbill; import com.glxp.api.entity.alihealth.YcFileCodeUploadVo; import com.glxp.api.entity.alihealth.YcFileOrderUploadVo; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; @@ -23,7 +21,6 @@ import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust; import com.glxp.api.req.alihealth.AlihealthYljgListupoutDetailReqeust; -import com.glxp.api.req.alihealth.AlihealthYljgListupoutReqeust; import com.glxp.api.req.inout.AddBizProductReqeust; import com.glxp.api.req.inout.AddOrderRequest; import com.glxp.api.req.inout.FilterOrderRequest; @@ -32,11 +29,9 @@ import com.glxp.api.service.alihealth.AlihealthBusService; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoCodeLostService; -import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.util.IntUtil; -import com.glxp.api.util.StringUtils; import com.glxp.api.util.alihealth.AlihealthYljgUtils; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.beans.BeanUtils; @@ -48,7 +43,6 @@ import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Collections; import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java index 83a42aeff..59f1ec611 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java @@ -3,7 +3,10 @@ package com.glxp.api.service.auth; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.req.auth.*; +import com.glxp.api.req.auth.FilterAuthUserRequest; +import com.glxp.api.req.auth.FilterInvLinkDataRequest; +import com.glxp.api.req.auth.FilterNoSelectUserRequest; +import com.glxp.api.req.auth.UpdateUserRequset; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/AuthAliUserService.java b/src/main/java/com/glxp/api/service/auth/AuthAliUserService.java index bbe63f7fb..f2df0c1fb 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthAliUserService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAliUserService.java @@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.auth.AuthAliUserDao; import com.glxp.api.entity.auth.AuthAliUser; -import com.glxp.api.entity.auth.SysWorkplace; import org.springframework.stereotype.Service; -import javax.annotation.Resource; - @Service public class AuthAliUserService extends ServiceImpl { public AuthAliUser getOne(){ diff --git a/src/main/java/com/glxp/api/service/auth/CustomerService.java b/src/main/java/com/glxp/api/service/auth/CustomerService.java index f422ecb32..3644d7dcb 100644 --- a/src/main/java/com/glxp/api/service/auth/CustomerService.java +++ b/src/main/java/com/glxp/api/service/auth/CustomerService.java @@ -5,7 +5,6 @@ import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.auth.UpdateUserRequset; -import lombok.val; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/src/main/java/com/glxp/api/service/auth/DeptService.java b/src/main/java/com/glxp/api/service/auth/DeptService.java index ba5d90b10..2c74ac9dc 100644 --- a/src/main/java/com/glxp/api/service/auth/DeptService.java +++ b/src/main/java/com/glxp/api/service/auth/DeptService.java @@ -4,7 +4,6 @@ package com.glxp.api.service.auth; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.req.auth.FilterInvWarehouseRequest; -import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/InvBusUserService.java b/src/main/java/com/glxp/api/service/auth/InvBusUserService.java index 3b89e6503..4d5763c17 100644 --- a/src/main/java/com/glxp/api/service/auth/InvBusUserService.java +++ b/src/main/java/com/glxp/api/service/auth/InvBusUserService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusUserRequest; -import com.glxp.api.res.auth.InvBusUserResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java index 4b6724d56..fbd529a13 100644 --- a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java @@ -6,7 +6,6 @@ import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; import com.glxp.api.req.auth.FilterInvWarehouseRequest; import com.glxp.api.res.auth.InvSubWarehouseResponse; import com.glxp.api.res.auth.InvWarehouseThirdSysResponse; -import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java index 1bbb56e87..c197d24ea 100644 --- a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java +++ b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java @@ -1,26 +1,18 @@ package com.glxp.api.service.auth; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.SysWorkplaceDao; import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.basic.SysWorkplaceFreight; -import com.glxp.api.entity.basic.SysWorkplaceLayer; import com.glxp.api.exception.JsonException; import com.glxp.api.req.auth.SysWorkplaceRequest; import com.glxp.api.req.basic.SysWorkplaceLayerRequest; -import com.glxp.api.req.basic.SysWorkplaceQueueRequest; -import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.req.collect.CollectOrderRequest; -import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; import com.glxp.api.res.basic.SysWorkplaceResponse; -import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.basic.SysWorkplaceFreightService; import com.glxp.api.service.basic.SysWorkplaceLayerService; -import org.apache.poi.ss.formula.functions.Offset; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index 438e35d60..7c449d212 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java @@ -6,7 +6,6 @@ import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.WarehouseUserEntity; import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.req.auth.FilterInvUserRequest; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index fb4ee51c2..d9eeec249 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.dao.auth.AuthAdminDao; import com.glxp.api.dao.auth.DeptUserDao; import com.glxp.api.dao.auth.SysUserRoleMapper; @@ -15,7 +16,6 @@ import com.glxp.api.entity.auth.SysUserRole; import com.glxp.api.exception.JsonException; import com.glxp.api.req.auth.*; import com.glxp.api.service.auth.AuthAdminService; -import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.service.auth.DeptService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java index a71d6c2e8..3091fa78f 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.auth.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java index d8b656c57..a41a812f4 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java @@ -8,11 +8,9 @@ import com.glxp.api.dao.auth.InvBusUserDao; import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusUserRequest; -import com.glxp.api.res.auth.InvBusUserResponse; import com.glxp.api.service.auth.InvBusUserService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.Collections; diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index 6e5edc1ef..8db6cd1d3 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -9,7 +9,6 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.thrsys.ThrSystemDao; import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; import com.glxp.api.req.auth.FilterInvWarehouseRequest; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java index 9106e75df..d02fd55e3 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java @@ -1,12 +1,10 @@ package com.glxp.api.service.auth.impl; -import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.SysDictDataMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.SysDictData; import com.glxp.api.exception.JsonException; -import com.glxp.api.exception.ServiceException; import com.glxp.api.req.auth.SysDictDataRequest; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.ISysDictDataService; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java index f7f3e5d67..4bb6591bb 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.dao.auth.SysDictDataMapper; @@ -10,13 +9,11 @@ import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.SysDictData; import com.glxp.api.entity.auth.SysDictType; import com.glxp.api.exception.JsonException; -import com.glxp.api.exception.ServiceException; import com.glxp.api.req.auth.SysDictDataRequest; import com.glxp.api.req.auth.SysDictTypeRequest; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.ISysDictTypeService; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java index c119e76af..49c77f054 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.auth.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.http.HttpUtil; diff --git a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java index cb34c44e3..bf12d518f 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java @@ -1,30 +1,18 @@ package com.glxp.api.service.basic; -import com.glxp.api.exception.JsonException; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.springframework.beans.BeanUtils; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; -import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.thrsys.ThrProductsResponse; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrProductsService; -import com.glxp.api.service.thrsys.ThrSystemService; -import com.glxp.api.util.*; +import com.glxp.api.util.RedisUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.*; +import java.util.List; @Service @Slf4j diff --git a/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java b/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java index 983541651..62fe9d2eb 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java @@ -1,24 +1,17 @@ package com.glxp.api.service.basic; -import cn.hutool.core.text.split.SplitIter; -import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.sync.SyncDataPurtypeDao; +import com.glxp.api.dao.basic.BasicCollectBustypeMapper; +import com.glxp.api.entity.basic.BasicCollectBustypeEntity; import com.glxp.api.req.basic.BasicCollectBusTypeRequest; import com.glxp.api.res.basic.BasicCollectBusTypeResponse; -import lombok.Data; -import org.apache.bcel.generic.PUSH; -import org.junit.Test; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.basic.BasicCollectBustypeMapper; -import com.glxp.api.entity.basic.BasicCollectBustypeEntity; import javax.annotation.Resource; import java.util.Collections; import java.util.List; -import java.util.Random; @Service public class BasicCollectBustypeService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/basic/BasicCollectPointCategoryService.java b/src/main/java/com/glxp/api/service/basic/BasicCollectPointCategoryService.java index 44358c8ba..eb0da184a 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCollectPointCategoryService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCollectPointCategoryService.java @@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.basic.BasicCollectPointCategoryMapper; import com.glxp.api.entity.basic.BasicCollectPointCategory; -import com.glxp.api.entity.basic.BasicProductCategory; import com.glxp.api.req.basic.BasicCollectgoryRequest; import com.glxp.api.res.basic.BasicCollectGoryResponse; -import org.apache.poi.ss.formula.functions.Offset; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/basic/BasicCollectPointService.java b/src/main/java/com/glxp/api/service/basic/BasicCollectPointService.java index 0ffe4b285..3adcae3b3 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCollectPointService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCollectPointService.java @@ -1,14 +1,11 @@ package com.glxp.api.service.basic; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.auth.SysWorkplace; -import com.glxp.api.req.auth.SysWorkplaceRequest; -import com.glxp.api.req.basic.BasicCollectRequest; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicCollectPointMapper; import com.glxp.api.entity.basic.BasicCollectPointEntity; +import com.glxp.api.req.basic.BasicCollectRequest; +import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java b/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java index fadb8125f..f2070f1e4 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java @@ -1,14 +1,13 @@ package com.glxp.api.service.basic; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.BasicCollectUserMapper; +import com.glxp.api.entity.basic.BasicCollectUserEntity; import com.glxp.api.req.basic.BasicCollectUserRequest; import com.glxp.api.res.basic.UserWorkResponse; -import org.aspectj.weaver.ast.Var; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.basic.BasicCollectUserMapper; -import com.glxp.api.entity.basic.BasicCollectUserEntity; import javax.annotation.Resource; import java.util.Collections; diff --git a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java index c2a09edb7..e4318bc0a 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java @@ -3,8 +3,6 @@ package com.glxp.api.service.basic; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.res.thrsys.ThrCorpsResponse; -import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java index fc0ebceaf..fe6c8a12d 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java @@ -8,7 +8,6 @@ import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.BasicHospTypeResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; - import java.util.List; public interface BasicHospTypeService extends IService { diff --git a/src/main/java/com/glxp/api/service/basic/BasicManufacturerService.java b/src/main/java/com/glxp/api/service/basic/BasicManufacturerService.java index 05570d441..4bfc46b70 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicManufacturerService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicManufacturerService.java @@ -3,25 +3,21 @@ package com.glxp.api.service.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.extra.pinyin.PinyinUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.entity.basic.BasicCorpEntity; +import com.glxp.api.dao.basic.BasicManufacturerMapper; +import com.glxp.api.entity.basic.BasicManufacturerEntity; import com.glxp.api.entity.thrsys.ThrManufacturerEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; -import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.service.thrsys.ThrManufacturerService; import com.glxp.api.util.CustomUtil; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.BasicManufacturerEntity; -import com.glxp.api.dao.basic.BasicManufacturerMapper; import javax.annotation.Resource; import java.util.*; diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescirbeDetailService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescirbeDetailService.java index e252e1a35..83311feb3 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescirbeDetailService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescirbeDetailService.java @@ -1,10 +1,10 @@ package com.glxp.api.service.basic; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import com.glxp.api.dao.basic.BasicSkPrescirbeDetailMapper; +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; +import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeDiService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeDiService.java index f83bfeff9..565cc1847 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeDiService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeDiService.java @@ -4,10 +4,10 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.BasicSkPrescribeDiMapper; import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity; import com.glxp.api.req.basic.BasicSkPrescribeDiRequest; import com.glxp.api.res.basic.BasicSkPrescribeDiResponse; -import com.glxp.api.dao.basic.BasicSkPrescribeDiMapper; import org.springframework.stereotype.Service; import java.util.Collections; diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeItemCodeService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeItemCodeService.java index e5eed1e83..32bba0764 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeItemCodeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeItemCodeService.java @@ -1,14 +1,12 @@ package com.glxp.api.service.basic; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.basic.BasicSkPrescribeItemCodeMapper; +import com.glxp.api.entity.basic.BasicSkPrescribeItemCode; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.BasicSkPrescribeItemCode; -import com.glxp.api.dao.basic.BasicSkPrescribeItemCodeMapper; @Service public class BasicSkPrescribeItemCodeService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java index 5e3ca1321..57a2fce28 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java @@ -13,15 +13,12 @@ import com.glxp.api.dao.basic.BasicSkPrescribeMapper; import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity; import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.basic.BasicSkPrescribeRequest; import com.glxp.api.req.basic.GetSickPrescribeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkPrescribeResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; -import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.util.IntUtil; import org.springframework.stereotype.Service; @@ -113,7 +110,7 @@ public class BasicSkPrescribeService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkSickerService.java b/src/main/java/com/glxp/api/service/basic/BasicSkSickerService.java index 94edb8e24..1a7c2763e 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkSickerService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkSickerService.java @@ -2,24 +2,20 @@ package com.glxp.api.service.basic; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.dao.basic.BasicSkProjectMapper; -import com.glxp.api.entity.basic.BasicSkPrescribeEntity; +import com.glxp.api.dao.basic.BasicSkSickerMapper; +import com.glxp.api.entity.basic.BasicSkSickerEntity; import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.req.basic.BasicSkProjectRequest; import com.glxp.api.req.basic.BasicSkSickerRequest; import com.glxp.api.req.basic.GetSickRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.BasicSkProjectResponse; import com.glxp.api.res.basic.BasicSkSickerResponse; import com.glxp.api.util.IntUtil; import com.glxp.api.util.RedisUtil; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.BasicSkSickerEntity; -import com.glxp.api.dao.basic.BasicSkSickerMapper; import javax.annotation.Resource; import java.util.ArrayList; diff --git a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java index e5f219ebb..e16f3502e 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.basic; -import org.springframework.beans.BeanUtils; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; @@ -10,16 +9,16 @@ import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.req.basic.UdiCombineRequest; import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.basic.UdiCombineRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.HttpClient; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiInfoUtil; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/glxp/api/service/basic/ProductInfoService.java b/src/main/java/com/glxp/api/service/basic/ProductInfoService.java index cff548fa4..5537770dc 100644 --- a/src/main/java/com/glxp/api/service/basic/ProductInfoService.java +++ b/src/main/java/com/glxp/api/service/basic/ProductInfoService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.basic; import com.glxp.api.entity.basic.ProductInfoEntity; -import com.glxp.api.req.basic.AddProductRequest; import com.glxp.api.req.basic.ProductInfoFilterRequest; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/basic/SupEvaluateDetailService.java b/src/main/java/com/glxp/api/service/basic/SupEvaluateDetailService.java index f3b1ad580..cc1874148 100644 --- a/src/main/java/com/glxp/api/service/basic/SupEvaluateDetailService.java +++ b/src/main/java/com/glxp/api/service/basic/SupEvaluateDetailService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.basic; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.basic.SupEvaluateDetailMapper; import com.glxp.api.entity.basic.SupEvaluateDetailEntity; +import org.springframework.stereotype.Service; @Service public class SupEvaluateDetailService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/basic/SupEvaluatePlanDetailService.java b/src/main/java/com/glxp/api/service/basic/SupEvaluatePlanDetailService.java index df3563fbe..90f9da317 100644 --- a/src/main/java/com/glxp/api/service/basic/SupEvaluatePlanDetailService.java +++ b/src/main/java/com/glxp/api/service/basic/SupEvaluatePlanDetailService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.basic; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.basic.SupEvaluatePlanDetailMapper; import com.glxp.api.entity.basic.SupEvaluatePlanDetailEntity; +import org.springframework.stereotype.Service; @Service public class SupEvaluatePlanDetailService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/basic/SupEvaluatePlanService.java b/src/main/java/com/glxp/api/service/basic/SupEvaluatePlanService.java index b09d7b836..b5e6effd6 100644 --- a/src/main/java/com/glxp/api/service/basic/SupEvaluatePlanService.java +++ b/src/main/java/com/glxp/api/service/basic/SupEvaluatePlanService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.basic; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.SupEvaluatePlanEntity; import com.glxp.api.dao.basic.SupEvaluatePlanMapper; +import com.glxp.api.entity.basic.SupEvaluatePlanEntity; +import org.springframework.stereotype.Service; @Service public class SupEvaluatePlanService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/basic/SupEvaluateService.java b/src/main/java/com/glxp/api/service/basic/SupEvaluateService.java index 93fc0cc23..6bb9024b0 100644 --- a/src/main/java/com/glxp/api/service/basic/SupEvaluateService.java +++ b/src/main/java/com/glxp/api/service/basic/SupEvaluateService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.basic; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.basic.SupEvaluateMapper; import com.glxp.api.entity.basic.SupEvaluateEntity; +import org.springframework.stereotype.Service; @Service public class SupEvaluateService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/basic/SupEvaluateSystemService.java b/src/main/java/com/glxp/api/service/basic/SupEvaluateSystemService.java index 34517d9a8..139964e73 100644 --- a/src/main/java/com/glxp/api/service/basic/SupEvaluateSystemService.java +++ b/src/main/java/com/glxp/api/service/basic/SupEvaluateSystemService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.basic; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.basic.SupEvaluateSystemMapper; import com.glxp.api.entity.basic.SupEvaluateSystemEntity; +import org.springframework.stereotype.Service; @Service public class SupEvaluateSystemService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceBusService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceBusService.java index 8e04774f0..9d4a8cb04 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceBusService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceBusService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.basic; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.SysWorkplaceBus; import com.glxp.api.dao.basic.SysWorkplaceBusMapper; +import com.glxp.api.entity.basic.SysWorkplaceBus; +import org.springframework.stereotype.Service; @Service public class SysWorkplaceBusService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java index 29009c962..9f5d2e0d9 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java @@ -7,13 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; -import com.glxp.api.entity.basic.BasicCollectUserEntity; import com.glxp.api.entity.basic.SysWorkplaceBus; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; -import com.glxp.api.res.basic.WorkBindWorkResponse; -import com.glxp.api.util.IntUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java index 6578efcc0..037e33487 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java @@ -7,7 +7,6 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.SysWorkplaceFreightMapper; import com.glxp.api.entity.basic.SysWorkplaceFreight; import com.glxp.api.entity.basic.SysWorkplaceLayer; -import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.SysWorkplaceFreightRequest; import com.glxp.api.res.basic.SysWorkplaceFreightPrintResponse; diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java index 21db7f560..f4bed99c4 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.SysWorkplaceLayerMapper; -import com.glxp.api.dao.basic.SysWorkplaceQueueMapper; import com.glxp.api.entity.basic.SysWorkplaceFreight; import com.glxp.api.entity.basic.SysWorkplaceLayer; import com.glxp.api.exception.JsonException; diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java index 06ae9ff45..c797c6b05 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java @@ -1,26 +1,18 @@ package com.glxp.api.service.basic; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.basic.SysWorkplaceFreight; +import com.glxp.api.dao.basic.SysWorkplaceQueueMapper; import com.glxp.api.entity.basic.SysWorkplaceLayer; +import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.basic.SysWorkplaceFreightRequest; import com.glxp.api.req.basic.SysWorkplaceQueueRequest; -import com.glxp.api.res.basic.SysWorkplaceFreightResponse; import com.glxp.api.res.basic.SysWorkplaceQueueResponse; import com.glxp.api.res.basic.SysWorkplaceQueueViewResponse; -import com.glxp.api.res.basic.SysWorkplaceResponse; -import com.glxp.api.task.SyncThirdSysTask; -import groovyjarjarantlr.debug.NewLineEvent; -import org.springframework.data.annotation.Reference; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.SysWorkplaceQueue; -import com.glxp.api.dao.basic.SysWorkplaceQueueMapper; import javax.annotation.Resource; import java.util.*; diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java index 928696d16..ad13dc856 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java @@ -9,7 +9,6 @@ import com.glxp.api.req.basic.SysWorkplaceRegionRequest; import com.glxp.api.res.basic.SysWorkplaceRegionResponse; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 3b854754e..b9b0b001b 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -1,52 +1,48 @@ package com.glxp.api.service.basic; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.TypeReference; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.auth.AuthAliUser; -import com.glxp.api.entity.thrsys.*; +import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.thrsys.BasicInsMaterialEntity; +import com.glxp.api.entity.thrsys.ThirdAliDrug; +import com.glxp.api.entity.thrsys.ThrProductsEntity; +import com.glxp.api.entity.thrsys.YbDrug; import com.glxp.api.exception.JsonException; +import com.glxp.api.http.NmpaUdiClient; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust; import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.basic.UdiCombineRequest; import com.glxp.api.req.basic.YbDrugDetailFilterRequest; +import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.req.thrsys.ThrInsDrugFeeRequest; import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest; -import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.alihealth.AlihealthKytSinglerelationResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.AuthAliUserService; -import com.glxp.api.service.thrsys.*; +import com.glxp.api.service.thrsys.BasicInsMaterialService; +import com.glxp.api.service.thrsys.ThirdAliDrugService; +import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.service.thrsys.YbDrugService; import com.glxp.api.util.*; import com.glxp.api.util.alihealth.CopyUtils; +import com.glxp.api.util.udi.UdiInfoUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.xmlbeans.impl.xb.xsdschema.Public; -import org.aspectj.weaver.ast.Var; import org.jfree.util.Log; import org.springframework.beans.BeanUtils; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.dao.basic.UdiRelevanceDao; -import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.http.NmpaUdiClient; -import com.glxp.api.req.basic.UdiCombineRequest; -import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.res.basic.UdiRelevanceResponse; - -import com.glxp.api.util.udi.UdiInfoUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * 耗材字典对照 diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index 508352deb..6196408f3 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -4,21 +4,14 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.dao.basic.BasicProductsDao; -import com.glxp.api.dao.basic.SupEvaluateDetailMapper; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.basic.UdiRelevanceDao; -import com.glxp.api.dao.thrsys.ThirdAliDrugMapper; -import com.glxp.api.dao.thrsys.ThrProductsDao; -import com.glxp.api.entity.basic.SupEvaluateDetailEntity; -import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.CodeRel; @@ -36,13 +29,15 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThirdAliDrugService; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.thrsys.YbDrugService; -import com.glxp.api.util.*; +import com.glxp.api.util.DimaUtil; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.IntUtil; +import com.glxp.api.util.PinyinUtils; import com.glxp.api.util.alihealth.CopyUtils; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiInfoUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; -import org.apache.poi.ss.formula.functions.Offset; import org.jfree.util.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index e47c0b648..2b71e3613 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -10,7 +10,6 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicProductsDao; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; @@ -22,7 +21,6 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.IntUtil; -import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java b/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java index b721e0852..0de2ee4da 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java @@ -3,7 +3,6 @@ package com.glxp.api.service.basic; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index d3e11869b..78a4d743f 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.basic.impl; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 32a3cabe8..348f00224 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -11,7 +11,6 @@ import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.IBasicBusTypePreService; -import com.glxp.api.util.IntUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index 42b39ed0d..a189f4082 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -10,7 +10,6 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.res.basic.BasicBussinessTypeResponse; @@ -19,7 +18,6 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrOrderUploadBustypesService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java index 65fd99597..ec7b999c9 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java @@ -1,10 +1,9 @@ package com.glxp.api.service.basic.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.basic.BasicCorpImportLogDao; import com.glxp.api.dao.basic.BasicCorpDao; +import com.glxp.api.dao.basic.BasicCorpImportLogDao; import com.glxp.api.dao.thrsys.ThrCorpDao; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsImportLogEntity; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index 88bf1afa0..4afc4b907 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -6,7 +6,6 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import com.glxp.api.service.basic.BasicCorpService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java b/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java index d03b7da9f..8b26b7590 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicDestinyRelService.java @@ -13,7 +13,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.basic.BasicDestinyRelMapper; import com.glxp.api.dao.basic.BasicSkProjectMapper; -import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.BasicSkProjectDetailEntity; import com.glxp.api.entity.basic.BasicSkProjectEntity; import com.glxp.api.entity.basic.UdiRlSupEntity; @@ -22,7 +21,6 @@ import com.glxp.api.req.basic.BasicDestinyRelRequest; import com.glxp.api.req.basic.DlThirdDestinyRequest; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.BasicSkProjectDetailResponse; import com.glxp.api.res.basic.BasicSkProjectResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java index fe8fa25c5..454aedfe4 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java @@ -7,7 +7,10 @@ import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.basic.UdiRlSupDao; import com.glxp.api.dao.thrsys.ThrProductsDao; -import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.basic.BasicProductsImportDetailEntity; +import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.basic.FilterUdiIpLogRequest; import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java index 0bf01f8bb..438b7bf13 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java @@ -1,8 +1,5 @@ package com.glxp.api.service.basic.impl; -import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.service.basic.UdiRelevanceService; -import org.springframework.beans.BeanUtils; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageHelper; @@ -23,13 +20,16 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.BasicProductsImportDetailService; import com.glxp.api.service.basic.BasicProductsImportLogService; +import com.glxp.api.service.basic.UdiProductService; +import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrDataService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.HttpClient; +import com.glxp.api.util.MsDateUtil; +import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemServiceImpl.java index c30816135..771129691 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemServiceImpl.java @@ -2,9 +2,9 @@ package com.glxp.api.service.basic.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.basic.BasicSkPrescribeItemMapper; import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import com.glxp.api.service.BasicSkPrescribeItemService; -import com.glxp.api.dao.basic.BasicSkPrescribeItemMapper; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java index 03635dd73..6eec9461a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java @@ -1,8 +1,6 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.req.basic.AddProductRequest; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.ProductInfoDao; import com.glxp.api.entity.basic.ProductInfoEntity; diff --git a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java index 3bfa07c3f..a57ff7f21 100644 --- a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java +++ b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java @@ -19,7 +19,6 @@ import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.thrsys.FilterThrOrderRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.util.IntUtil; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java index 94da415ee..1f298ae90 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java @@ -10,26 +10,23 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.collect.IoCollectCodeBackMapper; -import com.glxp.api.entity.basic.BasicSkPrescribeItemCode; import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.collect.*; -import com.glxp.api.entity.inout.IoCodeEntity; +import com.glxp.api.entity.collect.IoCollectCodeBackup; +import com.glxp.api.entity.collect.IoCollectOrderBackup; +import com.glxp.api.entity.collect.IoCollectOrderBizBackup; +import com.glxp.api.entity.collect.IoCollectOrderCheckCode; import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.IoCollectCodeRequest; -import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectCodeResponse; import com.glxp.api.res.inout.AddEnterCodeResponse; import com.glxp.api.res.inout.VailCodeResultResponse; -import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoSplitFifoCodeService; import com.glxp.api.util.udi.FilterUdiUtils; -import org.apache.bcel.classfile.Code; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java index 4ae9d94c4..714174f59 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java @@ -1,10 +1,9 @@ package com.glxp.api.service.collect; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.collect.IoCollectCodeBackMapper; +import com.glxp.api.dao.collect.IoCollectCodeMapper; import com.glxp.api.entity.collect.*; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.IoCollectCodeRequest; @@ -13,8 +12,9 @@ import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectCodeResponse; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.util.IntUtil; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -22,11 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.collect.IoCollectCodeMapper; -import org.springframework.transaction.annotation.Isolation; -import org.springframework.transaction.annotation.Transactional; - @Service public class IoCollectCodeService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java index 1432b74a8..ef9310b86 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java @@ -1,7 +1,5 @@ package com.glxp.api.service.collect; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -13,26 +11,19 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.collect.IoCollectLedGroupMapper; import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.entity.collect.IoCollectLedGroup; -import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.SysOrderLed; -import com.glxp.api.entity.thrsys.CodeRel; -import com.glxp.api.entity.thrsys.ThrManufacturerEntity; -import com.glxp.api.enums.led.LedColorStatusEnum; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectLedGroupRequest; import com.glxp.api.req.collect.LedGroupRequest; -import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.collect.IoCollectLedGroupResponse; import com.glxp.api.service.basic.SysWorkplaceQueueService; -import com.glxp.api.util.IntUtil; import com.glxp.api.util.OkHttpCli; import com.glxp.api.util.RedisUtil; import com.glxp.api.util.redis.RedisDelayedQueue; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 09a0adb3c..396fa50b7 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -13,7 +13,6 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.auth.InvWarehouseDao; -import com.glxp.api.dao.auth.SysWorkplaceDao; import com.glxp.api.dao.basic.SysWorkplaceBusMapper; import com.glxp.api.dao.collect.IoCollectOrderBackupMapper; import com.glxp.api.dao.inout.IoCodeTempDao; @@ -25,22 +24,17 @@ import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.SysWorkplaceBus; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.collect.*; -import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; -import com.glxp.api.req.collect.IoCollectCodeRequest; import com.glxp.api.req.collect.PostCollectOrderRequest; import com.glxp.api.req.inout.ReviewFinishRequest; -import com.glxp.api.res.basic.BasicSkPrescribeResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; -import com.glxp.api.res.collect.IoCollectCodeResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.auth.SysWorkplaceService; @@ -51,7 +45,6 @@ import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import lombok.extern.slf4j.Slf4j; -import org.jfree.util.Log; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java index 0de69def2..ac156c06d 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizBackupService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.dao.collect.IoCollectCodeBackMapper; import com.glxp.api.dao.collect.IoCollectOrderBizBackupMapper; import com.glxp.api.entity.collect.IoCollectOrderBizBackup; import com.glxp.api.http.ErpBasicClient; @@ -13,7 +12,6 @@ import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderUploadCountRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.CollectOrderUploadCountResponse; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizOriginService.java index 138207c92..56056c5b6 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizOriginService.java @@ -1,15 +1,15 @@ package com.glxp.api.service.collect; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.collect.IoCollectOrderBizOriginMapper; +import com.glxp.api.entity.collect.IoCollectOrderBizOrigin; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; import org.springframework.stereotype.Service; -import javax.annotation.Resource; + import java.util.Collections; import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.collect.IoCollectOrderBizOrigin; -import com.glxp.api.dao.collect.IoCollectOrderBizOriginMapper; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java index 8b17d49c4..3b3bd45b1 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java @@ -12,7 +12,6 @@ import com.glxp.api.res.collect.CollectOrderBizResponse; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCheckCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCheckCodeService.java index e8fee83b3..ba9113af0 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCheckCodeService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCheckCodeService.java @@ -1,9 +1,7 @@ package com.glxp.api.service.collect; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.collect.IoCollectOrderBizMapper; import com.glxp.api.dao.collect.IoCollectOrderCheckCodeMapper; -import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderCheckCode; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeAutoService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeAutoService.java index c0c0b3b45..bf2264f35 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeAutoService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeAutoService.java @@ -1,7 +1,10 @@ package com.glxp.api.service.collect; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.collect.IoCollectOrderCodeAutoMapper; +import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; import com.glxp.api.req.collect.CollectOrderCodeAutoRequest; import com.glxp.api.res.collect.CollectOrderCodeAutoResponse; import org.springframework.stereotype.Service; @@ -10,10 +13,6 @@ import javax.annotation.Resource; import java.util.Collections; import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.collect.IoCollectOrderCodeAutoMapper; -import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; - @Service public class IoCollectOrderCodeAutoService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index d1010d18f..58f88322d 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -13,7 +13,6 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.WorkOperType; import com.glxp.api.dao.collect.IoCollectOrderCodeManMapper; -import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; @@ -35,9 +34,7 @@ import com.glxp.api.res.collect.RelCodeDetailResponse; import com.glxp.api.res.inout.AddEnterCodeResponse; import com.glxp.api.res.inout.VailCodeResultResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.auth.SysWorkplaceService; -import com.glxp.api.service.basic.BasicCollectBustypeService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.basic.UdiRelevanceService; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderOriginService.java index 675e48af4..c05dd56bc 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderOriginService.java @@ -1,14 +1,13 @@ package com.glxp.api.service.collect; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.dao.collect.IoCollectOrderOriginMapper; +import com.glxp.api.entity.collect.IoCollectOrderOrigin; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.res.collect.IoCollectOrderResponse; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.collect.IoCollectOrderOrigin; -import com.glxp.api.dao.collect.IoCollectOrderOriginMapper; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index e4649ddcb..f5675fb1d 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -1,19 +1,14 @@ package com.glxp.api.service.collect; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -21,57 +16,47 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.collect.IoCollectOrderMapper; -import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.collect.*; -import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.inv.InvCountOrderDetailEntity; -import com.glxp.api.entity.inv.InvCountOrderEntity; -import com.glxp.api.entity.inv.InvCountSettingEntity; -import com.glxp.api.entity.thrsys.ThrSystemEntity; +import com.glxp.api.entity.inout.IoCodeEntity; +import com.glxp.api.entity.inout.IoCodeTempEntity; +import com.glxp.api.entity.inout.IoOrderDetailBizEntity; +import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.exception.JsonException; -import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.http.HttpOkClient; import com.glxp.api.http.sync.SpGetHttpClient; -import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.req.collect.*; -import com.glxp.api.req.inout.*; +import com.glxp.api.req.collect.CollectOrderBizRequest; +import com.glxp.api.req.collect.CollectOrderRequest; +import com.glxp.api.req.collect.VA010Mx; +import com.glxp.api.req.inout.DeleteTageCodeRequest; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.inout.ReviewSpmsRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.BasicSkPrescribeResponse; import com.glxp.api.res.basic.SysWorkplaceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; -import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderResponse; -import com.glxp.api.res.inout.IoStatOrderResponse; import com.glxp.api.res.sync.SpsSyncOrderResponse; -import com.glxp.api.res.thrsys.ThrInvProductResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.auth.DeptService; import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.sync.HeartService; import com.glxp.api.service.thrsys.SysWorkplacePutRelService; -import com.glxp.api.util.*; -import com.glxp.api.util.udi.FilterUdiUtils; +import com.glxp.api.util.BeanCopyUtils; +import com.glxp.api.util.IntUtil; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.udi.UdiCalCountUtil; -import net.sf.jasperreports.engine.util.JRStyledText; import org.springframework.beans.BeanUtils; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -80,7 +65,6 @@ import java.io.IOException; import java.io.InputStream; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java index 66874b515..a2c579e58 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java @@ -2,48 +2,32 @@ package com.glxp.api.service.collect; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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.BusTypeConstant; import com.glxp.api.dao.basic.BasicProductsDao; -import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; import com.glxp.api.dao.basic.UdiRelevanceDao; -import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.basic.BasicProductsEntity; +import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderBizOrigin; import com.glxp.api.entity.collect.IoCollectOrderOrigin; -import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.exception.JsonException; -import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.req.basic.GetSickPrescribeRequest; -import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.req.collect.CollectOrderRequest; -import com.glxp.api.req.inout.FilterOrderRequest; -import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.BasicSkPrescribeResponse; -import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; -import com.glxp.api.service.basic.*; +import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.util.BeanCopyUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.dao.CannotAcquireLockException; -import org.springframework.dao.DeadlockLoserDataAccessException; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.ExceptionHandler; import javax.annotation.Resource; -import java.sql.SQLException; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java b/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java index bd5823db5..323805ae0 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java @@ -1,12 +1,11 @@ package com.glxp.api.service.collect; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.collect.IoCollectSet; import com.glxp.api.dao.collect.IoCollectSetMapper; +import com.glxp.api.entity.collect.IoCollectSet; +import org.springframework.stereotype.Service; + +import java.util.List; @Service public class IoCollectSetService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java index cc5265454..7b1f2e143 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderCodeService.java @@ -1,15 +1,16 @@ package com.glxp.api.service.collect; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.collect.IoSplitDesOrderCodeMapper; +import com.glxp.api.entity.collect.IoSplitDesOrderCode; import com.glxp.api.req.collect.IoSplitDesOrderCodeDetailRequest; import com.glxp.api.res.collect.IoSplitDesOrderCodeDetailResponse; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.Collections; import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.collect.IoSplitDesOrderCode; -import com.glxp.api.dao.collect.IoSplitDesOrderCodeMapper; @Service public class IoSplitDesOrderCodeService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java index b5417d529..ba6d59119 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java @@ -1,22 +1,18 @@ package com.glxp.api.service.collect; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.collect.IoCollectOrderBiz; +import com.glxp.api.dao.collect.IoSplitDesOrderDetailMapper; +import com.glxp.api.entity.collect.IoSplitDesOrderDetail; import com.glxp.api.req.collect.IoSplitDesOrderDetailRequest; -import com.glxp.api.req.collect.IoSplitDesOrderRequest; import com.glxp.api.res.collect.IoSplitDesOrderDetailResponse; -import com.glxp.api.res.collect.IoSplitDesOrderResponse; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.collect.IoSplitDesOrderDetailMapper; -import com.glxp.api.entity.collect.IoSplitDesOrderDetail; - @Service public class IoSplitDesOrderDetailService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java index d2f89af5a..2ba9fb8bf 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.dao.collect.IoSplitDesOrderMapper; -import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoSplitDesOrder; import com.glxp.api.entity.collect.IoSplitDesOrderCode; import com.glxp.api.entity.collect.IoSplitDesOrderDetail; @@ -18,7 +17,6 @@ import com.glxp.api.entity.inout.IoSplitFifoInv; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.AddInvDesDetaiRequest; import com.glxp.api.req.collect.IoSplitDesOrderRequest; -import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.IoSplitDesOrderResponse; import com.glxp.api.service.inout.IoSplitCodeService; import com.glxp.api.service.inout.IoSplitFifoCodeService; @@ -26,8 +24,6 @@ import com.glxp.api.service.inout.IoSplitFifoInvService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.IntUtil; import com.glxp.api.util.OrderNoTypeBean; -import okhttp3.internal.http2.ErrorCode; -import org.apache.poi.ss.formula.functions.Offset; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index 8d84b00c3..03283d6bc 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -9,14 +9,17 @@ import cn.hutool.core.util.XmlUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.dao.collect.RelCodeBatchMapper; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.system.CompanyEntity; @@ -40,11 +43,7 @@ import com.glxp.api.util.StringUtils; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.collect.RelCodeBatchMapper; -import com.glxp.api.entity.collect.RelCodeBatch; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import org.w3c.dom.Document; diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java index 3e2f74c84..12d5e1980 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java @@ -3,11 +3,13 @@ package com.glxp.api.service.collect; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicProductsDao; +import com.glxp.api.dao.collect.RelCodeDetailMapper; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.RelCodeDetailRequest; import com.glxp.api.res.collect.RelCodeDetailResponse; @@ -15,11 +17,10 @@ import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.*; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.collect.RelCodeDetailMapper; -import com.glxp.api.entity.collect.RelCodeDetail; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; @Service public class RelCodeDetailService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/collect/SysOrderLedService.java b/src/main/java/com/glxp/api/service/collect/SysOrderLedService.java index ca032eb1a..93224af34 100644 --- a/src/main/java/com/glxp/api/service/collect/SysOrderLedService.java +++ b/src/main/java/com/glxp/api/service/collect/SysOrderLedService.java @@ -2,9 +2,6 @@ package com.glxp.api.service.collect; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.dao.collect.IoCollectLedGroupMapper; import com.glxp.api.dao.collect.SysOrderLedMapper; import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.entity.collect.IoCollectOrderBiz; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceAssetLoacationService.java b/src/main/java/com/glxp/api/service/dev/DeviceAssetLoacationService.java index bf5833842..21a397c7a 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceAssetLoacationService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceAssetLoacationService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.dev; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.dev.DeviceAssetLoacationMapper; import com.glxp.api.entity.dev.DeviceAssetLoacationEntity; +import org.springframework.stereotype.Service; @Service public class DeviceAssetLoacationService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/dev/DeviceAssetUsageService.java b/src/main/java/com/glxp/api/service/dev/DeviceAssetUsageService.java index 6824c2dc7..ff2c3a8fe 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceAssetUsageService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceAssetUsageService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.dev; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.dev.DeviceAssetUsageMapper; import com.glxp.api.entity.dev.DeviceAssetUsageEntity; +import org.springframework.stereotype.Service; @Service public class DeviceAssetUsageService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/dev/DeviceChangeLogService.java b/src/main/java/com/glxp/api/service/dev/DeviceChangeLogService.java index dc2eb6fd7..6c6a6b494 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceChangeLogService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceChangeLogService.java @@ -1,7 +1,7 @@ package com.glxp.api.service.dev; -import com.glxp.api.entity.dev.DeviceChangeLogEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.dev.DeviceChangeLogEntity; /** * 针对表【device_change_log(设备变更日志表)】的数据库操作Service diff --git a/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderItemService.java b/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderItemService.java index ee931d728..17c4f85e0 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderItemService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderItemService.java @@ -1,7 +1,7 @@ package com.glxp.api.service.dev; -import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderService.java b/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderService.java index b9f5bccfe..748c6d94b 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderService.java @@ -1,11 +1,10 @@ package com.glxp.api.service.dev; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceChangeOrderEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.entity.inout.IoCodeEntity; -import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.dev.DeviceChangeOrderDetailQuery; import com.glxp.api.req.dev.DeviceChangeOrderGenerateOrderId; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailItemService.java b/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailItemService.java index 8c9b93958..0c888d1b0 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailItemService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailItemService.java @@ -1,8 +1,8 @@ package com.glxp.api.service.dev; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam; import com.glxp.api.req.dev.DeviceCheckDetailItemQuery; import com.glxp.api.req.dev.DeviceCheckDetailParam; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailService.java index 6d72c15a2..4073effe5 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailService.java @@ -1,8 +1,8 @@ package com.glxp.api.service.dev; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.req.dev.DeviceCheckDetailMiniQuery; import com.glxp.api.req.dev.DeviceCheckDetailParam; import com.glxp.api.req.dev.DeviceCheckDetailQuery; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceCheckItemDictService.java b/src/main/java/com/glxp/api/service/dev/DeviceCheckItemDictService.java index ce17397fe..7df22215b 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceCheckItemDictService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceCheckItemDictService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.dev; import com.glxp.api.entity.dev.DeviceCheckItemDictEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.req.dev.DeviceCheckItemDictQuery; import com.glxp.api.service.CustomService; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceCheckService.java b/src/main/java/com/glxp/api/service/dev/DeviceCheckService.java index 811089b96..bf93f8f21 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceCheckService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceCheckService.java @@ -1,8 +1,8 @@ package com.glxp.api.service.dev; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceCheckEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.req.dev.DeviceCheckQuery; import com.glxp.api.vo.dev.DeviceCheckPrintVo; import com.glxp.api.vo.dev.DeviceCheckVo; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java index 8831a4a6b..be3f57685 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java @@ -1,8 +1,8 @@ package com.glxp.api.service.dev; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceInfoEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery; import com.glxp.api.req.dev.DeviceInfoDetailQuery; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanDelectService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanDelectService.java index 12d61bdf0..debec53e1 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanDelectService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanDelectService.java @@ -1,7 +1,7 @@ package com.glxp.api.service.dev; -import com.glxp.api.entity.dev.DeviceInspectPlanDelectEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.dev.DeviceInspectPlanDelectEntity; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskDetailService.java index e3065cc89..e839f2c8b 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskDetailService.java @@ -2,10 +2,10 @@ package com.glxp.api.service.dev; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; import com.glxp.api.dao.dev.DeviceInspectTaskDetailMapper; +import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; +import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; diff --git a/src/main/java/com/glxp/api/service/dev/DevicePlanDetailItemService.java b/src/main/java/com/glxp/api/service/dev/DevicePlanDetailItemService.java index 84155862f..9af4f2f6f 100644 --- a/src/main/java/com/glxp/api/service/dev/DevicePlanDetailItemService.java +++ b/src/main/java/com/glxp/api/service/dev/DevicePlanDetailItemService.java @@ -1,9 +1,7 @@ package com.glxp.api.service.dev; import com.glxp.api.entity.dev.DevicePlanDetailItemEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.req.dev.DevicePlanDetailItemQuery; -import com.glxp.api.req.dev.DevicePlanDetailQuery; import com.glxp.api.service.CustomService; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/dev/DevicePlanService.java b/src/main/java/com/glxp/api/service/dev/DevicePlanService.java index 0c86bf5f0..7636eabda 100644 --- a/src/main/java/com/glxp/api/service/dev/DevicePlanService.java +++ b/src/main/java/com/glxp/api/service/dev/DevicePlanService.java @@ -1,7 +1,7 @@ package com.glxp.api.service.dev; -import com.glxp.api.entity.dev.DevicePlanEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.dev.DevicePlanEntity; import com.glxp.api.req.dev.DevicePlanQuery; import com.glxp.api.vo.dev.DevicePlanVo; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java b/src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java index f223c461b..f6eb5a41b 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.dev; -import org.springframework.beans.BeanUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -10,6 +9,7 @@ import com.glxp.api.entity.dev.DeviceProjectSet; import com.glxp.api.req.dev.DeviceProjectSetRequest; import com.glxp.api.res.dev.DeviceProjectSetResponse; import com.glxp.api.service.auth.CustomerService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyDetailService.java index b180fdbf1..e5f834b8f 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyDetailService.java @@ -1,9 +1,8 @@ package com.glxp.api.service.dev; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; -import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.entity.dev.DeviceRepairApplyEntity; import com.glxp.api.req.dev.DeviceRepairApplyDetailDiagnosisParam; import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery; import com.glxp.api.req.dev.DeviceRepairApplyDetailQuery; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyService.java b/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyService.java index d2601f832..c9e05b488 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceRepairApplyService.java @@ -1,8 +1,8 @@ package com.glxp.api.service.dev; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceRepairApplyEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; import com.glxp.api.req.dev.DeviceRepairApplyAddParam; import com.glxp.api.req.dev.DeviceRepairApplyConfirmParam; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceRepairService.java b/src/main/java/com/glxp/api/service/dev/DeviceRepairService.java index 1f28dd86b..420f8146e 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceRepairService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceRepairService.java @@ -1,8 +1,8 @@ package com.glxp.api.service.dev; +import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceRepairEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.req.dev.DeviceRepairQuery; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailItemService.java b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailItemService.java index 78edf6384..abd09311f 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailItemService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailItemService.java @@ -2,9 +2,10 @@ package com.glxp.api.service.dev; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity; import com.glxp.api.entity.dev.DeviceUpkeepDetailItemEntity; -import com.glxp.api.req.dev.*; +import com.glxp.api.req.dev.DeviceUpkeepDetailItemFinishParam; +import com.glxp.api.req.dev.DeviceUpkeepDetailItemQuery; +import com.glxp.api.req.dev.DeviceUpkeepDetailParam; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailService.java index ee807fa4a..1973bfc77 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.dev; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.dev.DeviceCheckDetailEntity; import com.glxp.api.entity.dev.DeviceUpkeepDetailEntity; import com.glxp.api.req.dev.DeviceUpkeepDetailQuery; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java index ab3017976..89dcefa9a 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceUpkeepEntity; import com.glxp.api.req.dev.DeviceUpkeepQuery; -import com.glxp.api.vo.dev.*; +import com.glxp.api.vo.dev.DeviceUpkeepDetailVo; +import com.glxp.api.vo.dev.DeviceUpkeepPrintVo; +import com.glxp.api.vo.dev.DeviceUpkeepVo; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java index 5c55d62ca..e91cba301 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.dev.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -22,6 +21,7 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.dev.DeptDeviceDetailService; import com.glxp.api.util.IdUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeLogServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeLogServiceImpl.java index 05abaa99d..22176713c 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeLogServiceImpl.java @@ -1,9 +1,9 @@ package com.glxp.api.service.dev.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.dev.DeviceChangeLogMapper; import com.glxp.api.entity.dev.DeviceChangeLogEntity; import com.glxp.api.service.dev.DeviceChangeLogService; -import com.glxp.api.dao.dev.DeviceChangeLogMapper; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderItemServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderItemServiceImpl.java index feb437719..27e7ec544 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderItemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderItemServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.dev.DeviceChangeOrderItemMapper; import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.service.dev.DeviceChangeOrderItemService; -import com.glxp.api.dao.dev.DeviceChangeOrderItemMapper; import com.glxp.api.service.dev.DeviceInfoService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java index 6f9e6ebbf..2692a2bd4 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.dao.dev.DeviceChangeOrderMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.basic.BasicCorpEntity; @@ -35,7 +36,6 @@ import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.dev.DeviceChangeLogService; import com.glxp.api.service.dev.DeviceChangeOrderItemService; import com.glxp.api.service.dev.DeviceChangeOrderService; -import com.glxp.api.dao.dev.DeviceChangeOrderMapper; import com.glxp.api.service.dev.DeviceInfoService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.GennerOrderUtils; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailItemServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailItemServiceImpl.java index 1065a3142..93b622904 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailItemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailItemServiceImpl.java @@ -3,6 +3,7 @@ package com.glxp.api.service.dev.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.dev.DeviceCheckDetailItemMapper; import com.glxp.api.dao.dev.DeviceCheckDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; @@ -13,7 +14,6 @@ import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam; import com.glxp.api.req.dev.DeviceCheckDetailItemQuery; import com.glxp.api.req.dev.DeviceCheckDetailParam; import com.glxp.api.service.dev.DeviceCheckDetailItemService; -import com.glxp.api.dao.dev.DeviceCheckDetailItemMapper; import com.glxp.api.service.dev.DeviceCheckDetailService; import com.glxp.api.service.dev.DeviceCheckService; import com.glxp.api.util.IntUtil; @@ -24,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailServiceImpl.java index bb8cba6bd..3e4ffc32a 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailServiceImpl.java @@ -1,33 +1,32 @@ package com.glxp.api.service.dev.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.dev.DeviceCheckDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; -import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity; import com.glxp.api.entity.dev.DeviceRepairEntity; -import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.dev.*; -import com.glxp.api.service.dev.*; -import com.glxp.api.dao.dev.DeviceCheckDetailMapper; -import com.glxp.api.util.IntUtil; +import com.glxp.api.req.dev.DeviceCheckDetailMiniQuery; +import com.glxp.api.req.dev.DeviceCheckDetailParam; +import com.glxp.api.req.dev.DeviceCheckDetailQuery; +import com.glxp.api.req.dev.DeviceCheckDetailRepairParam; +import com.glxp.api.service.dev.DeviceCheckDetailService; +import com.glxp.api.service.dev.DeviceCheckService; +import com.glxp.api.service.dev.DeviceInfoService; +import com.glxp.api.service.dev.DeviceRepairService; import com.glxp.api.util.SnowflakeUtil; import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; -import org.apache.poi.ss.formula.functions.Now; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckItemDictServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckItemDictServiceImpl.java index def974368..0cefbdd66 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckItemDictServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckItemDictServiceImpl.java @@ -2,13 +2,12 @@ package com.glxp.api.service.dev.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.dev.DeviceCheckItemDictMapper; import com.glxp.api.entity.dev.DeviceCheckItemDictEntity; import com.glxp.api.req.dev.DeviceCheckItemDictQuery; import com.glxp.api.service.CustomServiceImpl; import com.glxp.api.service.dev.DeviceCheckItemDictService; -import com.glxp.api.dao.dev.DeviceCheckItemDictMapper; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java index b511ae50d..6dde7f4c6 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java @@ -6,22 +6,19 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; +import com.glxp.api.dao.dev.DeviceCheckMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.*; import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.exception.JsonException; import com.glxp.api.req.dev.DeviceCheckQuery; -import com.glxp.api.req.dev.DevicePlanDetailItemQuery; -import com.glxp.api.req.dev.DevicePlanDetailQuery; import com.glxp.api.service.dev.*; -import com.glxp.api.dao.dev.DeviceCheckMapper; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.SnowflakeUtil; import com.glxp.api.vo.dev.DeviceCheckPrintVo; import com.glxp.api.vo.dev.DeviceCheckPrintVo.DetailVo; import com.glxp.api.vo.dev.DeviceCheckVo; -import com.glxp.api.vo.dev.DeviceInfoVo; import com.glxp.api.vo.dev.DevicePlanDetailVo; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java index 24fff3b26..db15729c6 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java @@ -7,16 +7,15 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.dev.DeviceInfoMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceInfoEntity; -import com.glxp.api.entity.dev.DeviceUpkeepEntity; import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.exception.JsonException; import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery; import com.glxp.api.req.dev.DeviceInfoDetailQuery; import com.glxp.api.req.dev.DeviceInfoQuery; import com.glxp.api.service.dev.DeviceInfoService; -import com.glxp.api.dao.dev.DeviceInfoMapper; import com.glxp.api.vo.dev.DeviceInfoVo; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java index 1f0e245aa..80ef5d9b2 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.dev.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; @@ -10,8 +9,6 @@ import com.glxp.api.dao.dev.DeviceInspectOrderDao; import com.glxp.api.dao.dev.DeviceInspectPlanDao; import com.glxp.api.dao.dev.DeviceRepairOrderDao; import com.glxp.api.entity.dev.DeviceInspectOrderEntity; -import com.glxp.api.entity.dev.DeviceInspectPlanEntity; -import com.glxp.api.entity.dev.DeviceRepairOrderEntity; import com.glxp.api.req.dev.AddDeviceInspectOrderRequest; import com.glxp.api.req.dev.FilterDeviceInspectOrderRequest; import com.glxp.api.res.dev.DeviceInspectOrderResponse; @@ -20,6 +17,7 @@ import com.glxp.api.service.dev.DeviceInspectOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanDelectServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanDelectServiceImpl.java index 13fbd4d38..67d891055 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanDelectServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanDelectServiceImpl.java @@ -1,11 +1,11 @@ package com.glxp.api.service.dev.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.dev.DeviceInspectPlanDelectMapper; import com.glxp.api.entity.dev.DeviceInspectPlanDelectEntity; import com.glxp.api.service.dev.DeviceInspectPlanDelectService; +import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java index 96a268cc9..43c24fcb3 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.dev.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,13 +19,13 @@ import com.glxp.api.req.dev.AddDeviceInspectPlanRequest; import com.glxp.api.req.dev.FilterDeviceInspectPlanRequest; import com.glxp.api.res.dev.DeviceInspectPlanResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.dev.DeviceInspectOrderService; import com.glxp.api.service.dev.DeviceInspectPlanService; import com.glxp.api.service.dev.DeviceInspectTaskDetailService; import com.glxp.api.service.dev.DeviceInspectTaskService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectSetServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectSetServiceImpl.java index c6614d167..073c5cce5 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectSetServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.dev.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.common.res.BaseResponse; @@ -13,6 +12,7 @@ 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.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DevicePlanDetailItemServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DevicePlanDetailItemServiceImpl.java index d7c55abac..9a865e7f8 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DevicePlanDetailItemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DevicePlanDetailItemServiceImpl.java @@ -1,15 +1,12 @@ package com.glxp.api.service.dev.impl; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.dev.DevicePlanDetailItemMapper; import com.glxp.api.entity.dev.DevicePlanDetailItemEntity; import com.glxp.api.req.dev.DevicePlanDetailItemQuery; -import com.glxp.api.req.dev.DevicePlanDetailQuery; import com.glxp.api.service.CustomServiceImpl; import com.glxp.api.service.dev.DevicePlanDetailItemService; -import com.glxp.api.dao.dev.DevicePlanDetailItemMapper; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DevicePlanDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DevicePlanDetailServiceImpl.java index e472dfb7f..789931b85 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DevicePlanDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DevicePlanDetailServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.dev.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.dev.DevicePlanDetailMapper; import com.glxp.api.entity.dev.DevicePlanDetailEntity; import com.glxp.api.entity.dev.DevicePlanDetailItemEntity; import com.glxp.api.req.dev.DevicePlanDetailGroupQuery; @@ -9,7 +10,6 @@ import com.glxp.api.req.dev.DevicePlanDetailQuery; import com.glxp.api.service.CustomServiceImpl; import com.glxp.api.service.dev.DevicePlanDetailItemService; import com.glxp.api.service.dev.DevicePlanDetailService; -import com.glxp.api.dao.dev.DevicePlanDetailMapper; import com.glxp.api.vo.dev.DevicePlanDetailVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DevicePlanServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DevicePlanServiceImpl.java index 0976bad74..9aae32850 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DevicePlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DevicePlanServiceImpl.java @@ -1,16 +1,13 @@ package com.glxp.api.service.dev.impl; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.dev.DeviceCheckItemDictEntity; +import com.glxp.api.dao.dev.DevicePlanMapper; import com.glxp.api.entity.dev.DevicePlanEntity; import com.glxp.api.req.dev.DevicePlanQuery; -import com.glxp.api.service.dev.DevicePlanDetailItemService; import com.glxp.api.service.dev.DevicePlanDetailService; import com.glxp.api.service.dev.DevicePlanService; -import com.glxp.api.dao.dev.DevicePlanMapper; import com.glxp.api.vo.dev.DevicePlanVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java index d64e78590..03ad1db10 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java @@ -9,7 +9,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.dev.DeptDeviceDetailDao; import com.glxp.api.dao.dev.DeviceReceiveOrderDetailDao; -import com.glxp.api.dao.inv.InvProductDao; import com.glxp.api.dao.inv.InvProductNewDao; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; @@ -31,7 +30,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.List; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderServiceImpl.java index 1e7f634d9..b79bafa76 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderServiceImpl.java @@ -26,7 +26,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.List; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java index 4cad6f35d..6f1708b4c 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java @@ -2,13 +2,11 @@ package com.glxp.api.service.dev.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.BeanUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; +import com.glxp.api.dao.dev.DeviceRepairApplyDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; @@ -16,7 +14,6 @@ import com.glxp.api.entity.dev.DeviceRepairApplyEntity; import com.glxp.api.entity.dev.DeviceRepairEntity; import com.glxp.api.enums.dev.DeviceRepairApplyDetailStatusEnum; import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum; -import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.exception.JsonException; import com.glxp.api.req.dev.DeviceRepairApplyDetailDiagnosisParam; import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery; @@ -24,7 +21,6 @@ import com.glxp.api.req.dev.DeviceRepairApplyDetailQuery; import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery; import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse; import com.glxp.api.service.dev.*; -import com.glxp.api.dao.dev.DeviceRepairApplyDetailMapper; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.SnowflakeUtil; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java index b855ef11f..4c7d451b5 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.dev.DeviceRepairApplyMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; @@ -17,7 +18,6 @@ import com.glxp.api.req.dev.DeviceRepairApplyConfirmParam; import com.glxp.api.req.dev.DeviceRepairApplyQuery; import com.glxp.api.service.dev.DeviceCheckDetailService; import com.glxp.api.service.dev.DeviceInfoService; -import com.glxp.api.dao.dev.DeviceRepairApplyMapper; import com.glxp.api.service.dev.DeviceRepairApplyDetailService; import com.glxp.api.service.dev.DeviceRepairApplyService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java index 5d605c6e6..e48c1feaf 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java @@ -1,10 +1,5 @@ package com.glxp.api.service.dev.impl; -import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; -import com.glxp.api.entity.dev.DeviceInspectTaskEntity; -import com.glxp.api.entity.dev.DeviceRepairOrderDetailEntity; -import com.glxp.api.entity.dev.DeviceRepairOrderEntity; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -13,21 +8,24 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.DeviceStatus; import com.glxp.api.constant.DeviceType; -import com.glxp.api.dao.dev.DeviceInspectPlanDelectMapper; import com.glxp.api.dao.dev.DeviceRepairOrderDao; import com.glxp.api.dao.dev.DeviceRepairOrderDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskEntity; +import com.glxp.api.entity.dev.DeviceRepairOrderDetailEntity; +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.res.dev.DeviceRepairOrderResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.dev.DeviceInspectOrderService; import com.glxp.api.service.dev.DeviceInspectTaskDetailService; import com.glxp.api.service.dev.DeviceInspectTaskService; import com.glxp.api.service.dev.DeviceRepairOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java index 22d1578dc..55c8abead 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.dev.DeviceRepairMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceRepairEntity; import com.glxp.api.enums.dev.DeviceStatusEnum; @@ -12,7 +13,6 @@ import com.glxp.api.req.dev.DeviceRepairQuery; import com.glxp.api.service.dev.DeviceInfoService; import com.glxp.api.service.dev.DeviceRepairApplyDetailService; import com.glxp.api.service.dev.DeviceRepairService; -import com.glxp.api.dao.dev.DeviceRepairMapper; import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java index 44878aa21..516f26ccc 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java @@ -4,13 +4,13 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.dao.dev.DeviceCheckDetailMapper; import com.glxp.api.dao.dev.DeviceUpkeepDetailItemMapper; import com.glxp.api.dao.dev.DeviceUpkeepDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.dev.*; +import com.glxp.api.entity.dev.DeviceUpkeepDetailEntity; +import com.glxp.api.entity.dev.DeviceUpkeepDetailItemEntity; +import com.glxp.api.entity.dev.DeviceUpkeepEntity; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam; import com.glxp.api.req.dev.DeviceUpkeepDetailItemFinishParam; import com.glxp.api.req.dev.DeviceUpkeepDetailItemQuery; import com.glxp.api.req.dev.DeviceUpkeepDetailParam; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailServiceImpl.java index 86784ff5c..b55f3dd4e 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailServiceImpl.java @@ -6,10 +6,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.dev.DeviceUpkeepDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.dev.DeviceCheckDetailEntity; import com.glxp.api.entity.dev.DeviceUpkeepDetailEntity; import com.glxp.api.req.dev.DeviceUpkeepDetailQuery; -import com.glxp.api.service.dev.*; +import com.glxp.api.service.dev.DeviceInfoService; +import com.glxp.api.service.dev.DeviceUpkeepDetailService; +import com.glxp.api.service.dev.DeviceUpkeepService; import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java index 507c55507..4449e4e77 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java @@ -16,7 +16,10 @@ import com.glxp.api.service.dev.*; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.SnowflakeUtil; -import com.glxp.api.vo.dev.*; +import com.glxp.api.vo.dev.DevicePlanDetailVo; +import com.glxp.api.vo.dev.DeviceUpkeepDetailVo; +import com.glxp.api.vo.dev.DeviceUpkeepPrintVo; +import com.glxp.api.vo.dev.DeviceUpkeepVo; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderDetailServiceImpl.java index 843f561fd..5aa5f26b8 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderDetailServiceImpl.java @@ -10,12 +10,13 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.dev.InvMAExplanationDao; import com.glxp.api.dao.dev.InvMAOrderDao; import com.glxp.api.dao.dev.InvMAOrderDetailDao; -import com.glxp.api.dao.inv.*; +import com.glxp.api.dao.inv.InvProductDao; +import com.glxp.api.dao.inv.InvProductNewDao; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.dev.InvMAExplanationEntity; import com.glxp.api.entity.dev.InvMAOrderDetailEntity; import com.glxp.api.entity.dev.InvMAOrderEntity; -import com.glxp.api.entity.inv.*; +import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.dev.AddInvMAOrderDetailRequest; import com.glxp.api.req.dev.FilterInvMAOrderDetailRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; @@ -28,7 +29,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.List; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderServiceImpl.java index 8ed288867..004e19f3e 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.dev.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -19,6 +18,7 @@ import com.glxp.api.service.dev.InvMAOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inout/ExcelService.java b/src/main/java/com/glxp/api/service/inout/ExcelService.java index c8c161edb..6f6f39732 100644 --- a/src/main/java/com/glxp/api/service/inout/ExcelService.java +++ b/src/main/java/com/glxp/api/service/inout/ExcelService.java @@ -6,12 +6,9 @@ package com.glxp.api.service.inout; * @modyified By : */ -import com.glxp.api.entity.inout.IoStatDayEntity; -import com.glxp.api.req.inout.FilterStatDataDetailRequest; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.util.List; /** * 导出业务接口 diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 81c4bd48e..c6dec2e88 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -1,16 +1,6 @@ package com.glxp.api.service.inout; import cn.hutool.core.bean.BeanUtil; -import com.glxp.api.entity.basic.*; -import com.glxp.api.entity.inv.InvProductEntity; -import com.glxp.api.exception.JsonException; -import com.glxp.api.service.basic.*; -import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.inv.impl.InvProductService; -import com.glxp.api.service.inv.impl.InvProductServiceNew; -import com.glxp.api.vo.basic.InvProductNewVo; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -23,17 +13,26 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.entity.auth.InvWarehouseEntity; +import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; import com.glxp.api.req.inout.PdaPostOrderRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.InvWarehouseService; +import com.glxp.api.service.basic.*; +import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.InvPreProductDetailService; import com.glxp.api.service.inv.InvPreinProductDetailService; +import com.glxp.api.service.inv.impl.InvProductService; +import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import com.glxp.api.util.udi.FilterUdiUtils; +import com.glxp.api.vo.basic.InvProductNewVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 93b59a10f..1b7c6c3a0 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -1,26 +1,25 @@ package com.glxp.api.service.inout; -import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.util.*; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.UUID; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.system.SystemParamConfigService; +import com.glxp.api.util.*; +import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index cdbf37eff..279b070f4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -1,19 +1,14 @@ package com.glxp.api.service.inout; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.glxp.api.annotation.Log; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.*; @@ -36,7 +31,6 @@ import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.IntUtil; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; -import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index 6f2acdca0..5fb6c18ee 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -7,60 +7,35 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; 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.constant.Constant; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.inout.IoCodeTempDao; -import com.glxp.api.dao.system.CompanyDao; -import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.collect.RelCodeDetail; -import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.purchase.SupCertEntity; -import com.glxp.api.entity.purchase.SupProductEntity; -import com.glxp.api.entity.system.CompanyEntity; -import com.glxp.api.req.alihealth.AlihealthYljgCodedetailReqeust; -import com.glxp.api.req.inout.AddOrderRequest; import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.RelCodeDetailResponse; -import com.glxp.api.res.inout.AddCodeResult; import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoCodeTempResponse; -import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.collect.RelCodeDetailService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.util.BeanCopyUtils; -import com.glxp.api.util.DateUtil; import com.glxp.api.util.IntUtil; -import com.glxp.api.util.OrderNoTypeBean; -import com.glxp.api.util.alihealth.AlihealthYljgUtils; import com.glxp.api.util.page.PageQuery; import com.glxp.api.util.page.TableDataInfo; -import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.BeanUtils; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/inout/IoDestinyProcessCodeService.java b/src/main/java/com/glxp/api/service/inout/IoDestinyProcessCodeService.java index c7abffd21..2ba84cae0 100644 --- a/src/main/java/com/glxp/api/service/inout/IoDestinyProcessCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoDestinyProcessCodeService.java @@ -1,7 +1,5 @@ package com.glxp.api.service.inout; -import com.glxp.api.entity.inout.IoDestinyProcessCodeEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.req.inout.IodestinyProcessRequest; import com.glxp.api.res.inout.IodestinyProcessResponse; diff --git a/src/main/java/com/glxp/api/service/inout/IoDestinyProcessDetailService.java b/src/main/java/com/glxp/api/service/inout/IoDestinyProcessDetailService.java index d6d1c6bad..84331952c 100644 --- a/src/main/java/com/glxp/api/service/inout/IoDestinyProcessDetailService.java +++ b/src/main/java/com/glxp/api/service/inout/IoDestinyProcessDetailService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inout; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.inout.IoDestinyProcessDetailEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.IodestinyProcessRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; diff --git a/src/main/java/com/glxp/api/service/inout/IoDestinyProcessService.java b/src/main/java/com/glxp/api/service/inout/IoDestinyProcessService.java index bdf36276a..812da521e 100644 --- a/src/main/java/com/glxp/api/service/inout/IoDestinyProcessService.java +++ b/src/main/java/com/glxp/api/service/inout/IoDestinyProcessService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inout; -import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.IodestinyProcessRequest; public interface IoDestinyProcessService{ diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index e6bcaf82e..e4eeb0a79 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -1,11 +1,6 @@ package com.glxp.api.service.inout; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.service.dev.DeviceChangeOrderService; -import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.inv.impl.InvProductBatchService; -import com.glxp.api.service.inv.impl.InvProductService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; @@ -17,11 +12,18 @@ import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.*; import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.dev.DeviceChangeOrderService; +import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.*; +import com.glxp.api.service.inv.impl.InvProductBatchService; +import com.glxp.api.service.inv.impl.InvProductService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index 8a18f92dc..7072056d9 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -3,11 +3,9 @@ package com.glxp.api.service.inout; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; -import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.*; import com.glxp.api.res.inout.IoOrderDetailBizResponse; -import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index bb230d6a6..6d4a20b60 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inout; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; -import com.glxp.api.req.inout.FilterOrderDetailFinishBizRequest; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java index dad073e75..e0679d4ea 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.inout; -import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.CptTraceRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderMutiService.java b/src/main/java/com/glxp/api/service/inout/IoOrderMutiService.java index a709db575..1dc6f5ea8 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderMutiService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderMutiService.java @@ -1,7 +1,7 @@ package com.glxp.api.service.inout; -import com.glxp.api.entity.inout.IoOrderMutiEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.inout.IoOrderMutiEntity; import com.glxp.api.entity.inout.IoOrderMutiSetEntity; import com.glxp.api.req.inout.IoOrderMutiRequest; import com.glxp.api.res.inout.IoOrderMutiResponse; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderMutiSetService.java b/src/main/java/com/glxp/api/service/inout/IoOrderMutiSetService.java index a4af2815f..2e129fa9a 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderMutiSetService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderMutiSetService.java @@ -1,7 +1,7 @@ package com.glxp.api.service.inout; -import com.glxp.api.entity.inout.IoOrderMutiSetEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.inout.IoOrderMutiSetEntity; import com.glxp.api.req.inout.IoOrderMutiSetRequest; import com.glxp.api.res.inout.IoOrderMutiSetResponse; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderMutiUseService.java b/src/main/java/com/glxp/api/service/inout/IoOrderMutiUseService.java index f5306d6aa..8abb528dd 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderMutiUseService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderMutiUseService.java @@ -1,7 +1,7 @@ package com.glxp.api.service.inout; -import com.glxp.api.entity.inout.IoOrderMutiUseEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.inout.IoOrderMutiUseEntity; public interface IoOrderMutiUseService extends IService{ diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index ab41a71ea..bb7342ee0 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -8,7 +8,6 @@ import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inout.FilterUploadOrderRequest; import com.glxp.api.req.inout.OrderEditRequest; import com.glxp.api.res.inout.IoOrderResponse; -import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderSkPrescribeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderSkPrescribeService.java index c32e01ae4..3a095a3fc 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderSkPrescribeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderSkPrescribeService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.inout; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.inout.IoOrderSkPrescribeEntity; import com.glxp.api.dao.inout.IoOrderSkPrescribeMapper; +import com.glxp.api.entity.inout.IoOrderSkPrescribeEntity; +import org.springframework.stereotype.Service; @Service public class IoOrderSkPrescribeService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java index 5f6565b1b..36c032862 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java @@ -1,14 +1,12 @@ package com.glxp.api.service.inout; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.inout.IoSplitCodeEntity; -import com.glxp.api.req.inout.IoSplitCodeRequest; +import com.glxp.api.dao.inout.IoSplitCodeDetailMapper; +import com.glxp.api.entity.inout.IoSplitCodeDetailEntity; import com.glxp.api.req.inout.IoSplitDetailCodeRequest; import com.glxp.api.res.inout.IoSplitCodeDetailResponse; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.inout.IoSplitCodeDetailMapper; -import com.glxp.api.entity.inout.IoSplitCodeDetailEntity; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index 04043300b..50917eb40 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -17,8 +17,6 @@ import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; import com.glxp.api.entity.inout.IoSplitFifoInv; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.req.collect.AddInvDesDetaiRequest; -import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.inout.IoSplitCodeRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.ConfirmResponse; diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java index b04e83d34..d14d475e5 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java @@ -5,14 +5,11 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.dao.auth.SysWorkplaceDao; import com.glxp.api.dao.basic.BasicProductsDao; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.collect.IoCollectOrderBizMapper; import com.glxp.api.dao.collect.IoCollectOrderMapper; import com.glxp.api.dao.inout.IoSplitFifoCodeMapper; -import com.glxp.api.dao.inout.IoSplitFifoInvMapper; import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.basic.SysWorkplaceQueue; @@ -23,12 +20,10 @@ import com.glxp.api.entity.inout.IoSplitFifoInv; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; -import com.glxp.api.req.dev.DeviceChangeOrderParam; import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.req.inout.IoAutoPutRequest; import com.glxp.api.req.inout.IoSplitFifoCodeRequest; import com.glxp.api.req.inout.IoSplitFifoInvRequest; -import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.res.inout.IoSplitCodeResponse; @@ -36,13 +31,15 @@ import com.glxp.api.res.inout.IoSplitInvResponse; import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.basic.SysWorkplaceQueueService; import com.glxp.api.util.IntUtil; -import io.swagger.models.auth.In; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java index f31f0fdab..87fc0351f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java @@ -2,17 +2,20 @@ package com.glxp.api.service.inout; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.basic.UdiRelevanceDao; -import com.glxp.api.entity.basic.*; +import com.glxp.api.dao.inout.IoSplitFifoInvMapper; +import com.glxp.api.entity.basic.SysWorkplaceLayer; +import com.glxp.api.entity.basic.SysWorkplacePutRel; +import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.entity.collect.IoSplitFifoInvRel; import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.IoSplitFifoCodeEntity; +import com.glxp.api.entity.inout.IoSplitFifoInv; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.SysWorkplaceLayerRequest; import com.glxp.api.req.inout.IoSplitFifoInvRequest; @@ -25,10 +28,9 @@ import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.collect.IoSplitFifoInvRelService; import com.glxp.api.service.thrsys.SysWorkplacePutRelService; import com.glxp.api.util.IntUtil; -import org.apache.xpath.operations.Bool; -import org.aspectj.weaver.ast.Var; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -37,11 +39,6 @@ import java.util.Date; import java.util.List; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.inout.IoSplitFifoInv; -import com.glxp.api.dao.inout.IoSplitFifoInvMapper; -import org.springframework.transaction.annotation.Transactional; - @Service public class IoSplitFifoInvService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitQxService.java b/src/main/java/com/glxp/api/service/inout/IoSplitQxService.java index b4ffefc95..1060222a1 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitQxService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitQxService.java @@ -14,7 +14,10 @@ import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.collect.*; +import com.glxp.api.service.collect.IoCollectOrderBizBackupService; +import com.glxp.api.service.collect.IoCollectOrderBizService; +import com.glxp.api.service.collect.IoCollectOrderCodeAutoService; +import com.glxp.api.service.collect.IoCollectOrderCodeManService; import com.glxp.api.service.thrsys.SysWorkplacePutRelService; import com.glxp.api.util.IntUtil; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/glxp/api/service/inout/IoStatDetailService.java b/src/main/java/com/glxp/api/service/inout/IoStatDetailService.java index 35631b2c1..e8e25ba11 100644 --- a/src/main/java/com/glxp/api/service/inout/IoStatDetailService.java +++ b/src/main/java/com/glxp/api/service/inout/IoStatDetailService.java @@ -1,20 +1,19 @@ package com.glxp.api.service.inout; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.ConstantType; -import com.glxp.api.dao.inout.*; -import com.glxp.api.entity.inout.IoStatDayEntity; +import com.glxp.api.dao.inout.IoOrderDao; +import com.glxp.api.dao.inout.IoOrderDetailResultDao; +import com.glxp.api.dao.inout.IoStatDetailMapper; +import com.glxp.api.dao.inout.IoStatOrderDao; import com.glxp.api.entity.inout.IoStatDetailEntity; -import com.glxp.api.entity.inout.IoStatMonthEntity; import com.glxp.api.entity.inout.IoStatOrderEntity; import com.glxp.api.req.inout.FilterStatDataDetailRequest; import com.glxp.api.res.inv.IoOrderDetailStatRsponse; @@ -29,7 +28,6 @@ import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/service/inout/IoStatOrderService.java b/src/main/java/com/glxp/api/service/inout/IoStatOrderService.java index ed61adcf9..1e325675f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoStatOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoStatOrderService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.inout; -import com.glxp.api.entity.inout.IoStatOrderEntity; import com.glxp.api.req.inout.FilterStatDataRequest; import com.glxp.api.res.inout.IoStatOrderResponse; diff --git a/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java index 10329fa49..a479c5d46 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java @@ -1,13 +1,10 @@ package com.glxp.api.service.inout.impl; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.glxp.api.entity.inout.*; -import com.glxp.api.req.inout.FilterStatDataDetailRequest; import com.glxp.api.service.inout.*; import com.glxp.api.util.Excel.ExcelHandler; -import com.glxp.api.util.Excel.ExcelTemplateEnum; import com.glxp.api.util.Excel.Exception.RenException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,7 +12,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * 导出业务实现 diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java index 2f95c9f9c..beff2564b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java @@ -1,25 +1,21 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.inout.IoCodeLostMapper; +import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.req.inout.IoCodeLostRequest; import com.glxp.api.res.collect.RelCodeDetailResponse; import com.glxp.api.res.inout.IoCodeLostResponse; -import com.glxp.api.service.collect.RelCodeBatchService; import com.glxp.api.service.collect.RelCodeDetailService; +import com.glxp.api.service.inout.IoCodeLostService; import com.glxp.api.util.MsDateUtil; import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -import com.glxp.api.dao.inout.IoCodeLostMapper; -import com.glxp.api.entity.inout.IoCodeLostEntity; -import com.glxp.api.service.inout.IoCodeLostService; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java index d9106e4b3..77ecef4c3 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java @@ -1,14 +1,9 @@ package com.glxp.api.service.inout.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.res.inout.VailCodeResultResponse; -import com.glxp.api.util.udi.FilterUdiUtils; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -21,7 +16,7 @@ import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoCodeTempResponse; -import org.springframework.scheduling.annotation.Async; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java index 9fe6e33a4..b139eafe1 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java @@ -4,10 +4,8 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.UUID; -import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.basic.BasicSkSickerMapper; import com.glxp.api.dao.inout.IoOrderDao; @@ -16,7 +14,6 @@ import com.glxp.api.exception.JsonException; import com.glxp.api.req.inout.AddSkSiackerListRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inout.FilterSkSiackerListRequest; -import com.glxp.api.res.basic.BasicSkSickerResponse; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inout.IoDepartmentOrderService; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoDestinyProcessCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoDestinyProcessCodeServiceImpl.java index 621fd43b2..89acb8ef4 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoDestinyProcessCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoDestinyProcessCodeServiceImpl.java @@ -4,8 +4,8 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoDestinyProcessCodeMapper; import com.glxp.api.req.inout.IodestinyProcessRequest; import com.glxp.api.res.inout.IodestinyProcessResponse; -import org.springframework.stereotype.Service; import com.glxp.api.service.inout.IoDestinyProcessCodeService; +import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoDestinyProcessDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoDestinyProcessDetailServiceImpl.java index 3543aea5a..c266c7ef0 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoDestinyProcessDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoDestinyProcessDetailServiceImpl.java @@ -8,11 +8,13 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.basic.BasicSkProjectMapper; import com.glxp.api.dao.inout.IoDestinyProcessCodeMapper; +import com.glxp.api.dao.inout.IoDestinyProcessDetailMapper; import com.glxp.api.dao.inout.IoDestinyProcessMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.BasicSkProjectEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inout.IoDestinyProcessCodeEntity; +import com.glxp.api.entity.inout.IoDestinyProcessDetailEntity; import com.glxp.api.entity.inout.IoDestinyProcessEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.IodestinyProcessRequest; @@ -21,13 +23,11 @@ import com.glxp.api.res.inout.IodestinyProcessResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.impl.BasicDestinyRelService; +import com.glxp.api.service.inout.IoDestinyProcessDetailService; import com.glxp.api.util.StringUtils; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import org.springframework.stereotype.Service; -import com.glxp.api.dao.inout.IoDestinyProcessDetailMapper; -import com.glxp.api.entity.inout.IoDestinyProcessDetailEntity; -import com.glxp.api.service.inout.IoDestinyProcessDetailService; import javax.annotation.Resource; import java.util.ArrayList; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 107d7dec2..d1bc59623 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -1,16 +1,6 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.constant.ConstantType; -import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.inout.*; -import com.glxp.api.req.inout.*; -import com.glxp.api.res.inout.*; -import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.service.inout.*; -import com.glxp.api.service.purchase.SupCertService; -import com.glxp.api.service.purchase.SupProductService; -import com.glxp.api.util.*; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,25 +9,35 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicDestinyRelMapper; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.inout.IoOrderDetailBizDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; +import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.entity.inout.*; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupProductEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.inout.*; import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.inout.AddCodeResult; +import com.glxp.api.res.inout.IoOrderDetailBizResponse; +import com.glxp.api.res.inout.IoOrderDetailResultResponse; +import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; -import com.glxp.api.service.basic.BasicSkProjectService; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.system.SystemParamConfigService; +import com.glxp.api.service.inout.*; +import com.glxp.api.service.purchase.SupCertService; +import com.glxp.api.service.purchase.SupProductService; +import com.glxp.api.util.*; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index 480060e9c..dfe977546 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -1,17 +1,15 @@ package com.glxp.api.service.inout.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.glxp.api.dao.basic.UdiProductDao; -import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.req.inout.FilterOrderDetailFinishBizRequest; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicCorpDao; +import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; +import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; @@ -19,13 +17,13 @@ import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailCodeService; +import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; -import java.time.LocalDate; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index e893c49af..14070581a 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoOrderDetailResultDao; -import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.CptTraceRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java index 46186ca45..06a924342 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.inout.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiServiceImpl.java index e69d9a9d6..cb906fe3b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiServiceImpl.java @@ -1,10 +1,12 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; +import com.glxp.api.dao.inout.IoOrderMutiMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; @@ -17,13 +19,14 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.IoCodeTempService; +import com.glxp.api.service.inout.IoOrderDetailCodeService; +import com.glxp.api.service.inout.IoOrderMutiService; +import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.UdiCalCountUtil; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.inout.IoOrderMutiMapper; import javax.annotation.Resource; import java.util.Collections; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiSetServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiSetServiceImpl.java index 3940b6114..d4152f6b3 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiSetServiceImpl.java @@ -1,13 +1,13 @@ package com.glxp.api.service.inout.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.inout.IoOrderMutiSetMapper; +import com.glxp.api.entity.inout.IoOrderMutiSetEntity; import com.glxp.api.req.inout.IoOrderMutiSetRequest; import com.glxp.api.res.inout.IoOrderMutiSetResponse; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.inout.IoOrderMutiSetEntity; -import com.glxp.api.dao.inout.IoOrderMutiSetMapper; import com.glxp.api.service.inout.IoOrderMutiSetService; +import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiUseServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiUseServiceImpl.java index ffd9f7685..9cb230162 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiUseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiUseServiceImpl.java @@ -1,10 +1,10 @@ package com.glxp.api.service.inout.impl; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.inout.IoOrderMutiUseMapper; import com.glxp.api.entity.inout.IoOrderMutiUseEntity; import com.glxp.api.service.inout.IoOrderMutiUseService; +import org.springframework.stereotype.Service; @Service public class IoOrderMutiUseServiceImpl extends ServiceImpl implements IoOrderMutiUseService{ diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index bd191d5c2..ac6b97b8b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -1,11 +1,6 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.bean.BeanUtil; -import com.glxp.api.service.inv.impl.InvProductService; -import com.glxp.api.service.inv.impl.InvProductServiceNew; -import com.glxp.api.util.RedisUtil; -import com.glxp.api.vo.basic.InvProductNewVo; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.UUID; import cn.hutool.core.util.ReflectUtil; @@ -47,15 +42,23 @@ import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.OrderNoResult; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; -import com.glxp.api.service.inv.*; +import com.glxp.api.service.inv.InvPreProductDetailService; +import com.glxp.api.service.inv.InvPreProductService; +import com.glxp.api.service.inv.InvPreinProductDetailService; +import com.glxp.api.service.inv.InvPreinProductService; +import com.glxp.api.service.inv.impl.InvProductService; +import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.service.system.SyncUploadDataSetService; import com.glxp.api.service.thrsys.ThrOrderUploadBustypesService; -import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.IntUtil; +import com.glxp.api.util.MsDateUtil; +import com.glxp.api.util.RedisUtil; import com.glxp.api.util.udi.UdiCalCountUtil; +import com.glxp.api.vo.basic.InvProductNewVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java index a1ce7743e..7ebef55a7 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java @@ -11,7 +11,8 @@ import com.glxp.api.dao.inout.IoOrderDao; import com.glxp.api.dao.inout.IoOrderDetailResultDao; import com.glxp.api.dao.inout.IoStatDayDao; import com.glxp.api.dao.inout.IoStatOrderDao; -import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inout.IoStatDayEntity; +import com.glxp.api.entity.inout.IoStatOrderEntity; import com.glxp.api.req.inout.FilterStatDataDetailRequest; import com.glxp.api.res.inv.IoOrderDetailStatRsponse; import com.glxp.api.service.inout.IoStatDayService; @@ -27,8 +28,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java index eb905a1cb..fcc6e71fa 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java @@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inout.*; -import com.glxp.api.dao.schedule.SystemParamConfigDao; -import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inout.IoStatMonthEntity; +import com.glxp.api.entity.inout.IoStatOrderEntity; import com.glxp.api.req.inout.FilterStatDataDetailRequest; import com.glxp.api.res.dev.DateRequest; import com.glxp.api.res.inv.IoOrderDetailStatRsponse; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatOrderServiceImpl.java index 028a63a82..8e5816eb9 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatOrderServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inout.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoStatOrderDao; -import com.glxp.api.entity.inout.IoStatOrderEntity; import com.glxp.api.req.inout.FilterStatDataRequest; import com.glxp.api.res.inout.IoStatOrderResponse; import com.glxp.api.service.inout.IoStatOrderService; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java index 7afc84269..c977a7343 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java @@ -8,7 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inout.*; -import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inout.IoStatOrderEntity; +import com.glxp.api.entity.inout.IoStatQuarterEntity; import com.glxp.api.req.inout.FilterStatDataDetailRequest; import com.glxp.api.res.inv.IoOrderDetailStatRsponse; import com.glxp.api.service.inout.IoStatQuarterService; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java index 27d255e12..ad8ecc775 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inout.*; -import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inout.IoStatOrderEntity; +import com.glxp.api.entity.inout.IoStatQuarterEntity; +import com.glxp.api.entity.inout.IoStatYearEntity; import com.glxp.api.req.inout.FilterStatDataDetailRequest; import com.glxp.api.res.inv.IoOrderDetailStatRsponse; import com.glxp.api.service.inout.IoStatYearService; diff --git a/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java index 1417c9b44..6cc0836c3 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java @@ -6,12 +6,10 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; - import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.JsonProcessingException; import com.github.pagehelper.PageHelper; - import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -21,7 +19,10 @@ import com.glxp.api.entity.system.PlatformEntity; import com.glxp.api.req.inout.PlatformLinkRequest; import com.glxp.api.res.inout.IoUploadOrderResponse; import com.glxp.api.res.inout.PlatformLinkResponse; -import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.IoCodeTempService; +import com.glxp.api.service.inout.IoOrderDetailCodeService; +import com.glxp.api.service.inout.IoOrderService; +import com.glxp.api.service.inout.PlatformService; import com.glxp.api.util.OkHttpCli; import lombok.extern.slf4j.Slf4j; import okhttp3.*; diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailService.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailService.java index 2d4a82ef7..f3c158fac 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailService.java @@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.ReceiveDetailDao; -import com.glxp.api.dao.inv.InvProductRationMapper; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; -import com.glxp.api.entity.inv.InvProductRationEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; import com.glxp.api.res.inout.ReceiveDetailResponse; diff --git a/src/main/java/com/glxp/api/service/inv/InvCountCodesService.java b/src/main/java/com/glxp/api/service/inv/InvCountCodesService.java index 8b645c592..7aeb7b1ad 100644 --- a/src/main/java/com/glxp/api/service/inv/InvCountCodesService.java +++ b/src/main/java/com/glxp/api/service/inv/InvCountCodesService.java @@ -2,25 +2,23 @@ package com.glxp.api.service.inv; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; 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.dao.basic.UdiRelevanceDao; +import com.glxp.api.dao.inv.InvCountCodesMapper; import com.glxp.api.dao.inv.InvCountOrderDetailMapper; import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.inv.InvCountCodesEntity; import com.glxp.api.entity.inv.InvCountOrderDetailEntity; -import com.glxp.api.req.basic.FilterUdiInfoRequest; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inv.FilterInvCountCodesRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.inv.InvCountCodesEntity; -import com.glxp.api.dao.inv.InvCountCodesMapper; import javax.annotation.Resource; import java.util.Collections; diff --git a/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java index 5b5fa7406..924a6558c 100644 --- a/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java @@ -1,27 +1,25 @@ package com.glxp.api.service.inv; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; 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.dao.inv.InvCountOrderDetailMapper; import com.glxp.api.dao.inv.InvCountOrderMapper; import com.glxp.api.dao.inv.InvProductDao; -import com.glxp.api.entity.inv.InvCountCodesEntity; +import com.glxp.api.entity.inv.InvCountOrderDetailEntity; import com.glxp.api.entity.inv.InvCountOrderEntity; import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvCountOrderDetailRequest; import com.glxp.api.res.inv.InvCountOrderDetailResponse; -import org.apache.ibatis.session.ExecutorType; -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.inv.InvCountOrderDetailMapper; -import com.glxp.api.entity.inv.InvCountOrderDetailEntity; import javax.annotation.Resource; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.List; @Service public class InvCountOrderDetailService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java index 67c3033ce..fdc8e3787 100644 --- a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.inv; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -10,22 +11,25 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; -import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.dao.basic.BasicCorpDao; -import com.glxp.api.dao.basic.CompanyProductRelevanceDao; import com.glxp.api.dao.basic.UdiRelevanceDao; -import com.glxp.api.dao.inout.IoCodeDao; import com.glxp.api.dao.inout.IoCodeTempDao; -import com.glxp.api.dao.inv.*; +import com.glxp.api.dao.inv.InvCountCodesMapper; +import com.glxp.api.dao.inv.InvCountOrderDetailMapper; +import com.glxp.api.dao.inv.InvCountOrderMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.inv.*; +import com.glxp.api.entity.inv.InvCountCodesEntity; +import com.glxp.api.entity.inv.InvCountOrderDetailEntity; +import com.glxp.api.entity.inv.InvCountOrderEntity; +import com.glxp.api.entity.inv.InvCountSettingEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.req.inv.*; +import com.glxp.api.req.inv.FilterInvCountOrderRequest; +import com.glxp.api.req.inv.FilterInvCountOrderSaveRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inv.InvCountOrderResponse; import com.glxp.api.service.auth.CustomerService; @@ -41,7 +45,6 @@ import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -49,7 +52,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/inv/InvCpLocalProductService.java b/src/main/java/com/glxp/api/service/inv/InvCpLocalProductService.java index b53ca19bf..14b89a189 100644 --- a/src/main/java/com/glxp/api/service/inv/InvCpLocalProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvCpLocalProductService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.inv; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.inv.InvCpLocalProductMapper; import com.glxp.api.entity.inv.InvCpLocalProductEntity; +import org.springframework.stereotype.Service; @Service public class InvCpLocalProductService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/inv/InvCpThrProuductService.java b/src/main/java/com/glxp/api/service/inv/InvCpThrProuductService.java index f46637fcd..30f054f54 100644 --- a/src/main/java/com/glxp/api/service/inv/InvCpThrProuductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvCpThrProuductService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.inv; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.inv.InvCpThrProuductEntity; import com.glxp.api.dao.inv.InvCpThrProuductMapper; +import com.glxp.api.entity.inv.InvCpThrProuductEntity; +import org.springframework.stereotype.Service; @Service public class InvCpThrProuductService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java index 9e7a58cad..46137e0d5 100644 --- a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java +++ b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java @@ -6,7 +6,6 @@ import com.glxp.api.req.inv.InnerOrderQRCodeTextPDFTemplateRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inv.InnerOrderPrintResponse; - import java.util.List; public interface InvInnerOrderPrintService { diff --git a/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java b/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java index cba729bb3..8e1b38032 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java @@ -1,11 +1,8 @@ package com.glxp.api.service.inv; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity; -import com.glxp.api.req.inv.AddInvPlaceOrderRequest; import com.glxp.api.req.inv.FilterInvPlaceOrderRequest; import com.glxp.api.req.inv.FilterInvPlaceRequest; -import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvPlaceOrderDetailResponse; diff --git a/src/main/java/com/glxp/api/service/inv/InvPlaceService.java b/src/main/java/com/glxp/api/service/inv/InvPlaceService.java index ffc6f6f77..ea28657c0 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPlaceService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPlaceService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inv; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java index cd9a5c4a6..adee09398 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java @@ -2,9 +2,7 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.req.inv.FilterInvPreinDetailRequest; -import com.glxp.api.req.inv.FilterInvPreinRequest; import com.glxp.api.res.inv.InvPreinDetailResponse; -import com.glxp.api.res.inv.InvPreinOrderResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java b/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java index 5c955e71b..6825cf3a7 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java @@ -1,9 +1,7 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvPreinOrderEntity; -import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inv.FilterInvPreinRequest; -import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.InvPreinOrderResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java index f9f65670d..ba666d242 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java @@ -1,13 +1,9 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.entity.inv.InvPreProductDetailEntity; -import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; -import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvPreProductDetailResponse; -import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/InvProductRationService.java b/src/main/java/com/glxp/api/service/inv/InvProductRationService.java index b0e6fbfd4..13c9e68c2 100644 --- a/src/main/java/com/glxp/api/service/inv/InvProductRationService.java +++ b/src/main/java/com/glxp/api/service/inv/InvProductRationService.java @@ -3,12 +3,18 @@ package com.glxp.api.service.inv; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.dao.inv.InvProductRationMapper; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inout.IoOrderDetailBizEntity; +import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.entity.inout.PurReceiveDetailEntity; +import com.glxp.api.entity.inout.PurReceiveEntity; +import com.glxp.api.entity.inv.InvProductRationEntity; import com.glxp.api.entity.purchase.*; import com.glxp.api.req.inv.InvProductRationRequest; import com.glxp.api.res.basic.UdiRlSupResponse; @@ -31,9 +37,6 @@ import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.IntUtil; import com.glxp.api.util.OrderNoTypeBean; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.inv.InvProductRationEntity; -import com.glxp.api.dao.inv.InvProductRationMapper; import javax.annotation.Resource; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/service/inv/InvUserProductDetailService.java b/src/main/java/com/glxp/api/service/inv/InvUserProductDetailService.java index 30e61c005..4581f917a 100644 --- a/src/main/java/com/glxp/api/service/inv/InvUserProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvUserProductDetailService.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvUserProductDetailEntity; - import java.util.List; /** diff --git a/src/main/java/com/glxp/api/service/inv/InvUserProductService.java b/src/main/java/com/glxp/api/service/inv/InvUserProductService.java index 27cda7b8b..737b30963 100644 --- a/src/main/java/com/glxp/api/service/inv/InvUserProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvUserProductService.java @@ -1,12 +1,8 @@ package com.glxp.api.service.inv; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.entity.inv.InvUserProductEntity; -import java.util.List; - /** * @author Lenovo * @description 针对表【inv_user_product(用户库存表)】的数据库操作Service diff --git a/src/main/java/com/glxp/api/service/inv/StockCompareDetailService.java b/src/main/java/com/glxp/api/service/inv/StockCompareDetailService.java index 0874faf8a..87f4be674 100644 --- a/src/main/java/com/glxp/api/service/inv/StockCompareDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/StockCompareDetailService.java @@ -1,16 +1,11 @@ package com.glxp.api.service.inv; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.inv.StockCompareDetailEntity; import com.glxp.api.req.inv.InvProductDetailSelectQuery; -import com.glxp.api.req.inv.InvProductDetailSelectRequest; -import com.glxp.api.res.inv.StockCompareDetailResponse; import com.glxp.api.service.CustomService; import com.glxp.api.vo.inv.InvProductDetailSelectVo; -import java.util.List; - /** * 针对表【inv_stock_compare_detail】的数据库操作Service实现 */ diff --git a/src/main/java/com/glxp/api/service/inv/StockCompareService.java b/src/main/java/com/glxp/api/service/inv/StockCompareService.java index 3bcfde4be..bdeb00749 100644 --- a/src/main/java/com/glxp/api/service/inv/StockCompareService.java +++ b/src/main/java/com/glxp/api/service/inv/StockCompareService.java @@ -1,18 +1,14 @@ package com.glxp.api.service.inv; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.entity.inv.StockCompareDetailEntity; import com.glxp.api.entity.inv.StockCompareEntity; -import com.glxp.api.dao.inv.StockCompareMapper; import com.glxp.api.req.inv.FilterInvProductRequest; import com.glxp.api.req.inv.StockCompareDetailParam; import com.glxp.api.req.inv.StockCompareParam; import com.glxp.api.req.inv.StockCompareQuery; import com.glxp.api.service.CustomService; import com.glxp.api.vo.inv.StockCompareVo; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java index 64f293bb3..e360aeca6 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java @@ -1,15 +1,12 @@ package com.glxp.api.service.inv.impl; -import cn.hutool.core.thread.ThreadUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InvInnerOrderPdfTempDao; -import com.glxp.api.entity.inv.InnerOrderEntity; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; import com.glxp.api.req.inv.DeleteStPrintTempRequest; import com.glxp.api.req.inv.FilterStPrintTempRequest; -import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.inv.InvInnerOrderPdfTempService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index fefc76a18..58a29a471 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -1,11 +1,7 @@ package com.glxp.api.service.inv.impl; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.schema.ValidateResult; -import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.util.udi.UdiCalCountUtil; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -26,6 +22,7 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inv.InnerOrderPrintResponse; import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inv.InnerOrderDetailService; @@ -36,6 +33,7 @@ import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.FileUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java index 0ee39b7e5..69854ca89 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.inv.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,8 +13,10 @@ import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.inv.*; import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.entity.inv.*; -import com.glxp.api.req.inv.AddInvPlaceOrderRequest; +import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity; +import com.glxp.api.entity.inv.InvPlaceOrderEntity; +import com.glxp.api.entity.inv.InvPreInProductDetailEntity; +import com.glxp.api.entity.inv.InvPreProductDetailEntity; import com.glxp.api.req.inv.FilterInvPlaceOrderRequest; import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.res.inv.BindInvSpaceRequest; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index 1097a182b..19cb77827 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -1,34 +1,25 @@ package com.glxp.api.service.inv.impl; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; 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.Constant; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.auth.InvSpaceDao; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.inv.*; import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.entity.inv.*; -import com.glxp.api.req.inv.AddInvPlaceOrderRequest; +import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity; +import com.glxp.api.entity.inv.InvPlaceOrderEntity; +import com.glxp.api.entity.inv.InvPreInProductDetailEntity; +import com.glxp.api.entity.inv.InvPreProductDetailEntity; import com.glxp.api.req.inv.FilterInvPlaceRequest; -import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; -import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.inv.InvPlaceOrderService; import com.glxp.api.service.inv.InvPlaceService; -import com.glxp.api.util.BeanCopyUtils; -import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.vo.basic.InvProductNewVo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -37,9 +28,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.List; -import java.util.stream.Collectors; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index 750bf8f6c..91ab22db1 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -14,7 +14,6 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; -import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvPreProductDetailResponse; import com.glxp.api.service.auth.InvSpaceService; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java index 2479e6217..474226a81 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java @@ -3,10 +3,7 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.inv.InvPreinDetailDao; -import com.glxp.api.dao.inv.InvPreinOrderDao; -import com.glxp.api.entity.inv.InvPreProductDetailEntity; import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.req.inv.FilterInvPreinDetailRequest; import com.glxp.api.res.inv.InvPreinDetailResponse; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java index c201e86bb..f92c1dba2 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java @@ -9,7 +9,6 @@ import com.glxp.api.dao.inv.InvProductNewDao; import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvProductRequest; import com.glxp.api.res.inv.InvProductResponse; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java index 0c8ef40d0..4f05fabb6 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java @@ -9,16 +9,12 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.inout.IoOrderDao; -import com.glxp.api.dao.inout.IoOrderDetailBizDao; import com.glxp.api.dao.inv.InvPreInProductDetailDao; import com.glxp.api.dao.inv.InvPreProductDetailDao; -import com.glxp.api.dao.inv.InvProductDao; import com.glxp.api.dao.inv.InvProductNewDao; import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvProductDetailResponse; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java index 8ab007377..72fe64fe1 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java @@ -1,7 +1,5 @@ package com.glxp.api.service.inv.impl; -import com.baomidou.mybatisplus.annotation.TableField; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -23,6 +21,7 @@ import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java index ba13b48bc..3120273bd 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java @@ -4,13 +4,11 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.dao.inv.InvUserProductDao; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.entity.inv.InvUserProductEntity; import com.glxp.api.service.inv.InvUserProductService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; /** * @author Lenovo diff --git a/src/main/java/com/glxp/api/service/inv/impl/StockCompareDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/StockCompareDetailServiceImpl.java index f87089ab2..4a6dd112f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/StockCompareDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/StockCompareDetailServiceImpl.java @@ -1,19 +1,14 @@ package com.glxp.api.service.inv.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.inv.StockCompareDetailMapper; import com.glxp.api.entity.inv.StockCompareDetailEntity; import com.glxp.api.req.inv.InvProductDetailSelectQuery; -import com.glxp.api.req.inv.InvProductDetailSelectRequest; -import com.glxp.api.res.inv.StockCompareDetailResponse; import com.glxp.api.service.CustomServiceImpl; import com.glxp.api.service.inv.StockCompareDetailService; import com.glxp.api.vo.inv.InvProductDetailSelectVo; import org.springframework.stereotype.Service; -import java.util.List; - /** * 针对表【inv_stock_compare】的数据库操作Service实现 diff --git a/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java index b3ad9fff2..f7c5d8650 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java @@ -10,7 +10,8 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.dao.inv.StockCompareMapper; import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.inv.InvCpLocalProductEntity; import com.glxp.api.entity.inv.InvCpThrProuductEntity; import com.glxp.api.entity.inv.StockCompareDetailEntity; diff --git a/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java b/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java index 7bda74ec5..b20dbc2e4 100644 --- a/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.monitor.impl; import cn.hutool.core.bean.BeanUtil; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.monitor.SysOperLogMapper; import com.glxp.api.entity.monitor.OperLogDTO; diff --git a/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java b/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java index 7e9fbc263..a0b2cda98 100644 --- a/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java +++ b/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java @@ -1,13 +1,7 @@ package com.glxp.api.service.purchase; - - import com.glxp.api.entity.purchase.CustomerContactEntity; -import com.glxp.api.req.purchase.CustomerContactFilterRequest; -import com.glxp.api.req.system.DeleteRequest; - -import java.util.List; public interface CustomerContactService { diff --git a/src/main/java/com/glxp/api/service/purchase/PurOrderService.java b/src/main/java/com/glxp/api/service/purchase/PurOrderService.java index d30cbb2c3..b694a2e44 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurOrderService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurOrderService.java @@ -1,13 +1,9 @@ package com.glxp.api.service.purchase; -import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurOrderRequest; -import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurOrderResponse; -import com.glxp.api.res.purchase.PurPlanResponse; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/purchase/PurPlanService.java b/src/main/java/com/glxp/api/service/purchase/PurPlanService.java index ce82211de..2304028e8 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurPlanService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurPlanService.java @@ -4,7 +4,6 @@ package com.glxp.api.service.purchase; import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurPlanResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java index ad4d9424d..ea4f2002a 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java @@ -1,17 +1,12 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.CustomerContacDao; import com.glxp.api.entity.purchase.CustomerContactEntity; -import com.glxp.api.req.purchase.CustomerContactFilterRequest; -import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.service.purchase.CustomerContactService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; @Service @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyArgumentService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyArgumentService.java index c67a1449d..3e340512b 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyArgumentService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyArgumentService.java @@ -5,23 +5,23 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.purchase.PurApplyArgumentMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.entity.purchase.PurApplyArgument; import com.glxp.api.entity.purchase.PurApplyDetailEntity; import com.glxp.api.entity.purchase.PurApplyEntity; import com.glxp.api.req.purchase.PurApplyArgumentRequest; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.DeptService; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.purchase.PurApplyArgument; -import com.glxp.api.dao.purchase.PurApplyArgumentMapper; -import org.springframework.transaction.annotation.Transactional; @Service @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyService.java index e016d6969..ce326d37e 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyService.java @@ -3,9 +3,7 @@ package com.glxp.api.service.purchase.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.inout.ReceiveDao; import com.glxp.api.dao.purchase.PurApplyDao; -import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.PurApplyEntity; import com.glxp.api.req.purchase.PurApplyRequest; import com.glxp.api.res.purchase.PurApplyResponse; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurContractDetailService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurContractDetailService.java index 87c03b527..8168db038 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurContractDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurContractDetailService.java @@ -2,23 +2,18 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.basic.BasicProductsDao; import com.glxp.api.dao.basic.UdiRlSupDao; import com.glxp.api.dao.purchase.PurContractDetailMapper; -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.purchase.PurContractDetailEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.purchase.AddPurPlanDetailRequest; import com.glxp.api.req.purchase.PurContractDetailRequest; import com.glxp.api.res.basic.UdiRlSupResponse; -import com.glxp.api.service.basic.UdiRlSupService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java index 291871a18..160574b1f 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java @@ -1,27 +1,18 @@ package com.glxp.api.service.purchase.impl; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurContractDetailMapper; import com.glxp.api.dao.purchase.PurContractMapper; import com.glxp.api.dao.purchase.PurPlanDao; -import com.glxp.api.dao.purchase.PurPlanDetailDao; import com.glxp.api.entity.purchase.PurContractDetailEntity; import com.glxp.api.entity.purchase.PurContractEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.entity.purchase.PurPlanEntity; -import com.glxp.api.req.purchase.PurApplyDetailRequest; import com.glxp.api.req.purchase.PurContractRequest; -import com.glxp.api.req.purchase.PurOrderRequest; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurContractEntityResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; -import com.glxp.api.res.purchase.PurOrderResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemDetailService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemDetailService.java index 62cc5bcb4..66726b233 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemDetailService.java @@ -2,17 +2,17 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.purchase.PurInquiryItemDetailMapper; import com.glxp.api.dao.purchase.PurInquiryItemMapper; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.purchase.PurInquiryEntity; +import com.glxp.api.entity.purchase.PurInquiryItemDetailEntity; import com.glxp.api.entity.purchase.PurInquiryItemEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.req.purchase.PurContractDetailRequest; import com.glxp.api.service.basic.BasicCorpService; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.purchase.PurInquiryItemDetailMapper; -import com.glxp.api.entity.purchase.PurInquiryItemDetailEntity; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemService.java index c621de6d1..7e8636f55 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemService.java @@ -1,31 +1,16 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.basic.UdiRlSupDao; -import com.glxp.api.entity.purchase.PurContractDetailEntity; -import com.glxp.api.req.basic.CompanyProductRelevanceRequest; +import com.glxp.api.dao.purchase.PurInquiryItemMapper; +import com.glxp.api.entity.purchase.PurInquiryItemEntity; import com.glxp.api.req.purchase.AddPurInquiryItemRequest; -import com.glxp.api.req.purchase.AddPurPlanDetailRequest; import com.glxp.api.req.purchase.PurContractDetailRequest; -import com.glxp.api.req.purchase.PurInquiryRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; -import com.glxp.api.res.basic.UdiRlSupResponse; -import com.glxp.api.res.purchase.PurInquiryEntityResponse; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.purchase.PurInquiryItemMapper; -import com.glxp.api.entity.purchase.PurInquiryItemEntity; -import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryOfferService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryOfferService.java index e3b0af12c..01fc105f4 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryOfferService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryOfferService.java @@ -2,20 +2,13 @@ package com.glxp.api.service.purchase.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.purchase.PurInquiryMapper; import com.glxp.api.dao.purchase.PurInquiryOfferMapper; -import com.glxp.api.entity.BaseEntity; import com.glxp.api.entity.purchase.*; import com.glxp.api.req.purchase.PurInquiryOfferRequest; -import com.glxp.api.req.purchase.PurInquiryRequest; -import com.glxp.api.res.purchase.PurInquiryEntityResponse; import com.glxp.api.res.purchase.PurInquiryOfferEntityResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.SysApprovalFlowService; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; -import jodd.util.StringUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryService.java index 86c2691cb..2cd6f6b37 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryService.java @@ -3,17 +3,15 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.purchase.PurInquiryMapper; +import com.glxp.api.entity.purchase.PurInquiryEntity; import com.glxp.api.entity.purchase.PurInquiryItemDetailEntity; import com.glxp.api.entity.purchase.PurInquiryItemEntity; import com.glxp.api.req.purchase.PurInquiryRequest; -import com.glxp.api.res.purchase.PurContractEntityResponse; import com.glxp.api.res.purchase.PurInquiryEntityResponse; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.purchase.PurInquiryEntity; -import com.glxp.api.dao.purchase.PurInquiryMapper; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java index 1f7295cd8..1b54d8810 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java @@ -6,16 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurOrderDao; -import com.glxp.api.dao.purchase.PurPlanDao; -import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurOrderRequest; -import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurOrderResponse; -import com.glxp.api.res.purchase.PurPlanResponse; import com.glxp.api.service.purchase.PurOrderService; -import com.glxp.api.service.purchase.PurPlanService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index d33e824af..82d3e153f 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.purchase.SupProductDao; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.req.purchase.FilterPoductRequest; diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index ac1426124..aec15fc0e 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1,23 +1,5 @@ package com.glxp.api.service.sync; -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.glxp.api.dao.collect.RelCodeBatchMapper; -import com.glxp.api.dao.collect.RelCodeDetailMapper; -import com.glxp.api.dao.dev.*; -import com.glxp.api.dao.thrsys.ThrManufacturerMapper; -import com.glxp.api.entity.collect.RelCodeBatch; -import com.glxp.api.entity.collect.RelCodeDetail; -import com.glxp.api.entity.dev.*; -import com.glxp.api.res.inv.InnerOrderPrintResponse; -import com.glxp.api.service.collect.RelCodeBatchService; -import com.glxp.api.service.collect.RelCodeDetailService; -import com.glxp.api.service.dev.*; -import com.glxp.api.service.inout.impl.IoCodeService; -import org.junit.Test; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.exceptions.ExceptionUtil; @@ -27,18 +9,27 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.*; import com.glxp.api.dao.basic.*; +import com.glxp.api.dao.collect.RelCodeBatchMapper; +import com.glxp.api.dao.collect.RelCodeDetailMapper; +import com.glxp.api.dao.dev.*; import com.glxp.api.dao.inout.*; import com.glxp.api.dao.purchase.*; import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao; +import com.glxp.api.dao.thrsys.ThrManufacturerMapper; import com.glxp.api.dto.RelaySyncDto; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.collect.RelCodeBatch; +import com.glxp.api.entity.collect.RelCodeDetail; +import com.glxp.api.entity.dev.*; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.purchase.*; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; @@ -53,12 +44,19 @@ import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.res.sync.*; import com.glxp.api.service.auth.*; import com.glxp.api.service.basic.*; -import com.glxp.api.service.inout.*; +import com.glxp.api.service.collect.RelCodeBatchService; +import com.glxp.api.service.collect.RelCodeDetailService; +import com.glxp.api.service.dev.*; +import com.glxp.api.service.inout.IoOrderDetailBizService; +import com.glxp.api.service.inout.IoOrderDetailCodeService; +import com.glxp.api.service.inout.IoOrderDetailResultService; +import com.glxp.api.service.inout.IoOrderService; +import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.system.*; import com.glxp.api.service.thrsys.*; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.JsonUtils; +import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.RedisUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -66,6 +64,7 @@ import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; @@ -76,7 +75,6 @@ import javax.annotation.Resource; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.time.LocalDateTime; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/service/sync/SocketMsgService.java b/src/main/java/com/glxp/api/service/sync/SocketMsgService.java index 2f1cd3780..8f6084006 100644 --- a/src/main/java/com/glxp/api/service/sync/SocketMsgService.java +++ b/src/main/java/com/glxp/api/service/sync/SocketMsgService.java @@ -33,7 +33,6 @@ import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.logging.Logger; @Service @Slf4j diff --git a/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java b/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java index f7c3bf1ec..af0ea67dd 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.sync; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SyncDataBustypeEntity; -import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/sync/SyncDataPurTypeService.java b/src/main/java/com/glxp/api/service/sync/SyncDataPurTypeService.java index 9db354f7c..7aca76c00 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncDataPurTypeService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncDataPurTypeService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.sync; import com.glxp.api.entity.system.SyncDataPurTypeEntity; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java b/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java index f74384b27..a235f4dd7 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.sync; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.sync.SyncEditLogEntity; import com.glxp.api.dao.sync.SyncEditLogMapper; +import com.glxp.api.entity.sync.SyncEditLogEntity; +import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java b/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java index 3d1e290ac..e6f84dc18 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.sync; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.sync.SyncEditTypeMapper; import com.glxp.api.entity.sync.SyncEditTypeEntity; +import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/sync/UpBasicService.java b/src/main/java/com/glxp/api/service/sync/UpBasicService.java index cfc8268c2..696ca4826 100644 --- a/src/main/java/com/glxp/api/service/sync/UpBasicService.java +++ b/src/main/java/com/glxp/api/service/sync/UpBasicService.java @@ -1,36 +1,34 @@ package com.glxp.api.service.sync; -import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.purchase.impl.PurOrderDetailService; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.entity.system.*; +import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; -import com.glxp.api.req.auth.*; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.res.sync.*; +import com.glxp.api.res.sync.SpsSyncBusOrderResponse; +import com.glxp.api.res.sync.SpsSyncBusResponse; +import com.glxp.api.res.sync.SpsSyncOrderResponse; import com.glxp.api.res.system.SyncDataSetResponse; -import com.glxp.api.service.auth.*; -import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBusTypeChangeService; -import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.IoOrderDetailBizService; +import com.glxp.api.service.inout.IoOrderDetailCodeService; +import com.glxp.api.service.inout.IoOrderDetailResultService; +import com.glxp.api.service.inout.IoOrderService; +import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.purchase.PurOrderService; -import com.glxp.api.service.system.*; +import com.glxp.api.service.purchase.impl.PurOrderDetailService; import com.glxp.api.service.thrsys.IThrBusTypeOriginService; import com.glxp.api.util.MsDateUtil; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/sync/UpThrDataService.java b/src/main/java/com/glxp/api/service/sync/UpThrDataService.java index 7aefee12c..8425960b3 100644 --- a/src/main/java/com/glxp/api/service/sync/UpThrDataService.java +++ b/src/main/java/com/glxp/api/service/sync/UpThrDataService.java @@ -1,23 +1,7 @@ package com.glxp.api.service.sync; -import com.glxp.api.entity.thrsys.ThrCorpEntity; -import com.glxp.api.entity.thrsys.ThrDeptEntity; -import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.api.entity.thrsys.ThrProductsEntity; -import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.res.sync.SpsSyncThrDataResponse; -import com.glxp.api.res.sync.SpsSyncThrProductsResponse; -import com.glxp.api.res.system.SyncDataSetResponse; -import com.glxp.api.service.thrsys.ThrCorpService; -import com.glxp.api.service.thrsys.ThrDeptService; -import com.glxp.api.service.thrsys.ThrInvWarehouseService; -import com.glxp.api.service.thrsys.ThrProductsService; -import com.glxp.api.util.MsDateUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; - /** * 上传第三方基础数据到自助平台 */ diff --git a/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java b/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java index eaadcd7b4..8bbe50d4f 100644 --- a/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java +++ b/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java @@ -2,18 +2,13 @@ package com.glxp.api.service.sync; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.json.JSONUtil; -import com.glxp.api.config.WebSocketServer; import com.glxp.api.constant.SocketMsgType; import com.glxp.api.dao.system.SyncDataSetDao; -import com.glxp.api.dto.RelaySyncDto; -import com.glxp.api.entity.sync.SocketMsgEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.req.inout.FilterStatDataRequest; import com.glxp.api.res.inout.IoStatOrderResponse; import com.glxp.api.service.inout.IoStatOrderService; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.task.SyncHeartService; -import com.glxp.api.task.TestStatOrderService; import lombok.extern.slf4j.Slf4j; import org.java_websocket.enums.ReadyState; import org.springframework.beans.factory.annotation.Value; @@ -21,7 +16,6 @@ import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import javax.websocket.Session; import java.net.URISyntaxException; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java index d381878f2..05a07968f 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.sync.impl; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.sync.BasicDownloadDao; diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataPurTypeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataPurTypeServiceImpl.java index 3b0bc26f3..cef83bad2 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataPurTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataPurTypeServiceImpl.java @@ -1,8 +1,6 @@ package com.glxp.api.service.sync.impl; -import com.glxp.api.dao.sync.SyncDataBustypeDao; import com.glxp.api.dao.sync.SyncDataPurtypeDao; -import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncDataPurTypeEntity; import com.glxp.api.service.sync.SyncDataPurTypeService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java index a462aa78c..f1c9b4aca 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java @@ -1,9 +1,8 @@ package com.glxp.api.service.sync.impl; -import org.springframework.beans.BeanUtils; import com.glxp.api.dao.system.SyncDataSetDao; -import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataBustypeEntity; +import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.res.system.SyncDataSetResponse; import com.glxp.api.service.sync.SyncDataBustypeService; diff --git a/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java b/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java index 751865acd..0e8bb6aeb 100644 --- a/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java +++ b/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.system; import com.glxp.api.entity.system.SysRemindMsgEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.req.system.FilterSysRemindMsgRequest; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/system/SysRemindSetService.java b/src/main/java/com/glxp/api/service/system/SysRemindSetService.java index 6c8b8162f..781d256bb 100644 --- a/src/main/java/com/glxp/api/service/system/SysRemindSetService.java +++ b/src/main/java/com/glxp/api/service/system/SysRemindSetService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.system; import com.glxp.api.entity.system.SysRemindSetEntity; import com.glxp.api.req.system.FilterSysRemindSetRequest; -import com.glxp.api.util.page.TableDataInfo; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/system/SysTableHeadService.java b/src/main/java/com/glxp/api/service/system/SysTableHeadService.java index b85f28548..e4d00a8ad 100644 --- a/src/main/java/com/glxp/api/service/system/SysTableHeadService.java +++ b/src/main/java/com/glxp/api/service/system/SysTableHeadService.java @@ -1,15 +1,13 @@ package com.glxp.api.service.system; -import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.system.SysTableHeadMapper; +import com.glxp.api.entity.system.SysTableHeadEntity; import com.glxp.api.req.system.SysTableHeadRequest; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.system.SysTableHeadEntity; -import com.glxp.api.dao.system.SysTableHeadMapper; import javax.annotation.Resource; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/system/VersionService.java b/src/main/java/com/glxp/api/service/system/VersionService.java index 5de6cd7d2..33a3a170d 100644 --- a/src/main/java/com/glxp/api/service/system/VersionService.java +++ b/src/main/java/com/glxp/api/service/system/VersionService.java @@ -2,11 +2,8 @@ package com.glxp.api.service.system; import com.glxp.api.entity.system.VersionEntity; -import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.FilterVersionRequest; -import java.util.List; - public interface VersionService { VersionEntity getVersion(FilterVersionRequest filterVersionRequest); diff --git a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java index ccbac2b67..54b5b7f16 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java @@ -1,15 +1,12 @@ package com.glxp.api.service.system.impl; import com.glxp.api.dao.system.SyncUploadDataSetDao; -import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncUploadDataSetEntity; -import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.service.system.SyncUploadDataSetService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.List; @Service @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java index 1202d1fa7..37db19570 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java @@ -1,13 +1,11 @@ package com.glxp.api.service.system.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; -import com.glxp.api.req.system.FilterSysRemindMsgRequest; -import org.springframework.stereotype.Service; - import com.glxp.api.dao.system.SysRemindMsgMapper; import com.glxp.api.entity.system.SysRemindMsgEntity; +import com.glxp.api.req.system.FilterSysRemindMsgRequest; import com.glxp.api.service.system.SysRemindMsgService; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java index fabfdd000..09c8d8086 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java @@ -10,9 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/system/impl/VersionServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/VersionServiceImpl.java index 54857679f..e6bb6b21f 100644 --- a/src/main/java/com/glxp/api/service/system/impl/VersionServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/VersionServiceImpl.java @@ -2,13 +2,11 @@ package com.glxp.api.service.system.impl; import com.glxp.api.dao.system.VersionDao; import com.glxp.api.entity.system.VersionEntity; -import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.FilterVersionRequest; import com.glxp.api.service.system.VersionService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; @Service public class VersionServiceImpl implements VersionService { diff --git a/src/main/java/com/glxp/api/service/thrsys/BasicInsChdrugService.java b/src/main/java/com/glxp/api/service/thrsys/BasicInsChdrugService.java index 03e47a71f..ffebeb99d 100644 --- a/src/main/java/com/glxp/api/service/thrsys/BasicInsChdrugService.java +++ b/src/main/java/com/glxp/api/service/thrsys/BasicInsChdrugService.java @@ -1,11 +1,11 @@ package com.glxp.api.service.thrsys; -import com.github.pagehelper.PageHelper; -import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.BasicInsChdrugMapper; import com.glxp.api.entity.thrsys.BasicInsChdrugEntity; +import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest; +import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/BasicInsDrugService.java b/src/main/java/com/glxp/api/service/thrsys/BasicInsDrugService.java index 65ebcdaa0..38d12ebe5 100644 --- a/src/main/java/com/glxp/api/service/thrsys/BasicInsDrugService.java +++ b/src/main/java/com/glxp/api/service/thrsys/BasicInsDrugService.java @@ -1,13 +1,11 @@ package com.glxp.api.service.thrsys; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.thrsys.BasicInsChdrugEntity; -import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest; +import com.glxp.api.dao.thrsys.BasicInsDrugMapper; +import com.glxp.api.entity.thrsys.BasicInsDrugEntity; import com.glxp.api.req.thrsys.ThrInsDrugFeeRequest; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.thrsys.BasicInsDrugEntity; -import com.glxp.api.dao.thrsys.BasicInsDrugMapper; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java b/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java index c7b9c9016..9bd26f81e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java +++ b/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java @@ -1,13 +1,11 @@ package com.glxp.api.service.thrsys; -import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.thrsys.BasicInsChdrugEntity; -import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest; -import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.BasicInsMaterialMapper; import com.glxp.api.entity.thrsys.BasicInsMaterialEntity; +import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest; +import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/DeptMaterialCategoryService.java b/src/main/java/com/glxp/api/service/thrsys/DeptMaterialCategoryService.java index 6eb2a53d2..a810edb61 100644 --- a/src/main/java/com/glxp/api/service/thrsys/DeptMaterialCategoryService.java +++ b/src/main/java/com/glxp/api/service/thrsys/DeptMaterialCategoryService.java @@ -1,10 +1,9 @@ package com.glxp.api.service.thrsys; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.thrsys.DeptMaterialCategoryMapper; import com.glxp.api.entity.thrsys.DeptMaterialCategory; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import com.glxp.api.dao.thrsys.DeptMaterialCategoryMapper; import org.springframework.transaction.annotation.Transactional; @Service diff --git a/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java b/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java index 23f3d87d1..186b34377 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java @@ -3,8 +3,6 @@ package com.glxp.api.service.thrsys; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrConsumeMaterialCategoryService.java b/src/main/java/com/glxp/api/service/thrsys/ThrConsumeMaterialCategoryService.java index 17b3f8422..a457b1483 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrConsumeMaterialCategoryService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrConsumeMaterialCategoryService.java @@ -5,22 +5,19 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.thrsys.DeptMaterialCategoryMapper; -import com.glxp.api.entity.auth.SysRole; +import com.glxp.api.dao.thrsys.ThrConsumeMaterialCategoryMapper; import com.glxp.api.entity.thrsys.DeptMaterialCategory; -import com.glxp.api.entity.thrsys.ThrConsumeMaterialCategoryTree; +import com.glxp.api.entity.thrsys.ThrConsumeMaterialCategory; import com.glxp.api.req.thrsys.UpdateBindCategoryRequest; import com.glxp.api.res.chs.YbHcflEntityResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.util.TreeBuildUtils; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.thrsys.ThrConsumeMaterialCategory; -import com.glxp.api.dao.thrsys.ThrConsumeMaterialCategoryMapper; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import javax.validation.constraints.NotNull; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java index 58c999835..a6cb98750 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys; -import org.springframework.beans.BeanUtils; import cn.hutool.core.io.file.FileWriter; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; @@ -19,7 +18,6 @@ import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.ExcelUtil; import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java index 6f9bce6be..f9dd39ccd 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java @@ -1,8 +1,6 @@ package com.glxp.api.service.thrsys; -import org.springframework.beans.BeanUtils; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpBasicClient; @@ -15,7 +13,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrHslbService.java b/src/main/java/com/glxp/api/service/thrsys/ThrHslbService.java index b412d2b9f..24b360a13 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrHslbService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrHslbService.java @@ -1,13 +1,11 @@ package com.glxp.api.service.thrsys; -import com.github.pagehelper.PageHelper; -import com.glxp.api.req.thrsys.FilterThrCorpRequest; -import com.glxp.api.req.thrsys.FilterThrHslbRequest; -import com.glxp.api.res.thrsys.ThrCorpsResponse; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrHslbMapper; import com.glxp.api.entity.thrsys.ThrHslbEntity; +import com.glxp.api.req.thrsys.FilterThrHslbRequest; +import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java index 57c2d11d2..092297e60 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.thrsys; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.thrsys.ThrInvOrder; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.req.inv.FilterInvProductRequest; import com.glxp.api.req.thrsys.FilterDownloadInvOrderRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java index effbeced4..a2dc7b7bf 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java @@ -1,14 +1,16 @@ package com.glxp.api.service.thrsys; -import org.springframework.beans.BeanUtils; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.config.WebSocketServer; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; import com.glxp.api.entity.thrsys.*; import com.glxp.api.http.ErpInvClient; -import com.glxp.api.req.thrsys.*; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.req.thrsys.ThrInvProductsExportRequest; +import com.glxp.api.req.thrsys.ThrOnhandRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; import com.glxp.api.service.auth.CustomerService; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java index 6e887cec1..7c90db137 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java @@ -6,7 +6,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; -import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java b/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java index 603c32ce0..2ea0ebfaf 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java @@ -1,31 +1,25 @@ package com.glxp.api.service.thrsys; import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.config.WebSocketServer; -import com.glxp.api.constant.BasicProcessStatus; -import com.glxp.api.constant.Constant; -import com.glxp.api.dao.thrsys.ThrCorpDao; -import com.glxp.api.entity.thrsys.*; +import com.glxp.api.dao.thrsys.ThrManufacturerMapper; +import com.glxp.api.entity.thrsys.ThrManufacturerEntity; +import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.req.thrsys.*; +import com.glxp.api.req.thrsys.FilterBasicProducstRequest; +import com.glxp.api.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.req.thrsys.ThrManuFilterRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.thrsys.ThrCorpsResponse; -import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.thrsys.ThrManufacturerMapper; import javax.annotation.Resource; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; @Service public class ThrManufacturerService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java index 3e56ebb40..3ffffefec 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java @@ -4,8 +4,6 @@ package com.glxp.api.service.thrsys; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.res.thrsys.ThrErpOrderResponse; -import com.glxp.api.res.thrsys.ThrOrderResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBustypesService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBustypesService.java index 46a0c63ab..383250021 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBustypesService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderUploadBustypesService.java @@ -1,10 +1,10 @@ package com.glxp.api.service.thrsys; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.thrsys.ThrOrderUploadBustypesMapper; import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity; +import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java index 131cd8530..e47801937 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys; -import org.springframework.beans.BeanUtils; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java index 54ec5a904..98946c962 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java @@ -1,13 +1,11 @@ package com.glxp.api.service.thrsys; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.entity.thrsys.ThrHslbEntity; -import com.glxp.api.req.thrsys.FilterThrHslbRequest; +import com.glxp.api.dao.thrsys.ThrProductTypeMapper; +import com.glxp.api.entity.thrsys.ThrProductTypeEntity; import com.glxp.api.req.thrsys.FilterThrProductTypeRequest; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.thrsys.ThrProductTypeEntity; -import com.glxp.api.dao.thrsys.ThrProductTypeMapper; import javax.annotation.Resource; import java.util.Collections; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java index 4db419c05..1b794e369 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java @@ -1,14 +1,6 @@ package com.glxp.api.service.thrsys; -import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; -import com.glxp.api.req.thrsys.AddThrDiProductsRequest; -import com.glxp.api.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.res.thrsys.ThrProductsAddDiResponse; -import com.glxp.api.res.thrsys.UdiInfoResponse; - -import java.util.List; - public interface ThrProductsAddDiService { diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java index 9a32c8f38..9a109c9f3 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys; -import org.springframework.beans.BeanUtils; import cn.hutool.core.io.file.FileWriter; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java index ae930ebef..b0e24ab54 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java @@ -9,8 +9,6 @@ import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.req.thrsys.PostThrProductsRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; -import org.apache.ibatis.annotations.Param; -import org.springframework.web.multipart.MultipartFile; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java index 98bea2b83..083cf5ee6 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.thrsys; import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java index c99127995..91fe89296 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java @@ -1,7 +1,5 @@ package com.glxp.api.service.thrsys; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java index 0e0e07e50..4e86a7cb6 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java @@ -4,7 +4,6 @@ package com.glxp.api.service.thrsys; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java b/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java index 309353661..de4e9cb33 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java @@ -1,21 +1,16 @@ package com.glxp.api.service.thrsys; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; import cn.hutool.extra.pinyin.PinyinUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpBasicClient; -import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.BasicErpUnitsResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; -import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.util.CustomUtil; import org.springframework.beans.BeanUtils; @@ -27,7 +22,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; @Service public class ThrUnitImportService { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java index c481fd023..7e69eee93 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -22,6 +21,7 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.IThrBusTypeOriginService; import com.glxp.api.service.thrsys.ThrSystemDetailService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java index 6cef3fe62..5984e0773 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -11,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; -import java.util.Date; import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java index 2e5986f3b..23c2fbbd6 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -16,6 +15,7 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import com.glxp.api.service.thrsys.ThrCorpService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderDetailServiceImpl.java index ce69c03e1..5a33588ff 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderDetailServiceImpl.java @@ -1,11 +1,9 @@ package com.glxp.api.service.thrsys.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrInvOrderDetailMapper; import com.glxp.api.entity.thrsys.ThrInvOrderDetail; -import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.req.thrsys.FilterThrInvOrderDetailRequest; import com.glxp.api.service.thrsys.ThrInvOrderDetailService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index fdabc0272..94db808e4 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -23,7 +23,10 @@ import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.thrsys.*; +import com.glxp.api.entity.thrsys.ThrInvOrder; +import com.glxp.api.entity.thrsys.ThrInvOrderDetail; +import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; +import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.http.ErpInvClient; import com.glxp.api.req.inv.FilterInvProductRequest; @@ -55,10 +58,8 @@ import com.glxp.api.util.IntUtil; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; -import io.netty.util.internal.ThrowableUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; -import org.apache.regexp.RE; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java index 0064183de..2c53c914e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java @@ -4,14 +4,12 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrInvProductsDetailDao; import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsDetailService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; -import java.util.Date; import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java index 27ef9c7ac..12f17040a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; - import com.glxp.api.dao.thrsys.ThrInvProductsDao; import com.glxp.api.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; @@ -12,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; -import java.util.Date; import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index c2c0bfe35..205901a51 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -14,10 +13,10 @@ import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; import com.glxp.api.req.thrsys.UdiwmsWarehouseRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; import com.glxp.api.res.thrsys.UdiwmsWarehouseDetail; import com.glxp.api.service.thrsys.ThrInvWarehouseService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index 999841709..a2a68265e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.dao.thrsys.ThrOrderImportLogDao; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java index 81560310a..5d293bd55 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,11 +8,11 @@ import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; import com.glxp.api.dao.thrsys.ThrOrderDao; import com.glxp.api.dao.thrsys.ThrOrderDetailDao; -import com.glxp.api.entity.thrsys.*; -import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.entity.thrsys.ThrOrderEntity; +import com.glxp.api.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; +import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.res.thrsys.ThrErpOrderResponse; -import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.service.thrsys.ThrOrderImportLogService; import com.glxp.api.service.thrsys.ThrOrderService; import com.glxp.api.service.thrsys.ThrOrdersDlService; @@ -23,12 +22,10 @@ import com.glxp.api.util.IntUtil; import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.RedisUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index f6c9a55be..1fb78c72a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -1,28 +1,9 @@ package com.glxp.api.service.thrsys.impl; -import org.springframework.beans.BeanUtils; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.thrsys.ThrProductsAddDiDao; -import com.glxp.api.entity.basic.ProductInfoEntity; -import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; -import com.glxp.api.req.thrsys.AddThrDiProductsRequest; -import com.glxp.api.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.res.thrsys.ThrProductsAddDiResponse; -import com.glxp.api.res.thrsys.UdiInfoResponse; -import com.glxp.api.service.basic.ProductInfoService; import com.glxp.api.service.thrsys.ThrProductsAddDiService; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - @Service @Transactional(rollbackFor = Exception.class) public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index ea2a95d58..53f646996 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -1,12 +1,6 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.bean.BeanUtil; -import com.glxp.api.http.sync.SpGetHttpClient; -import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.req.thrsys.PostRelProductRequest; -import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.util.*; -import org.springframework.beans.BeanUtils; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; @@ -23,19 +17,28 @@ import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpBasicClient; +import com.glxp.api.http.sync.SpGetHttpClient; +import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.req.thrsys.PostRelProductRequest; import com.glxp.api.req.thrsys.PostThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.service.basic.UdiContrastService; +import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrProductsService; +import com.glxp.api.util.IntUtil; +import com.glxp.api.util.MsDateUtil; +import com.glxp.api.util.RedisUtil; +import com.glxp.api.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java index 4e8c7eb2a..8229cee60 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java @@ -3,9 +3,7 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.thrsys.ThrProductsDao; import com.glxp.api.dao.thrsys.ThrSystemBusApiDao; -import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import com.glxp.api.service.thrsys.ThrSystemBusApiService; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java index ed60c2323..90623f2b7 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java @@ -1,9 +1,7 @@ package com.glxp.api.service.thrsys.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.common.res.BaseResponse; import com.glxp.api.dao.thrsys.ThrSystemDetailDao; -import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; diff --git a/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java b/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java index c25bf6a96..ebd00c762 100644 --- a/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java +++ b/src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java @@ -11,21 +11,16 @@ import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.alihealth.local.AliBillsDisposeReqeust; import com.glxp.api.req.collect.IoCollectCodeRequest; import com.glxp.api.req.system.ScheduledRequest; - import com.glxp.api.service.system.SystemParamConfigService; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; import org.springframework.scheduling.config.ScheduledTaskRegistrar; import org.springframework.scheduling.support.CronTrigger; import org.springframework.stereotype.Component; -import redis.clients.jedis.resps.Tuple; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; @Component diff --git a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java index ec0dfd45f..8cba9bc7b 100644 --- a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java +++ b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java @@ -1,19 +1,16 @@ package com.glxp.api.task; -import javax.annotation.Resource; - +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.system.ScheduledEntity; +import com.glxp.api.idc.service.IdcService; +import com.glxp.api.req.system.ScheduledRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; import org.springframework.scheduling.config.ScheduledTaskRegistrar; import org.springframework.scheduling.support.CronTrigger; -import org.springframework.stereotype.Component; -import com.glxp.api.dao.schedule.ScheduledDao; -import com.glxp.api.entity.system.ScheduledEntity; -import com.glxp.api.idc.service.IdcService; -import com.glxp.api.req.system.ScheduledRequest; +import javax.annotation.Resource; // //@Component diff --git a/src/main/java/com/glxp/api/task/AsyncInvRationTask.java b/src/main/java/com/glxp/api/task/AsyncInvRationTask.java index 35a4e3fa0..c2d029394 100644 --- a/src/main/java/com/glxp/api/task/AsyncInvRationTask.java +++ b/src/main/java/com/glxp/api/task/AsyncInvRationTask.java @@ -1,10 +1,11 @@ package com.glxp.api.task; -import javax.annotation.Resource; - import cn.hutool.core.collection.CollUtil; import cn.hutool.core.thread.ThreadUtil; +import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.inv.InvProductRationEntity; +import com.glxp.api.entity.system.ScheduledEntity; +import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.service.inv.InvProductRationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,13 +13,9 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; import org.springframework.scheduling.config.ScheduledTaskRegistrar; import org.springframework.scheduling.support.CronTrigger; - -import com.glxp.api.dao.schedule.ScheduledDao; -import com.glxp.api.entity.system.ScheduledEntity; -import com.glxp.api.idc.service.IdcService; -import com.glxp.api.req.system.ScheduledRequest; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderDownloadTask.java b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderDownloadTask.java index 17f622deb..312ebf835 100644 --- a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderDownloadTask.java +++ b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderDownloadTask.java @@ -1,26 +1,18 @@ package com.glxp.api.task; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.collect.IoCollectSet; -import com.glxp.api.entity.inv.InvProductRationEntity; import com.glxp.api.entity.system.ScheduledEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.system.ScheduledRequest; -import com.glxp.api.req.system.SysParamConfigSaveRequest; import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; import com.glxp.api.service.collect.IoCollectOriginService; import com.glxp.api.service.collect.IoCollectSetService; -import com.glxp.api.service.inv.InvProductRationService; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.MsDateUtil; -import com.glxp.api.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,8 +25,6 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @Slf4j @Component diff --git a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderFinishTask.java b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderFinishTask.java index f0e2559da..13b885546 100644 --- a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderFinishTask.java +++ b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderFinishTask.java @@ -1,10 +1,7 @@ package com.glxp.api.task; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.SysWorkplaceBus; @@ -12,17 +9,13 @@ import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectSet; import com.glxp.api.entity.system.ScheduledEntity; -import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.system.ScheduledRequest; -import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; import com.glxp.api.service.basic.SysWorkplaceBusService; import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.collect.IoCollectOrderService; -import com.glxp.api.service.collect.IoCollectOriginService; import com.glxp.api.service.collect.IoCollectSetService; import com.glxp.api.util.IntUtil; -import com.glxp.api.util.MsDateUtil; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +27,6 @@ import org.springframework.scheduling.support.CronTrigger; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.util.Date; import java.util.List; @Slf4j diff --git a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderReprocessTask.java b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderReprocessTask.java index 07e471ec2..17dfa9325 100644 --- a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderReprocessTask.java +++ b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderReprocessTask.java @@ -1,26 +1,14 @@ package com.glxp.api.task; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; import com.glxp.api.dao.schedule.ScheduledDao; -import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderOrigin; -import com.glxp.api.entity.collect.IoCollectSet; import com.glxp.api.entity.system.ScheduledEntity; -import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.system.ScheduledRequest; -import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; -import com.glxp.api.service.basic.SysWorkplaceBusService; -import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.collect.IoCollectOrderOriginService; -import com.glxp.api.service.collect.IoCollectOrderService; import com.glxp.api.service.collect.IoCollectOriginService; -import com.glxp.api.service.collect.IoCollectSetService; -import com.glxp.api.util.MsDateUtil; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,8 +19,6 @@ import org.springframework.scheduling.support.CronTrigger; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.sql.SQLException; -import java.util.Date; import java.util.List; @Slf4j diff --git a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java index f9a56647f..51fd5eb0c 100644 --- a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java +++ b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java @@ -1,20 +1,16 @@ package com.glxp.api.task; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; -import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.collect.IoCollectSet; -import com.glxp.api.entity.system.ScheduledEntity; -import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.system.ScheduledRequest; -import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; -import com.glxp.api.res.collect.IoCollectCodeResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; -import com.glxp.api.service.collect.*; +import com.glxp.api.service.collect.IoCollectCodeService; +import com.glxp.api.service.collect.IoCollectOrderBackupService; +import com.glxp.api.service.collect.IoCollectSetService; import com.glxp.api.util.MsDateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/glxp/api/task/AsyncUnpackExpireTask.java b/src/main/java/com/glxp/api/task/AsyncUnpackExpireTask.java index 24b4a0948..4ef5cee13 100644 --- a/src/main/java/com/glxp/api/task/AsyncUnpackExpireTask.java +++ b/src/main/java/com/glxp/api/task/AsyncUnpackExpireTask.java @@ -2,7 +2,6 @@ package com.glxp.api.task; import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.system.ScheduledEntity; -import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.service.inout.IoSplitCodeService; import org.slf4j.Logger; diff --git a/src/main/java/com/glxp/api/task/CollectOrderEelCodeCountTask.java b/src/main/java/com/glxp/api/task/CollectOrderEelCodeCountTask.java index bf9ed9346..24d2c69e2 100644 --- a/src/main/java/com/glxp/api/task/CollectOrderEelCodeCountTask.java +++ b/src/main/java/com/glxp/api/task/CollectOrderEelCodeCountTask.java @@ -1,36 +1,23 @@ package com.glxp.api.task; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.glxp.api.common.res.BaseResponse; import com.glxp.api.dao.collect.IoCollectCodeBackMapper; import com.glxp.api.dao.collect.RelCodeDetailMapper; import com.glxp.api.dao.schedule.ScheduledDao; -import com.glxp.api.entity.collect.IoCollectCode; import com.glxp.api.entity.collect.IoCollectCodeBackup; -import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.service.collect.IoCollectCodeBackService; -import com.glxp.api.service.collect.RelCodeBatchService; -import com.glxp.api.service.collect.RelCodeDetailService; -import com.glxp.api.util.CacheUtils; -import com.glxp.api.util.RedisUtil; -import com.glxp.api.util.redis.RedisDelayedQueue; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; import org.springframework.scheduling.config.ScheduledTaskRegistrar; import org.springframework.scheduling.support.CronTrigger; import org.springframework.stereotype.Component; -import redis.clients.jedis.resps.Tuple; import javax.annotation.Resource; -import java.util.*; +import java.util.List; @Component @EnableScheduling diff --git a/src/main/java/com/glxp/api/task/LedClearTask.java b/src/main/java/com/glxp/api/task/LedClearTask.java index d77802899..34a35ff55 100644 --- a/src/main/java/com/glxp/api/task/LedClearTask.java +++ b/src/main/java/com/glxp/api/task/LedClearTask.java @@ -1,26 +1,21 @@ package com.glxp.api.task; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.schedule.ScheduledDao; -import com.glxp.api.entity.basic.SysWorkplaceQueue; -import com.glxp.api.entity.collect.*; +import com.glxp.api.entity.collect.IoCollectLedGroup; +import com.glxp.api.entity.collect.IoCollectOrderBiz; +import com.glxp.api.entity.collect.SysOrderLed; import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.service.basic.SysWorkplaceQueueService; -import com.glxp.api.service.collect.*; +import com.glxp.api.service.collect.IoCollectLedGroupService; +import com.glxp.api.service.collect.IoCollectOrderBizService; +import com.glxp.api.service.collect.SysOrderLedService; import com.glxp.api.service.inout.IoSplitCodeService; -import com.glxp.api.util.IntUtil; import com.glxp.api.util.RedisUtil; import com.glxp.api.util.redis.RedisDelayedQueue; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; -import org.jfree.ui.Spinner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; import org.springframework.scheduling.config.ScheduledTaskRegistrar; @@ -29,7 +24,8 @@ import org.springframework.stereotype.Component; import redis.clients.jedis.resps.Tuple; import javax.annotation.Resource; -import java.util.*; +import java.util.Iterator; +import java.util.List; @Component @EnableScheduling diff --git a/src/main/java/com/glxp/api/task/ScanThrOrderGenerateOrderTask.java b/src/main/java/com/glxp/api/task/ScanThrOrderGenerateOrderTask.java index 22b7825f9..3c4184272 100644 --- a/src/main/java/com/glxp/api/task/ScanThrOrderGenerateOrderTask.java +++ b/src/main/java/com/glxp/api/task/ScanThrOrderGenerateOrderTask.java @@ -1,6 +1,5 @@ package com.glxp.api.task; -import cn.hutool.core.thread.ThreadUtil; import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.req.system.ScheduledRequest; diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 736423d74..68c739e6c 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -1,6 +1,5 @@ package com.glxp.api.task; -import com.glxp.api.constant.BasicExportTypeEnum; import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.dao.system.SyncDataSetDao; import com.glxp.api.entity.system.ScheduledEntity; @@ -9,7 +8,6 @@ import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.service.sync.HeartService; import com.glxp.api.util.RedisUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; import org.springframework.scheduling.config.ScheduledTaskRegistrar; @@ -17,7 +15,6 @@ import org.springframework.scheduling.support.CronTrigger; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.util.Arrays; @Slf4j @Component diff --git a/src/main/java/com/glxp/api/task/SyncThirdSysTask.java b/src/main/java/com/glxp/api/task/SyncThirdSysTask.java index 62f654516..e7c96fa22 100644 --- a/src/main/java/com/glxp/api/task/SyncThirdSysTask.java +++ b/src/main/java/com/glxp/api/task/SyncThirdSysTask.java @@ -1,15 +1,12 @@ package com.glxp.api.task; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.glxp.api.constant.ThirdSysConstant; import com.glxp.api.dao.schedule.ScheduledDao; -import com.glxp.api.dao.system.SyncDataSetDao; import com.glxp.api.dao.thrsys.ThrSystemDetailDao; -import com.glxp.api.entity.inv.InvPlaceOrderEntity; import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.req.basic.DlThirdDestinyRequest; diff --git a/src/main/java/com/glxp/api/task/TaskExecutorConfig.java b/src/main/java/com/glxp/api/task/TaskExecutorConfig.java index 959500cea..67dcdd146 100644 --- a/src/main/java/com/glxp/api/task/TaskExecutorConfig.java +++ b/src/main/java/com/glxp/api/task/TaskExecutorConfig.java @@ -4,9 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.AsyncConfigurer; -import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.lang.reflect.Method; diff --git a/src/main/java/com/glxp/api/util/FileUtils.java b/src/main/java/com/glxp/api/util/FileUtils.java index 8bf1cd6b5..238b1a9c5 100644 --- a/src/main/java/com/glxp/api/util/FileUtils.java +++ b/src/main/java/com/glxp/api/util/FileUtils.java @@ -2,20 +2,7 @@ package com.glxp.api.util; import cn.hutool.core.util.StrUtil; -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.RandomAccessFile; -import java.io.Reader; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; diff --git a/src/main/java/com/glxp/api/util/MultipartFileTest.java b/src/main/java/com/glxp/api/util/MultipartFileTest.java index a3f32642c..315ed5fb6 100644 --- a/src/main/java/com/glxp/api/util/MultipartFileTest.java +++ b/src/main/java/com/glxp/api/util/MultipartFileTest.java @@ -9,8 +9,9 @@ import org.springframework.http.MediaType; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; - -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; public class MultipartFileTest { diff --git a/src/main/java/com/glxp/api/util/RedisUtil.java b/src/main/java/com/glxp/api/util/RedisUtil.java index 97f5e4265..49c91e56c 100644 --- a/src/main/java/com/glxp/api/util/RedisUtil.java +++ b/src/main/java/com/glxp/api/util/RedisUtil.java @@ -2,12 +2,10 @@ package com.glxp.api.util; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; -import org.jfree.util.Log; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java b/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java index 183410d12..bf9d52594 100644 --- a/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java +++ b/src/main/java/com/glxp/api/util/alihealth/AlihealthYljgUtils.java @@ -14,8 +14,6 @@ import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.req.alihealth.*; import com.glxp.api.res.alihealth.*; -import com.glxp.api.service.collect.RelCodeBatchService; -import com.glxp.api.service.collect.RelCodeDetailService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java b/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java index 25859bac6..ed9f8af7b 100644 --- a/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java +++ b/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java @@ -6,7 +6,6 @@ import redis.clients.jedis.resps.Tuple; import java.util.Iterator; import java.util.List; -import java.util.Set; @Component public class RedisDelayedQueue { diff --git a/src/main/java/com/glxp/api/util/test.java b/src/main/java/com/glxp/api/util/test.java index f68227035..1dec0a580 100644 --- a/src/main/java/com/glxp/api/util/test.java +++ b/src/main/java/com/glxp/api/util/test.java @@ -1,11 +1,6 @@ package com.glxp.api.util; -import com.glxp.api.constant.Constant; -import org.springframework.stereotype.Service; - import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; public class test { diff --git a/src/main/java/com/glxp/api/vo/dev/DeviceCheckDetailVo.java b/src/main/java/com/glxp/api/vo/dev/DeviceCheckDetailVo.java index 9057caf3a..dd92f1bba 100644 --- a/src/main/java/com/glxp/api/vo/dev/DeviceCheckDetailVo.java +++ b/src/main/java/com/glxp/api/vo/dev/DeviceCheckDetailVo.java @@ -1,6 +1,5 @@ package com.glxp.api.vo.dev; -import io.swagger.models.auth.In; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/vo/dev/DevicePlanDetailVo.java b/src/main/java/com/glxp/api/vo/dev/DevicePlanDetailVo.java index f5e6c5d6a..2180014eb 100644 --- a/src/main/java/com/glxp/api/vo/dev/DevicePlanDetailVo.java +++ b/src/main/java/com/glxp/api/vo/dev/DevicePlanDetailVo.java @@ -1,6 +1,5 @@ package com.glxp.api.vo.dev; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.dev.DevicePlanDetailEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/vo/dev/DevicePlanVo.java b/src/main/java/com/glxp/api/vo/dev/DevicePlanVo.java index c126e5b4d..d7ae0bb90 100644 --- a/src/main/java/com/glxp/api/vo/dev/DevicePlanVo.java +++ b/src/main/java/com/glxp/api/vo/dev/DevicePlanVo.java @@ -1,6 +1,5 @@ package com.glxp.api.vo.dev; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; import com.glxp.api.entity.dev.DevicePlanEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/vo/dev/DeviceRepairApplyDetailVo.java b/src/main/java/com/glxp/api/vo/dev/DeviceRepairApplyDetailVo.java index bcc0e12c4..2c3ebe92b 100644 --- a/src/main/java/com/glxp/api/vo/dev/DeviceRepairApplyDetailVo.java +++ b/src/main/java/com/glxp/api/vo/dev/DeviceRepairApplyDetailVo.java @@ -1,7 +1,6 @@ package com.glxp.api.vo.dev; import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; -import com.glxp.api.entity.dev.DeviceRepairApplyEntity; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepDetailVo.java b/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepDetailVo.java index 8ce0f39c6..4280e8eda 100644 --- a/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepDetailVo.java +++ b/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepDetailVo.java @@ -1,6 +1,5 @@ package com.glxp.api.vo.dev; -import com.glxp.api.entity.dev.DeviceUpkeepEntity; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepPrintVo.java b/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepPrintVo.java index c39948754..e6e9579ad 100644 --- a/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepPrintVo.java +++ b/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepPrintVo.java @@ -1,7 +1,6 @@ package com.glxp.api.vo.dev; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; -import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity; import com.glxp.api.entity.dev.DeviceUpkeepDetailItemEntity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepVo.java b/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepVo.java index a6c3d0ca0..b7bf2802f 100644 --- a/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepVo.java +++ b/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepVo.java @@ -1,6 +1,5 @@ package com.glxp.api.vo.dev; -import com.glxp.api.entity.dev.DeviceCheckEntity; import com.glxp.api.entity.dev.DeviceUpkeepEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/vo/inv/InvProductDetailSelectVo.java b/src/main/java/com/glxp/api/vo/inv/InvProductDetailSelectVo.java index 80eb08619..5a4ad5118 100644 --- a/src/main/java/com/glxp/api/vo/inv/InvProductDetailSelectVo.java +++ b/src/main/java/com/glxp/api/vo/inv/InvProductDetailSelectVo.java @@ -1,10 +1,7 @@ package com.glxp.api.vo.inv; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; -import java.time.LocalDate; - @Data public class InvProductDetailSelectVo { private Long productId; diff --git a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml index 35efa1e4e..15dc1e22e 100644 --- a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml @@ -25,8 +25,6 @@ - - - - - replace @@ -62,7 +57,6 @@ #{remark}, now()) - DELETE FROM auth_user_bustype