删除管理平台的企业圈数据获取，删除dubbo服务配置

search-console-b2b/pom.xml

@@ -76,20 +76,20 @@
 		</dependency>
 
 		<!-- dubbo -->
-		<dependency>
+		<!--<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>dubbo</artifactId>
-		</dependency>
+		</dependency>-->
 
 		<!-- zookeeper -->
-		<dependency>
+		<!--<dependency>
 			<groupId>org.apache.zookeeper</groupId>
 			<artifactId>zookeeper</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.github.sgroschupf</groupId>
 			<artifactId>zkclient</artifactId>
-		</dependency>
+		</dependency>-->
 
 		<!-- jdbc -->
 		<dependency>

search-console-b2b/src/main/java/com/uas/search/console/b2b/Application.java

@@ -19,7 +19,6 @@ import java.util.Map;
 @EnableTransactionManagement
 @EnableWebMvc
 @SpringBootApplication(scanBasePackages = "com.uas.search.console.b2b")
-@ImportResource({ "classpath:spring/dubbo.xml" })
 public class Application {
 
 	public static void main(String[] args) throws NotSerializableException, ClassNotFoundException, IOException {

search-console-b2b/src/main/java/com/uas/search/console/b2b/PlatformmanagerRepositoryConfiguration.java

@@ -1,54 +0,0 @@
-package com.uas.search.console.b2b;
-
-import javax.persistence.EntityManager;
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
-import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-
-import com.uas.search.console.b2b.util.SearchConstants;
-
-/**
- * platformmanager数据源的实体管理器及事务管理器配置
- * 
- * @author sunyj
- * @since 2017年4月23日 下午3:52:18
- */
-@Configuration
-@EnableJpaRepositories(entityManagerFactoryRef = "platformmanagerEntityManagerFactory", transactionManagerRef = "platformmanagerTransactionManager", basePackages = {
-		"com.uas.search.console.b2b.platformmanager.dao", "com.uas.search.console.b2b.jms.platformmanager"})
-public class PlatformmanagerRepositoryConfiguration {
-
-	@Autowired
-	private JpaProperties jpaProperties;
-
-	@Autowired
-	@Qualifier(SearchConstants.PLATFORMMANAGER_DATASOURCE_QUALIFIER)
-	private DataSource platformmanagerDataSource;
-
-	@Bean(name = "platformmanagerEntityManagerFactory")
-	public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder) {
-		return builder.dataSource(platformmanagerDataSource)
-				.properties(jpaProperties.getHibernateProperties(platformmanagerDataSource))
-				.packages("com.uas.search.console.b2b.platformmanager.model", "com.uas.search.console.b2b.jms.platformmanager")
-				.persistenceUnit("platformmanagerPersistenceUnit").build();
-	}
-
-	@Bean(name = "platformmanagerEntityManager")
-	public EntityManager entityManager(EntityManagerFactoryBuilder builder) {
-		return entityManagerFactory(builder).getObject().createEntityManager();
-	}
-
-	@Bean(name = "platformmanagerTransactionManager")
-	public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder) {
-		return new JpaTransactionManager(entityManagerFactory(builder).getObject());
-	}
-}

search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/JmsListener.java

@@ -259,10 +259,6 @@ public class JmsListener {
                 com.uas.search.console.b2b.jms.platformb2b.LuceneMessageDao luceneMessageDao = ContextUtils.getBean(com.uas.search.console.b2b.jms.platformb2b.LuceneMessageDao.class);
                 luceneMessageDao.save((com.uas.search.console.b2b.jms.platformb2b.LuceneMessage) luceneMessage);
                 luceneMessageDao.dequeueLuceneMessage(id);
-            } else {
-                com.uas.search.console.b2b.jms.platformmanager.LuceneMessageDao luceneMessageDao = ContextUtils.getBean(com.uas.search.console.b2b.jms.platformmanager.LuceneMessageDao.class);
-                luceneMessageDao.save((com.uas.search.console.b2b.jms.platformmanager.LuceneMessage) luceneMessage);
-                luceneMessageDao.dequeueLuceneMessage(id);
             }
         }
     }

search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/LuceneMessageServiceImpl.java

@@ -67,10 +67,6 @@ public class LuceneMessageServiceImpl implements LuceneMessageService {
             com.uas.search.console.b2b.jms.platformb2b.LuceneMessageDao dao = (com.uas.search.console.b2b.jms.platformb2b.LuceneMessageDao)luceneMessageDao;
             List<com.uas.search.console.b2b.jms.platformb2b.LuceneMessage> list = dao.findList(start, size);
             messages.addAll(list);
-        }else{
-            com.uas.search.console.b2b.jms.platformmanager.LuceneMessageDao dao = (com.uas.search.console.b2b.jms.platformmanager.LuceneMessageDao)luceneMessageDao;
-            List<com.uas.search.console.b2b.jms.platformmanager.LuceneMessage> list = dao.findList(start, size);
-            messages.addAll(list);
         }
         sPage.setContent(messages);
         return sPage;
@@ -81,8 +77,6 @@ public class LuceneMessageServiceImpl implements LuceneMessageService {
         switch (dataSourceQualifier) {
             case PLATFORMB2B_DATASOURCE:
                 return ContextUtils.getBean(com.uas.search.console.b2b.jms.platformb2b.LuceneMessageDao.class);
-            case PLATFORMMANAGER_DATASOURCE:
-                return ContextUtils.getBean(com.uas.search.console.b2b.jms.platformmanager.LuceneMessageDao.class);
             default:
                 throw new IllegalArgumentException("Unsupported datasource qualifier: " + dataSourceQualifier);
         }

search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/platformmanager/LuceneMessage.java

@@ -1,155 +0,0 @@
-package com.uas.search.console.b2b.jms.platformmanager;
-
-import com.uas.search.console.b2b.jms.LuceneMessageInterface;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 用于实时更新的消息
- *
- * @author sunyj
- * @since 2016年12月1日 下午3:05:22
- */
-@Entity
-@Table(name = "lucene$message")
-public class LuceneMessage implements Serializable, LuceneMessageInterface {
-
-    /**
-     * 序列号
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @Id
-    @Column(name = "me_id")
-    private Long id;
-
-    /**
-     * 表名
-     */
-    @Column(name = "me_table_name")
-    private String tableName;
-
-    /**
-     * 更改类型
-     */
-    @Column(name = "me_method_type")
-    private String methodType;
-
-    /**
-     * 数据 id
-     */
-    @Column(name = "me_data_id")
-    private Long dataId;
-
-    /**
-     * 数据，可为空
-     */
-    @Column(name = "me_data")
-    private String data;
-
-    /**
-     * 优先级
-     */
-    @Column(name = "me_priority")
-    private Long priority;
-
-    /**
-     * 尝试次数
-     */
-    @Column(name = "me_retry_count")
-    private Long retryCount;
-
-    /**
-     * 时间
-     */
-    @Column(name = "me_create_time")
-    private Date createTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    public void setTableName(String tableName) {
-        this.tableName = tableName;
-    }
-
-    public String getMethodType() {
-        return methodType;
-    }
-
-    public void setMethodType(String methodType) {
-        this.methodType = methodType;
-    }
-
-    public Long getDataId() {
-        return dataId;
-    }
-
-    public void setDataId(Long dataId) {
-        this.dataId = dataId;
-    }
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    public Long getPriority() {
-        return priority;
-    }
-
-    public void setPriority(Long priority) {
-        this.priority = priority;
-    }
-
-    public Long getRetryCount() {
-        return retryCount;
-    }
-
-    public void setRetryCount(Long retryCount) {
-        this.retryCount = retryCount;
-    }
-
-    public String getCreateTime() {
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTime);
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    @Override
-    public String toString() {
-        return "LuceneMessage{" +
-                "id=" + id +
-                ", tableName='" + tableName + '\'' +
-                ", methodType='" + methodType + '\'' +
-                ", dataId=" + dataId +
-                ", data='" + data + '\'' +
-                ", priority=" + priority +
-                ", retryCount=" + retryCount +
-                ", createTime=" + createTime +
-                '}';
-    }
-}
-

search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/platformmanager/LuceneMessageDao.java

@@ -1,47 +0,0 @@
-package com.uas.search.console.b2b.jms.platformmanager;
-
-import com.uas.search.console.b2b.jms.LuceneMessageDaoInterface;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.jpa.repository.query.Procedure;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @author sunyj
- * @since 2016年12月1日 下午5:35:24
- */
-@Repository("platformmanagerLuceneMessageDao")
-public interface LuceneMessageDao
-        extends JpaSpecificationExecutor<LuceneMessage>, JpaRepository<LuceneMessage, Long>, LuceneMessageDaoInterface {
-
-    /**
-     * 获取指定数目的数据
-     *
-     * @param start 开始的记录
-     * @param size  指定数目
-     * @return 数据
-     */
-    @Query(value = "select * from lucene$message where me_retry_count < 5 order by me_priority desc, me_id limit ?1, ?2", nativeQuery = true)
-    List<LuceneMessage> findList(Integer start, Integer size);
-
-    /**
-     * 统计行数
-     *
-     * @return 行数
-     */
-    @Query(value = "select count(1) from lucene$message where me_retry_count < 5", nativeQuery = true)
-    long count();
-
-    /**
-     * 出队消息
-     *
-     * @param id 消息 id
-     */
-    @Transactional
-    @Procedure(procedureName = "dequeue_lucene_message")
-    void dequeueLuceneMessage(Long id);
-}

search-console-b2b/src/main/java/com/uas/search/console/b2b/platformmanager/dao/UserSpaceDetailSimpleInfoDao.java

@@ -1,13 +0,0 @@
-package com.uas.search.console.b2b.platformmanager.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
-
-@Repository
-public interface UserSpaceDetailSimpleInfoDao
-		extends JpaRepository<UserSpaceDetailSimpleInfo, Long>, JpaSpecificationExecutor<UserSpaceDetailSimpleInfo> {
-
-}

search-console-b2b/src/main/java/com/uas/search/console/b2b/platformmanager/model/UserSpaceDetailSimpleInfo.java

@@ -1,201 +0,0 @@
-package com.uas.search.console.b2b.platformmanager.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 账户中心企业圈
- * 
- * @author hejq
- * @time 创建时间：2017年4月21日
- */
-@Table(name = "V$AC$US$DETAIL")
-@Entity
-public class UserSpaceDetailSimpleInfo {
-
-	/**
-	 * 表名
-	 */
-	public static final String TABLE_NAME = "AC$US$DETAIL";
-
-	/**
-	 * 字段名
-	 */
-	public static final String UU_FIELD = "uu";
-
-	public static final String NAME_FIELD = "name";
-
-	public static final String SHORTNAME_FIELD = "shortname";
-
-	public static final String INDUSTRY_FIELD = "industry";
-
-	public static final String BUSINESSCODE_FIELD = "businesscode";
-
-	public static final String ID_FIELD = "id";
-	
-	public static final String ADMINNAME_FIELD = "adminname";
-
-	public static final String SEARCHSTATUS_FIELD = "searchstatus";
-
-	public static final String STATUS_FIELD = "status";
-
-	public static final String PROFESSION_FIELD = "profession";
-
-	public static final String TAGS_FIELD = "tags";
-
-	@Id
-	@Column(name = ID_FIELD)
-	private Long id;
-
-	@Column(name = UU_FIELD)
-	private Long uu;
-
-	@Column(name = NAME_FIELD)
-	private String name;
-
-	@Column(name = SHORTNAME_FIELD)
-	private String shortname;
-
-	@Column(name = INDUSTRY_FIELD)
-	private String industry;
-
-	@Column(name = BUSINESSCODE_FIELD)
-	private String businesscode;
-
-	@Column(name = ADMINNAME_FIELD)
-	private String adminname;
-
-	@Column(name = SEARCHSTATUS_FIELD)
-	private Short searchstatus;
-
-	@Column(name = STATUS_FIELD)
-	private Short status;
-
-	@Column(name = PROFESSION_FIELD)
-	private String profession;
-
-	@Column(name = TAGS_FIELD)
-	private String tags;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getBusinesscode() {
-		return businesscode;
-	}
-
-	public void setBusinesscode(String businesscode) {
-		this.businesscode = businesscode;
-	}
-
-	public String getShortname() {
-		return shortname;
-	}
-
-	public void setShortname(String shortname) {
-		this.shortname = shortname;
-	}
-
-	public String getIndustry() {
-		return industry;
-	}
-
-	public void setIndustry(String industry) {
-		this.industry = industry;
-	}
-
-	public String getAdminname() {
-		return adminname;
-	}
-
-	public void setAdminname(String adminname) {
-		this.adminname = adminname;
-	}
-
-	public Short getSearchstatus() {
-		return searchstatus == null ? (short) 1 : searchstatus;
-	}
-
-	public void setSearchstatus(Short searchstatus) {
-		this.searchstatus = searchstatus;
-	}
-
-	public Short getStatus() {
-		return status == null ? (short) 1 : status;
-	}
-
-	public void setStatus(Short status) {
-		this.status = status;
-	}
-
-	public String getProfession() {
-		return profession;
-	}
-
-	public void setProfession(String profession) {
-		this.profession = profession;
-	}
-
-	public String getTags() {
-		return tags;
-	}
-
-	public void setTags(String tags) {
-		this.tags = tags;
-	}
-
-	public Long getUu() {
-		return uu;
-	}
-
-	public void setUu(Long uu) {
-		this.uu = uu;
-	}
-
-	/**
-	 * 获取所有可以搜索的字段列名（索引的field名）
-	 * 
-	 * @return 可以搜索的字段列名
-	 */
-	public static List<String> getKeywordFields() {
-		List<String> fields = new ArrayList<>();
-		fields.add(NAME_FIELD);
-		fields.add(SHORTNAME_FIELD);
-		fields.add(INDUSTRY_FIELD);
-		fields.add(BUSINESSCODE_FIELD);
-		fields.add(ADMINNAME_FIELD);
-		fields.add(PROFESSION_FIELD);
-		fields.add(TAGS_FIELD);
-		fields.add(UU_FIELD);
-		return fields;
-	}
-
-	@Override
-	public String toString() {
-		return "UserSpaceDetailSimpleInfo [id=" + id + ", uu=" + uu + ", name=" + name + ", shortname=" + shortname
-				+ ", industry=" + industry + ", businesscode=" + businesscode + ", adminname=" + adminname
-				+ ", searchstatus=" + searchstatus + ", status=" + status + ", profession=" + profession + ", tags="
-				+ tags + "]";
-	}
-
-
-
-}

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ClassAndTableNameUtils.java

@@ -4,8 +4,6 @@ import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.dao.*;
 import com.uas.search.console.b2b.model.*;
-import com.uas.search.console.b2b.platformmanager.dao.UserSpaceDetailSimpleInfoDao;
-import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
 import com.uas.search.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,7 +65,6 @@ public class ClassAndTableNameUtils {
 		entityClasses.add(DeputyOrderSimpleInfo.class);
 		entityClasses.add(VendorSimpleInfo.class);
 		entityClasses.add(CustmerSimpleInfo.class);
-		entityClasses.add(UserSpaceDetailSimpleInfo.class);
 		entityClasses.add(PurcInquirySimpleInfo.class);
 		entityClasses.add(PurcInquiryItemSimpleInfo2.class);
 		entityClasses.add(InvitationRecordSimpleInfo.class);
@@ -106,7 +103,6 @@ public class ClassAndTableNameUtils {
 		entityDaoClasses.add(DeputyOrderSimpleInfoDao.class);
 		entityDaoClasses.add(VendorSimpleInfoDao.class);
 		entityDaoClasses.add(CustmerSimpleInfoDao.class);
-		entityDaoClasses.add(UserSpaceDetailSimpleInfoDao.class);
 		entityDaoClasses.add(PurcInquirySimpleInfoDao.class);
 		entityDaoClasses.add(PurcInquiryItemSimpleInfo2Dao.class);
 		entityDaoClasses.add(InvitationRecordSimpleInfoDao.class);

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/DocumentToObjectUtils.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.model.*;
-import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
 import org.apache.lucene.document.Document;
 
 import java.lang.reflect.Method;
@@ -91,9 +90,7 @@ public class DocumentToObjectUtils {
 			return (T) toVendorSimpleInfo(document);
 		} else if (clazz == CustmerSimpleInfo.class) {
 			return (T) toCustmerSimpleInfo(document);
-		} else if (clazz == UserSpaceDetailSimpleInfo.class) {
-			return (T) toUserSpaceDetail(document);
-		} else if (clazz == PurcInquirySimpleInfo.class) {
+		}  else if (clazz == PurcInquirySimpleInfo.class) {
 			return (T) toPurcInquiry(document);
 		} else if (clazz == PurcInquiryItemSimpleInfo2.class) {
 			return (T) toPurcInquirySimpleInfo(document);
@@ -278,71 +275,6 @@ public class DocumentToObjectUtils {
 		return inquiry;
 	}
 
-	private static UserSpaceDetailSimpleInfo toUserSpaceDetail(Document document) {
-		if (document == null) {
-			return null;
-		}
-		Table_name tableName = ClassAndTableNameUtils.toTableName(UserSpaceDetailSimpleInfo.class);
-		UserSpaceDetailSimpleInfo userSpaceDetail = new UserSpaceDetailSimpleInfo();
-		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.ID_FIELD))) {
-			userSpaceDetail.setId(Long.valueOf(
-					document.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.ID_FIELD))));
-		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.NAME_FIELD))) {
-			userSpaceDetail.setName(
-					document.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.NAME_FIELD)));
-		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.SHORTNAME_FIELD))) {
-			userSpaceDetail.setShortname(document
-					.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.SHORTNAME_FIELD)));
-		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.INDUSTRY_FIELD))) {
-			userSpaceDetail.setIndustry(document
-					.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.INDUSTRY_FIELD)));
-		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.ADMINNAME_FIELD))) {
-			userSpaceDetail.setAdminname(document
-					.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.ADMINNAME_FIELD)));
-		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.SEARCHSTATUS_FIELD))) {
-			userSpaceDetail.setSearchstatus(Short.valueOf(document.get(
-					ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.SEARCHSTATUS_FIELD))));
-		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.BUSINESSCODE_FIELD))) {
-			userSpaceDetail.setBusinesscode(document
-					.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.BUSINESSCODE_FIELD)));
-		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.STATUS_FIELD))) {
-			userSpaceDetail.setStatus(Short.valueOf(document
-					.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.STATUS_FIELD))));
-		} else {
-			// 方便进行状态排序，前面展示的为优软认证的企业资料
-			userSpaceDetail.setStatus((short) 1);
-		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.PROFESSION_FIELD))) {
-			userSpaceDetail.setProfession(document
-					.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.PROFESSION_FIELD)));
-		}
-		if (null != document
-				.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.TAGS_FIELD))) {
-			userSpaceDetail.setTags(
-					document.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.TAGS_FIELD)));
-		}
-		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.UU_FIELD))) {
-			userSpaceDetail.setUu(Long.valueOf(
-					document.get(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.UU_FIELD))));
-		}
-		return userSpaceDetail;
-	}
-
 	private static DeputyOrderSimpleInfo toDeputyOrder(Document document) {
 		if (document == null) {
 			return null;

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/MergeUserSpaceDetailData.java

@@ -1,133 +0,0 @@
-package com.uas.search.console.b2b.util;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import com.uas.search.util.StringUtils;
-
-import com.alibaba.fastjson.JSONObject;
-import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
-
-/**
- * 用于对从数据库导出的企业文本文件进行处理，以json的形式写入多个文件中
- * 
- * @author sunyj
- * @since 2016年8月8日 下午9:00:31
- */
-public class MergeUserSpaceDetailData {
-
-	// 单个文件存储的最大数据数目
-	public static final int SINGLE_FILE_MAX_SIZE = 100000;
-
-	// 文本文件的路径
-	private static final String DATA_DIR = "C:\\Users\\sunyj-pc\\Desktop\\temp\\data\\prod";
-
-	/**
-	 * 将从本地文件读取的一行字符串数据解析为对象
-	 * 
-	 * @param data
-	 *            格式为"NAME" "SHORTNAME" "INDUSTRY" "ADMINNAME" "ID"
-	 * @return
-	 */
-	private static UserSpaceDetailSimpleInfo parseUsd(String data) {
-		UserSpaceDetailSimpleInfo userSpaceDetail = new UserSpaceDetailSimpleInfo();
-		String[] strs = data.split("\t");
-		if (!StringUtils.isEmpty(strs[0])) {
-			userSpaceDetail.setName(strs[0].substring(1, strs[0].length() - 1));
-		}
-		if (!StringUtils.isEmpty(strs[1])) {
-			userSpaceDetail.setShortname(strs[1].substring(1, strs[1].length() - 1));
-		}
-		if (!StringUtils.isEmpty(strs[2])) {
-			userSpaceDetail.setIndustry(strs[2].substring(1, strs[2].length() - 1));
-		}
-		if (!StringUtils.isEmpty(strs[3])) {
-			userSpaceDetail.setAdminname(strs[3].substring(1, strs[3].length() - 1));
-		}
-		if (!StringUtils.isEmpty(strs[4])) {
-			userSpaceDetail.setId(Long.parseLong(strs[4]));
-		}
-		if (!StringUtils.isEmpty(strs[5])) {
-			userSpaceDetail.setSearchstatus(Short.parseShort(strs[5]));
-		}
-		return userSpaceDetail;
-	}
-
-	public static void parse() {
-		BufferedReader usdReader = null;
-		PrintWriter printWriter = null;
-		// 分成多个文件存储
-		int fileIndex = 1;
-		try {
-			File file = new File(DATA_DIR + "\\usd");
-			if (!file.exists()) {
-				file.mkdirs();
-			}
-			usdReader = new BufferedReader(new FileReader(DATA_DIR + "\\AC_US_DETAIL.tsv"));
-			printWriter = new PrintWriter(DATA_DIR + "\\usd\\" + fileIndex + ".txt");
-			// 第一行内容为列名，不做解析
-			usdReader.readLine();
-			String usdLine = null;
-			int dataCount = 0;
-			while ((usdLine = usdReader.readLine()) != null) {
-				dataCount++;
-				// 一个文件存放100000条数据，一旦超过，写入新的文件
-				if (dataCount > SINGLE_FILE_MAX_SIZE) {
-					System.out.println("--------------------------------new file" + fileIndex);
-					dataCount = 1;
-					printWriter.flush();
-					printWriter.close();
-					fileIndex++;
-					printWriter = new PrintWriter(DATA_DIR + "\\usd\\" + fileIndex + ".txt");
-				}
-
-				try {
-					printWriter.println(JSONObject.toJSONString(parseUsd(usdLine)));
-				} catch (Exception e) {
-					System.out.println(usdLine);
-				}
-			}
-			printWriter.flush();
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				usdReader.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			printWriter.close();
-		}
-	}
-
-	public static void readData() {
-		BufferedReader br = null;
-		try {
-			br = new BufferedReader(new FileReader(DATA_DIR + "\\usd\\1.txt"));
-			String line = br.readLine();
-			System.out.println(JSONObject.parseObject(line, UserSpaceDetailSimpleInfo.class));
-		} catch (FileNotFoundException e) {
-			System.out.println("File not found!");
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				br.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	// public static void main(String[] args) {
-	// parse();
-	//// readData();
-	// }
-
-}

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ObjectToDocumentUtils.java

@@ -15,7 +15,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.core.model.Constant;
 import com.uas.search.b2b.service.SearchService.Table_name;
-import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
 
 /**
  * 将对象转换为Document的工具类
@@ -92,8 +91,6 @@ public class ObjectToDocumentUtils {
 			return toDocument((VendorSimpleInfo) object);
 		} else if (object instanceof CustmerSimpleInfo) {
 			return toDocument((CustmerSimpleInfo) object);
-		} else if (object instanceof UserSpaceDetailSimpleInfo) {
-			return toDocument((UserSpaceDetailSimpleInfo) object);
 		} else if (object instanceof PurcInquirySimpleInfo) {
 			return toDocument((PurcInquirySimpleInfo) object);
 		} else if (object instanceof PurcInquiryItemSimpleInfo2) {
@@ -2241,88 +2238,6 @@ public class ObjectToDocumentUtils {
 		return document;
 	}
 
-	/**
-	 * 将UserSpaceDetailSimpleInfo转成document
-	 * 
-	 * @param userSpaceDetailSimpleInfo
-	 * @return
-	 */
-	public static Document toDocument(UserSpaceDetailSimpleInfo userSpaceDetailSimpleInfo) {
-		if (userSpaceDetailSimpleInfo == null || userSpaceDetailSimpleInfo.getId() == null) {
-			return null;
-		}
-		Table_name tableName = ClassAndTableNameUtils.toTableName(UserSpaceDetailSimpleInfo.class);
-		Document document = new Document();
-		// 不能用LongField，否则后续实时更新索引时，方法updateDocument(new Term("", ""),
-		// doc)无法根据id进行更新
-		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.ID_FIELD),
-				String.valueOf(userSpaceDetailSimpleInfo.getId()), Store.YES));
-		if (null != userSpaceDetailSimpleInfo.getName()) {
-			document.add(
-					new TextField(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.NAME_FIELD),
-							String.valueOf(userSpaceDetailSimpleInfo.getName()), Store.YES));
-		}
-		if (null != userSpaceDetailSimpleInfo.getShortname()) {
-			document.add(new TextField(
-					ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.SHORTNAME_FIELD),
-					String.valueOf(userSpaceDetailSimpleInfo.getShortname()), Store.YES));
-		}
-		if (null != userSpaceDetailSimpleInfo.getIndustry()) {
-			document.add(new StringField(
-					ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.INDUSTRY_FIELD),
-					String.valueOf(userSpaceDetailSimpleInfo.getIndustry()), Store.YES));
-		}
-		if (null != userSpaceDetailSimpleInfo.getAdminname()) {
-			document.add(new TextField(
-					ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.ADMINNAME_FIELD),
-					String.valueOf(userSpaceDetailSimpleInfo.getAdminname()), Store.YES));
-		}
-		if (null != userSpaceDetailSimpleInfo.getBusinesscode()) {
-			document.add(new TextField(
-					ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.BUSINESSCODE_FIELD),
-					String.valueOf(userSpaceDetailSimpleInfo.getBusinesscode()), Store.YES));
-		}
-		if (null != userSpaceDetailSimpleInfo.getSearchstatus()) {
-			document.add(new StringField(
-					ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.SEARCHSTATUS_FIELD),
-					String.valueOf(userSpaceDetailSimpleInfo.getSearchstatus()), Store.YES));
-		}
-		if (null != userSpaceDetailSimpleInfo.getStatus()) {
-			document.add(new StringField(
-					ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.STATUS_FIELD),
-					String.valueOf(userSpaceDetailSimpleInfo.getStatus()), Store.YES));
-		}
-		if (null != userSpaceDetailSimpleInfo.getProfession()) {
-			document.add(new TextField(
-					ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.PROFESSION_FIELD),
-					userSpaceDetailSimpleInfo.getProfession(), Store.YES));
-		}
-		if (null != userSpaceDetailSimpleInfo.getTags()) {
-			document.add(
-					new TextField(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.TAGS_FIELD),
-							userSpaceDetailSimpleInfo.getTags(), Store.YES));
-		}
-		if (null != userSpaceDetailSimpleInfo.getStatus()) {
-			document.add(new StringField(
-					ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.STATUS_FIELD),
-					String.valueOf(userSpaceDetailSimpleInfo.getStatus()), Store.YES));
-		}
-		if (null != userSpaceDetailSimpleInfo.getUu()) {
-			document.add(
-					new StringField(ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.UU_FIELD),
-							String.valueOf(userSpaceDetailSimpleInfo.getUu()), Store.YES));
-		}
-		// 排序字段
-		document.add(new NumericDocValuesField(
-				ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.ID_FIELD),
-				userSpaceDetailSimpleInfo.getId()));
-		document.add(new NumericDocValuesField(
-				ClassAndTableNameUtils.combineField(tableName, UserSpaceDetailSimpleInfo.STATUS_FIELD),
-				userSpaceDetailSimpleInfo.getStatus()));
-
-		return document;
-	}
-
 	/**
 	 * 将purcInquirySimpleInfo转成document
 	 * 

search-console-b2b/src/main/resources/spring/dubbo.xml → search-console-b2b/src/main/resources/spring/dubbo.xml.deprecated

@@ -1,19 +1,19 @@
-<?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:dubbo="http://code.alibabatech.com/schema/dubbo"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-	http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
-
-	<dubbo:application name="search-b2b" owner="${dubbo.owner}" />
-
-	<dubbo:registry address="${zk.url}" />
-
-	<dubbo:protocol name="dubbo" port="20881" />
-
-	<bean id="searchService"
-		class="com.uas.search.console.b2b.service.impl.SearchServiceImpl" />
-
-	<!-- 提供搜索服务 -->
-	<dubbo:service interface="com.uas.search.b2b.service.SearchService"
-		ref="searchService" group="${dubbo.group}" />
+<?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:dubbo="http://code.alibabatech.com/schema/dubbo"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
+
+	<dubbo:application name="search-b2b" owner="${dubbo.owner}" />
+
+	<dubbo:registry address="${zk.url}" />
+
+	<dubbo:protocol name="dubbo" port="20881" />
+
+	<bean id="searchService"
+		class="com.uas.search.console.b2b.service.impl.SearchServiceImpl" />
+
+	<!-- 提供搜索服务 -->
+	<dubbo:service interface="com.uas.search.b2b.service.SearchService"
+		ref="searchService" group="${dubbo.group}" />
 </beans>