diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionDeptController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionDeptController.java index 1662362..33266db 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionDeptController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionDeptController.java @@ -1,19 +1,16 @@ package com.zcloud.primeport.web; -.web; - - -import .api.InspectionDeptServiceI; -import .dto.InspectionDeptAddCmd; -import .dto.InspectionDeptPageQry; -import .dto.InspectionDeptUpdateCmd; -import .dto.clientobject.InspectionDeptCO; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.primeport.api.InspectionDeptServiceI; +import com.zcloud.primeport.dto.InspectionDeptAddCmd; +import com.zcloud.primeport.dto.InspectionDeptPageQry; +import com.zcloud.primeport.dto.InspectionDeptUpdateCmd; +import com.zcloud.primeport.dto.clientobject.InspectionDeptCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionVehicleController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionVehicleController.java index f03ddc1..1f85598 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionVehicleController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionVehicleController.java @@ -1,19 +1,16 @@ package com.zcloud.primeport.web; -.web; - - -import .api.InspectionVehicleServiceI; -import .dto.InspectionVehicleAddCmd; -import .dto.InspectionVehiclePageQry; -import .dto.InspectionVehicleUpdateCmd; -import .dto.clientobject.InspectionVehicleCO; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.primeport.api.InspectionVehicleServiceI; +import com.zcloud.primeport.dto.InspectionVehicleAddCmd; +import com.zcloud.primeport.dto.InspectionVehiclePageQry; +import com.zcloud.primeport.dto.InspectionVehicleUpdateCmd; +import com.zcloud.primeport.dto.clientobject.InspectionVehicleCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptAddExe.java index 425b959..112ada1 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptAddExe.java @@ -1,11 +1,9 @@ package com.zcloud.primeport.command; -.command; - -import .domain.gateway.InspectionDeptGateway; -import .domain.model.InspectionDeptE; -import .dto.InspectionDeptAddCmd; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.InspectionDeptGateway; +import com.zcloud.primeport.domain.model.InspectionDeptE; +import com.zcloud.primeport.dto.InspectionDeptAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptRemoveExe.java index 41f35f9..195b320 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptRemoveExe.java @@ -1,9 +1,7 @@ package com.zcloud.primeport.command; -.command; - -import .domain.gateway.InspectionDeptGateway; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.InspectionDeptGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptUpdateExe.java index 6e53484..98e2a6d 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptUpdateExe.java @@ -1,11 +1,9 @@ package com.zcloud.primeport.command; -.command; - import com.alibaba.cola.exception.BizException; -import .domain.gateway.InspectionDeptGateway; -import .domain.model.InspectionDeptE; -import .dto.InspectionDeptUpdateCmd; +import com.zcloud.primeport.domain.gateway.InspectionDeptGateway; +import com.zcloud.primeport.domain.model.InspectionDeptE; +import com.zcloud.primeport.dto.InspectionDeptUpdateCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleAddExe.java index be406dd..b108276 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleAddExe.java @@ -1,11 +1,8 @@ package com.zcloud.primeport.command; - -.command; - -import .domain.gateway.InspectionVehicleGateway; -import .domain.model.InspectionVehicleE; -import .dto.InspectionVehicleAddCmd; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; +import com.zcloud.primeport.domain.model.InspectionVehicleE; +import com.zcloud.primeport.dto.InspectionVehicleAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleRemoveExe.java index d8a6753..31039ce 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleRemoveExe.java @@ -1,9 +1,7 @@ package com.zcloud.primeport.command; -.command; - -import .domain.gateway.InspectionVehicleGateway; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleUpdateExe.java index dfbc1fa..ce7ad40 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/InspectionVehicleUpdateExe.java @@ -1,11 +1,9 @@ package com.zcloud.primeport.command; -.command; - import com.alibaba.cola.exception.BizException; -import .domain.gateway.InspectionVehicleGateway; -import .domain.model.InspectionVehicleE; -import .dto.InspectionVehicleUpdateCmd; +import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; +import com.zcloud.primeport.domain.model.InspectionVehicleE; +import com.zcloud.primeport.dto.InspectionVehicleUpdateCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionDeptCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionDeptCoConvertor.java index 835b7e8..0fccc4d 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionDeptCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionDeptCoConvertor.java @@ -1,9 +1,7 @@ package com.zcloud.primeport.command.convertor; -.command.convertor; - -import .dto.clientobject.InspectionDeptCO; -import .persistence.dataobject.InspectionDeptDO; +import com.zcloud.primeport.dto.clientobject.InspectionDeptCO; +import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; import org.mapstruct.Mapper; import java.util.List; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionVehicleCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionVehicleCoConvertor.java index 5d369ce..f95893d 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionVehicleCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/InspectionVehicleCoConvertor.java @@ -1,9 +1,7 @@ package com.zcloud.primeport.command.convertor; -.command.convertor; - -import .dto.clientobject.InspectionVehicleCO; -import .persistence.dataobject.InspectionVehicleDO; +import com.zcloud.primeport.dto.clientobject.InspectionVehicleCO; +import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; import org.mapstruct.Mapper; import java.util.List; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionDeptQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionDeptQueryExe.java index 6b0f069..cd40a47 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionDeptQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionDeptQueryExe.java @@ -1,15 +1,12 @@ package com.zcloud.primeport.command.query; -.command.query; - -import .command.convertor.InspectionDeptCoConvertor; -import .dto.InspectionDeptPageQry; -import .dto.clientobject.InspectionDeptCO; -import .persistence.dataobject.InspectionDeptDO; -import .persistence.repository.InspectionDeptRepository; -import -import com.zcloud.gbscommon.utils.PageQueryHelper; import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.InspectionDeptCoConvertor; +import com.zcloud.primeport.dto.InspectionDeptPageQry; +import com.zcloud.primeport.dto.clientobject.InspectionDeptCO; +import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; +import com.zcloud.primeport.persistence.repository.InspectionDeptRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionVehicleQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionVehicleQueryExe.java index b86dbfe..7b2fce7 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionVehicleQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/InspectionVehicleQueryExe.java @@ -1,15 +1,12 @@ package com.zcloud.primeport.command.query; -.command.query; - -import .command.convertor.InspectionVehicleCoConvertor; -import .dto.InspectionVehiclePageQry; -import .dto.clientobject.InspectionVehicleCO; -import .persistence.dataobject.InspectionVehicleDO; -import .persistence.repository.InspectionVehicleRepository; -import -import com.zcloud.gbscommon.utils.PageQueryHelper; import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.InspectionVehicleCoConvertor; +import com.zcloud.primeport.dto.InspectionVehiclePageQry; +import com.zcloud.primeport.dto.clientobject.InspectionVehicleCO; +import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; +import com.zcloud.primeport.persistence.repository.InspectionVehicleRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/web-app/src/main/java/com/zcloud/primeport/service/InspectionDeptServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/InspectionDeptServiceImpl.java index fb5ebc7..3c6ab0c 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/InspectionDeptServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/InspectionDeptServiceImpl.java @@ -1,19 +1,15 @@ package com.zcloud.primeport.service; - -.service; - -import .api.InspectionDeptServiceI; -import .command.InspectionDeptAddExe; -import .command.InspectionDeptRemoveExe; -import .command.InspectionDeptUpdateExe; -import .command.query.InspectionDeptQueryExe; -import .dto.InspectionDeptAddCmd; -import .dto.InspectionDeptPageQry; -import .dto.InspectionDeptUpdateCmd; -import .dto.clientobject.InspectionDeptCO; - import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.InspectionDeptServiceI; +import com.zcloud.primeport.command.InspectionDeptAddExe; +import com.zcloud.primeport.command.InspectionDeptRemoveExe; +import com.zcloud.primeport.command.InspectionDeptUpdateExe; +import com.zcloud.primeport.command.query.InspectionDeptQueryExe; +import com.zcloud.primeport.dto.InspectionDeptAddCmd; +import com.zcloud.primeport.dto.InspectionDeptPageQry; +import com.zcloud.primeport.dto.InspectionDeptUpdateCmd; +import com.zcloud.primeport.dto.clientobject.InspectionDeptCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-app/src/main/java/com/zcloud/primeport/service/InspectionVehicleServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/InspectionVehicleServiceImpl.java index 8417949..7978bcb 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/InspectionVehicleServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/InspectionVehicleServiceImpl.java @@ -1,19 +1,16 @@ package com.zcloud.primeport.service; -.service; - -import .api.InspectionVehicleServiceI; -import .command.InspectionVehicleAddExe; -import .command.InspectionVehicleRemoveExe; -import .command.InspectionVehicleUpdateExe; -import .command.query.InspectionVehicleQueryExe; -import .dto.InspectionVehicleAddCmd; -import .dto.InspectionVehiclePageQry; -import .dto.InspectionVehicleUpdateCmd; -import .dto.clientobject.InspectionVehicleCO; - import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.InspectionVehicleServiceI; +import com.zcloud.primeport.command.InspectionVehicleAddExe; +import com.zcloud.primeport.command.InspectionVehicleRemoveExe; +import com.zcloud.primeport.command.InspectionVehicleUpdateExe; +import com.zcloud.primeport.command.query.InspectionVehicleQueryExe; +import com.zcloud.primeport.dto.InspectionVehicleAddCmd; +import com.zcloud.primeport.dto.InspectionVehiclePageQry; +import com.zcloud.primeport.dto.InspectionVehicleUpdateCmd; +import com.zcloud.primeport.dto.clientobject.InspectionVehicleCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-client/src/main/java/com/zcloud/primeport/api/InspectionDeptServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/InspectionDeptServiceI.java index ba66331..98f1a95 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/InspectionDeptServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/InspectionDeptServiceI.java @@ -1,14 +1,11 @@ package com.zcloud.primeport.api; -.api; - -import .dto.InspectionDeptAddCmd; -import .dto.InspectionDeptPageQry; -import .dto.InspectionDeptUpdateCmd; -import .dto.clientobject.InspectionDeptCO; - import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.InspectionDeptAddCmd; +import com.zcloud.primeport.dto.InspectionDeptPageQry; +import com.zcloud.primeport.dto.InspectionDeptUpdateCmd; +import com.zcloud.primeport.dto.clientobject.InspectionDeptCO; /** * web-client diff --git a/web-client/src/main/java/com/zcloud/primeport/api/InspectionVehicleServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/InspectionVehicleServiceI.java index 9bc23c1..6a8abd6 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/InspectionVehicleServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/InspectionVehicleServiceI.java @@ -1,14 +1,11 @@ package com.zcloud.primeport.api; -.api; - -import .dto.InspectionVehicleAddCmd; -import .dto.InspectionVehiclePageQry; -import .dto.InspectionVehicleUpdateCmd; -import .dto.clientobject.InspectionVehicleCO; - import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.InspectionVehicleAddCmd; +import com.zcloud.primeport.dto.InspectionVehiclePageQry; +import com.zcloud.primeport.dto.InspectionVehicleUpdateCmd; +import com.zcloud.primeport.dto.clientobject.InspectionVehicleCO; /** * web-client diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptAddCmd.java index e6953f9..2025f76 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptAddCmd.java @@ -1,6 +1,5 @@ package com.zcloud.primeport.dto; -.dto; import com.alibaba.cola.dto.Command; import io.swagger.annotations.ApiModelProperty; @@ -28,41 +27,5 @@ public class InspectionDeptAddCmd extends Command { @ApiModelProperty(value = "名称", name = "name", required = true) @NotEmpty(message = "名称不能为空") private String name; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptPageQry.java index 4f4f8d6..5f9a215 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptPageQry.java @@ -1,7 +1,5 @@ package com.zcloud.primeport.dto; -.dto; - import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptUpdateCmd.java index 44cab6d..460fc35 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptUpdateCmd.java @@ -1,6 +1,5 @@ package com.zcloud.primeport.dto; -.dto; import com.alibaba.cola.dto.Command; import io.swagger.annotations.ApiModelProperty; @@ -28,41 +27,6 @@ public class InspectionDeptUpdateCmd extends Command { @ApiModelProperty(value = "名称", name = "name", required = true) @NotEmpty(message = "名称不能为空") private String name; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleAddCmd.java index 0d74866..8de9232 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleAddCmd.java @@ -1,7 +1,5 @@ package com.zcloud.primeport.dto; -.dto; - import com.alibaba.cola.dto.Command; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -31,41 +29,6 @@ public class InspectionVehicleAddCmd extends Command { @ApiModelProperty(value = "车辆id", name = "vehicleMessageId", required = true) @NotEmpty(message = "车辆id不能为空") private Long vehicleMessageId; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehiclePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehiclePageQry.java index 88873d3..8e7079e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehiclePageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehiclePageQry.java @@ -1,7 +1,5 @@ package com.zcloud.primeport.dto; -.dto; - import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleUpdateCmd.java index 45d08be..510d2cd 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionVehicleUpdateCmd.java @@ -1,7 +1,5 @@ package com.zcloud.primeport.dto; -.dto; - import com.alibaba.cola.dto.Command; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -31,41 +29,5 @@ public class InspectionVehicleUpdateCmd extends Command { @ApiModelProperty(value = "车辆id", name = "vehicleMessageId", required = true) @NotEmpty(message = "车辆id不能为空") private Long vehicleMessageId; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionDeptCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionDeptCO.java index 0e6ea3d..e561807 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionDeptCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionDeptCO.java @@ -1,6 +1,5 @@ package com.zcloud.primeport.dto.clientobject; -.dto.clientobject; import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; @@ -21,41 +20,6 @@ public class InspectionDeptCO extends ClientObject { //名称 @ApiModelProperty(value = "名称") private String name; - //删除标识 - @ApiModelProperty(value = "删除标识") - private String deleteEnum; - //创建时间 - @ApiModelProperty(value = "创建时间") - private Date createTime; - //更新时间 - @ApiModelProperty(value = "更新时间") - private Date updateTime; - //创建人ID - @ApiModelProperty(value = "创建人ID") - private Long createId; - //更新人ID - @ApiModelProperty(value = "更新人ID") - private Long updateId; - //环境标识 - @ApiModelProperty(value = "环境标识") - private String env; - //创建人姓名 - @ApiModelProperty(value = "创建人姓名") - private String createName; - //更新人姓名 - @ApiModelProperty(value = "更新人姓名") - private String updateName; - //租户ID - @ApiModelProperty(value = "租户ID") - private Long tenantId; - //组织ID - @ApiModelProperty(value = "组织ID") - private Long orgId; - //版本号 - @ApiModelProperty(value = "版本号") - private Integer version; - //备注 - @ApiModelProperty(value = "备注") - private String remarks; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionVehicleCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionVehicleCO.java index bcad32e..4b52ab2 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionVehicleCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/InspectionVehicleCO.java @@ -1,7 +1,5 @@ package com.zcloud.primeport.dto.clientobject; -.dto.clientobject; - import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,41 +22,6 @@ public class InspectionVehicleCO extends ClientObject { //车辆id @ApiModelProperty(value = "车辆id") private Long vehicleMessageId; - //删除标识 - @ApiModelProperty(value = "删除标识") - private String deleteEnum; - //创建时间 - @ApiModelProperty(value = "创建时间") - private Date createTime; - //更新时间 - @ApiModelProperty(value = "更新时间") - private Date updateTime; - //创建人ID - @ApiModelProperty(value = "创建人ID") - private Long createId; - //更新人ID - @ApiModelProperty(value = "更新人ID") - private Long updateId; - //环境标识 - @ApiModelProperty(value = "环境标识") - private String env; - //创建人姓名 - @ApiModelProperty(value = "创建人姓名") - private String createName; - //更新人姓名 - @ApiModelProperty(value = "更新人姓名") - private String updateName; - //租户ID - @ApiModelProperty(value = "租户ID") - private Long tenantId; - //组织ID - @ApiModelProperty(value = "组织ID") - private Long orgId; - //版本号 - @ApiModelProperty(value = "版本号") - private Integer version; - //备注 - @ApiModelProperty(value = "备注") - private String remarks; + } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionDeptGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionDeptGateway.java index 47584c3..7cd0bcd 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionDeptGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionDeptGateway.java @@ -1,8 +1,6 @@ package com.zcloud.primeport.domain.gateway; -.domain.gateway; - -import .domain.model.InspectionDeptE; +import com.zcloud.primeport.domain.model.InspectionDeptE; /** * web-domain diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionVehicleGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionVehicleGateway.java index f4fb563..5e73e10 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionVehicleGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionVehicleGateway.java @@ -1,8 +1,7 @@ package com.zcloud.primeport.domain.gateway; -.domain.gateway; -import .domain.model.InspectionVehicleE; +import com.zcloud.primeport.domain.model.InspectionVehicleE; /** * web-domain diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionDeptE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionDeptE.java index 5c0e15d..c767752 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionDeptE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionDeptE.java @@ -1,12 +1,12 @@ package com.zcloud.primeport.domain.model; -.domain.model; - import com.alibaba.cola.domain.Entity; import com.jjb.saas.framework.domain.model.BaseE; import lombok.Data; import lombok.EqualsAndHashCode; + +@Data /** * web-domain * @@ -18,29 +18,6 @@ public class InspectionDeptE extends BaseE { private Long id; //名称 private String name; - //删除标识 - private String deleteEnum; - //创建时间 - private Date createTime; - //更新时间 - private Date updateTime; - //创建人ID - private Long createId; - //更新人ID - private Long updateId; - //环境标识 - private String env; - //创建人姓名 - private String createName; - //更新人姓名 - private String updateName; - //租户ID - private Long tenantId; - //组织ID - private Long orgId; - //版本号 - private Integer version; - //备注 - private String remarks; + } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java index c7af7be..a059429 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java @@ -1,12 +1,12 @@ package com.zcloud.primeport.domain.model; -.domain.model; import com.alibaba.cola.domain.Entity; import com.jjb.saas.framework.domain.model.BaseE; import lombok.Data; import lombok.EqualsAndHashCode; +@Data /** * web-domain * @@ -20,29 +20,6 @@ public class InspectionVehicleE extends BaseE { private Long inspectionDeptId; //车辆id private Long vehicleMessageId; - //删除标识 - private String deleteEnum; - //创建时间 - private Date createTime; - //更新时间 - private Date updateTime; - //创建人ID - private Long createId; - //更新人ID - private Long updateId; - //环境标识 - private String env; - //创建人姓名 - private String createName; - //更新人姓名 - private String updateName; - //租户ID - private Long tenantId; - //组织ID - private Long orgId; - //版本号 - private Integer version; - //备注 - private String remarks; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionDeptGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionDeptGatewayImpl.java index be0dd04..b5291e1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionDeptGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionDeptGatewayImpl.java @@ -1,11 +1,9 @@ package com.zcloud.primeport.gatewayimpl; -.gatewayimpl; - -import .domain.gateway.InspectionDeptGateway; -import .domain.model.InspectionDeptE; -import .persistence.dataobject.InspectionDeptDO; -import .persistence.repository.InspectionDeptRepository; +import com.zcloud.primeport.domain.gateway.InspectionDeptGateway; +import com.zcloud.primeport.domain.model.InspectionDeptE; +import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; +import com.zcloud.primeport.persistence.repository.InspectionDeptRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -40,12 +38,12 @@ public class InspectionDeptGatewayImpl implements InspectionDeptGateway { } @Override - public Boolean deletedInspectionDeptById(String id) { + public Boolean deletedInspectionDeptById(Long id) { return inspectionDeptRepository.removeById(id); } @Override - public Boolean deletedInspectionDeptByIds(String[] ids) { + public Boolean deletedInspectionDeptByIds(Long[] ids) { return inspectionDeptRepository.removeByIds(Arrays.asList(ids)); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionVehicleGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionVehicleGatewayImpl.java index 01ece16..e47f1d1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionVehicleGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionVehicleGatewayImpl.java @@ -1,11 +1,9 @@ package com.zcloud.primeport.gatewayimpl; -.gatewayimpl; - -import .domain.gateway.InspectionVehicleGateway; -import .domain.model.InspectionVehicleE; -import .persistence.dataobject.InspectionVehicleDO; -import .persistence.repository.InspectionVehicleRepository; +import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; +import com.zcloud.primeport.domain.model.InspectionVehicleE; +import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; +import com.zcloud.primeport.persistence.repository.InspectionVehicleRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -40,12 +38,12 @@ public class InspectionVehicleGatewayImpl implements InspectionVehicleGateway { } @Override - public Boolean deletedInspectionVehicleById(String id) { + public Boolean deletedInspectionVehicleById(Long id) { return inspectionVehicleRepository.removeById(id); } @Override - public Boolean deletedInspectionVehicleByIds(String[] ids) { + public Boolean deletedInspectionVehicleByIds(Long[] ids) { return inspectionVehicleRepository.removeByIds(Arrays.asList(ids)); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionDeptDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionDeptDO.java index cfeda19..f76c320 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionDeptDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionDeptDO.java @@ -1,12 +1,13 @@ package com.zcloud.primeport.persistence.dataobject; -.persistence.dataobject; - import com.baomidou.mybatisplus.annotation.*; import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * web-infrastructure * @@ -24,42 +25,7 @@ public class InspectionDeptDO extends BaseDO { //名称 @ApiModelProperty(value = "名称") private String name; - //删除标识 - @ApiModelProperty(value = "删除标识") - private String deleteEnum; - //创建时间 - @ApiModelProperty(value = "创建时间") - private Date createTime; - //更新时间 - @ApiModelProperty(value = "更新时间") - private Date updateTime; - //创建人ID - @ApiModelProperty(value = "创建人ID") - private Long createId; - //更新人ID - @ApiModelProperty(value = "更新人ID") - private Long updateId; - //环境标识 - @ApiModelProperty(value = "环境标识") - private String env; - //创建人姓名 - @ApiModelProperty(value = "创建人姓名") - private String createName; - //更新人姓名 - @ApiModelProperty(value = "更新人姓名") - private String updateName; - //租户ID - @ApiModelProperty(value = "租户ID") - private Long tenantId; - //组织ID - @ApiModelProperty(value = "组织ID") - private Long orgId; - //版本号 - @ApiModelProperty(value = "版本号") - private Integer version; - //备注 - @ApiModelProperty(value = "备注") - private String remarks; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionVehicleDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionVehicleDO.java index 1a253de..ab556ce 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionVehicleDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/InspectionVehicleDO.java @@ -1,9 +1,7 @@ package com.zcloud.primeport.persistence.dataobject; - -.persistence.dataobject; - import com.baomidou.mybatisplus.annotation.*; import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,42 +25,6 @@ public class InspectionVehicleDO extends BaseDO { //车辆id @ApiModelProperty(value = "车辆id") private Long vehicleMessageId; - //删除标识 - @ApiModelProperty(value = "删除标识") - private String deleteEnum; - //创建时间 - @ApiModelProperty(value = "创建时间") - private Date createTime; - //更新时间 - @ApiModelProperty(value = "更新时间") - private Date updateTime; - //创建人ID - @ApiModelProperty(value = "创建人ID") - private Long createId; - //更新人ID - @ApiModelProperty(value = "更新人ID") - private Long updateId; - //环境标识 - @ApiModelProperty(value = "环境标识") - private String env; - //创建人姓名 - @ApiModelProperty(value = "创建人姓名") - private String createName; - //更新人姓名 - @ApiModelProperty(value = "更新人姓名") - private String updateName; - //租户ID - @ApiModelProperty(value = "租户ID") - private Long tenantId; - //组织ID - @ApiModelProperty(value = "组织ID") - private Long orgId; - //版本号 - @ApiModelProperty(value = "版本号") - private Integer version; - //备注 - @ApiModelProperty(value = "备注") - private String remarks; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionDeptMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionDeptMapper.java index 64b5372..84fb469 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionDeptMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionDeptMapper.java @@ -1,9 +1,7 @@ package com.zcloud.primeport.persistence.mapper; -.persistence.mapper; - -import .persistence.dataobject.InspectionDeptDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionVehicleMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionVehicleMapper.java index cdc85b4..1d3addf 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionVehicleMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/InspectionVehicleMapper.java @@ -1,9 +1,7 @@ package com.zcloud.primeport.persistence.mapper; -.persistence.mapper; - -import .persistence.dataobject.InspectionVehicleDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionDeptRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionDeptRepository.java index bcfbff7..98abd0b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionDeptRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionDeptRepository.java @@ -1,11 +1,10 @@ package com.zcloud.primeport.persistence.repository; -.persistence.repository; - -import .persistence.dataobject.InspectionDeptDO; import com.alibaba.cola.dto.PageResponse; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; + +import java.util.Map; /** * web-infrastructure diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionVehicleRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionVehicleRepository.java index 397c7b6..7c82da2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionVehicleRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/InspectionVehicleRepository.java @@ -1,11 +1,9 @@ package com.zcloud.primeport.persistence.repository; -.persistence.repository; - -import .persistence.dataobject.InspectionVehicleDO; import com.alibaba.cola.dto.PageResponse; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; +import java.util.Map; /** * web-infrastructure diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionDeptRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionDeptRepositoryImpl.java index 6d1fe40..b5065cb 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionDeptRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionDeptRepositoryImpl.java @@ -1,15 +1,15 @@ package com.zcloud.primeport.persistence.repository.impl; -.persistence.repository.impl; - -import .persistence.dataobject.InspectionDeptDO; -import .persistence.mapper.InspectionDeptMapper; -import .persistence.repository.InspectionDeptRepository; import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.primeport.persistence.dataobject.InspectionDeptDO; +import com.zcloud.primeport.persistence.mapper.InspectionDeptMapper; +import com.zcloud.primeport.persistence.repository.InspectionDeptRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionVehicleRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionVehicleRepositoryImpl.java index 45a2796..5f74d95 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionVehicleRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/InspectionVehicleRepositoryImpl.java @@ -1,15 +1,15 @@ package com.zcloud.primeport.persistence.repository.impl; -.persistence.repository.impl; - -import .persistence.dataobject.InspectionVehicleDO; -import .persistence.mapper.InspectionVehicleMapper; -import .persistence.repository.InspectionVehicleRepository; import com.alibaba.cola.dto.PageResponse; -import com.zcloud.gbscommon.utils.PageQueryHelper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.primeport.persistence.dataobject.InspectionVehicleDO; +import com.zcloud.primeport.persistence.mapper.InspectionVehicleMapper; +import com.zcloud.primeport.persistence.repository.InspectionVehicleRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/web-infrastructure/src/main/resources/mapper/InspectionDeptMapper.xml b/web-infrastructure/src/main/resources/mapper/InspectionDeptMapper.xml index 9de914b..1b3b46c 100644 --- a/web-infrastructure/src/main/resources/mapper/InspectionDeptMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/InspectionDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/web-infrastructure/src/main/resources/mapper/InspectionVehicleMapper.xml b/web-infrastructure/src/main/resources/mapper/InspectionVehicleMapper.xml index 300be06..38dcb3c 100644 --- a/web-infrastructure/src/main/resources/mapper/InspectionVehicleMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/InspectionVehicleMapper.xml @@ -2,7 +2,7 @@ - +