修复broker目录调整时，目录结构错误调整问题

src/main/java/com/yihu/hos/broker/common/CollectHelper.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.common;
package com.yihu.hos.common;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/com/yihu/hos/broker/common/CommonPageController.java

@@ -1,5 +1,6 @@
package com.yihu.hos.broker.common;
package com.yihu.hos.common;
import com.yihu.hos.web.framework.util.PKUtil;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.system.model.SystemUser;
import org.springframework.stereotype.Controller;

src/main/java/com/yihu/hos/broker/common/JXLUtil.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.common;
package com.yihu.hos.common;
import jxl.Cell;
import jxl.Sheet;
@@ -8,6 +8,7 @@ import jxl.write.WritableSheet;
import jxl.write.WritableWorkbook;
import javax.servlet.http.HttpServletResponse;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.SimpleDateFormat;

src/main/java/com/yihu/hos/broker/common/ObjectVersion.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.common;
package com.yihu.hos.common;
import java.io.Serializable;
import java.security.SecureRandom;

src/main/java/com/yihu/hos/broker/common/ReflectUtil.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.common;
package com.yihu.hos.common;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;

src/main/java/com/yihu/hos/broker/common/Services.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.common;
package com.yihu.hos.common;
/**
 * 平台顶级服务列表.

src/main/java/com/yihu/hos/broker/common/constants/Constants.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.common.constants;
package com.yihu.hos.common.constants;
/**
 * @author HZY

src/main/java/com/yihu/hos/broker/common/constants/ContextAttributes.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.common.constants;
package com.yihu.hos.common.constants;
/**
 * @created Airhead 2016/11/14.

src/main/java/com/yihu/hos/datacollect/controller/DataCollectController.java

@@ -2,7 +2,7 @@ package com.yihu.hos.datacollect.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.datacollect.model.RsJobConfig;
import com.yihu.hos.datacollect.service.intf.IDatacollectManager;

src/main/java/com/yihu/hos/datacollect/service/DatacollectManager.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import com.yihu.hos.datacollect.dao.intf.IDatacollectDao;
import com.yihu.hos.datacollect.model.*;
import com.yihu.hos.datacollect.service.intf.IDatacollectManager;

src/main/java/com/yihu/hos/datacollect/service/DatacollectService.java

@@ -10,7 +10,7 @@ import com.yihu.ehr.dbhelper.common.sqlparser.ParserSql;
import com.yihu.ehr.dbhelper.common.sqlparser.ParserSqlserver;
import com.yihu.ehr.dbhelper.jdbc.DBHelper;
import com.yihu.ehr.dbhelper.mongodb.MongodbHelper;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import com.yihu.hos.crawler.model.config.SysConfig;

src/main/java/com/yihu/hos/datacollect/service/DatapushService.java

@@ -1,7 +1,7 @@
package com.yihu.hos.datacollect.service;
import com.yihu.ehr.dbhelper.mongodb.MongodbHelper;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import com.yihu.hos.datacollect.dao.intf.IDatacollectDao;

src/main/java/com/yihu/hos/interceptor/AuditInterceptor.java

@@ -1,6 +1,6 @@
package com.yihu.hos.interceptor;
import com.yihu.hos.broker.common.constants.ContextAttributes;
import com.yihu.hos.common.constants.ContextAttributes;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.EmptyInterceptor;
import org.slf4j.Logger;

src/main/java/com/yihu/hos/listeners/ApplicationStart.java

@@ -2,7 +2,7 @@ package com.yihu.hos.listeners;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import com.yihu.hos.broker.services.ServiceFlowEventService;
import com.yihu.hos.services.ServiceFlowEventService;
import com.yihu.hos.system.model.bo.ServiceFlow;
import com.yihu.hos.system.service.FlowManager;
import com.yihu.hos.web.framework.constrant.DateConvert;

src/main/java/com/yihu/hos/monitor/service/ServiceMonitorService.java

@@ -1,7 +1,7 @@
package com.yihu.hos.monitor.service;
import com.mongodb.*;
import com.yihu.hos.broker.common.constants.Constants;
import com.yihu.hos.common.constants.Constants;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.monitor.dao.ServiceMonitorDao;
import com.yihu.hos.system.model.SystemServiceEndpoint;

src/main/java/com/yihu/hos/resource/controller/RsResourceController.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.hos.broker.common.JXLUtil;
import com.yihu.hos.common.JXLUtil;
import com.yihu.hos.resource.model.*;
import com.yihu.hos.resource.service.IRsResourceRestService;
import com.yihu.hos.resource.service.IRsResourceService;

src/main/java/com/yihu/hos/resource/controller/StdController.java

@@ -1,6 +1,6 @@
package com.yihu.hos.resource.controller;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.resource.service.IStdService;

src/main/java/com/yihu/hos/resource/service/impl/StdService.java

@@ -2,7 +2,7 @@ package com.yihu.hos.resource.service.impl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;

src/main/java/com/yihu/hos/broker/services/ServiceFlowEventService.java

@@ -1,8 +1,8 @@
package com.yihu.hos.broker.services;
package com.yihu.hos.services;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.broker.common.constants.Constants;
import com.yihu.hos.common.constants.Constants;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import com.yihu.hos.system.model.bo.ServiceFlow;

src/main/java/com/yihu/hos/standard/service/bo/AdapterVersion.java

@@ -1,7 +1,7 @@
package com.yihu.hos.standard.service.bo;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.broker.common.ObjectVersion;
import com.yihu.hos.common.ObjectVersion;
public class AdapterVersion {
    public static final String FBVersion = "000000000000";

src/main/java/com/yihu/hos/standard/service/bo/StandardVersion.java

@@ -1,6 +1,6 @@
package com.yihu.hos.standard.service.bo;
import com.yihu.hos.broker.common.ObjectVersion;
import com.yihu.hos.common.ObjectVersion;
public class StandardVersion {
    public final static String VersionBoundSymbol = "_";

src/main/java/com/yihu/hos/system/controller/BaseDictController.java

@@ -1,6 +1,6 @@
package com.yihu.hos.system.controller;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.system.model.SystemDict;

src/main/java/com/yihu/hos/system/controller/DatasourceController.java

@@ -1,6 +1,6 @@
package com.yihu.hos.system.controller;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import com.yihu.hos.system.model.SystemDatasource;
import com.yihu.hos.system.service.intf.IDatasourceManager;
import com.yihu.hos.web.framework.model.Result;

src/main/java/com/yihu/hos/system/controller/FlowController.java

@@ -1,7 +1,7 @@
package com.yihu.hos.system.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.broker.common.constants.Constants;
import com.yihu.hos.common.constants.Constants;
import com.yihu.hos.system.model.SystemServiceFlow;
import com.yihu.hos.system.model.SystemServiceFlowClass;
import com.yihu.hos.system.model.SystemServiceFlowTemp;
@@ -9,6 +9,8 @@ import com.yihu.hos.system.service.FlowManager;
import com.yihu.hos.system.service.intf.IFlowManage;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.apache.commons.fileupload.disk.DiskFileItem;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
@@ -19,6 +21,9 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;

src/main/java/com/yihu/hos/system/service/BaseDictManager.java

@@ -7,12 +7,13 @@ import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.system.dao.intf.IBaseDictDao;
import com.yihu.hos.system.model.SystemDictList;
import com.yihu.hos.system.service.intf.IBaseDictManager;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import com.yihu.hos.system.model.SystemDict;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
 * Created by hzp on 2016/1/11.

src/main/java/com/yihu/hos/system/service/DatasourceManager.java

@@ -5,11 +5,12 @@ import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.system.dao.intf.IDatasourceDao;
import com.yihu.hos.system.model.SystemDatasource;
import com.yihu.hos.system.service.intf.IDatasourceManager;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;

src/main/java/com/yihu/hos/system/service/FlowManager.java

@@ -1,10 +1,10 @@
package com.yihu.hos.system.service;
import com.yihu.hos.broker.common.constants.Constants;
import com.yihu.hos.common.constants.Constants;
import com.yihu.hos.config.MongoConfig;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.core.encrypt.DES;
import com.yihu.hos.broker.services.ServiceFlowEventService;
import com.yihu.hos.services.ServiceFlowEventService;
import com.yihu.hos.system.dao.FlowClassDao;
import com.yihu.hos.system.dao.FlowDao;
import com.yihu.hos.system.dao.FlowTempDao;
@@ -24,10 +24,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.annotation.Resource;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * 系统流程管理业务类
@@ -421,6 +418,8 @@ public class FlowManager implements IFlowManage {
        return null;
    }
    /* *********************       发送消息方式生成文件   ********************************/
    public Integer sendAddRoute(Integer tempId, Integer flowId, String newCron) throws Exception {
        List<SystemServiceFlowTemp> flowTempRouters = flowTempDao.getFlowTemps(tempId, Constants.FLOW_TYPE_ROUTE);

src/main/java/com/yihu/hos/system/service/OrganizationManager.java

@@ -1,6 +1,6 @@
package com.yihu.hos.system.service;
import com.yihu.hos.broker.common.Services;
import com.yihu.hos.common.Services;
import com.yihu.hos.system.dao.intf.IDatasourceDao;
import com.yihu.hos.system.dao.intf.IOrganizationDao;
import com.yihu.hos.system.model.SystemOrganization;

src/test/java/com/yihu/hos/broker/services/ServiceFlowEventServiceTest.java

@@ -1,4 +1,4 @@
package com.yihu.hos.broker.services;
package com.yihu.hos.services;
import com.yihu.hos.ESBApplication;
import org.junit.Test;