From 9eb9a6a08305cd6e5c1260c80d708aa869bdd9a1 Mon Sep 17 00:00:00 2001 From: xiaqihang <xiaqihang@seaskysh.com> Date: Sun, 26 Sep 2021 10:05:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E5=BC=80=E4=BC=9A=E6=97=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seasky/seaskyocr/dto/account/AccountCmd.java | 3 +-- .../seasky/seaskyocr/dto/account/AccountOut.java | 3 --- .../java/com/seasky/seaskyocr/dto/ocr/OcrCmd.java | 5 ++--- .../java/com/seasky/seaskyocr/dto/ocr/OcrOut.java | 5 ++--- .../java/com/seasky/seaskyocr/dto/ocr/OcrQry.java | 4 ++-- .../command/contract/ContractCmdServiceImpl.java | 1 - .../domain/aggregate/account/AccountAggregate.java | 13 ++----------- .../domain/aggregate/account/AccountVO.java | 6 +----- .../domain/aggregate/account/AuthEntity.java | 12 +++++++++++- .../domain/aggregate/ocr/OcrAccountsVo.java | 8 -------- .../domain/aggregate/ocr/OcrAggregate.java | 8 ++------ .../seaskyocr/domain/aggregate/ocr/OcrCommonVo.java | 4 ++-- .../seasky/seaskyocr/domain}/enums/MethodEnum.java | 2 +- .../seaskyocr/domain}/enums/SupplierEnum.java | 2 +- .../service/account/AccountDomainServiceImpl.java | 10 +--------- .../ocrFactory/productImpl/HeHeProductImpl.java | 9 ++------- .../infrastructure/dataobject/po/AccountPO.java | 3 +-- .../infrastructure/dataobject/po/OcrPO.java | 1 - .../reader/account/AccountQueryServiceImpl.java | 3 +-- .../infrastructure/reader/ocr/OcrQueryConvert.java | 5 ++--- .../account/AccountConvertForRepository.java | 3 +-- .../repository/account/AccountRepositoryImpl.java | 3 --- .../repository/ocr/OcrConvertForRepository.java | 4 ++-- .../command/account/AccountCmdServiceTest.java | 4 +--- .../application/command/ocr/OcrCmdServiceTest.java | 6 ++---- .../application/query/ocr/OcrQueryServiceTest.java | 4 +--- 26 files changed, 41 insertions(+), 90 deletions(-) rename ServiceSite/{facade/src/main/java/com/seasky/seaskyocr => src/main/java/com/seasky/seaskyocr/domain}/enums/MethodEnum.java (92%) rename ServiceSite/{facade/src/main/java/com/seasky/seaskyocr => src/main/java/com/seasky/seaskyocr/domain}/enums/SupplierEnum.java (93%) diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountCmd.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountCmd.java index c00eba21..66e92b50 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountCmd.java +++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountCmd.java @@ -2,12 +2,11 @@ package com.seasky.seaskyocr.dto.account; import com.fasterxml.jackson.annotation.JsonInclude; import com.seasky.core.ddd.base.BaseDto; -import com.seasky.seaskyocr.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; import io.swagger.annotations.ApiModelProperty; import lombok.*; import lombok.experimental.Accessors; -import java.lang.reflect.Method; import java.util.List; @Data diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountOut.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountOut.java index 641a3e25..bed70461 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountOut.java +++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountOut.java @@ -2,17 +2,14 @@ package com.seasky.seaskyocr.dto.account; import com.fasterxml.jackson.annotation.JsonInclude; import com.seasky.core.ddd.base.BaseDto; -import com.seasky.seaskyocr.enums.MethodEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.io.Serializable; -import java.util.Date; import java.util.List; @Data diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrCmd.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrCmd.java index f884203b..bcf9afd7 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrCmd.java +++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrCmd.java @@ -3,8 +3,8 @@ package com.seasky.seaskyocr.dto.ocr; import com.seasky.core.ddd.base.BaseDto; import com.seasky.core.validate.Insert; import com.seasky.core.validate.Update; -import com.seasky.seaskyocr.enums.MethodEnum; -import com.seasky.seaskyocr.enums.SupplierEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.SupplierEnum; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -13,7 +13,6 @@ import lombok.NoArgsConstructor; import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.List; import java.util.Map; /** diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrOut.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrOut.java index 3dcf0d87..c018a548 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrOut.java +++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrOut.java @@ -2,8 +2,8 @@ package com.seasky.seaskyocr.dto.ocr; import com.fasterxml.jackson.annotation.JsonInclude; import com.seasky.core.ddd.base.BaseDto; -import com.seasky.seaskyocr.enums.MethodEnum; -import com.seasky.seaskyocr.enums.SupplierEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.SupplierEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; @@ -11,7 +11,6 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; -import java.util.List; import java.util.Map; @Data diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrQry.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrQry.java index 7e73fa2e..6b12c9e6 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrQry.java +++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/ocr/OcrQry.java @@ -2,8 +2,8 @@ package com.seasky.seaskyocr.dto.ocr; import com.fasterxml.jackson.annotation.JsonInclude; import com.seasky.core.ddd.base.BaseDto; -import com.seasky.seaskyocr.enums.MethodEnum; -import com.seasky.seaskyocr.enums.SupplierEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.SupplierEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/contract/ContractCmdServiceImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/contract/ContractCmdServiceImpl.java index 36280a2a..d3e0888a 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/contract/ContractCmdServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/contract/ContractCmdServiceImpl.java @@ -4,7 +4,6 @@ import com.seasky.seaskyocr.domain.aggregate.ocrimplement.contract.ContractAggre import com.seasky.seaskyocr.domain.service.ocrFactory.IOcrFactory; import com.seasky.seaskyocr.domain.service.ocrFactory.product.IHeHeProduct; import com.seasky.seaskyocr.dto.contract.CreateContractCmd; -import com.seasky.seaskyocr.enums.SupplierEnum; import org.apache.commons.codec.binary.Base64; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AccountAggregate.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AccountAggregate.java index a1c58896..769a17ff 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AccountAggregate.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AccountAggregate.java @@ -2,12 +2,10 @@ package com.seasky.seaskyocr.domain.aggregate.account; import com.seasky.core.ddd.base.BaseAggregate; import com.seasky.core.ddd.utils.MapperUtils; -import com.seasky.seaskyocr.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; import lombok.*; import lombok.experimental.Accessors; -import javax.validation.Valid; -import java.util.Date; import java.util.List; /** @@ -24,19 +22,12 @@ import java.util.List; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class AccountAggregate extends BaseAggregate { - //用户角色 + //用户鉴æƒä¿¡æ¯ private List<AuthEntity> authEntityList; - private String accountCode; - - private String accountName; - //更新用户视图 private AccountVO accountVO; - //å…³è”æœåŠ¡é›†åˆ - private List<MethodEnum> methodEnumList; - public AccountAggregate updateAccountVo(AccountAggregate accountAggregate) { AccountVO accountVO = MapperUtils.INSTANCE.map(AccountVO.class, accountAggregate); accountAggregate.setAccountVO(accountVO); diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AccountVO.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AccountVO.java index b9a72ed7..8b23371f 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AccountVO.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AccountVO.java @@ -1,11 +1,8 @@ package com.seasky.seaskyocr.domain.aggregate.account; -import com.seasky.seaskyocr.enums.MethodEnum; -import io.swagger.models.auth.In; +import com.seasky.seaskyocr.domain.enums.MethodEnum; import lombok.*; -import javax.validation.constraints.NotNull; -import java.util.Date; import java.util.List; /** @@ -25,5 +22,4 @@ public class AccountVO { private String accountName; - private List<MethodEnum> methodEnumList; } diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AuthEntity.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AuthEntity.java index b80f12d8..b8ed9303 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AuthEntity.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/account/AuthEntity.java @@ -1,5 +1,8 @@ package com.seasky.seaskyocr.domain.aggregate.account; +import com.seasky.seaskyocr.domain.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.SupplierEnum; + /** * 身份验è¯çš„实体 * @@ -9,7 +12,14 @@ package com.seasky.seaskyocr.domain.aggregate.account; public class AuthEntity { private Long ocrId; - private Long apiId; + private SupplierEnum supplierEnum; + + private MethodEnum methodEnum; + + /** + * 优先级 + */ + private Long priority; } diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrAccountsVo.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrAccountsVo.java index 0447e97d..f301604c 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrAccountsVo.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrAccountsVo.java @@ -1,13 +1,5 @@ package com.seasky.seaskyocr.domain.aggregate.ocr; -import com.seasky.seaskyocr.enums.MethodEnum; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - // @Data // @NoArgsConstructor // @AllArgsConstructor diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrAggregate.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrAggregate.java index f9834176..6ead13da 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrAggregate.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrAggregate.java @@ -1,16 +1,12 @@ package com.seasky.seaskyocr.domain.aggregate.ocr; -import cn.hutool.core.util.HashUtil; import com.seasky.core.ddd.base.BaseAggregate; import com.seasky.core.ddd.utils.MapperUtils; -import com.seasky.seaskyocr.enums.MethodEnum; -import com.seasky.seaskyocr.enums.SupplierEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.SupplierEnum; import lombok.*; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; import java.util.Map; /** diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrCommonVo.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrCommonVo.java index b1f0da1c..26c33307 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrCommonVo.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/aggregate/ocr/OcrCommonVo.java @@ -1,7 +1,7 @@ package com.seasky.seaskyocr.domain.aggregate.ocr; -import com.seasky.seaskyocr.enums.MethodEnum; -import com.seasky.seaskyocr.enums.SupplierEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.SupplierEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/enums/MethodEnum.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/enums/MethodEnum.java similarity index 92% rename from ServiceSite/facade/src/main/java/com/seasky/seaskyocr/enums/MethodEnum.java rename to ServiceSite/src/main/java/com/seasky/seaskyocr/domain/enums/MethodEnum.java index c7b35e86..8222bab6 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/enums/MethodEnum.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/enums/MethodEnum.java @@ -1,4 +1,4 @@ -package com.seasky.seaskyocr.enums; +package com.seasky.seaskyocr.domain.enums; /** * 方法枚举 diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/enums/SupplierEnum.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/enums/SupplierEnum.java similarity index 93% rename from ServiceSite/facade/src/main/java/com/seasky/seaskyocr/enums/SupplierEnum.java rename to ServiceSite/src/main/java/com/seasky/seaskyocr/domain/enums/SupplierEnum.java index be7569d5..6cf5788d 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/enums/SupplierEnum.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/enums/SupplierEnum.java @@ -1,4 +1,4 @@ -package com.seasky.seaskyocr.enums; +package com.seasky.seaskyocr.domain.enums; /** * 供应商枚举 diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/service/account/AccountDomainServiceImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/service/account/AccountDomainServiceImpl.java index 3a5768a3..e4c3f198 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/service/account/AccountDomainServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/service/account/AccountDomainServiceImpl.java @@ -1,21 +1,13 @@ package com.seasky.seaskyocr.domain.service.account; -import cn.hutool.core.util.ObjectUtil; -import com.seasky.core.common.Error; -import com.seasky.core.common.ResponseCode; -import com.seasky.core.ddd.base.enums.LogicStampEnum; -import com.seasky.core.exception.DataBusinessException; -import com.seasky.core.exception.DataVerifyException; import com.seasky.seaskyocr.domain.aggregate.account.AccountAggregate; import com.seasky.seaskyocr.domain.aggregate.account.AccountRepository; -import com.seasky.seaskyocr.domain.aggregate.ocr.OcrAggregate; import com.seasky.seaskyocr.domain.aggregate.ocr.OcrRepository; -import com.seasky.seaskyocr.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/service/ocrFactory/productImpl/HeHeProductImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/service/ocrFactory/productImpl/HeHeProductImpl.java index 454eb404..8977fb63 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/service/ocrFactory/productImpl/HeHeProductImpl.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/domain/service/ocrFactory/productImpl/HeHeProductImpl.java @@ -1,10 +1,7 @@ package com.seasky.seaskyocr.domain.service.ocrFactory.productImpl; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.mysql.cj.xdevapi.JsonArray; import com.seasky.core.common.Error; import com.seasky.core.common.ResponseCode; import com.seasky.core.exception.DataAccessException; @@ -15,7 +12,7 @@ import com.seasky.seaskyocr.domain.aggregate.ocrimplement.contract.ContractAggre import com.seasky.seaskyocr.domain.aggregate.ocrimplement.contract.ContractRepository; import com.seasky.seaskyocr.domain.aggregate.ocrimplement.contract.ContractVO; import com.seasky.seaskyocr.domain.service.ocrFactory.product.IHeHeProduct; -import com.seasky.seaskyocr.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; import org.apache.http.HttpEntity; @@ -30,8 +27,6 @@ import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collection; -import java.util.List; import java.util.Map; import org.springframework.util.ObjectUtils; @@ -71,7 +66,7 @@ class HeHeProductImpl implements IHeHeProduct { } @Override - public String getContract(ContractAggregate contractAggregate) { + public String getContract(ContractAggregate contractAggregate) { byte[] bytes = new byte[0]; try { bytes = contractAggregate.getFile().getBytes(); diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/dataobject/po/AccountPO.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/dataobject/po/AccountPO.java index 54fc8f2d..a8a4ff4e 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/dataobject/po/AccountPO.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/dataobject/po/AccountPO.java @@ -4,14 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.seasky.core.ddd.base.BaseDataObject; import com.seasky.core.validate.Insert; -import com.seasky.seaskyocr.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.NotNull; -import java.lang.reflect.Method; import java.util.List; /** diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/dataobject/po/OcrPO.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/dataobject/po/OcrPO.java index de8c61a9..1e9cbf65 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/dataobject/po/OcrPO.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/dataobject/po/OcrPO.java @@ -3,7 +3,6 @@ package com.seasky.seaskyocr.infrastructure.dataobject.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.seasky.core.ddd.base.BaseDataObject; -import com.seasky.seaskyocr.enums.SupplierEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/account/AccountQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/account/AccountQueryServiceImpl.java index 4704343a..fb3cce54 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/account/AccountQueryServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/account/AccountQueryServiceImpl.java @@ -9,7 +9,7 @@ import com.seasky.core.ddd.utils.MapperUtils; import com.seasky.seaskyocr.application.query.account.AccountQueryService; import com.seasky.seaskyocr.dto.account.AccountOut; import com.seasky.seaskyocr.dto.account.AccountQry; -import com.seasky.seaskyocr.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; import com.seasky.seaskyocr.infrastructure.dataobject.po.AccountPO; import com.seasky.seaskyocr.infrastructure.dataobject.po.OcrAccountPO; import com.seasky.seaskyocr.infrastructure.db.mapper.table.AccountMapper; @@ -19,7 +19,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; @Service diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/ocr/OcrQueryConvert.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/ocr/OcrQueryConvert.java index 48b2735e..7cbf4449 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/ocr/OcrQueryConvert.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/reader/ocr/OcrQueryConvert.java @@ -1,9 +1,8 @@ package com.seasky.seaskyocr.infrastructure.reader.ocr; -import com.seasky.core.ddd.utils.MapperUtils; import com.seasky.seaskyocr.dto.ocr.OcrOut; -import com.seasky.seaskyocr.enums.MethodEnum; -import com.seasky.seaskyocr.enums.SupplierEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.SupplierEnum; import com.seasky.seaskyocr.infrastructure.dataobject.po.OcrPO; import java.util.ArrayList; diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/account/AccountConvertForRepository.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/account/AccountConvertForRepository.java index 93fe3f8d..1dcfcc08 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/account/AccountConvertForRepository.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/account/AccountConvertForRepository.java @@ -3,8 +3,7 @@ package com.seasky.seaskyocr.infrastructure.repository.account; import cn.hutool.core.util.ObjectUtil; import com.seasky.core.ddd.utils.MapperUtils; import com.seasky.seaskyocr.domain.aggregate.account.AccountAggregate; -import com.seasky.seaskyocr.domain.aggregate.account.AccountVO; -import com.seasky.seaskyocr.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; import com.seasky.seaskyocr.infrastructure.dataobject.po.AccountPO; import com.seasky.seaskyocr.infrastructure.dataobject.po.OcrAccountPO; diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/account/AccountRepositoryImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/account/AccountRepositoryImpl.java index b4084f34..c420bc70 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/account/AccountRepositoryImpl.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/account/AccountRepositoryImpl.java @@ -4,12 +4,9 @@ import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.seasky.core.base.AbstractService; import com.seasky.core.ddd.base.DomainKeysMap; -import com.seasky.core.ddd.base.enums.LogicStampEnum; import com.seasky.core.util.ExceptionUtil; import com.seasky.seaskyocr.domain.aggregate.account.AccountAggregate; import com.seasky.seaskyocr.domain.aggregate.account.AccountRepository; -import com.seasky.seaskyocr.domain.aggregate.ocr.OcrAggregate; -import com.seasky.seaskyocr.enums.MethodEnum; import com.seasky.seaskyocr.infrastructure.dataobject.po.AccountPO; import com.seasky.seaskyocr.infrastructure.dataobject.po.OcrAccountPO; import com.seasky.seaskyocr.infrastructure.db.mapper.table.AccountMapper; diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/ocr/OcrConvertForRepository.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/ocr/OcrConvertForRepository.java index bab32d16..94ed8bb9 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/ocr/OcrConvertForRepository.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/infrastructure/repository/ocr/OcrConvertForRepository.java @@ -3,8 +3,8 @@ package com.seasky.seaskyocr.infrastructure.repository.ocr; import cn.hutool.core.util.ObjectUtil; import com.seasky.core.ddd.utils.MapperUtils; import com.seasky.seaskyocr.domain.aggregate.ocr.OcrAggregate; -import com.seasky.seaskyocr.enums.MethodEnum; -import com.seasky.seaskyocr.enums.SupplierEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.SupplierEnum; import com.seasky.seaskyocr.infrastructure.dataobject.po.*; import java.util.ArrayList; diff --git a/ServiceSite/src/test/java/com/seasky/seaskyocr/application/command/account/AccountCmdServiceTest.java b/ServiceSite/src/test/java/com/seasky/seaskyocr/application/command/account/AccountCmdServiceTest.java index 93045553..f2877deb 100644 --- a/ServiceSite/src/test/java/com/seasky/seaskyocr/application/command/account/AccountCmdServiceTest.java +++ b/ServiceSite/src/test/java/com/seasky/seaskyocr/application/command/account/AccountCmdServiceTest.java @@ -1,7 +1,7 @@ package com.seasky.seaskyocr.application.command.account; import com.seasky.seaskyocr.dto.account.AccountCmd; -import com.seasky.seaskyocr.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -9,8 +9,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; -import static org.junit.jupiter.api.Assertions.*; - /** * DESC: * diff --git a/ServiceSite/src/test/java/com/seasky/seaskyocr/application/command/ocr/OcrCmdServiceTest.java b/ServiceSite/src/test/java/com/seasky/seaskyocr/application/command/ocr/OcrCmdServiceTest.java index 4ad9bba2..c5fdd748 100644 --- a/ServiceSite/src/test/java/com/seasky/seaskyocr/application/command/ocr/OcrCmdServiceTest.java +++ b/ServiceSite/src/test/java/com/seasky/seaskyocr/application/command/ocr/OcrCmdServiceTest.java @@ -2,8 +2,8 @@ package com.seasky.seaskyocr.application.command.ocr; import com.seasky.seaskyocr.dto.ocr.OcrCmd; import com.seasky.seaskyocr.dto.ocr.OcrSecretCmd; -import com.seasky.seaskyocr.enums.MethodEnum; -import com.seasky.seaskyocr.enums.SupplierEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.SupplierEnum; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -13,8 +13,6 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; -import static org.junit.jupiter.api.Assertions.*; - /** * DESC: * diff --git a/ServiceSite/src/test/java/com/seasky/seaskyocr/application/query/ocr/OcrQueryServiceTest.java b/ServiceSite/src/test/java/com/seasky/seaskyocr/application/query/ocr/OcrQueryServiceTest.java index 9dcebf38..ca4fb802 100644 --- a/ServiceSite/src/test/java/com/seasky/seaskyocr/application/query/ocr/OcrQueryServiceTest.java +++ b/ServiceSite/src/test/java/com/seasky/seaskyocr/application/query/ocr/OcrQueryServiceTest.java @@ -3,13 +3,11 @@ package com.seasky.seaskyocr.application.query.ocr; import com.seasky.core.common.Pagination; import com.seasky.seaskyocr.dto.ocr.OcrOut; import com.seasky.seaskyocr.dto.ocr.OcrQry; -import com.seasky.seaskyocr.enums.MethodEnum; +import com.seasky.seaskyocr.domain.enums.MethodEnum; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import static org.junit.jupiter.api.Assertions.*; - /** * DESC: * -- GitLab From 9b073d32a0508338b19ae222313f94b08a10a680 Mon Sep 17 00:00:00 2001 From: xiaqihang <xiaqihang@seaskysh.com> Date: Sun, 26 Sep 2021 10:06:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9AAccountOut=20=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90String?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/seasky/seaskyocr/dto/account/AccountOut.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountOut.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountOut.java index bed70461..ce8ac785 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountOut.java +++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/account/AccountOut.java @@ -28,8 +28,7 @@ public class AccountOut extends BaseDto implements Serializable { @ApiModelProperty(value = "妿 ¡åç§°") private String accountName; - @ApiModelProperty(value = "具备的方法", example = "[1,2,3]") - private List<MethodEnum> methodEnumList; + private List<String> methodEnumList; } -- GitLab