Merge branch 'master' of http://192.168.1.220:10080/esb/esb

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

@@ -5,11 +5,11 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
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;
import com.yihu.hos.datacollect.service.intf.IDatacollectService;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.datacollect.service.DatacollectManager;
import com.yihu.hos.datacollect.service.DatacollectService;
import com.yihu.hos.resource.service.StdService;
import com.yihu.hos.standard.service.adapter.AdapterSchemeService;
import com.yihu.hos.system.service.intf.IDatasourceManager;
import com.yihu.hos.system.service.DatasourceManager;
import com.yihu.hos.web.framework.constant.DateConvert;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.Result;
@@ -36,16 +36,16 @@ import java.util.*;
public class DataCollectController extends BaseController {
    @Resource(name = Services.Datacollect)
    IDatacollectManager datacollect;
    DatacollectManager datacollect;
    @Resource(name = Services.DatacollectService)
    IDatacollectService datacollectService;
    DatacollectService datacollectService;
    @Resource(name = Services.StdService)
    IStdService stdService;
    @Resource(name = StdService.BEAN_ID)
    StdService stdService;
    @Resource(name = Services.Datasource)
    IDatasourceManager datasource;
    DatasourceManager datasource;
    @Resource(name = AdapterSchemeService.BEAN_ID)
    private AdapterSchemeService adapterSchemeService;

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

@@ -1,13 +1,14 @@
package com.yihu.hos.datacollect.controller;
import com.yihu.hos.datacollect.service.intf.IDatapushService;
import com.yihu.hos.datacollect.service.DatapushService;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
/**
 * 数据采集配置页面
@@ -17,8 +18,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
@Controller("dataPushController")
public class DataPushController extends BaseController {
    @Autowired
    IDatapushService datapushService;
    @Resource(name = DatapushService.BEAN_ID)
    DatapushService datapushService;
    /**************************** 推送数据 ************************************************/
    /*

src/main/java/com/yihu/hos/datacollect/dao/DatacollectDao.java

@@ -1,11 +1,9 @@
package com.yihu.hos.datacollect.dao;
import com.yihu.hos.datacollect.dao.intf.IDatacollectDao;
import com.yihu.hos.datacollect.model.DtoJobDataset;
import com.yihu.hos.datacollect.model.RsJobDataset;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.constant.DateConvert;
import com.yihu.hos.resource.model.RsDatasourceDataset;
import com.yihu.hos.web.framework.constant.DateConvert;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.SimpleChartItem;
@@ -21,12 +19,14 @@ import java.util.Map;
 * Created by hzp on 2016/1/11.
 */
@Repository("DatacollectDao")
public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
public class DatacollectDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "DatacollectDao";
    /**
     * 通过机构代码获取版本号
     */
    @Override
    
    public String getVersionByQLC(String orgCode) throws Exception
    {
        try{
@@ -45,7 +45,7 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
    /**
     * 根据JobId获取Cron表达式
     */
    @Override
    
    public String getCronByJobId(String jobId)
    {
        try{
@@ -62,7 +62,7 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
     * 获取任务列表
     * @return
     */
    @Override
    
    public DataGridResult getJobList(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception
    {
        StringBuilder sb = new StringBuilder();
@@ -81,7 +81,7 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
     * @return
     * @throws Exception
     */
    @Override
    
    public List<RsJobDataset> getJobDataset(String jobId) throws Exception
    {
        String sql = "select * from rs_job_dataset where job_id='"+jobId+"'";
@@ -92,7 +92,7 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
    /**
     * 获取版本名称
     */
    @Override
    
    public String getSchemeAndVersion(String schemeVersionId) throws Exception
    {
        String sql = "select IFNULL( (select  CONCAT_WS(' -- ',s.name,v.name)  from adapter_scheme_version v " +
@@ -104,7 +104,7 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
    /**
     * 修改任务状态
     */
    @Override
    
    public void validJob(String id,String valid) throws Exception
    {
        String sql = "update rs_job_config set valid='"+valid+"' where Id='"+id+"'";
@@ -174,7 +174,7 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
    /**
     * 获取任务详细日志列表
     */
    @Override
    
    public DataGridResult getJobLogDetail(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception
    {
        StringBuilder sb = new StringBuilder();
@@ -212,7 +212,7 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
    /**
     * 获取任务日志列表
     */
    @Override
    
    public DataGridResult getJobLog(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception
    {
        StringBuilder sb = new StringBuilder();

src/main/java/com/yihu/hos/datacollect/dao/DatacollectLogDao.java

@@ -1,6 +1,5 @@
package com.yihu.hos.datacollect.dao;
import com.yihu.hos.datacollect.dao.intf.IDatacollectLogDao;
import com.yihu.hos.datacollect.model.RsDatapushLog;
import com.yihu.hos.web.framework.constant.DateConvert;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
@@ -16,14 +15,14 @@ import java.util.Map;
 * Created by hzp on 2016/1/11.
 */
@Repository("DatacollectLogDao")
public class DatacollectLogDao extends SQLGeneralDAO implements IDatacollectLogDao {
public class DatacollectLogDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "DatacollectLogDao";
    /**
     * 修改轮询字段
     */
    @Override
    
    public void updateJobDatasetKeyvalue(String id,String jobDatasetKeyvalue) throws Exception
    {
        String sql = "update rs_job_dataset set job_dataset_keyvalue='"+jobDatasetKeyvalue+"' where id='"+id+"'";
@@ -34,7 +33,7 @@ public class DatacollectLogDao extends SQLGeneralDAO implements IDatacollectLogD
    /**
     * 推数据新增日志
     */
    @Override
    
    public void addDataPushLog(String type,String success,String content) throws Exception
    {
        RsDatapushLog log = new RsDatapushLog();
@@ -48,7 +47,6 @@ public class DatacollectLogDao extends SQLGeneralDAO implements IDatacollectLogD
    /**
     * 获取日志列表
     */
    @Override
    public DataGridResult queryDataPushLog(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception
    {
        StringBuilder sb = new StringBuilder();

src/main/java/com/yihu/hos/datacollect/dao/intf/IDatacollectDao.java

@@ -1,92 +0,0 @@
package com.yihu.hos.datacollect.dao.intf;
import com.yihu.hos.datacollect.model.DtoJobDataset;
import com.yihu.hos.datacollect.model.RsJobDataset;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.SimpleChartItem;
import com.yihu.hos.resource.model.RsDatasourceDataset;
import java.util.List;
import java.util.Map;
/**
 * Created by hzp on 2016/1/11.
 */
public interface IDatacollectDao extends XSQLGeneralDAO {
    /**
     * 通过机构代码获取版本号
     */
    public String getVersionByQLC(String orgCode) throws Exception;
    /**
     * 根据JobId获取Cron表达式
     */
    public String getCronByJobId(String jobId);
    /**
     * 获取任务列表
     * @return
     */
    public DataGridResult getJobList(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception;
    /**
     * 获取任务数据集
     * @return
     * @throws Exception
     */
    public List<RsJobDataset> getJobDataset(String jobId) throws Exception;
    /**
     * 获取版本名称
     */
    public String getSchemeAndVersion(String schemeVersionId) throws Exception;
    /**
     * 修改任务状态
     */
    public void validJob(String id, String valid) throws Exception;
    /**
     * 删除任务关联数据集
     */
    public void deleteJobDatasetByJobId(String jobId) throws Exception;
    /**
     * 通过版本获取配置的数据集--数据源
     * @throws Exception
     */
    public List<RsDatasourceDataset> getDatasourceDataset(String stdVersion) throws Exception;
    /**
     * 删除数据集数据源关联
     */
    public void deleteDatasourceDatasetById(String id) throws Exception;
    /**
     * 通过任务ID获取相关数据集
     */
    public List<DtoJobDataset> getDatacollectDataset(String jobId) throws Exception;
    /**
     * 获取任务日志列表
     */
    public DataGridResult getJobLogDetail(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception;
    /**
     * 获取任务日志列表
     */
    public DataGridResult getJobLog(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception;
    /**
     * 获取采集日志统计
     */
    public List<Map<String, Object>> getJobLogCount(String logId) throws Exception;
    /**
     * 任务详细根据数据集分组
     */
    public List<SimpleChartItem> getJobLogDataset(String logId) throws Exception;
}

src/main/java/com/yihu/hos/datacollect/dao/intf/IDatacollectLogDao.java

@@ -1,29 +0,0 @@
package com.yihu.hos.datacollect.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import java.util.Map;
/**
 * 采集日志
 * Created by hzp on 2016/1/26.
 */
public interface IDatacollectLogDao extends XSQLGeneralDAO {
    /**
     * 修改
     */
    void updateJobDatasetKeyvalue(String id, String jobDatasetKeyvalue) throws Exception;
    /**
     * 推数据新增日志
     */
    void addDataPushLog(String type,String success,String content) throws Exception;
    /**
     * 获取日志列表
     */
    DataGridResult queryDataPushLog(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception;
}

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

@@ -5,16 +5,17 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.hos.common.Services;
import com.yihu.hos.datacollect.dao.intf.IDatacollectDao;
import com.yihu.hos.datacollect.dao.DatacollectDao;
import com.yihu.hos.datacollect.model.*;
import com.yihu.hos.datacollect.service.intf.IDatacollectManager;
import com.yihu.hos.resource.model.RsDatasourceDataset;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.resource.service.StdService;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.standard.StdDataSetModel;
import com.yihu.hos.system.service.FlowManager;
import com.yihu.hos.system.service.intf.IFlowManage;
import com.yihu.hos.web.framework.model.*;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.DictItem;
import com.yihu.hos.web.framework.model.SimpleChartItem;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.BeanUtils;
@@ -28,16 +29,18 @@ import java.util.List;
import java.util.Map;
@Service(Services.Datacollect)
public class DatacollectManager implements IDatacollectManager {
public class DatacollectManager{
    @Resource(name = "DatacollectDao")
    private IDatacollectDao datacollectDao;
    public static final String BEAN_ID = Services.Datacollect;
    @Resource(name = Services.StdService)
    private IStdService stdManager;
    @Resource(name = DatacollectDao.BEAN_ID)
    private DatacollectDao datacollectDao;
    @Resource(name = StdService.BEAN_ID)
    private StdService stdManager;
    @Resource(name = FlowManager.BEAN_ID)
    private IFlowManage flowManage;
    private FlowManager flowManage;
    @Autowired
    private ObjectMapper objectMapper;
@@ -49,7 +52,6 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 根据JobId获取Cron表达式
     */
    @Override
    public String getCronByJobId(String jobId) throws Exception {
        return datacollectDao.getCronByJobId(jobId);
    }
@@ -59,7 +61,7 @@ public class DatacollectManager implements IDatacollectManager {
     *
     * @return
     */
    @Override
    public RsJobConfig getJobById(String id) throws Exception {
        return datacollectDao.getEntity(RsJobConfig.class, id);
    }
@@ -67,7 +69,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 获取任务列表
     */
    @Override
    public DataGridResult getJobList(Map<String, Object> conditionMap, int page, int rows) throws Exception {
        DataGridResult re = datacollectDao.getJobList(conditionMap, page, rows);
        //获取任务列表
@@ -118,7 +120,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 根据适配方案获取数据集列表
     */
    @Override
    public DataGridResult getSchemeDataset(String schemeId, String schemeVersion, String jobId) throws Exception {
        //获取适配数据集总和
        List<AdapterDatasetModel> datasetString = stdManager.getDatasetByScheme(schemeVersion);
@@ -170,7 +172,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 根据适配方案获取字段列表
     */
    @Override
    public DataGridResult getSchemeDatasetCol(String schemeId, String schemeVersion, String datasetId) throws Exception {
        //获取适配字段
        List datacolString = stdManager.getDatacolByScheme(schemeVersion, datasetId);
@@ -197,7 +199,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 根据任务Id获取相关数据集下拉数据
     */
    @Override
    public DataGridResult getJobDatasetByJobId(String jobId) throws Exception {
        //获取任务数据集
        List<RsJobDataset> jobDataset = datacollectDao.getJobDataset(jobId);
@@ -218,7 +220,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 新增任务
     */
    @Override
    @Transactional
    public ActionResult addJob(RsJobConfig obj, String cron, String jobDataset) throws Exception {
        datacollectDao.saveEntity(obj);//保存任务
@@ -242,7 +244,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 修改任务
     */
    @Override
    @Transactional
    public ActionResult updateJob(RsJobConfig obj, String cron, String jobDataset) throws Exception {
        Integer flowId = flowManage.updateCamelFile(obj.getFlowTempId(), obj.getFlowId(), cron);
@@ -262,7 +264,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 修改任务
     */
    @Override
    @Transactional
    public ActionResult updateJob(RsJobConfig obj) throws Exception {
        datacollectDao.updateEntity(obj);
@@ -307,7 +309,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 数据集数据源管理列表（包含全部数据集）
     */
    @Override
    public DataGridResult getDatasetSource(String stdVersion) throws Exception {
        //获取版本下全部数据集
        List<StdDataSetModel> stdDataSetModelList = stdManager.getDatasetByVersion(stdVersion);
@@ -345,7 +347,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 保存数据集数据源配置
     */
    @Override
    @Transactional
    public ActionResult saveDatasetSource(String json) throws Exception {
        //TODO: Use jackson
@@ -384,7 +386,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 获取任务详细日志列表
     */
    @Override
    public DataGridResult getJobLogDetail(Map<String, Object> conditionMap, int page, int rows) throws Exception {
        return datacollectDao.getJobLogDetail(conditionMap, page, rows);
    }
@@ -392,7 +394,7 @@ public class DatacollectManager implements IDatacollectManager {
    /**
     * 获取任务日志列表
     */
    @Override
    public DataGridResult getJobLog(Map<String, Object> conditionMap, int page, int rows) throws Exception {
        DataGridResult re = datacollectDao.getJobLog(conditionMap, page, rows);
@@ -430,7 +432,7 @@ public class DatacollectManager implements IDatacollectManager {
     *
     * @return
     */
    @Override
    public DataGridResult getJobLogDataset(String logId) throws Exception {
        DataGridResult re = new DataGridResult();
        List<SimpleChartItem> maps = datacollectDao.getJobLogDataset(logId);

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

@@ -15,12 +15,10 @@ import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import com.yihu.hos.crawler.model.config.SysConfig;
import com.yihu.hos.crawler.model.patient.PatientIdentity;
import com.yihu.hos.datacollect.dao.intf.IDatacollectDao;
import com.yihu.hos.datacollect.dao.intf.IDatacollectLogDao;
import com.yihu.hos.datacollect.dao.DatacollectDao;
import com.yihu.hos.datacollect.dao.DatacollectLogDao;
import com.yihu.hos.datacollect.model.*;
import com.yihu.hos.datacollect.service.intf.IDatacollectManager;
import com.yihu.hos.datacollect.service.intf.IDatacollectService;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.resource.service.StdService;
import com.yihu.hos.web.framework.constant.DateConvert;
import com.yihu.hos.web.framework.constant.SqlConstants;
import com.yihu.hos.web.framework.model.ActionResult;
@@ -46,20 +44,22 @@ import java.util.*;
 * 数据采集执行服务
 */
@Service(Services.DatacollectService)
public class DatacollectService implements IDatacollectService {
public class DatacollectService  {
    static private final Logger logger = LoggerFactory.getLogger(DatacollectService.class);
    public static final String BEAN_ID = Services.DatacollectService;
    MongodbHelper mongoOrigin = new MongodbHelper("origin");
    MongodbHelper mongo = new MongodbHelper();
    String dateFormat = "yyyy-MM-dd HH:mm:ss"; //默认时间字符串格式
    int maxNum = 1000; //查询条数限制
    @Resource(name = Services.Datacollect)
    private IDatacollectManager datacollect;
    @Resource(name = Services.StdService)
    private IStdService stdService;
    @Resource(name = "DatacollectDao")
    private IDatacollectDao datacollectDao;
    @Resource(name = "DatacollectLogDao")
    private IDatacollectLogDao datacollectLogDao;
    private DatacollectManager datacollect;
    @Resource(name = StdService.BEAN_ID)
    private StdService stdService;
    @Resource(name = DatacollectDao.BEAN_ID)
    private DatacollectDao datacollectDao;
    @Resource(name = DatacollectLogDao.BEAN_ID)
    private DatacollectLogDao datacollectLogDao;
    @Autowired
    private ObjectMapper objectMapper;
@@ -81,7 +81,6 @@ public class DatacollectService implements IDatacollectService {
    /**
     * 执行任务
     */
    @Override
    public void executeJob(String jobId) throws Exception {
        //获取任务详细信息
@@ -162,7 +161,6 @@ public class DatacollectService implements IDatacollectService {
    /**
     * 根据日志详细补采数据
     */
    @Override
    @Transactional
    public ActionResult repeatJob(String id) throws Exception {
        RsJobLogDetail log = datacollectLogDao.getEntity(RsJobLogDetail.class, id);

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

@@ -4,10 +4,9 @@ import com.yihu.ehr.dbhelper.mongodb.MongodbHelper;
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;
import com.yihu.hos.datacollect.dao.intf.IDatacollectLogDao;
import com.yihu.hos.datacollect.service.intf.IDatapushService;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.datacollect.dao.DatacollectDao;
import com.yihu.hos.datacollect.dao.DatacollectLogDao;
import com.yihu.hos.resource.service.StdService;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.resultModel.AdapterMetadataResultDetailModel;
import com.yihu.hos.web.framework.model.ActionResult;
@@ -18,6 +17,7 @@ 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.ArrayList;
import java.util.List;
@@ -25,18 +25,20 @@ import java.util.List;
 * 推数据服务
 */
@Service(Services.DatapushService)
public class DatapushService implements IDatapushService {
public class DatapushService {
    public static final String BEAN_ID = Services.DatapushService;
    static private final Logger logger = LoggerFactory.getLogger(DatapushService.class);
    @Autowired
    private IDatacollectDao datacollect;
    private DatacollectDao datacollect;
    @Autowired
    private IDatacollectLogDao datacollectLog;
    @Resource(name = DatacollectLogDao.BEAN_ID)
    private DatacollectLogDao datacollectLog;
    @Autowired
    private IStdService stdService;
    @Resource(name = StdService.BEAN_ID)
    private StdService stdService;
    MongodbHelper mongo = new MongodbHelper();
@@ -72,7 +74,6 @@ public class DatapushService implements IDatapushService {
    /**
     * 数据入库
     */
    @Override
    @Transactional
    public Result pushData(String datasetCode,String dataString,String orgCode) throws Exception
    {

src/main/java/com/yihu/hos/datacollect/service/intf/IDatacollectManager.java

@@ -1,96 +0,0 @@
package com.yihu.hos.datacollect.service.intf;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.datacollect.model.RsJobConfig;
import com.yihu.hos.web.framework.model.DataGridResult;
import java.util.Map;
/**
 * Created by hzp on 2015/12/25.
 */
public interface IDatacollectManager {
    /**
     * 根据JobId获取Cron表达式
     */
    public String getCronByJobId(String jobId) throws Exception;
    /**
     * 根据ID获取任务详细
     * @return
     */
    public RsJobConfig getJobById(String id) throws Exception;
    /**
     * 获取任务列表
     */
    public DataGridResult getJobList(Map<String, Object> conditionMap, int page, int rows) throws Exception;
    /**
     * 根据适配方案获取数据集列表
     */
    public DataGridResult getSchemeDataset(String schemeId, String schemeVersion, String jobId) throws Exception;
    /**
     * 根据适配方案获取字段列表
     */
    public DataGridResult getSchemeDatasetCol(String schemeId, String schemeVersion, String datasetId) throws Exception;
    /**
     * 根据任务Id获取相关数据集下拉数据
     */
    public DataGridResult getJobDatasetByJobId(String jobId) throws Exception;
    /**
     * 新增任务
     */
    public ActionResult addJob(RsJobConfig obj, String cron, String jobDataset) throws Exception;
    /**
     * 修改任务
     */
    public ActionResult updateJob(RsJobConfig obj, String cron, String jobDataset) throws Exception;
    /**
     * 修改任务
     */
    public ActionResult updateJob(RsJobConfig obj) throws Exception;
    /**
     * 删除任务
     */
    public ActionResult deleteJob(String id) throws Exception;
    /**
     * 修改任务状态
     */
    public ActionResult validJob(String jobId, String valid) throws Exception;
    /**
     * 数据集数据源管理列表（包含全部数据集）
     */
    public DataGridResult getDatasetSource(String stdVersion) throws Exception;
    /**
     * 保存数据集数据源配置
     */
    public ActionResult saveDatasetSource(String json) throws Exception;
    /**
     * 获取任务日志列表
     */
    public DataGridResult getJobLogDetail(Map<String, Object> conditionMap, int page, int rows) throws Exception;
    /**
     * 获取任务日志列表
     */
    public DataGridResult getJobLog(Map<String, Object> conditionMap, int page, int rows) throws Exception;
    /**
     * 任务详细根据数据集分组
     */
    public DataGridResult getJobLogDataset(String logId) throws Exception;
}

src/main/java/com/yihu/hos/datacollect/service/intf/IDatacollectService.java

@@ -1,20 +0,0 @@
package com.yihu.hos.datacollect.service.intf;
import com.yihu.hos.web.framework.model.ActionResult;
/**
 * Created by hzp on 2015/12/25.
 */
public interface IDatacollectService {
    /**
     * 执行任务
     */
    public void executeJob(String jobId) throws Exception;
    /**
     * 根据日志详细补采数据
     */
    public ActionResult repeatJob(String id) throws Exception;
}

src/main/java/com/yihu/hos/datacollect/service/intf/IDatapushService.java

@@ -1,15 +0,0 @@
package com.yihu.hos.datacollect.service.intf;
import com.yihu.hos.web.framework.model.Result;
/**
 * Created by hzp on 2016/4/14.
 */
public interface IDatapushService {
    /**
     * 数据入库
     */
    Result pushData(String dataset,String data,String orgCode) throws Exception;
}

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

@@ -1,9 +1,9 @@
package com.yihu.hos.resource.controller;
import com.yihu.hos.resource.model.RsResourceCategory;
import com.yihu.hos.resource.service.RsCategoryServiceImpl;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.resource.model.RsResourceCategory;
import com.yihu.hos.resource.service.IRsCategoryService;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -22,8 +22,8 @@ import java.util.Map;
@RequestMapping("/resource/rsCategory")
public class RsCategoryController extends BaseController {
    @Resource(name = "categoryService")
    private IRsCategoryService rsCategoryService;
    @Resource(name = RsCategoryServiceImpl.BEAN_ID)
    private RsCategoryServiceImpl rsCategoryService;
    //跳转到列表页
    @RequestMapping("initial")

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

@@ -2,7 +2,7 @@ package com.yihu.hos.resource.controller;
import com.yihu.hos.resource.model.RsDemensionCategory;
import com.yihu.hos.resource.model.RsDimension;
import com.yihu.hos.resource.service.IRsDimensionService;
import com.yihu.hos.resource.service.RsDimensionServiceImpl;
import com.yihu.hos.web.framework.model.Result;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
@@ -22,8 +22,8 @@ import java.util.Map;
@Controller
@RequestMapping("/dimension")
public class RsDimensionController {
    @Resource(name = "rsDimensionService")
    private IRsDimensionService rsDimensionService;
    @Resource(name = RsDimensionServiceImpl.BEAN_ID)
    private RsDimensionServiceImpl rsDimensionService;
    /**
     * @param model

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

@@ -6,8 +6,8 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
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;
import com.yihu.hos.resource.service.RsResourceRestServiceImpl;
import com.yihu.hos.resource.service.RsResourceServiceImpl;
import com.yihu.hos.resource.viewresult.RsResourceDeatilModel;
import com.yihu.hos.resource.viewresult.RsResourceDimensionModel;
import com.yihu.hos.web.framework.model.ActionResult;
@@ -35,10 +35,10 @@ import java.util.Map;
@RequestMapping("/resource")
@Controller
public class RsResourceController extends BaseController {
    @Resource(name = "resourceService")
    private IRsResourceService resourceService;
    @Resource(name = "resourceRestService")
    private IRsResourceRestService resourceRestService;
    @Resource(name = RsResourceServiceImpl.BEAN_ID)
    private RsResourceServiceImpl resourceService;
    @Resource(name = RsResourceRestServiceImpl.BEAN_ID)
    private RsResourceRestServiceImpl resourceRestService;
    /**

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

@@ -1,10 +1,10 @@
package com.yihu.hos.resource.controller;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsResourceRest;
import com.yihu.hos.resource.model.RsResourceRestDetail;
import com.yihu.hos.resource.service.IRsResourceRestService;
import com.yihu.hos.resource.service.RsResourceRestServiceImpl;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -23,8 +23,8 @@ import java.util.Map;
@RequestMapping("/resourceRest")
@Controller
public class RsResourceRestController {
    @Resource(name = "resourceRestService")
    private IRsResourceRestService resourceRestService;
    @Resource(name = RsResourceRestServiceImpl.BEAN_ID)
    private RsResourceRestServiceImpl resourceRestService;
    @RequestMapping("/initial")
    public String initial(Model model) {

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

@@ -1,9 +1,8 @@
package com.yihu.hos.resource.controller;
import com.yihu.hos.common.Services;
import com.yihu.hos.resource.service.StdService;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.resource.service.IStdService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -20,8 +19,8 @@ public class StdController extends BaseController {
    @Resource(name = Services.StdService)
    IStdService stdService;
    @Resource(name = StdService.BEAN_ID)
    StdService stdService;
    /**************************** 标准字典 ************************************************/

src/main/java/com/yihu/hos/resource/dao/IRsAppResourceDao.java

@@ -1,21 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.resource.model.RsAppResource;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import java.util.List;
/**
 * Created by chenweida on 2016/1/25.
 */
public interface IRsAppResourceDao extends XSQLGeneralDAO {
    List<RsAppResource> getAppResourceByResourceId(String resourceid) throws Exception;
    void deleteByResourceId(String resourceId)throws Exception;
    RsAppResource getAppResourceByResourceIdAndAppId(String resourceId, String appId)throws Exception;
    void deleteEntityList(List<RsAppResource> deleteList)throws Exception;
    void saveEntityList(List<RsAppResource> newList)throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/IRsAppResourceDetailDao.java

@@ -1,17 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.resource.model.RsAppResourceDetail;
import java.util.List;
/**
 * Created by chenweida on 2016/1/25.
 */
public interface IRsAppResourceDetailDao extends XSQLGeneralDAO {
    List<RsAppResourceDetail> getAppResourceDetailByAppResouceId(String id) throws Exception;
    void deleteByAppResourceId(String id) throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/IRsCategoryDao.java

@@ -1,27 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsDemensionCategory;
import com.yihu.hos.resource.model.RsResourceCategory;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2015/12/15.
 */
public interface IRsCategoryDao extends XSQLGeneralDAO {
    RsDemensionCategory[] getAllCategory() throws Exception;
    Result getList(Map<String, Object> conditionMap) throws Exception;
    RsResourceCategory getCategoryByNameAndPid(String name, String pid) throws Exception;
    RsResourceCategory getCategoryByNameAndPidWithOutThis(String name, String pid, String id) throws Exception;
    List<RsResourceCategory> getCategoryByPid(String id) throws Exception;
    List<RsResourceCategory> getCategoryWithOutId(String id) throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/IRsDemensionCategoryDao.java

@@ -1,17 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsDemensionCategory;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/26.
 */
public interface IRsDemensionCategoryDao extends XSQLGeneralDAO {
    List<RsDemensionCategory> getDimensionCategoryList() throws Exception;
    Result getDimensionCatecoryList(Map<String, Object> conditionMap) throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/IRsDimensionDao.java

@@ -1,9 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
/**
 * Created by chenweida on 2016/1/26.
 */
public interface IRsDimensionDao extends XSQLGeneralDAO {
}

src/main/java/com/yihu/hos/resource/dao/IRsResourceCategoryDao.java

@@ -1,13 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.resource.model.RsResourceCategory;
import java.util.List;
/**
 * Created by chenweida on 2016/1/13.
 */
public interface IRsResourceCategoryDao extends XSQLGeneralDAO {
    List<RsResourceCategory> getAllRsResourceCategory() throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/IRsResourceDao.java

@@ -1,28 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.model.RsResource;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/13.
 */
public interface IRsResourceDao extends XSQLGeneralDAO {
    DataGridResult getResourceList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception;
    DataGridResult getResourceFiled(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception;
    int getResourceListCount(Map<String, Object> conditionMap) throws Exception;
    List<RsResource> getAllRsResource() throws Exception;
    RsResource getResourceById(String id) throws Exception;
    /**
     * 通过分类获取资源
     */
    List<RsResource> getAllRsResourceByCategory(String category) throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/IRsResourceDatasetDao.java

@@ -1,13 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/21.
 */
public interface IRsResourceDatasetDao extends XSQLGeneralDAO{
    public DataGridResult getDataSet(Map<String, Object> conditionMap) throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/IRsResourceDimensionDao.java

@@ -1,17 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.viewresult.RsResourceDimensionModel;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/26.
 */
public interface IRsResourceDimensionDao extends XSQLGeneralDAO {
    List<RsResourceDimensionModel> getDimensionByResourceId(String resourceId) throws Exception;
    Result getDimensionList(Map<String, Object> conditionMap) throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/IRsResourceMetadataDao.java

@@ -1,28 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsResourceMetadata;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/21.
 */
public interface IRsResourceMetadataDao extends XSQLGeneralDAO {
    void deleteMetadatasByDataSetCode(String dataSetCode) throws Exception;
    void deleteLogicDataSupportMetaDataByLocalDataSetId(String datasetId) throws Exception;
    List<RsResourceMetadata> getMetadataByLocalDatssetId(String datasetId) throws Exception;
    Result getResourceAuthorize(Map<String, Object> params) throws Exception;
    List<RsResourceMetadata> getMetadataByResourceId(String code) throws Exception;
    RsResourceMetadata getMetadataByCodeAndResourceId(String code, String resourceId) throws Exception;
    RsResourceMetadata getMetadataByCodeAndResourceIdWithOutId(String code, String resourceId, String id) throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/IRsResourceRestDao.java

@@ -1,13 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/30.
 */
public interface IRsResourceRestDao extends XSQLGeneralDAO {
    DataGridResult getResourceRestList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/IRsResourceRestDetailDao.java

@@ -1,20 +0,0 @@
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.model.RsResourceRestDetail;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/30.
 */
public interface IRsResourceRestDetailDao extends XSQLGeneralDAO {
    DataGridResult getResourceRestDetilList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception;
    RsResourceRestDetail getResourceRestDetailByCode(String code) throws Exception;
    RsResourceRestDetail getResourceRestDetailByCodeAndResourceRestId(String code, String resourceRestId) throws Exception;
    RsResourceRestDetail getResourceRestDetailByCodeAndResourceRestIdWithOutId(String code, String resourceRestId, String id) throws Exception;
}

src/main/java/com/yihu/hos/resource/dao/impl/RsAppResourceDaoImpl.java

@@ -1,8 +1,7 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.resource.dao.IRsAppResourceDao;
import com.yihu.hos.resource.model.RsAppResource;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -11,29 +10,31 @@ import java.util.List;
 * Created by chenweida on 2016/1/25.
 */
@Repository("rsAppResourceDao")
public class RsAppResourceDaoImpl extends SQLGeneralDAO implements IRsAppResourceDao {
    @Override
public class RsAppResourceDaoImpl extends SQLGeneralDAO {
    public static final String BEAN_ID = "rsAppResourceDao";
    
    public List<RsAppResource> getAppResourceByResourceId(String resourceid) throws Exception {
        List<RsAppResource> rs = (List<RsAppResource>) super.hibernateTemplate.find("from RsAppResource r where r.resourceId=?", resourceid);
        return rs;
    }
    @Override
    
    public void deleteByResourceId(String resourceId) throws Exception {
        super.hibernateTemplate.deleteAll(super.hibernateTemplate.find("from RsAppResource r where r.resourceId=?", resourceId));
    }
    @Override
    
    public RsAppResource getAppResourceByResourceIdAndAppId(String resourceId, String appId) {
        return (RsAppResource) super.hibernateTemplate.find("from RsAppResource r where r.resourceId=? and r.appId=? ", resourceId, appId).get(0);
    }
    @Override
    
    public void deleteEntityList(List<RsAppResource> deleteList) throws Exception {
        super.hibernateTemplate.deleteAll(deleteList);
    }
    @Override
    public void saveEntityList(List<RsAppResource> newList) throws Exception {
        for (RsAppResource r : newList)
            super.hibernateTemplate.save(r);

src/main/java/com/yihu/hos/resource/dao/impl/RsAppResourceDetailDaoImpl.java

@@ -1,8 +1,7 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.resource.dao.IRsAppResourceDetailDao;
import com.yihu.hos.resource.model.RsAppResourceDetail;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -11,14 +10,14 @@ import java.util.List;
 * Created by chenweida on 2016/1/25.
 */
@Repository("rsAppResourceDetailDao")
public class RsAppResourceDetailDaoImpl extends SQLGeneralDAO implements IRsAppResourceDetailDao {
public class RsAppResourceDetailDaoImpl extends SQLGeneralDAO {
    public static final String BEAN_ID = "rsAppResourceDetailDao";
    @Override
    public List<RsAppResourceDetail> getAppResourceDetailByAppResouceId(String id) throws Exception {
        return (List<RsAppResourceDetail>) super.hibernateTemplate.find("from RsAppResourceDetail r where r.appResouceId=? ", id);
    }
    @Override
    public void deleteByAppResourceId(String id) throws Exception {
        super.hibernateTemplate.deleteAll(super.hibernateTemplate.find("from RsAppResourceDetail r where r.appResouceId=? ", id));
    }

src/main/java/com/yihu/hos/resource/dao/impl/RsCategoryDaoImpl.java

@@ -1,10 +1,9 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsCategoryDao;
import com.yihu.hos.resource.model.RsDemensionCategory;
import com.yihu.hos.resource.model.RsResourceCategory;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -12,14 +11,16 @@ import java.util.List;
import java.util.Map;
@Repository("rsCategoryDao")
public class RsCategoryDaoImpl extends SQLGeneralDAO implements IRsCategoryDao {
    @Override
public class RsCategoryDaoImpl extends SQLGeneralDAO {
    
    public static final String BEAN_ID = "rsCategoryDao";
    
   
    public RsDemensionCategory[] getAllCategory() throws Exception {
        return (RsDemensionCategory[]) super.hibernateTemplate.find("from RsResourceCategory").toArray();
    }
    @Override
   
    public Result getList(Map<String, Object> conditionMap) throws Exception {
        StringBuilder sb = new StringBuilder();
        sb.append(" from RsResourceCategory r ");
@@ -30,7 +31,7 @@ public class RsCategoryDaoImpl extends SQLGeneralDAO implements IRsCategoryDao {
        return super.getDataGridResult(sb.toString(), (Integer) conditionMap.get("page"), (Integer) conditionMap.get("rows"));
    }
    @Override
   
    public RsResourceCategory getCategoryByNameAndPid(String name, String pid) throws Exception {
        List<RsResourceCategory> r = (List<RsResourceCategory>) super.hibernateTemplate.find("from RsResourceCategory r where r.name=? and r.pid=?", name, pid);
        if (r != null && r.size() > 0)
@@ -39,7 +40,7 @@ public class RsCategoryDaoImpl extends SQLGeneralDAO implements IRsCategoryDao {
            return null;
    }
    @Override
   
    public RsResourceCategory getCategoryByNameAndPidWithOutThis(String name, String pid, String id) throws Exception {
        List<RsResourceCategory> r = (List<RsResourceCategory>) super.hibernateTemplate.find("from RsResourceCategory r where r.name=? and r.pid = ? and r.id != ?", name, pid, id);
        if (r != null && r.size() > 0)
@@ -48,7 +49,7 @@ public class RsCategoryDaoImpl extends SQLGeneralDAO implements IRsCategoryDao {
            return null;
    }
    @Override
   
    public List<RsResourceCategory> getCategoryByPid(String id) throws Exception {
        return (List<RsResourceCategory>) super.hibernateTemplate.find("from RsResourceCategory r where r.pid =?", id);
    }

src/main/java/com/yihu/hos/resource/dao/impl/RsDemensionCategoryDaoImpl.java

@@ -1,9 +1,8 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.resource.model.RsDemensionCategory;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsDemensionCategoryDao;
import com.yihu.hos.resource.model.RsDemensionCategory;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -14,14 +13,15 @@ import java.util.Map;
 * Created by chenweida on 2016/1/26.
 */
@Repository("demensionCategoryDao")
public class RsDemensionCategoryDaoImpl extends SQLGeneralDAO implements IRsDemensionCategoryDao {
    @Override
public class RsDemensionCategoryDaoImpl extends SQLGeneralDAO {
    public static final String BEAN_ID = "demensionCategoryDao";
    public List<RsDemensionCategory> getDimensionCategoryList() throws Exception {
        List<RsDemensionCategory> a = (List<RsDemensionCategory>) super.hibernateTemplate.find(" from RsDemensionCategory ");
        return (List<RsDemensionCategory>) super.hibernateTemplate.find(" from RsDemensionCategory ");
    }
    @Override
    public Result getDimensionCatecoryList(Map<String, Object> conditionMap) throws Exception {
        StringBuilder sb = new StringBuilder();
        sb.append(" from RsDemensionCategory r ");

src/main/java/com/yihu/hos/resource/dao/impl/RsDimensionDaoImpl.java

@@ -1,6 +1,5 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.resource.dao.IRsDimensionDao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.springframework.stereotype.Repository;
@@ -8,5 +7,7 @@ import org.springframework.stereotype.Repository;
 * Created by chenweida on 2016/1/26.
 */
@Repository("dimensionDao")
public class RsDimensionDaoImpl extends SQLGeneralDAO implements IRsDimensionDao {
public class RsDimensionDaoImpl extends SQLGeneralDAO  {
    public static final String BEAN_ID = "dimensionDao";
}

src/main/java/com/yihu/hos/resource/dao/impl/RsResourceCategoryDaoImpl.java

@@ -1,8 +1,7 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.resource.dao.IRsResourceCategoryDao;
import com.yihu.hos.resource.model.RsResourceCategory;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -11,8 +10,10 @@ import java.util.List;
 * Created by chenweida on 2016/1/13.
 */
@Repository("rsResourceCategoryDao")
public class RsResourceCategoryDaoImpl extends SQLGeneralDAO implements IRsResourceCategoryDao {
    @Override
public class RsResourceCategoryDaoImpl extends SQLGeneralDAO {
    public static final String BEAN_ID = "rsResourceCategoryDao";
    public List<RsResourceCategory> getAllRsResourceCategory() throws Exception {
        return (List<RsResourceCategory>) super.hibernateTemplate.find(" from RsResourceCategory r ");
    }

src/main/java/com/yihu/hos/resource/dao/impl/RsResourceDaoImpl.java

@@ -1,9 +1,8 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.resource.model.RsResource;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.dao.IRsResourceDao;
import com.yihu.hos.resource.model.RsResource;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -14,7 +13,10 @@ import java.util.Map;
 * Created by chenweida on 2016/1/13.
 */
@Repository("rsResourceDao")
public class RsResourceDaoImpl extends SQLGeneralDAO implements IRsResourceDao {
public class RsResourceDaoImpl extends SQLGeneralDAO  {
    public static final String BEAN_ID = "rsResourceDao";
    public DataGridResult getResourceList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception {
        StringBuilder sb = new StringBuilder();
@@ -29,7 +31,7 @@ public class RsResourceDaoImpl extends SQLGeneralDAO implements IRsResourceDao {
        return super.getDataGridResult(sb.toString(), page, rows);
    }
    @Override
  
    public DataGridResult getResourceFiled(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception {
        StringBuffer sql = new StringBuffer(" from RsResourceMetadata smd where 1=1 ");
        if (!StringUtils.isEmpty(conditionMap.get("resourceId"))) {
@@ -38,7 +40,7 @@ public class RsResourceDaoImpl extends SQLGeneralDAO implements IRsResourceDao {
        return super.getDataGridResult(sql.toString(), page, rows);
    }
    @Override
  
    public int getResourceListCount(Map<String, Object> conditionMap) throws Exception {
        StringBuilder sb = new StringBuilder();
@@ -53,7 +55,7 @@ public class RsResourceDaoImpl extends SQLGeneralDAO implements IRsResourceDao {
        return super.hibernateTemplate.find(sb.toString()).size();
    }
    @Override
  
    public List<RsResource> getAllRsResource() throws Exception {
        return (List<RsResource>) super.hibernateTemplate.find(" from RsResource r ");
    }
@@ -61,12 +63,12 @@ public class RsResourceDaoImpl extends SQLGeneralDAO implements IRsResourceDao {
    /**
     * 通过分类获取资源
     */
    @Override
  
    public List<RsResource> getAllRsResourceByCategory(String category) throws Exception {
        return (List<RsResource>) super.hibernateTemplate.find(" from RsResource r where Category='"+category+"'");
    }
    @Override
  
    public RsResource getResourceById(String id) throws Exception {
        return super.getEntity(RsResource.class, id);
    }

src/main/java/com/yihu/hos/resource/dao/impl/RsResourceDatasetDaoImpl.java

@@ -1,8 +1,7 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.dao.IRsResourceDatasetDao;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -12,7 +11,10 @@ import java.util.Map;
 * Created by chenweida on 2016/1/21.
 */
@Repository("resourceDatasetDao")
public class RsResourceDatasetDaoImpl extends SQLGeneralDAO implements IRsResourceDatasetDao{
public class RsResourceDatasetDaoImpl extends SQLGeneralDAO{
    public static final String BEAN_ID = "resourceDatasetDao";
    public DataGridResult getDataSet(Map<String, Object> conditionMap) throws Exception {
        StringBuilder sb = new StringBuilder();
        sb.append(" from RsResourceDataset r ");

src/main/java/com/yihu/hos/resource/dao/impl/RsResourceDimensionDaoImpl.java

@@ -1,9 +1,8 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.resource.viewresult.RsResourceDimensionModel;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsResourceDimensionDao;
import com.yihu.hos.resource.viewresult.RsResourceDimensionModel;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -14,14 +13,17 @@ import java.util.Map;
 * Created by chenweida on 2016/1/26.
 */
@Repository("resourceDimensionDao")
public class RsResourceDimensionDaoImpl extends SQLGeneralDAO implements IRsResourceDimensionDao {
    @Override
public class RsResourceDimensionDaoImpl extends SQLGeneralDAO{
    public static final String BEAN_ID = "resourceDimensionDao";
   
    public List<RsResourceDimensionModel> getDimensionByResourceId(String resourceId) throws Exception {
        String sql = "select * from rs_dimension d,rs_resource_dimension rd where d.id=rd.dimension_id and rd.resource_id='" + resourceId + "'";
        return super.queryListBySql(sql, RsResourceDimensionModel.class);
    }
    @Override
   
    public Result getDimensionList(Map<String, Object> conditionMap) throws Exception {
        StringBuilder sb = new StringBuilder();
        sb.append(" from RsDimension r ");

src/main/java/com/yihu/hos/resource/dao/impl/RsResourceMetadataDaoImpl.java

@@ -1,9 +1,8 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.resource.model.RsResourceMetadata;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsResourceMetadataDao;
import com.yihu.hos.resource.model.RsResourceMetadata;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -13,24 +12,27 @@ import java.util.Map;
 * Created by chenweida on 2016/1/21.
 */
@Repository("resourceMetadataDao")
public class RsResourceMetadataDaoImpl extends SQLGeneralDAO implements IRsResourceMetadataDao {
    @Override
public class RsResourceMetadataDaoImpl extends SQLGeneralDAO{
    public static final String BEAN_ID = "resourceMetadataDao";
  
    public void deleteMetadatasByDataSetCode(String dataSetCode) throws Exception {
        super.hibernateTemplate.deleteAll(super.hibernateTemplate.find("from RsResourceMetadata s where s.datasetId=?", dataSetCode));
    }
    @Override
  
    public void deleteLogicDataSupportMetaDataByLocalDataSetId(String datasetId) throws Exception {
        super.hibernateTemplate.deleteAll(super.hibernateTemplate.find("from RsResourceMetadata s where s.datasetId=? and s.dataSupportType=1", datasetId));
    }
    @Override
  
    public List<RsResourceMetadata> getMetadataByLocalDatssetId(String datasetId) {
        return (List<RsResourceMetadata>) super.hibernateTemplate.find("from RsResourceMetadata r where r.datasetId=?", datasetId);
    }
    @Override
  
    public Result getResourceAuthorize(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from RsResourceMetadata t where 1=1 ");
@@ -38,12 +40,12 @@ public class RsResourceMetadataDaoImpl extends SQLGeneralDAO implements IRsResou
    }
    @Override
  
    public List<RsResourceMetadata> getMetadataByResourceId(String code) throws Exception {
        return (List<RsResourceMetadata>) super.hibernateTemplate.find("from RsResourceMetadata r where r.resourceId=?", code);
    }
    @Override
  
    public RsResourceMetadata getMetadataByCodeAndResourceId(String code, String resourceId) throws Exception {
        List<RsResourceMetadata> rms = (List<RsResourceMetadata>) super.hibernateTemplate.find("from RsResourceMetadata r where r.code=? and r.resourceId=?", code, resourceId);
        if (rms != null && rms.size() > 0) {
@@ -52,7 +54,7 @@ public class RsResourceMetadataDaoImpl extends SQLGeneralDAO implements IRsResou
        return null;
    }
    @Override
  
    public RsResourceMetadata getMetadataByCodeAndResourceIdWithOutId(String code, String resourceId, String id) throws Exception {
        List<RsResourceMetadata> rms = (List<RsResourceMetadata>) super.hibernateTemplate.find("from RsResourceMetadata r where r.code=? and r.resourceId=? and r.id!=?", code, resourceId,id);
        if (rms != null && rms.size() > 0) {

src/main/java/com/yihu/hos/resource/dao/impl/RsResourceRestDaoImpl.java

@@ -1,8 +1,7 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.dao.IRsResourceRestDao;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -12,8 +11,10 @@ import java.util.Map;
 * Created by chenweida on 2016/1/30.
 */
@Repository("resourceRestDao")
public class RsResourceRestDaoImpl extends SQLGeneralDAO implements IRsResourceRestDao {
    @Override
public class RsResourceRestDaoImpl extends SQLGeneralDAO  {
    public static final String BEAN_ID = "resourceRestDao";
    public DataGridResult getResourceRestList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception {
        StringBuilder sb = new StringBuilder();
        sb.append(" from RsResourceRest r ");

src/main/java/com/yihu/hos/resource/dao/impl/RsResourceRestDetailDaoImpl.java

@@ -1,9 +1,8 @@
package com.yihu.hos.resource.dao.impl;
package com.yihu.hos.resource.dao;
import com.yihu.hos.resource.model.RsResourceRestDetail;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.resource.dao.IRsResourceRestDetailDao;
import com.yihu.hos.resource.model.RsResourceRestDetail;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -14,8 +13,11 @@ import java.util.Map;
 * Created by chenweida on 2016/1/30.
 */
@Repository("resourceRestDetailDao")
public class RsResourceRestDetailDaoImpl extends SQLGeneralDAO implements IRsResourceRestDetailDao {
    @Override
public class RsResourceRestDetailDaoImpl extends SQLGeneralDAO {
    public static final String BEAN_ID = "resourceRestDetailDao";
   
    public DataGridResult getResourceRestDetilList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception {
        StringBuilder sb = new StringBuilder();
        sb.append(" from RsResourceRestDetail r ");
@@ -29,12 +31,12 @@ public class RsResourceRestDetailDaoImpl extends SQLGeneralDAO implements IRsRes
        return super.getDataGridResult(sb.toString(), page, rows);
    }
    @Override
   
    public RsResourceRestDetail getResourceRestDetailByCode(String code) throws Exception {
        return (RsResourceRestDetail) super.hibernateTemplate.find("from RsResourceRestDetail r where r.code=?", code).get(0);
    }
    @Override
   
    public RsResourceRestDetail getResourceRestDetailByCodeAndResourceRestId(String code, String resourceRestId) throws Exception {
        List<RsResourceRestDetail> rrrds = (List<RsResourceRestDetail>) super.hibernateTemplate.find("from RsResourceRestDetail r where r.code=? ", code);
        if (rrrds != null && rrrds.size() > 0) {
@@ -43,7 +45,7 @@ public class RsResourceRestDetailDaoImpl extends SQLGeneralDAO implements IRsRes
        return null;
    }
    @Override
   
    public RsResourceRestDetail getResourceRestDetailByCodeAndResourceRestIdWithOutId(String code, String resourceRestId, String id) throws Exception {
        List<RsResourceRestDetail> rrrds = (List<RsResourceRestDetail>) super.hibernateTemplate.find("from RsResourceRestDetail r where r.code=? and r.id!=?", code, id);
        if (rrrds != null && rrrds.size() > 0) {

src/main/java/com/yihu/hos/resource/service/IRsCategoryService.java

@@ -1,23 +0,0 @@
package com.yihu.hos.resource.service;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsResourceCategory;
import java.util.Map;
/**
 * Created by chenweida on 2015/12/15.
 */
public interface IRsCategoryService {
    Result getList(Map<String, Object> conditionMap) throws Exception;
    RsResourceCategory getCategoryById(String id) throws Exception;
    Result createCategory(RsResourceCategory rrc) throws Exception;
    Result updateCategory(RsResourceCategory rrc) throws Exception;
    Result deleteCategory(String id) throws Exception;
    Result getCategoryWithOutId(String id) throws Exception;
}

src/main/java/com/yihu/hos/resource/service/IRsDimensionService.java

@@ -1,37 +0,0 @@
package com.yihu.hos.resource.service;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsDemensionCategory;
import com.yihu.hos.resource.model.RsDimension;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/26.
 */
public interface IRsDimensionService {
    Result getDimensionCategoryList() throws Exception;
    Result getDimensionList(Map<String, Object> conditionMap) throws Exception;
    RsDimension getDimensionById(String id) throws Exception;
    Result updateDimension(RsDimension rsDimension) throws Exception;
    Result addDimension(RsDimension rsDimension) throws Exception;
    Result deleteDimensionById(String id) throws Exception;
    Result getDimensionCatecoryList(Map<String, Object> conditionMap) throws Exception;
    Result deleteDimensionCatetory(String id) throws Exception;
    RsDemensionCategory getDimensionCatetoryById(String id) throws Exception;
    Result addDimensionCatetroy(RsDemensionCategory r)throws Exception;
    Result updateDimensionCatetroy(RsDemensionCategory r)throws Exception;
    ;
}

src/main/java/com/yihu/hos/resource/service/IRsResourceRestService.java

@@ -1,35 +0,0 @@
package com.yihu.hos.resource.service;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsResourceRest;
import com.yihu.hos.resource.model.RsResourceRestDetail;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/30.
 */
public interface IRsResourceRestService {
    DataGridResult getResourceRestDetilList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception;
    DataGridResult getResourceRestList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception;
    RsResourceRest getResourceRestById(String id) throws Exception;
    RsResourceRestDetail getResourceRestDetail(String id) throws Exception;
    Result deleteResourceRestById(String id) throws Exception;
    Result deleteResourceRestDetail(String id) throws Exception;
    Result addResourceRest(RsResourceRest rr)throws Exception;
    Result updateResourceRest(RsResourceRest rr)throws Exception;
    Result addResourceRestDetail(RsResourceRestDetail rrd)throws Exception;
    Result updateResourceRestDetail(RsResourceRestDetail rrd)throws Exception;
    RsResourceRestDetail getResourceRestDetailByCode(String code)throws Exception;
}

src/main/java/com/yihu/hos/resource/service/IRsResourceService.java

@@ -1,80 +0,0 @@
package com.yihu.hos.resource.service;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.model.TreeResult;
import com.yihu.hos.resource.model.RsAppResourceDetail;
import com.yihu.hos.resource.model.RsResource;
import com.yihu.hos.resource.model.RsResourceDataset;
import com.yihu.hos.resource.model.RsResourceMetadata;
import com.yihu.hos.resource.viewresult.RsResourceDeatilModel;
import com.yihu.hos.resource.viewresult.RsResourceDimensionModel;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2015/12/15.
 */
public interface IRsResourceService {
    List<TreeResult> getResourceTreeList(String name) throws Exception;
    DataGridResult getResourceList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception;
    int getResourceListCount(Map<String, Object> conditionMap) throws Exception;
    RsResourceDeatilModel getRsResourceDeatilModel(String id) throws Exception;
    void updateRsResource(RsResource rs) throws Exception;
    void createRsResource(RsResource rs) throws Exception;
    void deleteResource(String id) throws Exception;
    DataGridResult getResourceFiled(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception;
    List<TreeResult> resourceCategoryTreeList(String name) throws Exception;
    String searchRomoteResourceList(String code, Map<String, String> params) throws Exception;
    Result getDataSet(Map<String, Object> params) throws Exception;
    Result improtAllMetadata(RsResourceDataset dataset, String reourceId) throws Exception;
    Result deleteMetadata(String id) throws Exception;
    RsResourceMetadata getRsResourceMetadata(String id) throws Exception;
    Result createMetaData(RsResourceMetadata rmd) throws Exception;
    Result updateMetaData(RsResourceMetadata rmd) throws Exception;
    Result getMetaDataByDatasetId(String code, String datasetId) throws Exception;
    Result improtSameMetadata(String reourceId, String metaData, String dataset, String datasetId) throws Exception;
    RsResourceDataset getLocalDataSetById(String datasetId) throws Exception;
    Result getMetadataByLocalDatssetId(String datasetId) throws Exception;
    Result getResourceAuthorize(String resourceId, String appID) throws Exception;
    Result getMetaData(Map<String, Object> params) throws Exception;
    Result getResourceApp(String id) throws Exception;
    Result updateResourceApp(String ids, String resourceId) throws Exception;
    Result getResourceAppList(String resourceId) throws Exception;
    Result changeAppResource(String flag, String appId, String ids, String resourceId) throws Exception;
    List<RsResourceDimensionModel> getDimensionByResourceId(String resourceId) throws Exception;
    RsAppResourceDetail getAppResourceDetailId(String id) throws Exception;
    Result saveResourceDimension(RsAppResourceDetail appResourceDetail) throws Exception;
    List<RsResourceMetadata>  getResourceMetadataListColumn(String code) throws Exception;
}

src/main/java/com/yihu/hos/resource/service/IStdService.java

@@ -1,68 +0,0 @@
package com.yihu.hos.resource.service;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.model.adapter.resultModel.AdapterMetadataResultDetailModel;
import com.yihu.hos.standard.model.adapter.resultModel.AdapterSchemeVersionResultDetailModel;
import com.yihu.hos.standard.model.standard.StdDataSetModel;
import com.yihu.hos.standard.model.standard.StdMetaDataModel;
import java.util.List;
import java.util.Map;
/**
 * Created by hzp on 2016/1/20.
 */
public interface IStdService {
    /**
     * 通过适配方案获取字典列表
     */
    public DictionaryResult getDictResultByVersion(String schemeVersion, String dictId) throws Exception;
    /**************************** 适配方案 **************************************************/
    /**
     * 获取适配方案列表
     */
    public List<AdapterSchemeVersionResultDetailModel> getSchemeVersion() throws Exception;
    /**
     * 通过适配方案获取数据集列表
     */
    public List<AdapterDatasetModel> getDatasetByScheme(String schemeVersion) throws Exception;
    /**
     * 通过适配方案+应用数据集ID获取数据集列表
     */
    public List<AdapterDatasetModel> getDatasetByScheme(String schemeVersion, String adapterDatasetId) throws Exception;
    /**
     * 通过适配方案获取字段列表
     */
    public List<AdapterMetadataResultDetailModel> getDatacolByScheme(String schemeVersion, String datasetId) throws Exception;
    /**
     * 通过适配方案获取字典列表
     */
    public List<AdapterDictEntryModel> getDictByScheme(String schemeVersion, String dictId) throws Exception;
    /**
     * 通过适配方案+标准数据集CODE获取数据集
     * @return
     */
    public AdapterDatasetModel getDatasetByCode(String schemeVersion,String stdDatasetCode) throws Exception;
    /******************************** 标准版本 *****************************************************/
    /**
     * 通过标准版本获取数据集列表
     */
    public List<StdDataSetModel> getDatasetByVersion(String stdVersion) throws Exception;
    public List<StdMetaDataModel> metadatasAllVersionList(Map<String, Object> params) throws Exception;
    public List<StdDataSetModel> datasetsAllVersionList() throws Exception;
    public List datasetVersionListByName(String rsResourceImportDatasetDialogName)throws Exception;
}

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

@@ -1,33 +1,36 @@
package com.yihu.hos.resource.service.impl;
package com.yihu.hos.resource.service;
import com.yihu.hos.resource.dao.IRsCategoryDao;
import com.yihu.hos.resource.dao.IRsResourceDao;
import com.yihu.hos.resource.dao.RsCategoryDaoImpl;
import com.yihu.hos.resource.dao.RsResourceDaoImpl;
import com.yihu.hos.resource.model.RsResource;
import com.yihu.hos.resource.model.RsResourceCategory;
import com.yihu.hos.resource.service.IRsCategoryService;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
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;
@Service("categoryService")
public class RsCategoryServiceImpl implements IRsCategoryService {
    @Autowired
    private IRsCategoryDao rsCategoryDao;
public class RsCategoryServiceImpl  {
    public static final String BEAN_ID = "categoryService";
    @Resource(name = RsCategoryDaoImpl.BEAN_ID)
    private RsCategoryDaoImpl rsCategoryDao;
    @Resource(name = RsResourceDaoImpl.BEAN_ID)
    private RsResourceDaoImpl rsResourceDao;
    @Autowired
    private IRsResourceDao rsResourceDao;
    @Override
    public Result getList(Map<String, Object> conditionMap) throws Exception {
        return rsCategoryDao.getList(conditionMap);
    }
    @Override
    public RsResourceCategory getCategoryById(String id) throws Exception {
        return rsCategoryDao.getEntity(RsResourceCategory.class, id);
    }
@@ -80,7 +83,7 @@ public class RsCategoryServiceImpl implements IRsCategoryService {
        return Result.success("删除成功");
    }
    @Override
    public Result getCategoryWithOutId(String id) throws Exception {
        DataGridResult dataGridResult=new DataGridResult();
        List<RsResourceCategory> rs= rsCategoryDao.getCategoryWithOutId(id);

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

@@ -1,13 +1,12 @@
package com.yihu.hos.resource.service.impl;
package com.yihu.hos.resource.service;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsDemensionCategoryDao;
import com.yihu.hos.resource.dao.IRsDimensionDao;
import com.yihu.hos.resource.dao.IRsResourceDimensionDao;
import com.yihu.hos.resource.dao.RsDemensionCategoryDaoImpl;
import com.yihu.hos.resource.dao.RsDimensionDaoImpl;
import com.yihu.hos.resource.dao.RsResourceDimensionDaoImpl;
import com.yihu.hos.resource.model.RsDemensionCategory;
import com.yihu.hos.resource.model.RsDimension;
import com.yihu.hos.resource.service.IRsDimensionService;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -18,27 +17,30 @@ import java.util.Map;
 * Created by chenweida on 2016/1/26.
 */
@Service("rsDimensionService")
public class RsDimensionServiceImpl implements IRsDimensionService {
    @Resource(name = "resourceDimensionDao")
    private IRsResourceDimensionDao resourceDimensionDao;
    @Resource(name = "demensionCategoryDao")
    private IRsDemensionCategoryDao demensionCategoryDao;
    @Resource(name = "dimensionDao")
    private IRsDimensionDao dimensionDao;
    @Override
public class RsDimensionServiceImpl {
    public static final String BEAN_ID = "rsDimensionService";
    @Resource(name = RsResourceDimensionDaoImpl.BEAN_ID)
    private RsResourceDimensionDaoImpl resourceDimensionDao;
    @Resource(name = RsDemensionCategoryDaoImpl.BEAN_ID)
    private RsDemensionCategoryDaoImpl demensionCategoryDao;
    @Resource(name = RsDimensionDaoImpl.BEAN_ID)
    private RsDimensionDaoImpl dimensionDao;
  
    public Result getDimensionCategoryList() throws Exception {
        ActionResult actionResult = new ActionResult();
        actionResult.setData(demensionCategoryDao.getDimensionCategoryList());
        return actionResult;
    }
    @Override
  
    public Result getDimensionList(Map<String, Object> conditionMap) throws Exception {
        return resourceDimensionDao.getDimensionList(conditionMap);
    }
    @Override
  
    public RsDimension getDimensionById(String id) throws Exception {
        return dimensionDao.getEntity(RsDimension.class, id);
    }
@@ -67,7 +69,7 @@ public class RsDimensionServiceImpl implements IRsDimensionService {
        return Result.success("删除成功");
    }
    @Override
  
    public Result getDimensionCatecoryList(Map<String, Object> conditionMap) throws Exception {
        return demensionCategoryDao.getDimensionCatecoryList(conditionMap);
    }
@@ -78,7 +80,7 @@ public class RsDimensionServiceImpl implements IRsDimensionService {
        return Result.success("删除成功");
    }
    @Override
  
    public RsDemensionCategory getDimensionCatetoryById(String id) throws Exception {
        return demensionCategoryDao.getEntity(RsDemensionCategory.class, id);
    }

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

@@ -1,12 +1,11 @@
package com.yihu.hos.resource.service.impl;
package com.yihu.hos.resource.service;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.dao.IRsResourceRestDao;
import com.yihu.hos.resource.dao.IRsResourceRestDetailDao;
import com.yihu.hos.resource.dao.RsResourceRestDaoImpl;
import com.yihu.hos.resource.dao.RsResourceRestDetailDaoImpl;
import com.yihu.hos.resource.model.RsResourceRest;
import com.yihu.hos.resource.model.RsResourceRestDetail;
import com.yihu.hos.resource.service.IRsResourceRestService;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -18,28 +17,31 @@ import java.util.Map;
 * Created by chenweida on 2016/1/30.
 */
@Service("resourceRestService")
public class RsResourceRestServiceImpl implements IRsResourceRestService {
    @Resource(name = "resourceRestDao")
    private IRsResourceRestDao resourceRestDao;
    @Resource(name = "resourceRestDetailDao")
    private IRsResourceRestDetailDao resourceRestDetailDao;
public class RsResourceRestServiceImpl {
    public static final String BEAN_ID = "resourceRestService";
    @Resource(name = RsResourceRestDaoImpl.BEAN_ID)
    private RsResourceRestDaoImpl resourceRestDao;
    @Resource(name = RsResourceRestDetailDaoImpl.BEAN_ID)
    private RsResourceRestDetailDaoImpl resourceRestDetailDao;
    @Override
   
    public DataGridResult getResourceRestDetilList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception {
        return resourceRestDetailDao.getResourceRestDetilList(conditionMap, page, rows);
    }
    @Override
   
    public DataGridResult getResourceRestList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception {
        return resourceRestDao.getResourceRestList(conditionMap, page, rows);
    }
    @Override
   
    public RsResourceRest getResourceRestById(String id) throws Exception {
        return resourceRestDao.getEntity(RsResourceRest.class, id);
    }
    @Override
   
    public RsResourceRestDetail getResourceRestDetail(String id) throws Exception {
        return resourceRestDetailDao.getEntity(RsResourceRestDetail.class, id);
    }
@@ -113,7 +115,7 @@ public class RsResourceRestServiceImpl implements IRsResourceRestService {
        return Result.success("更新成功");
    }
    @Override
   
    public RsResourceRestDetail getResourceRestDetailByCode(String code) throws Exception {
        return resourceRestDetailDao.getResourceRestDetailByCode(code);
    }

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

@@ -1,4 +1,4 @@
package com.yihu.hos.resource.service.impl;
package com.yihu.hos.resource.service;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -8,12 +8,10 @@ import com.yihu.hos.core.http.HttpClientKit;
import com.yihu.hos.crawler.service.EsbHttp;
import com.yihu.hos.resource.dao.*;
import com.yihu.hos.resource.model.*;
import com.yihu.hos.resource.service.IRsResourceService;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.resource.viewresult.ResourceAuthorizeDGModel;
import com.yihu.hos.resource.viewresult.RsResourceDeatilModel;
import com.yihu.hos.resource.viewresult.RsResourceDimensionModel;
import com.yihu.hos.system.dao.intf.IAppDao;
import com.yihu.hos.system.dao.AppDao;
import com.yihu.hos.system.model.SystemApp;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DataGridResult;
@@ -33,30 +31,33 @@ import java.util.List;
import java.util.Map;
@Service("resourceService")
public class RsResourceServiceImpl implements IRsResourceService {
    @Resource(name = "rsResourceCategoryDao")
    private IRsResourceCategoryDao rsResourceCategoryDao;
    @Resource(name = "rsResourceDao")
    private IRsResourceDao rsResourceDao;
    @Resource(name = "resourceDatasetDao")
    private IRsResourceDatasetDao resourceDatasetDao;
    @Resource(name = "resourceMetadataDao")
    private IRsResourceMetadataDao resourceMetadataDao;
    @Resource(name = "appDao")
    private IAppDao appDao;
    @Resource(name = "rsAppResourceDao")
    private IRsAppResourceDao appResourceDao;
    @Resource(name = "rsAppResourceDetailDao")
    private IRsAppResourceDetailDao rsAppResourceDetailDao;
    @Resource(name = "resourceDimensionDao")
    private IRsResourceDimensionDao resourceDimensionDao;
    @Autowired
    private IStdService stdService;
public class RsResourceServiceImpl {
    public static final String BEAN_ID = "resourceService";
    @Resource(name = RsResourceCategoryDaoImpl.BEAN_ID)
    private RsResourceCategoryDaoImpl rsResourceCategoryDao;
    @Resource(name = RsResourceDaoImpl.BEAN_ID)
    private RsResourceDaoImpl rsResourceDao;
    @Resource(name = RsResourceDatasetDaoImpl.BEAN_ID)
    private RsResourceDatasetDaoImpl resourceDatasetDao;
    @Resource(name = RsResourceMetadataDaoImpl.BEAN_ID)
    private RsResourceMetadataDaoImpl resourceMetadataDao;
    @Resource(name = AppDao.BEAN_ID)
    private AppDao appDao;
    @Resource(name = RsAppResourceDaoImpl.BEAN_ID)
    private RsAppResourceDaoImpl appResourceDao;
    @Resource(name = RsAppResourceDetailDaoImpl.BEAN_ID)
    private RsAppResourceDetailDaoImpl rsAppResourceDetailDao;
    @Resource(name = RsResourceDimensionDaoImpl.BEAN_ID)
    private RsResourceDimensionDaoImpl resourceDimensionDao;
    @Resource(name = StdService.BEAN_ID)
    private StdService stdService;
    @Autowired
    private ObjectMapper objectMapper;
    @Override
  
    public List<TreeResult> getResourceTreeList(String name) throws Exception {
        List<TreeResult> treeVOs = new ArrayList<TreeResult>();
        List<String> pidList = new ArrayList<>();
@@ -129,7 +130,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
            return treeVOs;
    }
    @Override
  
    public List<TreeResult> resourceCategoryTreeList(String name) throws Exception {
        List<TreeResult> treeVOs = new ArrayList<TreeResult>();
        List<RsResourceCategory> rsCategorya = rsResourceCategoryDao.getAllRsResourceCategory();
@@ -268,18 +269,18 @@ public class RsResourceServiceImpl implements IRsResourceService {
        return treeVOs;
    }
    @Override
  
    public DataGridResult getResourceList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception {
        return rsResourceDao.getResourceList(conditionMap, page, rows);
    }
    @Override
  
    public int getResourceListCount(Map<String, Object> conditionMap) throws Exception {
        return rsResourceDao.getResourceListCount(conditionMap);
    }
    @Override
  
    public RsResourceDeatilModel getRsResourceDeatilModel(String id) throws Exception {
        RsResourceDeatilModel rsResourceDeatilModel = new RsResourceDeatilModel();
        RsResource rsResource = rsResourceDao.getResourceById(id);
@@ -317,7 +318,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
        }
    }
    @Override
  
    public DataGridResult getResourceFiled(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception {
        RsResource rs = rsResourceDao.getEntity(RsResource.class, (String) conditionMap.get("resourceId"));
        conditionMap.put("datasetId", rs.getDatasetCode());
@@ -328,7 +329,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
    /**
     * 通过网关获取资源数据
     */
    @Override
  
    public String searchRomoteResourceList(String code, Map<String, String> params) throws Exception {
        params.put("code", code);
        String result = HttpClientKit.get(EsbHttp.defaultHttpUrl, params).getBody();
@@ -340,7 +341,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
        return (String) response_params;
    }
    @Override
  
    public Result getDataSet(Map<String, Object> params) throws Exception {
        DataGridResult re = new DataGridResult();
        if (StringUtils.isEmpty(params.get("datasetId"))) {
@@ -426,7 +427,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
        return Result.success("删除成功");
    }
    @Override
  
    public RsResourceMetadata getRsResourceMetadata(String id) throws Exception {
        return resourceMetadataDao.getEntity(RsResourceMetadata.class, id);
    }
@@ -461,7 +462,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
        return Result.success("更新成功");
    }
    @Override
  
    public Result getMetaDataByDatasetId(String code, String datasetId) throws Exception {
        if (StringUtils.isEmpty(code)) {
            return new DataGridResult();
@@ -531,19 +532,19 @@ public class RsResourceServiceImpl implements IRsResourceService {
        return Result.success("导入成功");
    }
    @Override
  
    public RsResourceDataset getLocalDataSetById(String datasetId) throws Exception {
        return resourceDatasetDao.getEntity(RsResourceDataset.class, datasetId);
    }
    @Override
  
    public Result getMetadataByLocalDatssetId(String datasetId) throws Exception {
        ActionResult ar = new ActionResult();
        ar.setData(resourceMetadataDao.getMetadataByLocalDatssetId(datasetId));
        return ar;
    }
    @Override
  
    public Result getResourceAuthorize(String resourceId, String appId) throws Exception {
        DataGridResult dr = new DataGridResult();
        //查找该资源所对应的数据元
@@ -592,7 +593,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
        return dr;
    }
    @Override
  
    public Result getMetaData(Map<String, Object> params) throws Exception {
        DataGridResult re = new DataGridResult();
        RsResourceMetadata rd = resourceMetadataDao.getEntity(RsResourceMetadata.class, (String) params.get("id"));
@@ -602,7 +603,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
        return re;
    }
    @Override
  
    public Result getResourceApp(String resourceid) throws Exception {
        ActionResult returnData = new ActionResult();
        Map<String, Object> rsMap = new HashMap<String, Object>();
@@ -682,7 +683,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
        return Result.success("更新成功");
    }
    @Override
  
    public Result getResourceAppList(String resourceId) throws Exception {
        DataGridResult dgr = new DataGridResult();
        List<RsAppResource> rars = appResourceDao.getAppResourceByResourceId(resourceId);
@@ -740,12 +741,12 @@ public class RsResourceServiceImpl implements IRsResourceService {
        return Result.success("修改成功");
    }
    @Override
  
    public List<RsResourceDimensionModel> getDimensionByResourceId(String resourceId) throws Exception {
        return resourceDimensionDao.getDimensionByResourceId(resourceId);
    }
    @Override
  
    public RsAppResourceDetail getAppResourceDetailId(String id) throws Exception {
        return rsAppResourceDetailDao.getEntity(RsAppResourceDetail.class, id);
    }
@@ -758,7 +759,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
        return Result.success("保存成功");
    }
    @Override
  
    public List<RsResourceMetadata> getResourceMetadataListColumn(String code) throws Exception {
        return resourceMetadataDao.getMetadataByResourceId(code);
    }

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

@@ -1,10 +1,9 @@
package com.yihu.hos.resource.service.impl;
package com.yihu.hos.resource.service;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
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;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.model.adapter.resultModel.AdapterMetadataResultDetailModel;
@@ -33,7 +32,9 @@ import java.util.Map;
 * Created by hzp on 2016/1/20.
 */
@Service(Services.StdService)
public class StdService implements IStdService {
public class StdService  {
    public static final String BEAN_ID = Services.StdService;
    @Resource(name = StdDatasetService.BEAN_ID)
    private StdDatasetService stdDatasetService;
@@ -197,7 +198,6 @@ public class StdService implements IStdService {
        return stdDatasetService.getAllVersionDatasetList();
    }
    @Override
    public List datasetVersionListByName(String rsResourceImportDatasetDialogName) throws Exception {
        return stdDatasetService.datasetVersionListByName(rsResourceImportDatasetDialogName);
    }

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

@@ -2,11 +2,10 @@ package com.yihu.hos.system.controller;
import com.yihu.hos.system.model.SystemApp;
import com.yihu.hos.system.model.SystemServiceEndpoint;
import com.yihu.hos.system.service.intf.IAppManager;
import com.yihu.hos.system.service.AppManager;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.fileupload.disk.DiskFileItem;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
@@ -17,10 +16,6 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.websocket.server.PathParam;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Date;
import java.util.HashMap;
@@ -32,8 +27,8 @@ import java.util.Map;
@RequestMapping("/app")
@Controller
public class AppController extends BaseController {
    @Resource(name = "appManager")
    private IAppManager appManager;
    @Resource(name = AppManager.BEAN_ID)
    private AppManager appManager;
    /**
     *  应用管理管理界面
     *

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

@@ -1,15 +1,15 @@
package com.yihu.hos.system.controller;
import com.yihu.hos.system.service.AuthorityManager;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.service.intf.IAuthorityManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
/**
@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
@Controller
@RequestMapping("/authority")
public class AuthorityController {
    @Autowired
    private IAuthorityManager authorityManager;
    @Resource(name = AuthorityManager.BEAN_ID)
    private AuthorityManager authorityManager;
    /**
     * 权限管理界面

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

@@ -1,11 +1,11 @@
package com.yihu.hos.system.controller;
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;
import com.yihu.hos.system.model.SystemDictList;
import com.yihu.hos.system.service.intf.IBaseDictManager;
import com.yihu.hos.system.service.BaseDictManager;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -20,7 +20,7 @@ import javax.annotation.Resource;
public class BaseDictController extends BaseController {
    @Resource(name = Services.BaseDict)
    private IBaseDictManager dictManager;
    private BaseDictManager dictManager;

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

@@ -2,7 +2,7 @@ package com.yihu.hos.system.controller;
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.system.service.DatasourceManager;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.apache.commons.beanutils.BeanUtils;
@@ -24,7 +24,7 @@ import java.util.Map;
public class DatasourceController extends BaseController {
    @Resource(name = Services.Datasource)
    IDatasourceManager datasource;
    DatasourceManager datasource;
    /*
        数据源配置

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

@@ -1,19 +1,17 @@
package com.yihu.hos.system.controller;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.resource.model.RsResourceRest;
import com.yihu.hos.resource.model.RsResourceRestDetail;
import com.yihu.hos.system.model.SystemDict;
import com.yihu.hos.system.model.SystemDictList;
import com.yihu.hos.system.service.intf.IDictManager;
import com.yihu.hos.system.service.DictManager;
import com.yihu.hos.web.framework.model.Result;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
@@ -24,8 +22,8 @@ import java.util.Map;
@Controller
@RequestMapping("/dict")
public class DictController {
    @Autowired
    private IDictManager dictManager;
    @Resource(name = DictManager.BEAN_ID)
    private DictManager dictManager;
    @RequestMapping("/initial")
    public String dictInitial(Model model) {

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

@@ -5,7 +5,6 @@ import com.yihu.hos.system.model.SystemServiceFlow;
import com.yihu.hos.system.model.SystemServiceFlowClass;
import com.yihu.hos.system.model.SystemServiceFlowTemp;
import com.yihu.hos.system.service.FlowManager;
import com.yihu.hos.system.service.intf.IFlowManage;
import com.yihu.hos.web.framework.constant.ServiceFlowConstant;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
@@ -36,7 +35,7 @@ import java.util.Map;
public class FlowController extends BaseController {
    @Resource(name = FlowManager.BEAN_ID)
    private IFlowManage flowManage;
    private FlowManager flowManage;
    /**
     *  流程管理管理界面

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

@@ -1,17 +1,17 @@
package com.yihu.hos.system.controller;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.system.model.SystemMenu;
import com.yihu.hos.system.model.SystemMenuAction;
import com.yihu.hos.system.service.intf.IMenuManager;
import com.yihu.hos.system.service.MenuManager;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
@@ -22,8 +22,8 @@ import java.util.Map;
@RequestMapping("/menu")
@Controller
public class MenuActionController extends BaseController {
    @Autowired
    private IMenuManager menuManager;
    @Resource(name = MenuManager.BEAN_ID)
    private MenuManager menuManager;
    /**
     * 菜单管理界面

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

@@ -1,12 +1,11 @@
package com.yihu.hos.system.controller;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.system.model.SystemOrganization;
import com.yihu.hos.system.service.intf.IOrganizationManager;
import com.yihu.hos.system.service.OrganizationManager;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,9 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.lang.System;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -27,8 +24,8 @@ import java.util.Map;
@Controller
public class OrgController extends BaseController {
    @Autowired
    private IOrganizationManager organization;
    @Resource(name = OrganizationManager.BEAN_ID)
    private OrganizationManager organization;
    /**
     * 组织管理界面

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

@@ -1,17 +1,17 @@
package com.yihu.hos.system.controller;
import com.yihu.hos.system.model.SystemParam;
import com.yihu.hos.system.service.intf.ISystemParamManager;
import com.yihu.hos.system.service.SystemParamManager;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
@@ -22,8 +22,8 @@ import java.util.Map;
@RequestMapping("/param")
@Controller
public class ParamController extends BaseController {
    @Autowired
    private ISystemParamManager systemParamManager;
    @Resource(name = SystemParamManager.BEAN_ID)
    private SystemParamManager systemParamManager;
    /**
     * 系统参数管理界面

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

@@ -1,17 +1,17 @@
package com.yihu.hos.system.controller;
import com.yihu.hos.system.model.SystemRole;
import com.yihu.hos.system.service.RoleManager;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.system.model.SystemRole;
import com.yihu.hos.system.service.intf.IRoleManager;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
@@ -22,8 +22,8 @@ import java.util.Map;
@RequestMapping("/role")
@Controller
public class RoleController extends BaseController {
    @Autowired
    private IRoleManager roleManager;
    @Resource(name = RoleManager.BEAN_ID)
    private RoleManager roleManager;
    /**
     * 角色管理界面

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

@@ -2,7 +2,7 @@ package com.yihu.hos.system.controller;
import com.yihu.hos.common.constants.ContextAttributes;
import com.yihu.hos.interceptor.LocalContext;
import com.yihu.hos.system.service.intf.ISystemManager;
import com.yihu.hos.system.service.SystemManager;
import com.yihu.hos.tenant.model.TenantSession;
import com.yihu.hos.tenant.service.AuthenticateService;
import com.yihu.hos.web.framework.model.ActionResult;
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -25,8 +26,8 @@ import javax.servlet.http.HttpSession;
@Controller("systemController")
public class SystemController {
    @Autowired
    private ISystemManager ehr;
    @Resource(name = SystemManager.BEAN_ID)
    private SystemManager ehr;
    @Autowired
    private AuthenticateService authenticateService;

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

@@ -2,19 +2,19 @@ package com.yihu.hos.system.controller;
import com.yihu.hos.system.model.SystemUser;
import com.yihu.hos.system.model.SystemUserRole;
import com.yihu.hos.system.service.intf.IUserManager;
import com.yihu.hos.system.service.UserManager;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.PKUtil;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.util.HashMap;
@@ -27,8 +27,8 @@ import java.util.Map;
@RequestMapping("/user")
@Controller
public class UserController extends BaseController {
    @Autowired
    private IUserManager userManager;
    @Resource(name = UserManager.BEAN_ID)
    private UserManager userManager;
    /**

src/main/java/com/yihu/hos/system/dao/AppDao.java

@@ -1,6 +1,5 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.system.dao.intf.IAppDao;
import com.yihu.hos.system.model.SystemApp;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
@@ -14,9 +13,8 @@ import java.util.Map;
 * Created by chenweida on 2016/1/21.
 */
@Repository("appDao")
public class AppDao extends SQLGeneralDAO implements IAppDao {
public class AppDao extends SQLGeneralDAO  {
    public static final String BEAN_ID = "appDao";
    @Override
    public Result getAppList(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from SystemApp t where 1=1 ");
        if (!StringUtils.isEmpty(params.get("status"))) //是否有效
@@ -32,7 +30,6 @@ public class AppDao extends SQLGeneralDAO implements IAppDao {
    }
    @Override
    public List<SystemApp> getAllApplist() throws Exception {
        return (List<SystemApp>) super.hibernateTemplate.find("from SystemApp");
    }

src/main/java/com/yihu/hos/system/dao/AppServiceDao.java

@@ -1,6 +1,5 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.system.dao.intf.IAppServiceDao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.stereotype.Repository;
@@ -14,9 +13,9 @@ import java.util.Map;
 * Created at 2016/8/16.
 */
@Repository("appServiceDao")
public class AppServiceDao extends SQLGeneralDAO implements IAppServiceDao {
public class AppServiceDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "appServiceDao";
    @Override
   
    public Result getAppServiceList(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from SystemServiceEndpoint t where 1=1 ");
        if (!StringUtils.isEmpty(params.get("valid"))) //是否有效

src/main/java/com/yihu/hos/system/dao/BaseDictDao.java

@@ -1,7 +1,6 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.system.dao.intf.IBaseDictDao;
import com.yihu.hos.system.model.SystemDict;
import com.yihu.hos.system.model.SystemDictList;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
@@ -17,13 +16,16 @@ import java.util.List;
 * Created by hzp on 2016/1/11.
 */
@Repository("BaseDictDao")
public class BaseDictDao extends SQLGeneralDAO implements IBaseDictDao {
public class BaseDictDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "BaseDictDao";
    /**
     * 获取系统字典列表
     * @return
     */
    @Override
   
    public DataGridResult getSystemDictList(String condition,Integer page, Integer pageSize) throws Exception  {
@@ -34,7 +36,7 @@ public class BaseDictDao extends SQLGeneralDAO implements IBaseDictDao {
     * 通过ID获取系统字典信息
     * @return
     */
    @Override
   
    public SystemDictList getSystemDictInfoById(String id) throws Exception  {
        String sql = "select * from system_dict_list where id = '"+id+"'";
        return super.queryObjBySql(sql,SystemDictList.class);
@@ -44,7 +46,7 @@ public class BaseDictDao extends SQLGeneralDAO implements IBaseDictDao {
     * 通过dictName获取字典信息
     * @return
     */
    @Override
   
    public SystemDictList getSystemDictInfoByName(String dictName) throws Exception {
        String sql = "select * from system_dict_list where dict_name = '"+dictName+"'";
        return super.queryObjBySql(sql,SystemDictList.class);
@@ -56,7 +58,7 @@ public class BaseDictDao extends SQLGeneralDAO implements IBaseDictDao {
     * 获取某字典数据
     * @return
     */
    @Override
   
    public DictionaryResult getSystemDict(String dictName) throws Exception
    {
        String sql = "select * from system_dict where dict_name = '"+dictName+"' order by sort";
@@ -82,7 +84,7 @@ public class BaseDictDao extends SQLGeneralDAO implements IBaseDictDao {
     * 获取某字典数据
     * @return
     */
    @Override
   
    public DictionaryResult getRelationDict(String tableName,String codeCol,String valueCole,String extendCol,String Where) throws Exception
    {
        String sql = "select "+ codeCol+" as code,"+valueCole +" as value";

src/main/java/com/yihu/hos/system/dao/DatasourceDao.java

@@ -1,9 +1,8 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.system.model.SystemDatasource;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.system.dao.intf.IDatasourceDao;
import com.yihu.hos.system.model.SystemDatasource;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -17,12 +16,14 @@ import java.util.Map;
 * Created by hzp on 2016/1/16.
 */
@Repository("DatasourceDao")
public class DatasourceDao extends SQLGeneralDAO implements IDatasourceDao {
public class DatasourceDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "DatasourceDao";
    /**
     * 测试连接数据源
     */
    @Override
   
    public void testDatasource(String type,String config) throws Exception
    {
        String driver = "";
@@ -55,7 +56,7 @@ public class DatasourceDao extends SQLGeneralDAO implements IDatasourceDao {
     * 获取数据源列表
     * @return
     */
    @Override
   
    public DataGridResult getDatasource(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception
    {
        StringBuilder sb = new StringBuilder();
@@ -78,7 +79,7 @@ public class DatasourceDao extends SQLGeneralDAO implements IDatasourceDao {
     * 获取全部数据源列表
     * @return
     */
    @Override
   
    public DataGridResult getDatasourceByOrg(String orgId) throws Exception
    {
        DataGridResult re = new DataGridResult();
@@ -96,14 +97,14 @@ public class DatasourceDao extends SQLGeneralDAO implements IDatasourceDao {
    /**
     * 修改数据源状态(暂弃)
     */
    @Override
   
    public void validDatasource(String id,String valid)  throws Exception
    {
        String sql = "update System_Datasource set activity_Flag='"+valid+"' where Id='"+id+"'";
        super.execute(sql);
    }
    @Override
   
    public List<SystemDatasource> getDatasources(String orgId) throws Exception {
        String sql = "select * from System_Datasource";
        if(orgId!=null&&orgId.length()>0){

src/main/java/com/yihu/hos/system/dao/DictDao.java

@@ -1,9 +1,8 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.system.model.SystemDict;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.dao.intf.IDictDao;
import com.yihu.hos.system.model.SystemDict;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -14,8 +13,11 @@ import java.util.Map;
 * Created by chenweida on 2016/1/20.
 */
@Repository("dictDao")
public class DictDao extends SQLGeneralDAO implements IDictDao {
    @Override
public class DictDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "dictDao";
   
    public Result getDictList(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder(" from SystemDict s where 1=1 ");
        if (!StringUtils.isEmpty(params.get("dictId"))) {
@@ -28,7 +30,7 @@ public class DictDao extends SQLGeneralDAO implements IDictDao {
    }
    @Override
   
    public SystemDict getDictItemByCodeWithOutId(String code, String id) throws Exception  {
        List<SystemDict> sds = (List<SystemDict>) super.hibernateTemplate.find("from SystemDict s where s.code=? and s.id != ?", code, id);
        if (sds != null && sds.size() > 0) {
@@ -37,7 +39,7 @@ public class DictDao extends SQLGeneralDAO implements IDictDao {
        return null;
    }
    @Override
   
    public SystemDict getDictItemByCode(String code) throws Exception {
        List<SystemDict> sds = (List<SystemDict>) super.hibernateTemplate.find("from SystemDict s where s.code=? ", code);
        if (sds != null && sds.size() > 0) {
@@ -46,7 +48,7 @@ public class DictDao extends SQLGeneralDAO implements IDictDao {
        return null;
    }
    @Override
   
    public void delDictItemByDictName(String dictName) throws Exception
    {
        String sqlStr = "delete from system_dict where dict_name='" + dictName + "'";

src/main/java/com/yihu/hos/system/dao/DictListDao.java

@@ -1,9 +1,8 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.system.model.SystemDictList;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.dao.intf.IDictListDao;
import com.yihu.hos.system.model.SystemDictList;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -14,8 +13,10 @@ import java.util.Map;
 * Created by chenweida on 2016/1/20.
 */
@Repository("dictListDao")
public class DictListDao extends SQLGeneralDAO implements IDictListDao {
    @Override
public class DictListDao extends SQLGeneralDAO  {
    public static final String BEAN_ID = "dictListDao";
    public Result getDictList(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from SystemDictList s where 1=1 ");
        if (!StringUtils.isEmpty(params.get("name"))) {
@@ -25,7 +26,7 @@ public class DictListDao extends SQLGeneralDAO implements IDictListDao {
        return super.getDataGridResult(sb.toString(), Integer.valueOf(params.get("page").toString()), Integer.valueOf(params.get("rows").toString()));
    }
    @Override
  
    public SystemDictList getDitcByName(String dictName) throws Exception {
        List<SystemDictList> sdl = (List<SystemDictList>) super.hibernateTemplate.find("from SystemDictList s where s.dictName=?", dictName);
        if (sdl != null && sdl.size() > 0) {
@@ -34,7 +35,7 @@ public class DictListDao extends SQLGeneralDAO implements IDictListDao {
        return null;
    }
    @Override
  
    public SystemDictList getDitcByNameWithOutId(String dictName, String id) throws Exception {
        List<SystemDictList> sdl = (List<SystemDictList>) super.hibernateTemplate.find("from SystemDictList s where s.dictName=? and s.id!=?", dictName, id);
        if (sdl != null && sdl.size() > 0) {

src/main/java/com/yihu/hos/system/dao/MenuActionDao.java

@@ -1,8 +1,7 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.system.dao.intf.IMenuActionDao;
import com.yihu.hos.system.model.SystemMenuAction;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -13,8 +12,11 @@ import java.util.Map;
 * Created by chenweida on 2016/1/18.
 */
@Repository("menuActionDao")
public class MenuActionDao extends SQLGeneralDAO implements IMenuActionDao {
    @Override
public class MenuActionDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "menuActionDao";
   
    public List<SystemMenuAction> getAllMenutAction(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from SystemMenuAction s where 1=1");
        if (!StringUtils.isEmpty(params.get("name"))) {
@@ -26,13 +28,13 @@ public class MenuActionDao extends SQLGeneralDAO implements IMenuActionDao {
        return (List<SystemMenuAction>) super.hibernateTemplate.find(sb.toString());
    }
    @Override
   
    public void activityMenuAction(String menuactionId, String activityFlag) throws Exception {
        String sql = "update System_menu_action set flag='" + activityFlag + "' where Id='" + menuactionId + "'";
        super.execute(sql);
    }
    @Override
   
    public SystemMenuAction getMenuActionByNameAndMenuId(String name, String menuid) throws Exception {
        List<SystemMenuAction> ss = (List<SystemMenuAction>) super.hibernateTemplate.find("from SystemMenuAction s where s.name=? and s.menuId=?", name, menuid);
        if (ss != null && ss.size() > 0) {
@@ -41,7 +43,7 @@ public class MenuActionDao extends SQLGeneralDAO implements IMenuActionDao {
        return null;
    }
    @Override
   
    public SystemMenuAction getMenuActionByNameAndMenuIdWithOutId(String name, String menuid, String id) throws Exception {
        List<SystemMenuAction> ss = (List<SystemMenuAction>) super.hibernateTemplate.find("from SystemMenuAction s where s.name=?  and s.menuId=? and s.id!=?", name, menuid, id);
        if (ss != null && ss.size() > 0) {

src/main/java/com/yihu/hos/system/dao/MenuDao.java

@@ -1,8 +1,7 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.system.dao.intf.IMenuDao;
import com.yihu.hos.system.model.SystemMenu;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -13,8 +12,11 @@ import java.util.Map;
 * Created by chenweida on 2016/1/18.
 */
@Repository("menuDao")
public class MenuDao extends SQLGeneralDAO implements IMenuDao {
    @Override
public class MenuDao extends SQLGeneralDAO  {
    public static final String BEAN_ID = "menuDao";
  
    public List<SystemMenu> getAllMenut(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from SystemMenu s where 1=1");
        Object name = params.get("name");
@@ -24,20 +26,20 @@ public class MenuDao extends SQLGeneralDAO implements IMenuDao {
        return (List<SystemMenu>) super.hibernateTemplate.find(sb.toString());
    }
    @Override
  
    public void activityMenu(String menuid, String activityFlag) throws Exception {
        String sql = "update System_menu set valid='" + activityFlag + "' where Id='" + menuid + "'";
        super.execute(sql);
    }
    @Override
  
    public void deleteMenu(String id) throws Exception {
        //删除父菜单
        SystemMenu systemMenu = this.getEntity(SystemMenu.class, id);
        deleteEntity(systemMenu);
    }
    @Override
  
    public SystemMenu getMenuByCodeWithOutId(String code, String id) throws Exception {
        List<SystemMenu> sms = (List<SystemMenu>) super.hibernateTemplate.find("from SystemMenu s where s.code=? and s.id!=?", code, id);
        if (sms != null && sms.size() > 0) {
@@ -46,7 +48,7 @@ public class MenuDao extends SQLGeneralDAO implements IMenuDao {
        return null;
    }
    @Override
  
    public SystemMenu getMenuByCode(String code) throws Exception {
        List<SystemMenu> sms = (List<SystemMenu>) super.hibernateTemplate.find("from SystemMenu s where s.code=?", code);
        if (sms != null && sms.size() > 0) {

src/main/java/com/yihu/hos/system/dao/OrganizationDao.java

@@ -1,6 +1,5 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.system.dao.intf.IOrganizationDao;
import com.yihu.hos.system.model.SystemOrganization;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
@@ -14,7 +13,10 @@ import java.util.Map;
 * Created by hzp on 2016/1/11.
 */
@Repository("OrganizationDao")
public class OrganizationDao extends SQLGeneralDAO implements IOrganizationDao {
public class OrganizationDao extends SQLGeneralDAO  {
    public static final String BEAN_ID = "OrganizationDao";
    /**
     * 获取组织列表
     * @return

src/main/java/com/yihu/hos/system/dao/RoleDao.java

@@ -1,9 +1,8 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.system.model.SystemRole;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.dao.intf.IRoleDao;
import com.yihu.hos.system.model.SystemRole;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -14,8 +13,11 @@ import java.util.Map;
 * Created by chenweida on 2016/1/19.
 */
@Repository("roleDao")
public class RoleDao extends SQLGeneralDAO implements IRoleDao {
    @Override
public class RoleDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "roleDao";
  
    public Result getRoleList(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from SystemRole s where 1=1 ");
        if (!StringUtils.isEmpty(params.get("name"))) {
@@ -24,13 +26,13 @@ public class RoleDao extends SQLGeneralDAO implements IRoleDao {
        return super.getDataGridResult(sb.toString(), Integer.valueOf(params.get("page").toString()), Integer.valueOf(params.get("rows").toString()));
    }
    @Override
  
    public void activityRole(String roleid, String activityFlag) throws Exception {
        String sql = "update System_role set valid='" + activityFlag + "' where Id='" + roleid + "'";
        super.execute(sql);
    }
    @Override
  
    public SystemRole getRoleByName(String name) throws Exception {
        List<SystemRole> srs = (List<SystemRole>) super.hibernateTemplate.find("from SystemRole s where s.name=? ", name);
        if (srs != null && srs.size() > 0) {
@@ -39,7 +41,7 @@ public class RoleDao extends SQLGeneralDAO implements IRoleDao {
        return null;
    }
    @Override
  
    public SystemRole getRoleByNameWithOutId(String name, String id) throws Exception {
        List<SystemRole> srs = (List<SystemRole>) super.hibernateTemplate.find("from SystemRole s where s.name=? and s.id!=?", name, id);
        if (srs != null && srs.size() > 0) {

src/main/java/com/yihu/hos/system/dao/SystemParamDao.java

@@ -1,9 +1,8 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.system.model.SystemParam;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.dao.intf.ISystemParamDao;
import com.yihu.hos.system.model.SystemParam;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -14,8 +13,11 @@ import java.util.Map;
 * Created by chenweida on 2016/1/19.
 */
@Repository("systemParamDao")
public class SystemParamDao extends SQLGeneralDAO implements ISystemParamDao {
    @Override
public class SystemParamDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "systemParamDao";
   
    public Result getParamList(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from SystemParam t where 1=1 ");
        if (!StringUtils.isEmpty(params.get("name"))) {
@@ -24,7 +26,7 @@ public class SystemParamDao extends SQLGeneralDAO implements ISystemParamDao {
        return super.getDataGridResult(sb.toString(), Integer.valueOf(params.get("page").toString()), Integer.valueOf(params.get("rows").toString()));
    }
    @Override
   
    public SystemParam getParamByKey(String paramKey) throws Exception {
        List<SystemParam> sParams = (List<SystemParam>) super.hibernateTemplate.find("from SystemParam s where s.paramKey = ?", paramKey);
        if (sParams != null && sParams.size() > 0) {
@@ -33,7 +35,7 @@ public class SystemParamDao extends SQLGeneralDAO implements ISystemParamDao {
        return null;
    }
    @Override
   
    public SystemParam getParamByKeyWithOutId(String paramKey, String id) throws Exception {
        List<SystemParam> sParams = (List<SystemParam>) super.hibernateTemplate.find("from SystemParam s where s.paramKey=? and s.id!=?", paramKey, id);
        if (sParams != null && sParams.size() > 0) {

src/main/java/com/yihu/hos/system/dao/SystemRoleActionDao.java

@@ -1,8 +1,7 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.system.dao.intf.ISystemRoleActionDao;
import com.yihu.hos.system.model.SystemRoleAction;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -11,19 +10,22 @@ import java.util.List;
 * Created by chenweida on 2016/2/19.
 */
@Repository("systemRoleActionDao")
public class SystemRoleActionDao extends SQLGeneralDAO implements ISystemRoleActionDao {
    @Override
public class SystemRoleActionDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "systemRoleActionDao";
   
    public List<SystemRoleAction> getSystemRoleActionListByRoleId(String roleId) throws Exception {
        return (List<SystemRoleAction>) super.hibernateTemplate.find("from SystemRoleAction s where s.roleId=?", roleId);
    }
    @Override
   
    public SystemRoleAction getRoleActionByRoleIdAndActionId(String roleId, String actionId) throws Exception {
        return (SystemRoleAction) super.hibernateTemplate.find("from SystemRoleAction s where s.roleId=? and s.actionId=?", roleId, actionId).get(0);
    }
    @Override
   
    public void deleteAllByRoleId(String roleId) throws Exception {
        super.hibernateTemplate.bulkUpdate("delete SystemRoleAction s where s.roleId=?",roleId);
    }

src/main/java/com/yihu/hos/system/dao/SystemRoleMenuDao.java

@@ -1,8 +1,7 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.system.dao.intf.ISystemRoleMenuDao;
import com.yihu.hos.system.model.SystemRoleMenu;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -11,19 +10,22 @@ import java.util.List;
 * Created by chenweida on 2016/2/19.
 */
@Repository("systemRoleMenuDao")
public class SystemRoleMenuDao extends SQLGeneralDAO implements ISystemRoleMenuDao {
    @Override
public class SystemRoleMenuDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "systemRoleMenuDao";
  
    public List<SystemRoleMenu> getSystemRoleMenuListByRoleId(String roleId) throws Exception {
        return (List<SystemRoleMenu>) super.hibernateTemplate.find("from SystemRoleMenu s where s.roleId=?", roleId);
    }
    @Override
  
    public SystemRoleMenu getRoleMenuByRoleIdAndMenuId(String roleId, String menuId) throws Exception {
        return (SystemRoleMenu) super.hibernateTemplate.find("from SystemRoleMenu s where s.roleId=? and s.menuId=?", roleId, menuId).get(0);
    }
    @Override
  
    public void deleteAllByRoleId(String roleId) throws Exception {
        super.hibernateTemplate.bulkUpdate("delete SystemRoleMenu s where s.roleId=?",roleId);
    }

src/main/java/com/yihu/hos/system/dao/UserDao.java

@@ -1,10 +1,9 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.dao.intf.IUserDao;
import com.yihu.hos.system.model.SystemUser;
import com.yihu.hos.system.model.SystemUserRole;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@@ -15,8 +14,11 @@ import java.util.Map;
 * Created by chenweida on 2016/1/19.
 */
@Repository("userDao")
public class UserDao extends SQLGeneralDAO implements IUserDao {
    @Override
public class UserDao extends SQLGeneralDAO {
    public static final String BEAN_ID = "userDao";
  
    public Result getUserList(Map<String, Object> params) throws Exception {
        StringBuilder sb = new StringBuilder("from SystemUser t where 1=1  and t.activated != '"+SystemUser.ACTIVATED_DELETE+"'");
        if (!StringUtils.isEmpty(params.get("name"))) {
@@ -25,13 +27,13 @@ public class UserDao extends SQLGeneralDAO implements IUserDao {
        return super.getDataGridResult(sb.toString(), Integer.valueOf(params.get("page").toString()), Integer.valueOf(params.get("rows").toString()));
    }
    @Override
  
    public void activityUser(String useid, String flag) throws Exception {
        String sql = "update System_user set activated='" + flag + "' where Id='" + useid + "'";
        super.execute(sql);
    }
    @Override
  
    public SystemUser getUserByLoginCode(String loginCode) throws Exception {
        List<SystemUser> users = (List<SystemUser>) hibernateTemplate.find("from SystemUser s where s.loginCode =? and s.activated!=?", loginCode,SystemUser.ACTIVATED_DELETE);
        if (users != null && users.size() > 0) {

src/main/java/com/yihu/hos/system/dao/intf/IAppDao.java

@@ -1,18 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.model.SystemApp;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/21.
 */
public interface IAppDao extends XSQLGeneralDAO {
    Result getAppList(Map<String, Object> params) throws Exception;
    List<SystemApp> getAllApplist() throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/IAppServiceDao.java

@@ -1,16 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import java.util.Map;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2016/8/16.
 */
public interface IAppServiceDao extends XSQLGeneralDAO {
    Result getAppServiceList(Map<String, Object> params) throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/IBaseDictDao.java

@@ -1,48 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.system.model.SystemDictList;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
/**
 * Created by hzp on 2016/1/11.
 */
public interface IBaseDictDao {
    /**
     * 获取字典列表
     * @return
     */
    DataGridResult getSystemDictList(String condition, Integer page, Integer pageSize) throws Exception ;
    /**
     * 通过ID获取系统字典信息
     * @return
     */
    SystemDictList getSystemDictInfoById(String id) throws Exception ;
    /**
     * 通过dictName获取字典信息
     * @return
     */
    SystemDictList getSystemDictInfoByName(String dictName) throws Exception ;
    /**
     * 获取某字典数据
     * @return
     */
    DictionaryResult getSystemDict(String dictName) throws Exception ;
    /**
     * 获取表数据
     * @return
     */
    DictionaryResult getRelationDict(String tableName, String codeCol, String valueCole, String extendCol, String Where) throws Exception ;
    /**
     * 获取标准字典数据
     * @return
     */
    DictionaryResult getStdDict(String code) throws Exception ;
}

src/main/java/com/yihu/hos/system/dao/intf/IDatasourceDao.java

@@ -1,38 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.system.model.SystemDatasource;
import java.util.List;
import java.util.Map;
/**
 * Created by hzp on 2016/1/11.
 */
public interface IDatasourceDao extends XSQLGeneralDAO {
    /**
     * 测试连接数据源
     */
    void testDatasource(String type, String config) throws Exception;
    /**
     * 获取数据源列表
     * @return
     */
    DataGridResult getDatasource(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception;
    /**
     * 获取全部数据源列表
     * @return
     */
    DataGridResult getDatasourceByOrg(String orgId) throws Exception;
    /**
     * 修改数据源状态(暂弃)
     */
    void validDatasource(String id, String valid) throws Exception;
    List<SystemDatasource> getDatasources(String orgId)throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/IDictDao.java

@@ -1,20 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.model.SystemDict;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/20.
 */
public interface IDictDao extends XSQLGeneralDAO {
    Result getDictList(Map<String, Object> params) throws Exception;
    SystemDict getDictItemByCodeWithOutId(String code, String id) throws Exception;
    SystemDict getDictItemByCode(String code) throws Exception;
    void delDictItemByDictName(String dictName) throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/IDictListDao.java

@@ -1,18 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.model.SystemDictList;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/20.
 */
public interface IDictListDao extends XSQLGeneralDAO {
    Result getDictList(Map<String, Object> params) throws Exception;
    SystemDictList getDitcByName(String dictName) throws Exception;
    SystemDictList getDitcByNameWithOutId(String dictName, String id) throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/IMenuActionDao.java

@@ -1,20 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.system.model.SystemMenuAction;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/18.
 */
public interface IMenuActionDao extends XSQLGeneralDAO {
    List<SystemMenuAction> getAllMenutAction(Map<String, Object> params) throws Exception;
    void activityMenuAction(String menuactionId, String activityFlag) throws Exception;
    SystemMenuAction getMenuActionByNameAndMenuId(String name, String menuid) throws Exception;
    SystemMenuAction getMenuActionByNameAndMenuIdWithOutId(String name, String menuid, String id) throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/IMenuDao.java

@@ -1,22 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.system.model.SystemMenu;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/18.
 */
public interface IMenuDao extends XSQLGeneralDAO {
    List<SystemMenu> getAllMenut(Map<String, Object> params) throws Exception;
    void activityMenu(String orgId, String activityFlag) throws Exception;
    void deleteMenu(String id) throws Exception;
    SystemMenu getMenuByCodeWithOutId(String code, String id) throws Exception;
    SystemMenu getMenuByCode(String code) throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/IOrganizationDao.java

@@ -1,32 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.system.model.SystemOrganization;
import java.util.List;
import java.util.Map;
/**
 * Created by hzp on 2016/1/11.
 */
public interface IOrganizationDao extends XSQLGeneralDAO {
    /**
     * 获取组织列表
     * @return
     */
    DataGridResult getOrgList(Map<String, Object> conditionMap, Integer page, Integer pageSize) throws Exception;
    /**
     * 获取组织信息ByCodeorName
     */
    List getOrgByCodeOrName(String code, String name) throws Exception;
    /**
     * 修改组织状态
     */
    void activityOrg(String orgId, String activityFlag) throws Exception;
    SystemOrganization getOrgByIde(String orgId) throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/IRoleDao.java

@@ -1,20 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.model.SystemRole;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/19.
 */
public interface IRoleDao extends XSQLGeneralDAO {
    Result getRoleList(Map<String, Object> params) throws Exception;
    void activityRole(String roleId, String activityFlag) throws Exception;
    SystemRole getRoleByName(String name) throws Exception;
    SystemRole getRoleByNameWithOutId(String name, String id) throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/ISystemParamDao.java

@@ -1,19 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.model.SystemParam;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/19.
 */
public interface ISystemParamDao extends XSQLGeneralDAO {
    Result getParamList(Map<String, Object> params) throws Exception;
    SystemParam getParamByKey(String paramKey) throws Exception;
    SystemParam getParamByKeyWithOutId(String paramKey, String id) throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/ISystemRoleActionDao.java

@@ -1,17 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.system.model.SystemRoleAction;
import java.util.List;
/**
 * Created by chenweida on 2016/2/19.
 */
public interface ISystemRoleActionDao extends XSQLGeneralDAO {
    List<SystemRoleAction> getSystemRoleActionListByRoleId(String roleId) throws Exception;
    SystemRoleAction getRoleActionByRoleIdAndActionId(String roleId, String actionId) throws Exception;
    void deleteAllByRoleId(String roleId) throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/ISystemRoleMenuDao.java

@@ -1,17 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.system.model.SystemRoleMenu;
import java.util.List;
/**
 * Created by chenweida on 2016/2/19.
 */
public interface ISystemRoleMenuDao extends XSQLGeneralDAO {
    List<SystemRoleMenu> getSystemRoleMenuListByRoleId(String roleId) throws Exception;
    SystemRoleMenu getRoleMenuByRoleIdAndMenuId(String roleId, String menuId) throws Exception;
    void deleteAllByRoleId(String roleId)throws Exception;
}

src/main/java/com/yihu/hos/system/dao/intf/IUserDao.java

@@ -1,26 +0,0 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.model.SystemUser;
import com.yihu.hos.system.model.SystemUserRole;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/19.
 */
public interface IUserDao extends XSQLGeneralDAO {
    Result getUserList(Map<String, Object> params) throws Exception;
    void activityUser(String useid, String flag) throws Exception;
    SystemUser getUserByLoginCode(String loginCode) throws Exception;
    void deleteUserRoleByUserId(String userId) throws Exception;
    List<SystemUserRole> getUserRoleByUserId(String userId) throws Exception;
}

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

@@ -3,11 +3,10 @@ package com.yihu.hos.system.service;
import com.yihu.hos.config.MongoConfig;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.core.encrypt.DES;
import com.yihu.hos.system.dao.intf.IAppDao;
import com.yihu.hos.system.dao.intf.IAppServiceDao;
import com.yihu.hos.system.dao.AppDao;
import com.yihu.hos.system.dao.AppServiceDao;
import com.yihu.hos.system.model.SystemApp;
import com.yihu.hos.system.model.SystemServiceEndpoint;
import com.yihu.hos.system.service.intf.IAppManager;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.GridFSUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,22 +23,24 @@ import java.util.Map;
 */
@Service("appManager")
public class AppManager implements IAppManager {
    @Resource(name = "appDao")
    private IAppDao appDao;
public class AppManager {
    public static final String BEAN_ID = "appManager";
    @Resource(name = "appServiceDao")
    private IAppServiceDao appServiceDao;
    @Resource(name = AppDao.BEAN_ID)
    private AppDao appDao;
    @Resource(name = AppServiceDao.BEAN_ID)
    private AppServiceDao appServiceDao;
    @Autowired
    private MongoConfig mongoConfig;
    @Override
   
    public Result getAppList(Map<String, Object> params) throws Exception {
        return appDao.getAppList(params);
    }
    @Override
   
    public SystemApp getAppById(String id) throws Exception {
        return appDao.getEntity(SystemApp.class,id);
    }
@@ -77,12 +78,12 @@ public class AppManager implements IAppManager {
    /* ==============================服务模块=================================  */
    @Override
   
    public Result getAppServiceList(Map<String, Object> params) throws Exception {
        return appServiceDao.getAppServiceList(params);
    }
    @Override
   
    public SystemServiceEndpoint getAppServiceById(String id) throws Exception {
        SystemServiceEndpoint serviceEndpoint = appServiceDao.getEntity(SystemServiceEndpoint.class,id);
        serviceEndpoint.setRequesModule(serviceEndpoint.getRequesModule().replaceAll("\n", "<br>"));
@@ -130,7 +131,7 @@ public class AppManager implements IAppManager {
    }
    @Override
   
    public Result uploadFile(CommonsMultipartFile file) {
        String dbName = "upload";
        String newFileName;
@@ -145,7 +146,7 @@ public class AppManager implements IAppManager {
        return Result.error("上传失败");
    }
    @Override
   
    public Result readFile(OutputStream os, String fileName) {
        String dbName = "upload";
        try {

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

@@ -2,18 +2,18 @@ package com.yihu.hos.system.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.hos.system.dao.intf.*;
import com.yihu.hos.system.dao.*;
import com.yihu.hos.system.model.SystemMenu;
import com.yihu.hos.system.model.SystemMenuAction;
import com.yihu.hos.system.model.SystemRoleAction;
import com.yihu.hos.system.model.SystemRoleMenu;
import com.yihu.hos.system.service.intf.IAuthorityManager;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
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.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -22,24 +22,27 @@ import java.util.List;
 * Created by chenweida on 2016/1/20.
 */
@Service("authorityManager")
public class AuthorityManager implements IAuthorityManager {
    @Autowired
    private IMenuDao menuDao;
    @Autowired
    private IMenuActionDao menuActionDao;
    @Autowired
    private IRoleDao roleDao;
    @Autowired
    private ISystemRoleActionDao systemRoleActionDao;
    @Autowired
    private ISystemRoleMenuDao systemRoleMenuDao;
    @Autowired
    private IAppDao appdao;
public class AuthorityManager {
    public static final String BEAN_ID = "authorityManager";
    @Resource(name = MenuDao.BEAN_ID)
    private MenuDao menuDao;
    @Resource(name = MenuActionDao.BEAN_ID)
    private MenuActionDao menuActionDao;
    @Resource(name = RoleDao.BEAN_ID)
    private RoleDao roleDao;
    @Resource(name = SystemRoleActionDao.BEAN_ID)
    private SystemRoleActionDao systemRoleActionDao;
    @Resource(name = SystemRoleMenuDao.BEAN_ID)
    private SystemRoleMenuDao systemRoleMenuDao;
    @Resource(name = AppDao.BEAN_ID)
    private AppDao appdao;
    @Autowired
    private ObjectMapper objectMapper;
    @Override
   
    public Result getMenuList(String roleId) throws Exception {
        DataGridResult r = new DataGridResult();
        //找出全部的

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

@@ -1,35 +1,36 @@
package com.yihu.hos.system.service;
import com.yihu.hos.common.Services;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.system.dao.BaseDictDao;
import com.yihu.hos.system.model.SystemDict;
import com.yihu.hos.system.model.SystemDictList;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
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.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.
 */
@Service(Services.BaseDict)
@Transactional
public class BaseDictManager implements IBaseDictManager {
public class BaseDictManager {
    public static final String BEAN_ID = Services.BaseDict;
    @Resource(name = "BaseDictDao")
    private IBaseDictDao baseDictDao;
    @Resource(name = BaseDictDao.BEAN_ID)
    private BaseDictDao baseDictDao;
    /**
     * 获取字典数据(常用)
     * @return
     */
    @Override
   
    public DictionaryResult getDict(String name,String where,String type) throws Exception
    {
        if(type == "1")
@@ -67,7 +68,7 @@ public class BaseDictManager implements IBaseDictManager {
     * 获取字典列表
     * @return
     */
    @Override
   
    public DataGridResult getSystemDictList(String condition,Integer page, Integer pageSize) throws Exception
    {
        return baseDictDao.getSystemDictList(condition,page,pageSize);
@@ -77,7 +78,7 @@ public class BaseDictManager implements IBaseDictManager {
     * 通过ID获取系统字典信息
     * @return
     */
    @Override
   
    public SystemDictList getSystemDictInfoById(String id) throws Exception
    {
        return baseDictDao.getSystemDictInfoById(id);
@@ -87,7 +88,7 @@ public class BaseDictManager implements IBaseDictManager {
     * 通过dictName获取字典信息
     * @return
     */
    @Override
   
    public SystemDictList getSystemDictInfoByName(String dictName) throws Exception
    {
        return baseDictDao.getSystemDictInfoByName(dictName);
@@ -96,7 +97,7 @@ public class BaseDictManager implements IBaseDictManager {
    /**
     * 新增字典信息
     */
    @Override
   
    @Transactional
    public ActionResult addDict(SystemDictList obj) throws Exception
    {
@@ -106,7 +107,7 @@ public class BaseDictManager implements IBaseDictManager {
    /**
     * 修改字典信息
     */
    @Override
   
    @Transactional
    public ActionResult updateDict(SystemDictList obj) throws Exception
    {
@@ -116,7 +117,7 @@ public class BaseDictManager implements IBaseDictManager {
    /**
     * 删除字典信息
     */
    @Override
   
    @Transactional
    public ActionResult deleteDict(SystemDictList obj) throws Exception
    {
@@ -127,7 +128,7 @@ public class BaseDictManager implements IBaseDictManager {
    /**
     * 新增字典项
     */
    @Override
   
    @Transactional
    public ActionResult addDictItem(SystemDict obj) throws Exception
    {
@@ -137,7 +138,7 @@ public class BaseDictManager implements IBaseDictManager {
    /**
     * 修改字典项
     */
    @Override
   
    @Transactional
    public ActionResult updateDictItem(SystemDict obj) throws Exception
    {
@@ -147,7 +148,7 @@ public class BaseDictManager implements IBaseDictManager {
    /**
     * 删除字典项
     */
    @Override
   
    @Transactional
    public ActionResult deleteDictItem(SystemDict obj) throws Exception
    {

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

@@ -1,12 +1,10 @@
package com.yihu.hos.system.service;
import com.yihu.hos.common.Services;
import com.yihu.hos.system.dao.DatasourceDao;
import com.yihu.hos.system.model.SystemDatasource;
import com.yihu.hos.web.framework.model.ActionResult;
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.common.Services;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,10 +17,12 @@ import java.util.Map;
 */
@Service(Services.Datasource)
@Transactional
public class DatasourceManager implements IDatasourceManager {
public class DatasourceManager {
    public static final String BEAN_ID = Services.Datasource;
    @Autowired
    private IDatasourceDao datasourceDao;
    @Resource(name = DatasourceDao.BEAN_ID)
    private DatasourceDao datasourceDao;
    /**
     * 测试连接
@@ -42,7 +42,7 @@ public class DatasourceManager implements IDatasourceManager {
     * 根据ID获取数据源信息
     * @return
     */
    @Override
   
    public SystemDatasource getDatasourcegById(String id) throws Exception
    {
        return datasourceDao.getEntity(SystemDatasource.class, id);
@@ -55,7 +55,7 @@ public class DatasourceManager implements IDatasourceManager {
     * @return
     * @throws Exception
     */
    @Override
   
    public DataGridResult getDatasource(Map<String, Object> conditionMap, int page, int rows) throws Exception{
        return datasourceDao.getDatasource(conditionMap,page,rows);
    }
@@ -63,7 +63,7 @@ public class DatasourceManager implements IDatasourceManager {
    /**
     * 根据组织ID获取据源列表
     */
    @Override
   
    public DataGridResult getDatasourceByOrg(String orgId) throws Exception{
        return datasourceDao.getDatasourceByOrg(orgId);
    }
@@ -74,7 +74,7 @@ public class DatasourceManager implements IDatasourceManager {
     * @param config
     * @return
     */
    @Override
   
    public ActionResult testDatasource(String dataSource, String config) {
        try {
            boolean re = testDB(dataSource, config);
@@ -96,7 +96,7 @@ public class DatasourceManager implements IDatasourceManager {
     * @param obj
     * @return
     */
    @Override
   
    @Transactional
    public ActionResult addDatasource(SystemDatasource obj) {
        try{
@@ -114,7 +114,7 @@ public class DatasourceManager implements IDatasourceManager {
     * @param obj
     * @return
     */
    @Override
   
    @Transactional
    public ActionResult updateDatasource(SystemDatasource obj) {
        try{
@@ -130,7 +130,7 @@ public class DatasourceManager implements IDatasourceManager {
    /**
     * 删除数据源
     */
    @Override
   
    @Transactional
    public ActionResult deleteDatasource(String id)
    {
@@ -144,7 +144,7 @@ public class DatasourceManager implements IDatasourceManager {
        }
    }
    @Override
   
    public List<SystemDatasource> getDatasources(String orgId) {
        try {
            return datasourceDao.getDatasources(orgId);

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

@@ -1,26 +1,28 @@
package com.yihu.hos.system.service;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.dao.intf.IDictDao;
import com.yihu.hos.system.dao.intf.IDictListDao;
import com.yihu.hos.system.dao.DictDao;
import com.yihu.hos.system.dao.DictListDao;
import com.yihu.hos.system.model.SystemDict;
import com.yihu.hos.system.model.SystemDictList;
import com.yihu.hos.system.service.intf.IDictManager;
import org.springframework.beans.factory.annotation.Autowired;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/20.
 */
@Service("dictManager")
public class DictManager implements IDictManager {
    @Autowired
    private IDictDao dictItemDao;//字典项
    @Autowired
    private IDictListDao dictDao;//字典
public class DictManager  {
    public static final String BEAN_ID = "dictManager";
    @Resource(name =DictDao.BEAN_ID )
    private DictDao dictItemDao;//字典项
    @Resource(name = DictListDao.BEAN_ID)
    private DictListDao dictDao;//字典
    @Transactional
    public Result getDictList(Map<String, Object> params) throws Exception {
@@ -32,12 +34,12 @@ public class DictManager implements IDictManager {
        return dictItemDao.getDictList(params);
    }
    @Override
   
    public SystemDict getSystemDictById(String id) throws Exception {
        return dictItemDao.getEntity(SystemDict.class, id);
    }
    @Override
   
    public SystemDictList getSystemDictListById(String id) throws Exception {
        return dictDao.getEntity(SystemDictList.class, id);
    }

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

@@ -11,7 +11,6 @@ import com.yihu.hos.system.dao.FlowTempDao;
import com.yihu.hos.system.model.SystemServiceFlow;
import com.yihu.hos.system.model.SystemServiceFlowClass;
import com.yihu.hos.system.model.SystemServiceFlowTemp;
import com.yihu.hos.system.service.intf.IFlowManage;
import com.yihu.hos.web.framework.constant.ServiceFlowConstant;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DictItem;
@@ -38,7 +37,7 @@ import java.util.Map;
 * Created at 2016/8/19.
 */
@Service("flowManager")
public class FlowManager implements IFlowManage {
public class FlowManager {
    public static final String BEAN_ID = "flowManager";
    @Autowired
@@ -151,7 +150,7 @@ public class FlowManager implements IFlowManage {
        return null;
    }
    @Override
    
    public Result getFlowList(Map<String, Object> params) throws Exception {
        return flowDao.getFlowList(params);
    }
@@ -191,7 +190,7 @@ public class FlowManager implements IFlowManage {
        /* ===================================  flowClass 部分================================================*/
    @Override
    
    public SystemServiceFlow getFlowById(Integer id) throws Exception {
        return flowDao.getEntity(SystemServiceFlow.class, id);
    }
@@ -354,12 +353,12 @@ public class FlowManager implements IFlowManage {
    }
    @Override
    
    public Result getFlowClassList(Map<String, Object> params) throws Exception {
        return null;
    }
    @Override
    
    public List<SystemServiceFlowClass> getFlowClassByFlowId(Integer flowId) throws Exception {
        return flowClassDao.getFlowClassByFlowId(flowId);
    }
@@ -385,13 +384,13 @@ public class FlowManager implements IFlowManage {
        return succ;
    }
    @Override
    
    public List<SystemServiceFlowTemp> getFlowTempByFlowId(Integer id) throws Exception {
        return flowTempDao.getFlowTempByFlowId(id);
    }
    //TODO
    @Override
    
    public boolean genFlewByflowTempId(Integer flowTempId) throws Exception {
        SystemServiceFlow flow = getFlowById(flowTempId);
        //生成新的route类
@@ -400,7 +399,7 @@ public class FlowManager implements IFlowManage {
        return false;
    }
    @Override
    
    public Result uploadFile(CommonsMultipartFile file) {
        String dbName = "upload";
        String newFileName;
@@ -415,7 +414,7 @@ public class FlowManager implements IFlowManage {
        return Result.error("上传失败");
    }
    @Override
    
    public Result readFile(OutputStream os, String fileName) {
        String dbName = "upload";
        try {
@@ -470,7 +469,7 @@ public class FlowManager implements IFlowManage {
     * @return
     * @throws Exception
     */
    @Override
    
    public ActionResult getFlowList(String type) throws Exception {
        List<SystemServiceFlow> flowList = flowDao.getFlowList(type);
        ActionResult re = new ActionResult();
@@ -522,7 +521,7 @@ public class FlowManager implements IFlowManage {
     * @return
     * @throws Exception
     */
    @Override
    
    public Integer updateCamelFile(Integer flowTempId, Integer flowId, String newCron) throws Exception {
         /* 修改route文件无需重新生成flowClass记录，文件名根据className+routeId 生成；*/
        List<SystemServiceFlowTemp> flowTempRouters = flowTempDao.getFlowTemps(flowTempId, ServiceFlowConstant.FLOW_TYPE_ROUTE);

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

@@ -1,37 +1,39 @@
package com.yihu.hos.system.service;
import com.yihu.hos.system.dao.MenuActionDao;
import com.yihu.hos.system.dao.MenuDao;
import com.yihu.hos.system.model.SystemMenu;
import com.yihu.hos.system.model.SystemMenuAction;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.system.dao.intf.IMenuActionDao;
import com.yihu.hos.system.dao.intf.IMenuDao;
import com.yihu.hos.system.model.SystemMenu;
import com.yihu.hos.system.model.SystemMenuAction;
import com.yihu.hos.system.service.intf.IMenuManager;
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.Map;
/**
 * Created by chenweida on 2016/1/18.
 */
@Service("menuManager")
public class MenuManager implements IMenuManager {
    @Autowired
    private IMenuDao menuDao;
    @Autowired
    private IMenuActionDao menuActionDao;
public class MenuManager{
    public static final String BEAN_ID = "menuManager";
    @Resource(name = MenuDao.BEAN_ID)
    private MenuDao menuDao;
    @Resource(name = MenuActionDao.BEAN_ID)
    private MenuActionDao menuActionDao;
    @Override
   
    public Result getMenuList(Map<String, Object> params) throws Exception {
        DataGridResult actionResult = new DataGridResult();
        actionResult.setDetailModelList(menuDao.getAllMenut(params));
        return actionResult;
    }
    @Override
   
    public SystemMenu getMenuById(String menuId) throws Exception {
        return menuDao.getEntity(SystemMenu.class, menuId);
    }
@@ -82,14 +84,14 @@ public class MenuManager implements IMenuManager {
    }
    //==============================menuAction==================================
    @Override
   
    public Result getMenuActionList(Map<String, Object> params) throws Exception {
        DataGridResult actionResult = new DataGridResult();
        actionResult.setDetailModelList(menuActionDao.getAllMenutAction(params));
        return actionResult;
    }
    @Override
   
    public SystemMenuAction getMenuActionById(String menuId) throws Exception {
        return menuActionDao.getEntity(SystemMenuAction.class, menuId);
    }

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

@@ -1,16 +1,15 @@
package com.yihu.hos.system.service;
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.dao.DatasourceDao;
import com.yihu.hos.system.dao.OrganizationDao;
import com.yihu.hos.system.model.SystemOrganization;
import com.yihu.hos.system.service.intf.IOrganizationManager;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
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;
@@ -18,19 +17,22 @@ import java.util.Map;
 * Created by hzp on 2016/1/11.
 */
@Service(Services.Organization)
public class OrganizationManager implements IOrganizationManager {
public class OrganizationManager {
    @Autowired
    private IOrganizationDao organizationDao;
    public static final String BEAN_ID = Services.Organization;
    @Autowired
    private IDatasourceDao datasourceDao;
    @Resource(name = OrganizationDao.BEAN_ID)
    private OrganizationDao organizationDao;
    @Resource(name = DatasourceDao.BEAN_ID)
    private DatasourceDao datasourceDao;
    /**
     * 根据ID获取组织详细
     * @return
     */
    @Override
  
    public SystemOrganization getOrgById(String id) throws Exception
    {
        return organizationDao.getEntity(SystemOrganization.class,id);
@@ -39,7 +41,7 @@ public class OrganizationManager implements IOrganizationManager {
    /**
     * 获取组织列表
     */
    @Override
  
    public DataGridResult getOrgList(Map<String, Object> conditionMap, Integer page, Integer rows) throws Exception
    {
        return organizationDao.getOrgList(conditionMap,page,rows);
@@ -48,7 +50,7 @@ public class OrganizationManager implements IOrganizationManager {
    /**
     * 新增组织
     */
    @Override
  
    @Transactional
    public Result addOrg(SystemOrganization obj) throws Exception {
        String code= obj.getCode() ;
@@ -65,7 +67,7 @@ public class OrganizationManager implements IOrganizationManager {
    /**
     * 修改组织
     */
    @Override
  
    @Transactional
    public Result updateOrg(SystemOrganization obj) {
@@ -93,7 +95,7 @@ public class OrganizationManager implements IOrganizationManager {
    /**
     * 删除组织
     */
    @Override
  
    @Transactional
    public Result deleteOrg(String id) {
        try{
@@ -115,7 +117,7 @@ public class OrganizationManager implements IOrganizationManager {
        }
    }
    @Override
  
    public SystemOrganization getOrgByIde(String orgId) throws Exception {
        return organizationDao.getOrgByIde(orgId);
    }