clean imports before release

hljlgj · Sep 25, 2018 · d0c9437 · d0c9437
1 parent 75390d8
commit d0c9437
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 86 deletions.
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
@@ -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
@@ -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
@@ -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/...chment/src/main/java/com/yonyou/iuap/baseservice/attachment/service/GenericAtService.java b/...chment/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<T extends Attachmentable> extends GenericService<T>   {
 

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
@@ -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
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:aop="http://www.springframework.org/schema/aop"
-	   xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx"
-	   xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-	   xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
-		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
-		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd"
-	   default-lazy-init="true">
+
+
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd"
+       default-lazy-init="true">
 
 
 <description>Spring configuration for  persistence configuration</description>

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
@@ -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
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:aop="http://www.springframework.org/schema/aop"
-	   xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx"
-	   xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-	   xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
-		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
-		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd"
-	   default-lazy-init="true">
+
+
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd"
+       default-lazy-init="true">
 
 
 <description>persistence</description>

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
@@ -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
@@ -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
@@ -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
@@ -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/.../main/java/com/yonyou/iuap/baseservice/multitenant/service/GenericMultiTenantService.java b/.../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/...nt/src/main/java/com/yonyou/iuap/baseservice/multitenant/service/MultenCommonService.java b/...nt/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
@@ -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
@@ -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
@@ -1,38 +1,27 @@
 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;
 import org.springframework.data.domain.Page;
 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.*;
 
 
 /**