diff --git a/association/src/main/java/com/yonyou/iuap/baseservice/controller/GenericAssoController.java b/association/src/main/java/com/yonyou/iuap/baseservice/controller/GenericAssoController.java index b41c68f..adca771 100644 --- a/association/src/main/java/com/yonyou/iuap/baseservice/controller/GenericAssoController.java +++ b/association/src/main/java/com/yonyou/iuap/baseservice/controller/GenericAssoController.java @@ -5,7 +5,6 @@ import com.yonyou.iuap.baseservice.entity.annotation.Associative; import com.yonyou.iuap.baseservice.intg.service.GenericIntegrateService; import com.yonyou.iuap.baseservice.service.GenericAssoService; -import com.yonyou.iuap.baseservice.service.GenericService; import com.yonyou.iuap.baseservice.vo.GenericAssoVo; import com.yonyou.iuap.mvc.constants.RequestStatusEnum; import com.yonyou.iuap.mvc.type.JsonResponse; diff --git a/association/src/main/java/com/yonyou/iuap/baseservice/service/GenericAssoService.java b/association/src/main/java/com/yonyou/iuap/baseservice/service/GenericAssoService.java index c33d852..6cf93eb 100644 --- a/association/src/main/java/com/yonyou/iuap/baseservice/service/GenericAssoService.java +++ b/association/src/main/java/com/yonyou/iuap/baseservice/service/GenericAssoService.java @@ -6,7 +6,6 @@ import com.yonyou.iuap.baseservice.entity.Model; import com.yonyou.iuap.baseservice.entity.annotation.Associative; import com.yonyou.iuap.baseservice.intg.service.GenericIntegrateService; -import com.yonyou.iuap.baseservice.persistence.mybatis.mapper.GenericMapper; import com.yonyou.iuap.baseservice.vo.GenericAssoVo; import com.yonyou.iuap.mvc.type.SearchParams; import org.apache.commons.collections.MapUtils; diff --git a/attachment/src/main/java/com/yonyou/iuap/baseservice/attachment/entity/Attachmentable.java b/attachment/src/main/java/com/yonyou/iuap/baseservice/attachment/entity/Attachmentable.java index b63a26e..ea2a439 100644 --- a/attachment/src/main/java/com/yonyou/iuap/baseservice/attachment/entity/Attachmentable.java +++ b/attachment/src/main/java/com/yonyou/iuap/baseservice/attachment/entity/Attachmentable.java @@ -1,6 +1,5 @@ package com.yonyou.iuap.baseservice.attachment.entity; -import com.yonyou.iuap.baseservice.entity.LogicDel; import com.yonyou.iuap.baseservice.entity.Model; import java.util.List; diff --git a/attachment/src/main/java/com/yonyou/iuap/baseservice/attachment/service/GenericAtService.java b/attachment/src/main/java/com/yonyou/iuap/baseservice/attachment/service/GenericAtService.java index f6c7d4d..74a6a94 100644 --- a/attachment/src/main/java/com/yonyou/iuap/baseservice/attachment/service/GenericAtService.java +++ b/attachment/src/main/java/com/yonyou/iuap/baseservice/attachment/service/GenericAtService.java @@ -2,26 +2,27 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; +import com.yonyou.iuap.baseservice.attachment.dao.mapper.AttachmentMapper; import com.yonyou.iuap.baseservice.attachment.entity.AttachmentEntity; import com.yonyou.iuap.baseservice.attachment.entity.Attachmentable; -import com.yonyou.iuap.baseservice.attachment.dao.mapper.AttachmentMapper; import com.yonyou.iuap.baseservice.persistence.mybatis.mapper.GenericExMapper; import com.yonyou.iuap.baseservice.persistence.mybatis.mapper.GenericMapper; import com.yonyou.iuap.baseservice.ref.service.RefCommonService; import com.yonyou.iuap.baseservice.service.GenericService; -import com.yonyou.iuap.baseservice.persistence.support.QueryFeatureExtension; import com.yonyou.iuap.baseservice.support.generator.GeneratorManager; import com.yonyou.iuap.context.InvocationInfoProxy; import com.yonyou.iuap.mvc.type.SearchParams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContextAware; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import java.io.Serializable; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class GenericAtService extends GenericService { diff --git a/bpm/src/test/java/com/yonyou/iuap/baseservice/bpm/service/MockBpmService.java b/bpm/src/test/java/com/yonyou/iuap/baseservice/bpm/service/MockBpmService.java index 7c15030..e5be0eb 100644 --- a/bpm/src/test/java/com/yonyou/iuap/baseservice/bpm/service/MockBpmService.java +++ b/bpm/src/test/java/com/yonyou/iuap/baseservice/bpm/service/MockBpmService.java @@ -1,6 +1,5 @@ package com.yonyou.iuap.baseservice.bpm.service; -import com.yonyou.iuap.baseservice.bpm.service.GenericBpmService; import com.yonyou.iuap.baseservice.bpm.dao.MockMapper; import com.yonyou.iuap.baseservice.bpm.model.MockModel; import com.yonyou.iuap.bpm.pojo.BPMFormJSON; diff --git a/bpm/src/test/resources/t-app-persistence.xml b/bpm/src/test/resources/t-app-persistence.xml index fad6de9..876fbd5 100644 --- a/bpm/src/test/resources/t-app-persistence.xml +++ b/bpm/src/test/resources/t-app-persistence.xml @@ -1,18 +1,14 @@ + + + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd" + default-lazy-init="true"> Spring configuration for persistence configuration diff --git a/controller/src/test/java/com/yonyou/iuap/baseservice/entity/SanyOrder.java b/controller/src/test/java/com/yonyou/iuap/baseservice/entity/SanyOrder.java index 7807967..14d28b2 100644 --- a/controller/src/test/java/com/yonyou/iuap/baseservice/entity/SanyOrder.java +++ b/controller/src/test/java/com/yonyou/iuap/baseservice/entity/SanyOrder.java @@ -9,7 +9,6 @@ import javax.persistence.Column; import javax.persistence.Id; import javax.persistence.Table; - import java.io.Serializable; import java.util.Date; diff --git a/controller/src/test/resources/t-app-persistence.xml b/controller/src/test/resources/t-app-persistence.xml index 4bb3f7e..3cd5cd9 100644 --- a/controller/src/test/resources/t-app-persistence.xml +++ b/controller/src/test/resources/t-app-persistence.xml @@ -1,18 +1,14 @@ + + + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd" + default-lazy-init="true"> persistence diff --git a/entity/src/test/java/com/yonyou/iuap/baseservice/model/App.java b/entity/src/test/java/com/yonyou/iuap/baseservice/model/App.java index 0d2418f..6d82690 100644 --- a/entity/src/test/java/com/yonyou/iuap/baseservice/model/App.java +++ b/entity/src/test/java/com/yonyou/iuap/baseservice/model/App.java @@ -1,8 +1,9 @@ package com.yonyou.iuap.baseservice.model; -import java.lang.reflect.Field; import com.yonyou.iuap.baseservice.entity.annotation.Reference; +import java.lang.reflect.Field; + /** * Hello world! * diff --git a/intg/src/main/java/com/yonyou/iuap/baseservice/intg/service/DrCommonService.java b/intg/src/main/java/com/yonyou/iuap/baseservice/intg/service/DrCommonService.java index 0d58e2e..2ea4cfe 100644 --- a/intg/src/main/java/com/yonyou/iuap/baseservice/intg/service/DrCommonService.java +++ b/intg/src/main/java/com/yonyou/iuap/baseservice/intg/service/DrCommonService.java @@ -1,6 +1,5 @@ package com.yonyou.iuap.baseservice.intg.service; -import cn.hutool.core.util.ReflectUtil; import com.yonyou.iuap.baseservice.entity.LogicDel; import com.yonyou.iuap.baseservice.entity.Model; import com.yonyou.iuap.baseservice.persistence.support.DeleteFeatureExtension; @@ -9,7 +8,6 @@ import com.yonyou.iuap.mvc.type.SearchParams; import org.springframework.stereotype.Service; -import java.io.Serializable; import java.util.List; import java.util.Map; diff --git a/intg/src/main/java/com/yonyou/iuap/baseservice/intg/service/GenericIntegrateService.java b/intg/src/main/java/com/yonyou/iuap/baseservice/intg/service/GenericIntegrateService.java index 71b2030..c2703ed 100644 --- a/intg/src/main/java/com/yonyou/iuap/baseservice/intg/service/GenericIntegrateService.java +++ b/intg/src/main/java/com/yonyou/iuap/baseservice/intg/service/GenericIntegrateService.java @@ -18,10 +18,12 @@ import java.io.Serializable; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.sql.SQLIntegrityConstraintViolationException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import static com.yonyou.iuap.baseservice.intg.support.ServiceFeature.*; +import static com.yonyou.iuap.baseservice.intg.support.ServiceFeature.LOGICAL_DEL; /** * 特性集成服务,用于GenericService所有服务接口集成多种组件特性 diff --git a/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/entity/MultiTenant.java b/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/entity/MultiTenant.java index 8e586f4..f0521e2 100644 --- a/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/entity/MultiTenant.java +++ b/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/entity/MultiTenant.java @@ -1,7 +1,6 @@ package com.yonyou.iuap.baseservice.multitenant.entity; -import com.yonyou.iuap.baseservice.entity.LogicDel; import com.yonyou.iuap.baseservice.entity.Model; /** diff --git a/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/service/GenericMultiTenantService.java b/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/service/GenericMultiTenantService.java index a732209..47bf272 100644 --- a/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/service/GenericMultiTenantService.java +++ b/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/service/GenericMultiTenantService.java @@ -5,7 +5,6 @@ import com.yonyou.iuap.baseservice.multitenant.dao.mapper.GenericMultiTenantMapper; import com.yonyou.iuap.baseservice.multitenant.entity.MultiTenant; import com.yonyou.iuap.baseservice.service.GenericService; -import com.yonyou.iuap.baseservice.persistence.support.QueryFeatureExtension; import com.yonyou.iuap.context.InvocationInfoProxy; import com.yonyou.iuap.mvc.type.SearchParams; import org.apache.commons.lang3.StringUtils; diff --git a/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/service/MultenCommonService.java b/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/service/MultenCommonService.java index b042c28..8114a85 100644 --- a/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/service/MultenCommonService.java +++ b/multitenant/src/main/java/com/yonyou/iuap/baseservice/multitenant/service/MultenCommonService.java @@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import java.io.Serializable; import java.util.List; import java.util.Map; diff --git a/ref/src/main/java/com/yonyou/iuap/baseservice/ref/controller/RefCommonController.java b/ref/src/main/java/com/yonyou/iuap/baseservice/ref/controller/RefCommonController.java index 1abd83c..dc5e87f 100644 --- a/ref/src/main/java/com/yonyou/iuap/baseservice/ref/controller/RefCommonController.java +++ b/ref/src/main/java/com/yonyou/iuap/baseservice/ref/controller/RefCommonController.java @@ -1,16 +1,18 @@ package com.yonyou.iuap.baseservice.ref.controller; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; - +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.yonyou.iuap.baseservice.entity.RefParamConfig; +import com.yonyou.iuap.baseservice.entity.RefParamVO; +import com.yonyou.iuap.baseservice.persistence.utils.RefXMLParse; +import com.yonyou.iuap.baseservice.persistence.utils.RefXmlConstract; +import com.yonyou.iuap.baseservice.ref.service.RefCommonService; +import com.yonyou.iuap.baseservice.ref.utils.RefUitls; import com.yonyou.iuap.i18n.MessageSourceUtil; +import com.yonyou.iuap.ref.model.RefVertion; +import com.yonyou.iuap.ref.model.RefViewModelVO; +import com.yonyou.iuap.wb.utils.JsonResponse; +import com.yonyou.uap.ieop.security.datapermission.DataPermissionCenter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -25,19 +27,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.yonyou.iuap.baseservice.entity.RefParamConfig; -import com.yonyou.iuap.baseservice.entity.RefParamVO; -import com.yonyou.iuap.baseservice.persistence.utils.RefXMLParse; -import com.yonyou.iuap.baseservice.persistence.utils.RefXmlConstract; -import com.yonyou.iuap.baseservice.ref.service.RefCommonService; -import com.yonyou.iuap.baseservice.ref.utils.RefUitls; -import com.yonyou.iuap.ref.model.RefVertion; -import com.yonyou.iuap.ref.model.RefViewModelVO; -import com.yonyou.iuap.wb.utils.JsonResponse; -import com.yonyou.uap.ieop.security.datapermission.DataPermissionCenter; +import javax.servlet.http.HttpServletRequest; +import java.util.*; /** * 说明:参照基础controller,所有参照都通过平台回调到这个地址取数据 diff --git a/ref/src/main/java/com/yonyou/iuap/baseservice/ref/dao/mapper/RefCommonMapper.java b/ref/src/main/java/com/yonyou/iuap/baseservice/ref/dao/mapper/RefCommonMapper.java index 2fd651d..50920e0 100644 --- a/ref/src/main/java/com/yonyou/iuap/baseservice/ref/dao/mapper/RefCommonMapper.java +++ b/ref/src/main/java/com/yonyou/iuap/baseservice/ref/dao/mapper/RefCommonMapper.java @@ -5,10 +5,8 @@ import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.PageRequest; -import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Set; /** * 查询参照数据mybatis diff --git a/ref/src/main/java/com/yonyou/iuap/baseservice/ref/service/RefCommonService.java b/ref/src/main/java/com/yonyou/iuap/baseservice/ref/service/RefCommonService.java index f5cc844..22e5d49 100644 --- a/ref/src/main/java/com/yonyou/iuap/baseservice/ref/service/RefCommonService.java +++ b/ref/src/main/java/com/yonyou/iuap/baseservice/ref/service/RefCommonService.java @@ -1,24 +1,18 @@ package com.yonyou.iuap.baseservice.ref.service; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.ReflectUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.yonyou.iuap.baseservice.entity.Model; import com.yonyou.iuap.baseservice.entity.RefParamConfig; +import com.yonyou.iuap.baseservice.entity.RefParamVO; +import com.yonyou.iuap.baseservice.entity.annotation.Reference; import com.yonyou.iuap.baseservice.persistence.support.QueryFeatureExtension; +import com.yonyou.iuap.baseservice.persistence.utils.RefXMLParse; +import com.yonyou.iuap.baseservice.ref.dao.mapper.RefCommonMapper; import com.yonyou.iuap.mvc.type.SearchParams; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,13 +20,8 @@ import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; -import com.yonyou.iuap.baseservice.entity.RefParamVO; -import com.yonyou.iuap.baseservice.entity.annotation.Reference; -import com.yonyou.iuap.baseservice.persistence.utils.RefXMLParse; -import com.yonyou.iuap.baseservice.ref.dao.mapper.RefCommonMapper; - -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ReflectUtil; +import java.lang.reflect.Field; +import java.util.*; /**