org.json改为jackson.json

hos-admin/src/main/java/com/yihu/hos/crawler/format/AdapterScheme.java

@@ -1,5 +1,8 @@
package com.yihu.hos.crawler.format;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterMetadataModel;
import com.yihu.hos.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.hos.standard.service.adapter.AdapterDatasetService;
@@ -40,15 +43,20 @@ public class AdapterScheme  extends AdapterBase{
            adapterMetaDataMap =new HashMap<>();
            Map<String, String> condition = new HashMap<>();
            condition.put("column", "adapter_dataset_code");
            //TODO: Use jackson
//            JSONObject jsonpObject = JSONObject.fromObject(condition);
//            List<AdapterDatasetModel> adapterDataSets = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, jsonpObject.toString());
//            for (AdapterDatasetModel adapterDataSet:adapterDataSets){
//                List<AdapterMetadataModel> adapterMetaDataTList = getAdapterMetadataService().getAdapterMetadataByDataset(version, adapterDataSet.getId());
//                if (adapterMetaDataTList!=null && adapterMetaDataTList.size()>0){
//                    adapterMetaDataMap.put(adapterDataSet.getStdDatasetCode(), adapterMetaDataTList);
//                }
//            }
            String conditionStr ="";
            ObjectMapper mapper = new ObjectMapper();
            try {
                conditionStr = mapper.writeValueAsString(condition);
            } catch (JsonProcessingException e) {
                e.printStackTrace();
            }
            List<AdapterDatasetModel> adapterDataSets = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, conditionStr);
            for (AdapterDatasetModel adapterDataSet:adapterDataSets){
                List<AdapterMetadataModel> adapterMetaDataTList = getAdapterMetadataService().getAdapterMetadataByDataset(version, adapterDataSet.getId());
                if (adapterMetaDataTList!=null && adapterMetaDataTList.size()>0){
                    adapterMetaDataMap.put(adapterDataSet.getStdDatasetCode(), adapterMetaDataTList);
                }
            }
        }
        return adapterMetaDataMap;
    }
@@ -60,4 +68,5 @@ public class AdapterScheme  extends AdapterBase{
        return getAdapterMetaDataMap().get(dataSetCode);
    }
}

hos-admin/src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDataSet.java

@@ -1,9 +1,14 @@
package com.yihu.hos.crawler.model.adapter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.crawler.model.patient.PatientIdentity;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.model.adapter.AdapterMetadataModel;
import com.yihu.hos.standard.service.adapter.AdapterMetadataService;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import java.util.*;
@@ -37,21 +42,21 @@ public class AdapterDataSet {
            adapterMetaDataMap = new HashMap<>();
            Map<String, Object> condition = new HashMap<>();
            condition.put("column", "adapter_metadata_code");
            //TODO: Use Jackson
//            JSONObject jsonpObject = JSONObject.fromObject(condition);
//            AdapterMetadataService metadataService = SpringBeanUtil.getService(AdapterMetadataService.BEAN_ID);
//            List<AdapterMetadataModel> adapterMetaDataModelList = metadataService.getAdapterMetadataNotNullList(adapterVersion, adapterDatasetModel.getStdDatasetId(), jsonpObject.toString());
//            List<Integer> stdMetaDataIdList = new ArrayList<>();
//            if (!CollectionUtil.isEmpty(adapterMetaDataModelList)) {
//                for (AdapterMetadataModel adapterMetadataModel : adapterMetaDataModelList) {
//                    stdMetaDataIdList.add(adapterMetadataModel.getStdMetadataId());
//                }
//                for (AdapterMetadataModel adapterMetadataModel : adapterMetaDataModelList) {
//                    AdapterMetaData adapterMetaData = new AdapterMetaData(adapterMetadataModel, adapterVersion, entryMap);
//                    adapterMetaDataList.add(adapterMetaData);
//                    adapterMetaDataMap.put(adapterMetadataModel.getStdMetadataCode().toUpperCase(), adapterMetaData);
//                }
//            }
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterMetadataService metadataService = SpringBeanUtil.getService(AdapterMetadataService.BEAN_ID);
            List<AdapterMetadataModel> adapterMetaDataModelList = metadataService.getAdapterMetadataNotNullList(adapterVersion, adapterDatasetModel.getStdDatasetId(),objectMapper.writeValueAsString(condition));
            List<Integer> stdMetaDataIdList = new ArrayList<>();
            if (!CollectionUtil.isEmpty(adapterMetaDataModelList)) {
                for (AdapterMetadataModel adapterMetadataModel : adapterMetaDataModelList) {
                    stdMetaDataIdList.add(adapterMetadataModel.getStdMetadataId());
                }
                for (AdapterMetadataModel adapterMetadataModel : adapterMetaDataModelList) {
                    AdapterMetaData adapterMetaData = new AdapterMetaData(adapterMetadataModel, adapterVersion, entryMap);
                    adapterMetaDataList.add(adapterMetaData);
                    adapterMetaDataMap.put(adapterMetadataModel.getStdMetadataCode().toUpperCase(), adapterMetaData);
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
        }

hos-admin/src/main/java/com/yihu/hos/crawler/service/CrawlerManager.java

@@ -2,19 +2,19 @@ package com.yihu.hos.crawler.service;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.crawler.model.adapter.AdapterDataSet;
import com.yihu.hos.crawler.model.config.SysConfig;
import com.yihu.hos.crawler.model.patient.Patient;
import com.yihu.hos.web.framework.model.DictItem;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.hos.standard.service.adapter.AdapterDatasetService;
import com.yihu.hos.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.web.framework.model.DictItem;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -184,9 +184,9 @@ public class CrawlerManager {
                }
                Map<String, String> condition = new HashMap<>();
                condition.put("column", "adapter_dataset_code");
                //TODO: Use jackson
//                JSONObject jsonpObject = JSONObject.fromObject(condition);
//                adapterDataSetModelList = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, jsonpObject.toString());
                ObjectMapper mapper = new ObjectMapper();
                String conditionStr = mapper.writeValueAsString(condition);
                adapterDataSetModelList = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, conditionStr);
            }
            /**

hos-admin/src/main/java/com/yihu/hos/crawler/service/CrawlerService.java

@@ -1,6 +1,8 @@
package com.yihu.hos.crawler.service;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.crawler.dao.CrawlerDatasetDao;
@@ -24,6 +26,7 @@ import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DetailModelResult;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -66,44 +69,42 @@ public class CrawlerService {
     * @throws Exception
     */
    public ActionResult saveDataSetRelation(String version, String json) throws Exception {
        //TODO: Use jackson
//        JSONObject root = JSONObject.fromObject(json);
//        JSONArray jsonList = root.getJSONArray("lines");
//        JSONArray entrances = root.getJSONArray("entrances");
//        AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(version));
//        if (jsonList != null && jsonList.size() > 0) {
//            // 删除旧关联关系
//            crawlerFlowDao.deleteCrawlerFlowList(versionModel.getId());
//            for (Object item : jsonList) {
//                JSONObject obj = JSONObject.fromObject(item);
//                String from = obj.getString("from");
//                String to = obj.getString("to");
//                String fromPort = obj.getString("fromPort");
//                String toPort = obj.getString("toPort");
//                // 保存编排关系
//                CrawlerFlowModel crawlerFlow = new CrawlerFlowModel();
//                crawlerFlow.setDatasetCode(to);
//                crawlerFlow.setInputDatasetCode(from);
//                crawlerFlow.setMetadataCode(toPort);
//                crawlerFlow.setInputMetadataCode(fromPort);
//                crawlerFlow.setSchemeVersionId(versionModel.getId());
//                crawlerFlowDao.saveEntity(crawlerFlow);
//            }
//            // 删除编排头部信息
//            crawlerFlowHeadDao.deleteCrawlerFlowHeadList(versionModel.getId());
//
//            for (Object item : entrances) {
//                JSONObject obj = JSONObject.fromObject(item);
//                String dataSet = obj.getString("dataSet");
//                String meta = obj.getString("meta");
//                //  保存入口数据集
//                CrawlerFlowHeadModel headModel = new CrawlerFlowHeadModel();
//                headModel.setSchemeVersionId(versionModel.getId());
//                headModel.setDatasetCode(dataSet);
//                headModel.setMetadataCode(meta);
//                crawlerFlowHeadDao.saveEntity(headModel);
//            }
//        }
        ObjectMapper mapper = new ObjectMapper();
        ObjectNode root = mapper.readValue(json,ObjectNode.class);
        ArrayNode jsonList = (ArrayNode) root.get("lines");
        ArrayNode entrances = (ArrayNode) root.get("entrances");
        AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(version));
        if (jsonList != null && jsonList.size() > 0) {
            // 删除旧关联关系
            crawlerFlowDao.deleteCrawlerFlowList(versionModel.getId());
            for (JsonNode obj : jsonList) {
                String from = obj.get("from").toString();
                String to = obj.get("to").toString();
                String fromPort = obj.get("fromPort").toString();
                String toPort = obj.get("toPort").toString();
                // 保存编排关系
                CrawlerFlowModel crawlerFlow = new CrawlerFlowModel();
                crawlerFlow.setDatasetCode(to);
                crawlerFlow.setInputDatasetCode(from);
                crawlerFlow.setMetadataCode(toPort);
                crawlerFlow.setInputMetadataCode(fromPort);
                crawlerFlow.setSchemeVersionId(versionModel.getId());
                crawlerFlowDao.saveEntity(crawlerFlow);
            }
            // 删除编排头部信息
            crawlerFlowHeadDao.deleteCrawlerFlowHeadList(versionModel.getId());
            for (JsonNode obj : entrances) {
                String dataSet = obj.get("dataSet").toString();
                String meta = obj.get("meta").toString();
                //  保存入口数据集
                CrawlerFlowHeadModel headModel = new CrawlerFlowHeadModel();
                headModel.setSchemeVersionId(versionModel.getId());
                headModel.setDatasetCode(dataSet);
                headModel.setMetadataCode(meta);
                crawlerFlowHeadDao.saveEntity(headModel);
            }
        }
        return new ActionResult(true, "保存成功！");
    }
@@ -176,56 +177,55 @@ public class CrawlerService {
     * @throws Exception
     */
    public void saveJobData(String json, Integer rows, Integer page) throws Exception {
        //TODO: Use jackson
//        JSONArray jsonList = JSONArray.fromObject(json);
//
//        //清空当页数据
//        deleteCurrentPage(rows, page);
//
//        for (Object item : jsonList) {
//            JSONObject obj = JSONObject.fromObject(item);
//            if (obj.containsKey("schemeId") && obj.containsKey("versionId")) {
//                String schemeId = obj.getString("schemeId");
//                String versionId = obj.getString("versionId");
//                AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(versionId));
//                if (versionModel != null) {
//                    AdapterVersion adapterVersion = new AdapterVersion(versionModel.getVersion());
//                    //删除已存在的数据集
//                    crawlerDatasetDao.deleteCrawlerDatasetList(versionModel.getId());
//                    List<AdapterDatasetModel> adapterDatasetModelList;
//                    //根据id字符串获取编排数据集
//                    if (obj.containsKey("dataSets")) {
//                        List<Integer> newDatasetIdList = new ArrayList<>();
//                        String dataSetStr = obj.getString("dataSets");
//                        if (StringUtils.isNotBlank(dataSetStr)) {
//                            String[] IdList = dataSetStr.split(",");
//                            for (String aIdList : IdList) {
//                                if (!Objects.equals(aIdList, "")) {
//                                    Integer DaSetId = Integer.valueOf(aIdList);
//                                    newDatasetIdList.add(DaSetId);
//                                }
//                            }
//                        }
//
//                        adapterDatasetModelList = adapterDatasetService.getListByAdapterDatasetIdList(adapterVersion, newDatasetIdList);
//                        for (AdapterDatasetModel model : adapterDatasetModelList) {
//                            CrawlerDataSetModel dataSetModel = new CrawlerDataSetModel();
//                            dataSetModel.setSchemeId(Integer.valueOf(schemeId));
//                            dataSetModel.setSchemeVersionId(versionModel.getId());
//                            dataSetModel.setDatasetId(model.getStdDatasetId());
//                            dataSetModel.setDatasetCode(model.getStdDatasetCode());
//                            dataSetModel.setDatasetName(model.getStdDatasetName());
//                            crawlerDatasetDao.saveEntity(dataSetModel);
//                        }
//                    }
//
//                    //如果保存传入编排映射关系，进行保存操作
//                    if (obj.containsKey("relation") && !Objects.equals(obj.getString("relation"), "")) {
//                        saveDataSetRelation(versionId, obj.getString("relation"));
//                    }
//                }
//            }
//        }
        ObjectMapper mapper = new ObjectMapper();
        ArrayNode jsonList = mapper.readValue(json,ArrayNode.class);
        //清空当页数据
        deleteCurrentPage(rows, page);
        for (JsonNode obj : jsonList) {
            if (obj.has("schemeId") && obj.has("versionId")) {
                String schemeId = obj.get("schemeId").toString();
                String versionId = obj.get("versionId").toString();
                AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(versionId));
                if (versionModel != null) {
                    AdapterVersion adapterVersion = new AdapterVersion(versionModel.getVersion());
                    //删除已存在的数据集
                    crawlerDatasetDao.deleteCrawlerDatasetList(versionModel.getId());
                    List<AdapterDatasetModel> adapterDatasetModelList;
                    //根据id字符串获取编排数据集
                    if (obj.has("dataSets")) {
                        List<Integer> newDatasetIdList = new ArrayList<>();
                        String dataSetStr = obj.get("dataSets").toString();
                        if (StringUtils.isNotBlank(dataSetStr)) {
                            String[] IdList = dataSetStr.split(",");
                            for (String aIdList : IdList) {
                                if (!Objects.equals(aIdList, "")) {
                                    Integer DaSetId = Integer.valueOf(aIdList);
                                    newDatasetIdList.add(DaSetId);
                                }
                            }
                        }
                        adapterDatasetModelList = adapterDatasetService.getListByAdapterDatasetIdList(adapterVersion, newDatasetIdList);
                        for (AdapterDatasetModel model : adapterDatasetModelList) {
                            CrawlerDataSetModel dataSetModel = new CrawlerDataSetModel();
                            dataSetModel.setSchemeId(Integer.valueOf(schemeId));
                            dataSetModel.setSchemeVersionId(versionModel.getId());
                            dataSetModel.setDatasetId(model.getStdDatasetId());
                            dataSetModel.setDatasetCode(model.getStdDatasetCode());
                            dataSetModel.setDatasetName(model.getStdDatasetName());
                            crawlerDatasetDao.saveEntity(dataSetModel);
                        }
                    }
                    //如果保存传入编排映射关系，进行保存操作
                    if (obj.has("relation") && !Objects.equals(obj.get("relation").toString(), "")) {
                        saveDataSetRelation(versionId, obj.get("relation").toString());
                    }
                }
            }
        }
    }

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

@@ -1,17 +1,19 @@
package com.yihu.hos.datacollect.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
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.standard.service.adapter.AdapterSchemeService;
import com.yihu.hos.system.service.intf.IDatasourceManager;
import com.yihu.hos.web.framework.constrant.DateConvert;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.standard.service.adapter.AdapterSchemeService;
import com.yihu.hos.system.service.intf.IDatasourceManager;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -76,12 +78,13 @@ public class DataCollectController extends BaseController {
            }
            //获取方案列表
            //TODO: Use jackson
//            List data = stdService.getSchemeVersion();
//            JSONArray jsonArray = JSONArray.fromObject(data);
//            model.addAttribute("schemeList", "{\"detailModelList\":" + (CollectionUtil.isEmpty(data) ? "[]" : jsonArray) + "}");
//
//            model.addAttribute("contentPage", "/datacollect/editorJob");
            List data = stdService.getSchemeVersion();
            ObjectMapper mapper = new ObjectMapper();
            String jsonlist = mapper.writeValueAsString(data);
            ArrayNode jsonArray = mapper.readValue(jsonlist,ArrayNode.class);
            model.addAttribute("schemeList", "{\"detailModelList\":" + (CollectionUtil.isEmpty(data) ? "[]" : jsonArray) + "}");
            model.addAttribute("contentPage", "/datacollect/editorJob");
            return "pageView";
        } catch (Exception ex) {
            model.addAttribute("contentPage", "/datacollect/editorJob");

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

@@ -1,10 +1,17 @@
package com.yihu.hos.datacollect.service;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.hos.common.Services;
import com.yihu.hos.datacollect.dao.intf.IDatacollectDao;
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.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.standard.StdDataSetModel;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.DictItem;
@@ -105,52 +112,52 @@ public class DatacollectManager implements IDatacollectManager {
     */
    @Override
    public DataGridResult getSchemeDataset(String schemeId, String schemeVersion, String jobId) throws Exception {
        return null; //TODO: Use jackson
//        //获取适配数据集总和
//        List<AdapterDatasetModel> datasetString = stdManager.getDatasetByScheme(schemeVersion);
//        JSONArray jsonArray =  JSONArray.fromObject(datasetString);
//        //获取任务数据集
//        List<RsJobDataset> jobDataset = datacollectDao.getJobDataset(jobId);
//
//        DataGridResult re = new DataGridResult();
//        List<DtoJobDataset> list = new ArrayList<>();
//        for(Object item : jsonArray)
//        {
//            JSONObject jsonItem = JSONObject.fromObject(item);
//            String datasetId= jsonItem.getString("adapterDatasetId");
//            //配置完整才显示
//            if(datasetId.length()>0&&jsonItem.getString("adapterDatasetName").length()>0&&jsonItem.getString("adapterDatasetName")!="null"&&jsonItem.getString("adapterDatasetCode").length()>0&&jsonItem.getString("adapterDatasetCode")!="null")
//            {
//                DtoJobDataset obj = new DtoJobDataset();
//                obj.setJobDatasetName(jsonItem.getString("adapterDatasetName"));
//                obj.setJobDatasetCode(jsonItem.getString("adapterDatasetCode"));
//                obj.setJobDatasetId(datasetId);
//
//                //是否关联任务
//                if(jobDataset!=null&&jobDataset.size()>0)
//                {
//                    for(RsJobDataset jd :jobDataset)
//                    {
//                        if(jd.getJobDatasetId().equals(datasetId))
//                        {
//                            obj.setId(jd.getId());
//                            obj.setJobId(jobId);
//                            obj.setJobDatasetKeyvalue(jd.getJobDatasetKeyvalue());
//                            obj.setJobDatasetKey(jd.getJobDatasetKey());
//                            obj.setJobDatasetKeytype(jd.getJobDatasetKeytype());
//                            obj.setChecked("1");
//                            obj.setJobDatasetCondition(jd.getJobDatasetCondition());
//                            break;
//                        }
//                    }
//
//                }
//                list.add(obj);
//            }
//        }
//        re.setDetailModelList(list);
//
//        return re;
        //获取适配数据集总和
        List<AdapterDatasetModel> datasetString = stdManager.getDatasetByScheme(schemeVersion);
        ObjectMapper mapper = new ObjectMapper();
        String jsonlist = mapper.writeValueAsString(datasetString);
        ArrayNode jsonArray = mapper.readValue(jsonlist, ArrayNode.class);
        //获取任务数据集
        List<RsJobDataset> jobDataset = datacollectDao.getJobDataset(jobId);
        DataGridResult re = new DataGridResult();
        List<DtoJobDataset> list = new ArrayList<>();
        for(JsonNode jsonItem : jsonArray)
        {
            String datasetId= jsonItem.get("adapterDatasetId").toString();
            //配置完整才显示
            if(datasetId.length()>0&&jsonItem.get("adapterDatasetName").toString().length()>0&&jsonItem.get("adapterDatasetName").toString()!="null"&&jsonItem.get("adapterDatasetCode").toString().length()>0&&jsonItem.get("adapterDatasetCode").toString()!="null")
            {
                DtoJobDataset obj = new DtoJobDataset();
                obj.setJobDatasetName(jsonItem.get("adapterDatasetName").asText());
                obj.setJobDatasetCode(jsonItem.get("adapterDatasetCode").asText());
                obj.setJobDatasetId(datasetId);
                //是否关联任务
                if(jobDataset!=null&&jobDataset.size()>0)
                {
                    for(RsJobDataset jd :jobDataset)
                    {
                        if(jd.getJobDatasetId().equals(datasetId))
                        {
                            obj.setId(jd.getId());
                            obj.setJobId(jobId);
                            obj.setJobDatasetKeyvalue(jd.getJobDatasetKeyvalue());
                            obj.setJobDatasetKey(jd.getJobDatasetKey());
                            obj.setJobDatasetKeytype(jd.getJobDatasetKeytype());
                            obj.setChecked("1");
                            obj.setJobDatasetCondition(jd.getJobDatasetCondition());
                            break;
                        }
                    }
                }
                list.add(obj);
            }
        }
        re.setDetailModelList(list);
        return re;
    }
    /**
@@ -275,38 +282,38 @@ public class DatacollectManager implements IDatacollectManager {
     */
    @Override
    public DataGridResult getDatasetSource(String stdVersion) throws Exception {
        return null; //TODO: Use jackson
//        //获取版本下全部数据集
//        List<StdDataSetModel> stdDataSetModelList = stdManager.getDatasetByVersion(stdVersion);
//        JSONArray datasetList = JSONArray.fromObject(stdDataSetModelList);
//        //获取已配数据集
//        List<RsDatasourceDataset> jobDataset = datacollectDao.getDatasourceDataset(stdVersion);
//
//        DataGridResult re = new DataGridResult();
//        List<JSONObject> list = new ArrayList<>();
//        for (Object item : datasetList) {
//            JSONObject obj = JSONObject.fromObject(item);
//            JSONObject dd = new JSONObject();
//            dd.put("datasetId", obj.getString("id"));
//            dd.put("datasetCode", obj.getString("code"));
//            dd.put("datasetName", obj.getString("name"));
//            dd.put("stdVersion", stdVersion);
//
//            if (jobDataset != null && jobDataset.size() > 0) {
//                for (RsDatasourceDataset rdd : jobDataset) {
//                    if (rdd.getDatasetId().equals(obj.getString("id"))) {
//                        dd.put("orgId", rdd.getOrgId());
//                        dd.put("datasourceId", rdd.getDatasourceId());
//                        dd.put("id", rdd.getId());
//                        break;
//                    }
//                }
//            }
//            list.add(dd);
//        }
//        re.setDetailModelList(list);
//
//        return re;
        //获取版本下全部数据集
        List<StdDataSetModel> stdDataSetModelList = stdManager.getDatasetByVersion(stdVersion);
        ObjectMapper mapper = new ObjectMapper();
        String jsonlist = mapper.writeValueAsString(stdDataSetModelList);
        ArrayNode datasetList = mapper.readValue(jsonlist, ArrayNode.class);
        //获取已配数据集
        List<RsDatasourceDataset> jobDataset = datacollectDao.getDatasourceDataset(stdVersion);
        DataGridResult re = new DataGridResult();
        List<JsonNode> list = new ArrayList<>();
        for (JsonNode obj : datasetList) {
            ObjectNode dd = mapper.createObjectNode();
            dd.put("datasetId", obj.get("id").asText());
            dd.put("datasetCode", obj.get("code").asText());
            dd.put("datasetName", obj.get("name").asText());
            dd.put("stdVersion", stdVersion);
            if (jobDataset != null && jobDataset.size() > 0) {
                for (RsDatasourceDataset rdd : jobDataset) {
                    if (rdd.getDatasetId().equals(obj.get("id").asText())) {
                        dd.put("orgId", rdd.getOrgId());
                        dd.put("datasourceId", rdd.getDatasourceId());
                        dd.put("id", rdd.getId());
                        break;
                    }
                }
            }
            list.add(dd);
        }
        re.setDetailModelList(list);
        return re;
    }
    /**
@@ -482,43 +489,41 @@ public class DatacollectManager implements IDatacollectManager {
     * 保存任务关联数据集
     */
    private void saveJobDataset(String jobId, String jobDataset) throws Exception {
        //TODO: Use jackson
//        if(jobDataset!=null&&jobDataset.length()>0) {
//            //清空任务关联数据集
//            datacollectDao.deleteJobDatasetByJobId(jobId);
//
//            JSONArray array = JSONArray.fromObject(jobDataset);
//
//            if (array != null && array.size() > 0) {
//                for (Object item : array) {
//                    JSONObject obj = JSONObject.fromObject(item);
//                    RsJobDataset rs = new RsJobDataset();
//                    if(obj.get("jobDatasetCondition")!=null&&obj.getString("jobDatasetCondition")!="null")
//                    {
//                        rs.setJobDatasetCondition(obj.getString("jobDatasetCondition"));
//                    }
//                    if(obj.get("jobDatasetId")!=null&&obj.getString("jobDatasetId")!="null") {
//                        rs.setJobDatasetId(obj.getString("jobDatasetId"));
//                    }
//                    if(obj.get("jobDatasetKey")!=null&&obj.getString("jobDatasetKey")!="null") {
//                        rs.setJobDatasetKey(obj.getString("jobDatasetKey"));
//                    }
//                    if(obj.get("jobDatasetKeytype")!=null&&obj.getString("jobDatasetKeytype")!="null") {
//                        rs.setJobDatasetKeytype(obj.getString("jobDatasetKeytype"));
//                    }
//                    if(obj.get("jobDatasetKeyvalue")!=null&&obj.getString("jobDatasetKeyvalue")!="null") {
//                        rs.setJobDatasetKeyvalue(obj.getString("jobDatasetKeyvalue"));
//                    }
//                    if(obj.get("jobDatasetName")!=null&&obj.getString("jobDatasetName")!="null") {
//                        rs.setJobDatasetName(obj.getString("jobDatasetName"));
//                    }
//                    rs.setJobId(jobId);
//                    datacollectDao.saveEntity(rs);
//                }
//            }
//        }
//        else{
//            return;
//        }
        if(jobDataset!=null&&jobDataset.length()>0) {
            //清空任务关联数据集
            datacollectDao.deleteJobDatasetByJobId(jobId);
            ObjectMapper mapper = new ObjectMapper();
            ArrayNode array = mapper.readValue(jobDataset,ArrayNode.class);
            if (array != null && array.size() > 0) {
                for (JsonNode obj : array) {
                    RsJobDataset rs = new RsJobDataset();
                    if(obj.get("jobDatasetCondition")!=null&&obj.get("jobDatasetCondition").asText()!="null")
                    {
                        rs.setJobDatasetCondition(obj.get("jobDatasetCondition").asText());
                    }
                    if(obj.get("jobDatasetId")!=null&&obj.get("jobDatasetId").asText()!="null") {
                        rs.setJobDatasetId(obj.get("jobDatasetId").asText());
                    }
                    if(obj.get("jobDatasetKey")!=null&&obj.get("jobDatasetKey").asText()!="null") {
                        rs.setJobDatasetKey(obj.get("jobDatasetKey").asText());
                    }
                    if(obj.get("jobDatasetKeytype")!=null&&obj.get("jobDatasetKeytype").asText()!="null") {
                        rs.setJobDatasetKeytype(obj.get("jobDatasetKeytype").asText());
                    }
                    if(obj.get("jobDatasetKeyvalue")!=null&&obj.get("jobDatasetKeyvalue").asText()!="null") {
                        rs.setJobDatasetKeyvalue(obj.get("jobDatasetKeyvalue").asText());
                    }
                    if(obj.get("jobDatasetName")!=null&&obj.get("jobDatasetName").asText()!="null") {
                        rs.setJobDatasetName(obj.get("jobDatasetName").asText());
                    }
                    rs.setJobId(jobId);
                    datacollectDao.saveEntity(rs);
                }
            }
        }
        else{
            return;
        }
    }
}

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

@@ -1,9 +1,15 @@
package com.yihu.hos.resource.controller;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.hos.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.viewresult.RsResourceDeatilModel;
import com.yihu.hos.resource.viewresult.RsResourceDimensionModel;
import com.yihu.hos.web.framework.model.ActionResult;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
@@ -214,12 +220,13 @@ public class RsResourceController extends BaseController {
    @RequestMapping("/resource/rsResourceDimension")
    public String rsResourceDimension(Model model, String id, String resourceId) {
        try {
            ObjectMapper mapper = new ObjectMapper();
            RsAppResourceDetail rard = resourceService.getAppResourceDetailId(id);
            model.addAttribute("appResourceDetail", rard);
            model.addAttribute("metadataName", resourceService.getRsResourceMetadata(rard.getMetadataId()));
            //TODO: Use jackson
//            model.addAttribute("resultSelect", JSONArray.fromObject(resourceService.getDimensionByResourceId(resourceId)).toString());
            List<RsResourceDimensionModel> rsResourceDimensionModels =resourceService.getDimensionByResourceId(resourceId);
            model.addAttribute("resultSelect", mapper.writeValueAsString(rsResourceDimensionModels));
            model.addAttribute("resourceId", resourceId);
            model.addAttribute("contentPage", "/resource/resourceregister/rsResourceDimensionDialog");
        } catch (Exception e) {
@@ -298,32 +305,33 @@ public class RsResourceController extends BaseController {
            }
            //访问服务得到数据
            String response_params = resourceService.searchRomoteResourceList(resource.getCode(), params);
            //TODO: Use jackson
//            if (response_params.startsWith("[")) {
//                //如果是数组
//                Integer count = JSONArray.fromObject(response_params).size();//得到总数
//                //访问服务得到元数据
//                //设置动态datagrid值
//                result.setDetailModelList(JSONArray.fromObject(response_params.toString().replace(":null", ":\"\"")));
//                result.setTotalCount(count);
//                result.setCurrPage(Integer.valueOf(currPage));
//                result.setPageSize(count);
//                result.setSuccessFlg(true);
//            } else if (response_params.startsWith("{")) {
//                Integer count = (Integer) JSONObject.fromObject(response_params).get("count");//得到总数
//                //访问服务得到元数据
//                //设置动态datagrid值
//                String s = JSONObject.fromObject(response_params).get("detailModelList").toString().replace(":null", ":\"\"");
//                result.setDetailModelList(JSONArray.fromObject(s));
//                result.setTotalCount(count);
//                result.setCurrPage(Integer.valueOf(currPage));
//                result.setPageSize(Integer.valueOf(pageSize));
//                result.setSuccessFlg(true);
//            } else {
//                result.setSuccessFlg(false);
//                result.setMessage("获取数据失败");
//            }
            ObjectMapper mapper = new ObjectMapper();
            if (response_params.startsWith("[")) {
                //如果是数组
                ArrayNode jsonArray = mapper.readValue(response_params,ArrayNode.class);
                Integer count =jsonArray.size();//得到总数
                //访问服务得到元数据
                //设置动态datagrid值
                result.setDetailModelList(mapper.readValue(response_params.toString().replace(":null", ":\"\""),List.class));
                result.setTotalCount(count);
                result.setCurrPage(Integer.valueOf(currPage));
                result.setPageSize(count);
                result.setSuccessFlg(true);
            } else if (response_params.startsWith("{")) {
                ObjectNode objectNode = mapper.readValue(response_params,ObjectNode.class);
                Integer count =  objectNode.get("count").asInt();//得到总数
                //访问服务得到元数据
                //设置动态datagrid值
                String s = objectNode.get("detailModelList").toString().replace(":null", ":\"\"");
                result.setDetailModelList(mapper.readValue(s,List.class));
                result.setTotalCount(count);
                result.setCurrPage(Integer.valueOf(currPage));
                result.setPageSize(Integer.valueOf(pageSize));
                result.setSuccessFlg(true);
            } else {
                result.setSuccessFlg(false);
                result.setMessage("获取数据失败");
            }
        } catch (Exception e) {
            e.printStackTrace();
            result.setSuccessFlg(false);
@@ -342,6 +350,7 @@ public class RsResourceController extends BaseController {
    @ResponseBody
    public String searchResourceDatagridColunm(HttpServletRequest request, HttpServletResponse response) {
        Map<String, Object> mapParam = new HashMap<String, Object>();
        ObjectMapper mapper = new ObjectMapper();
        String id = request.getParameter("id");//资源ID
        try {
            //得到资源对象
@@ -363,12 +372,11 @@ public class RsResourceController extends BaseController {
            mapParam.put("colunmCode", colunmCode);
            mapParam.put("colunmDict", colunmDict);
            mapParam.put("colunmType", colunmType);
            return mapper.writeValueAsString(mapParam);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return "";  //TODO: Use jackson
//        return JSONObject.fromObject(mapParam).toString();
        return "";
    }
    /**
@@ -791,41 +799,39 @@ public class RsResourceController extends BaseController {
    @RequestMapping("/exportAllExcel")
    public void exportAllExcel(HttpServletRequest request, HttpServletResponse response) {
        //TODO: Use jackson
//        try {
//            String field = request.getParameter("field");
//
//            String name = request.getParameter("name");
//            Map<String, String> fieldMap = new HashMap<String, String>();
//            for (Object o : JSONArray.fromObject(field)) {
//                JSONObject jo = ((JSONObject) o);
//                fieldMap.put(String.valueOf(jo.get("key")), String.valueOf(jo.get("value")));
//
//            }
//            Result e = this.searchRomoteResourceList(request);
//            JXLUtil.listMapToExcel(((DataGridResult) e).getDetailModelList(), fieldMap, name, response);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
        try {
            String field = request.getParameter("field");
            ObjectMapper mapper = new ObjectMapper();
            ArrayNode jsonArray = mapper.readValue(field,ArrayNode.class);
            String name = request.getParameter("name");
            Map<String, String> fieldMap = new HashMap<String, String>();
            for (JsonNode jo :jsonArray) {
                fieldMap.put(String.valueOf(jo.get("key")), String.valueOf(jo.get("value")));
            }
            Result e = this.searchRomoteResourceList(request);
            JXLUtil.listMapToExcel(((DataGridResult) e).getDetailModelList(), fieldMap, name, response);
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    @RequestMapping("/exportSomeExcel")
    public void exportSomeExcel(HttpServletRequest request, HttpServletResponse response) {
        //TODO: Use jackson
//        try {
//            String field = request.getParameter("field");
//            String data = request.getParameter("data");
//            String name = request.getParameter("name");
//            Map<String, String> fieldMap = new HashMap<String, String>();
//            for (Object o : JSONArray.fromObject(field)) {
//                JSONObject jo = ((JSONObject) o);
//                fieldMap.put(String.valueOf(jo.get("key")), String.valueOf(jo.get("value")));
//
//            }
//            JXLUtil.listMapToExcel(JSONArray.fromObject(data), fieldMap, name, response);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
        try {
            ObjectMapper mapper = new ObjectMapper();
            String field = request.getParameter("field");
            String data = request.getParameter("data");
            String name = request.getParameter("name");
            ArrayNode jsonArray = mapper.readValue(field,ArrayNode.class);
            Map<String, String> fieldMap = new HashMap<String, String>();
            for (JsonNode jo : jsonArray) {
                fieldMap.put(String.valueOf(jo.get("key")), String.valueOf(jo.get("value")));
            }
            JXLUtil.listMapToExcel(mapper.readValue(data,List.class), fieldMap, name, response);
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
}

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

@@ -1,5 +1,10 @@
package com.yihu.hos.resource.service.impl;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.hos.core.httpclient.HttpHelper;
import com.yihu.hos.resource.dao.*;
import com.yihu.hos.resource.model.*;
import com.yihu.hos.resource.service.IRsResourceService;
@@ -323,20 +328,20 @@ public class RsResourceServiceImpl implements IRsResourceService {
     */
    @Override
    public String searchRomoteResourceList(String code, Map<String, Object> params) throws Exception {
//        String result = HttpHelper.getByGateway(code, params).getBody();
        return ""; //TODO: Use jackson
//        JSONObject jsonobject = JSONObject.fromObject(result);
//        Object response_params = jsonobject.get("responseResult");
//        if (response_params.equals("null")) {
//            return "";
//        }
//        return (String) response_params;
        String result = HttpHelper.getByGateway(code, params).getBody();
        ObjectMapper mapper = new ObjectMapper();
        JsonNode jsonobject = mapper.readValue(result,JsonNode.class);
        Object response_params = jsonobject.get("responseResult");
        if (response_params.equals("null")) {
            return "";
        }
        return (String) response_params;
    }
    @Override
    public Result getDataSet(Map<String, Object> params) throws Exception {
        DataGridResult re = new DataGridResult();
        ObjectMapper mapper = new ObjectMapper();
        if (StringUtils.isEmpty(params.get("datasetId"))) {
            if (params.get("rsResourceImportDatasetDialogName") != null) {
@@ -351,12 +356,11 @@ public class RsResourceServiceImpl implements IRsResourceService {
        } else {
            RsResourceDataset rd = resourceDatasetDao.getEntity(RsResourceDataset.class, (String) params.get("datasetId"));
            List list = new ArrayList();
            //TODO: Use jackson
//            JSONObject jo = JSONObject.fromObject(rd);
//            jo.put("checked", "true");
//            list.add(jo);
//            re.setDetailModelList(list);
            String jsonStr = mapper.writeValueAsString(rd);
            ObjectNode jo = mapper.readValue(jsonStr,ObjectNode.class);
            jo.put("checked", "true");
            list.add(jo);
            re.setDetailModelList(list);
        }
        return re;
    }
@@ -381,36 +385,37 @@ public class RsResourceServiceImpl implements IRsResourceService {
        Map<String, Object> paramsTemp = new HashMap<String, Object>();
        //TODO: Use jackson
//        paramsTemp.put("condition", JSONObject.fromObject(params).toString());
//
//        List responseParasm = stdService.metadatasAllVersionList(params);
//        JSONArray array = JSONArray.fromObject(responseParasm);
//        if (array.size() == 0) {
//            throw new Exception("该数据集没有数据元");
//        }
//        //保存数据集
//        //保存数据元
//        for (int i = 0; i < array.size(); i++) {
//            JSONObject jsonObject = array.getJSONObject(i);
//            RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
//            rsResourceMetadata.setDatasetId(dataSetId);
//            rsResourceMetadata.setCode((String) jsonObject.get("code"));
//            rsResourceMetadata.setDeCode((String) jsonObject.get("deCode"));
//            rsResourceMetadata.setResourceId(reourceId);
//            rsResourceMetadata.setName((String) jsonObject.get("name"));
//            rsResourceMetadata.setType((String) jsonObject.get("type"));
//            rsResourceMetadata.setFormat((String) jsonObject.get("format"));
//            rsResourceMetadata.setDictId((Integer) jsonObject.get("dictId"));
//            rsResourceMetadata.setDefinition((String) jsonObject.get("definition"));
//            rsResourceMetadata.setNullable((Integer) jsonObject.get("nullable"));
//            rsResourceMetadata.setColumnLength((String) jsonObject.get("columnLength"));
//            rsResourceMetadata.setColumnType((String) jsonObject.get("columnType"));
//            rsResourceMetadata.setColumnName((String) jsonObject.get("columnName"));
//            rsResourceMetadata.setPrimaryKey((Integer) jsonObject.get("primaryKey"));
//            rsResourceMetadata.setDataSupportType(1);
//            resourceMetadataDao.saveEntity(rsResourceMetadata);
//        }
        ObjectMapper mapper = new ObjectMapper();
        paramsTemp.put("condition",mapper.writeValueAsString(params));
        List responseParasm = stdService.metadatasAllVersionList(params);
        String jsonlist = mapper.writeValueAsString(responseParasm);
        ArrayNode array = mapper.readValue(jsonlist, ArrayNode.class);
        if (array.size() == 0) {
            throw new Exception("该数据集没有数据元");
        }
        //保存数据集
        //保存数据元
        for (int i = 0; i < array.size(); i++) {
            JsonNode jsonObject = array.get(i);
            RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
            rsResourceMetadata.setDatasetId(dataSetId);
            rsResourceMetadata.setCode(jsonObject.get("code").asText());
            rsResourceMetadata.setDeCode(jsonObject.get("deCode").asText());
            rsResourceMetadata.setResourceId(reourceId);
            rsResourceMetadata.setName(jsonObject.get("name").asText());
            rsResourceMetadata.setType(jsonObject.get("type").asText());
            rsResourceMetadata.setFormat(jsonObject.get("format").asText());
            rsResourceMetadata.setDictId( jsonObject.get("dictId").asInt());
            rsResourceMetadata.setDefinition(jsonObject.get("definition").asText());
            rsResourceMetadata.setNullable( jsonObject.get("nullable").asInt());
            rsResourceMetadata.setColumnLength(jsonObject.get("columnLength").asText());
            rsResourceMetadata.setColumnType(jsonObject.get("columnType").asText());
            rsResourceMetadata.setColumnName(jsonObject.get("columnName").asText());
            rsResourceMetadata.setPrimaryKey( jsonObject.get("primaryKey").asInt());
            rsResourceMetadata.setDataSupportType(1);
            resourceMetadataDao.saveEntity(rsResourceMetadata);
        }
        return Result.success("导入成功");
    }
@@ -463,23 +468,23 @@ public class RsResourceServiceImpl implements IRsResourceService {
        }
        DataGridResult r = new DataGridResult();
        Map<String, Object> params = new HashMap<String, Object>();
        ObjectMapper mapper = new ObjectMapper();
        params.put("code", code);
        //得到所有的数据元
        List responseParasm = stdService.metadatasAllVersionList(params);
        //TODO: Use jackson
//        JSONArray jr = JSONArray.fromObject(responseParasm);
//        if (!StringUtils.isEmpty(datasetId)) {
//            List<RsResourceMetadata> md = resourceMetadataDao.getMetadataByLocalDatssetId(datasetId);
//            for (int i = 0; i < JSONArray.fromObject(responseParasm).size(); i++) {
//                for (int j = 0; j < md.size(); j++) {
//                    if (JSONArray.fromObject(responseParasm).getJSONObject(i).get("code").equals(md.get(j).getCode())) {
//                        jr.getJSONObject(i).put("checked", "true");
//                    }
//                }
//            }
//        }
        String jsonlist = mapper.writeValueAsString(responseParasm);
        ArrayNode jr = mapper.readValue(jsonlist,ArrayNode.class);
        if (!StringUtils.isEmpty(datasetId)) {
            List<RsResourceMetadata> md = resourceMetadataDao.getMetadataByLocalDatssetId(datasetId);
            for (int i = 0; i < jr.size(); i++) {
                for (int j = 0; j < md.size(); j++) {
                    if (jr.get("code").asText().equals(md.get(j).getCode())) {
                        ((ObjectNode) jr.get(i)).put("checked", "true");
                    }
                }
            }
        }
//        r.setDetailModelList(jr);
        return r;
    }
@@ -487,44 +492,43 @@ public class RsResourceServiceImpl implements IRsResourceService {
    @Transactional
    public Result improtSameMetadata(String reourceId, String metaData, String dataset, String datasetId) throws Exception {
        RsResource resource = rsResourceDao.getResourceById(reourceId);
        ObjectMapper mapper = new ObjectMapper();
        if (StringUtils.isEmpty(datasetId)) {
            //第一次导入
            String datasetID = PKUtil.getUuid();//得到ID
            RsResourceDataset rsResourceDataset = new RsResourceDataset();
            //TODO: Use jackson
//            org.apache.commons.beanutils.BeanUtils.populate(rsResourceDataset, JSONObject.fromObject(dataset));
//            rsResourceDataset.setId(datasetID);
//            resourceDatasetDao.saveEntity(rsResourceDataset);
//            JSONArray array = JSONArray.fromObject(metaData);
//            if (array.size() == 0) {
//                throw new Exception("该数据集没有数据元");
//            }
//            for (int i = 0; i < array.size(); i++) {
//                JSONObject jsonObject = array.getJSONObject(i);
//                RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
//                org.apache.commons.beanutils.BeanUtils.populate(rsResourceMetadata, jsonObject);
//                rsResourceMetadata.setDataSupportType(1);
//                rsResourceMetadata.setDatasetId(datasetID);
//                rsResourceMetadata.setResourceId(reourceId);
//                resourceMetadataDao.saveEntity(rsResourceMetadata);
//            }
            org.apache.commons.beanutils.BeanUtils.populate(rsResourceDataset, mapper.readValue(dataset, Map.class));
            rsResourceDataset.setId(datasetID);
            resourceDatasetDao.saveEntity(rsResourceDataset);
            ArrayNode array = mapper.readValue(metaData,ArrayNode.class);
            if (array.size() == 0) {
                throw new Exception("该数据集没有数据元");
            }
            for (int i = 0; i < array.size(); i++) {
                JsonNode jsonObject = array.get(i);
                RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
                org.apache.commons.beanutils.BeanUtils.populate(rsResourceMetadata, mapper.readValue(jsonObject.toString(),Map.class));
                rsResourceMetadata.setDataSupportType(1);
                rsResourceMetadata.setDatasetId(datasetID);
                rsResourceMetadata.setResourceId(reourceId);
                resourceMetadataDao.saveEntity(rsResourceMetadata);
            }
            resource.setDatasetCode(datasetID);
        } else {
            //修改
            resourceMetadataDao.deleteLogicDataSupportMetaDataByLocalDataSetId(datasetId);
            //TODO: Use jackson
//            JSONArray array = JSONArray.fromObject(metaData);
//            for (int i = 0; i < array.size(); i++) {
//                JSONObject jsonObject = array.getJSONObject(i);
//                RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
//                org.apache.commons.beanutils.BeanUtils.populate(rsResourceMetadata, jsonObject);
//                rsResourceMetadata.setDataSupportType(1);
//                rsResourceMetadata.setResourceId(reourceId);
//                rsResourceMetadata.setDatasetId(resource.getDatasetCode());
//                resourceMetadataDao.saveEntity(rsResourceMetadata);
//            }
            ArrayNode array = mapper.readValue(metaData, ArrayNode.class);
            for (int i = 0; i < array.size(); i++) {
                JsonNode jsonObject = array.get(i);
                RsResourceMetadata rsResourceMetadata = new RsResourceMetadata();
                org.apache.commons.beanutils.BeanUtils.populate(rsResourceMetadata, mapper.readValue(jsonObject.toString(),Map.class));
                rsResourceMetadata.setDataSupportType(1);
                rsResourceMetadata.setResourceId(reourceId);
                rsResourceMetadata.setDatasetId(resource.getDatasetCode());
                resourceMetadataDao.saveEntity(rsResourceMetadata);
            }
        }
        return Result.success("导入成功");
    }

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

@@ -1,6 +1,9 @@
package com.yihu.hos.resource.service.impl;
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;
@@ -15,10 +18,12 @@ import com.yihu.hos.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.standard.service.standard.StdDatasetService;
import com.yihu.hos.standard.service.standard.StdMetadataService;
import com.yihu.hos.web.framework.model.DictItem;
import com.yihu.hos.web.framework.model.DictionaryResult;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -66,9 +71,14 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("adapterDatasetId", adapterDatasetId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        return null; //TODO: Use jackson
        //return datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        ObjectMapper mapper = new ObjectMapper();
        String conditon = null;
        try {
            conditon = mapper.writeValueAsString(map);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), conditon, null, null, null);
    }
@@ -78,9 +88,9 @@ public class StdService implements IStdService {
    public List<AdapterMetadataResultDetailModel> getDatacolByScheme(String schemeVersion, String datasetId) throws Exception {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("adapterDatasetId", datasetId);
        return null; //TODO: Use jackson
//        return metadataService.getInfoList(schemeVersion, net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        ObjectMapper mapper = new ObjectMapper();
        String condition = mapper.writeValueAsString(map);
        return metadataService.getInfoList(schemeVersion, condition, null, null, null);
    }
    /**
@@ -90,9 +100,15 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDictId", dictId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        return null; //TODO: Use jackson
//        return dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        ObjectMapper mapper = new ObjectMapper();
        String condition = null;
        try {
            condition = mapper.writeValueAsString(map);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), condition, null, null, null);
    }
    /**
@@ -103,24 +119,24 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDictId", dictId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        //TODO: Use jackson
//        List<AdapterDictEntryModel> dictentryList = dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
//
//
//        List<DictItem> list = new ArrayList<>();
//        if (!CollectionUtil.isEmpty(dictentryList)) {
//            for (AdapterDictEntryModel adapterDictEntryModel : dictentryList) {
//                String code = adapterDictEntryModel.getAdapterEntryCode();
//                if (code != null) {
//                    DictItem dict = new DictItem();
//                    dict.setCode(code);
//                    dict.setValue(adapterDictEntryModel.getAdapterEntryValue());
//                    list.add(dict);
//                }
//            }
//        }
//        re.setDetailModelList(list);
        ObjectMapper mapper = new ObjectMapper();
        String condition = mapper.writeValueAsString(map);
        List<AdapterDictEntryModel> dictentryList = dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), condition, null, null, null);
        List<DictItem> list = new ArrayList<>();
        if (!CollectionUtil.isEmpty(dictentryList)) {
            for (AdapterDictEntryModel adapterDictEntryModel : dictentryList) {
                String code = adapterDictEntryModel.getAdapterEntryCode();
                if (code != null) {
                    DictItem dict = new DictItem();
                    dict.setCode(code);
                    dict.setValue(adapterDictEntryModel.getAdapterEntryValue());
                    list.add(dict);
                }
            }
        }
        re.setDetailModelList(list);
        return re;
    }
@@ -135,15 +151,16 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDatasetCode", stdDatasetCode);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        ObjectMapper mapper = new ObjectMapper();
        String condition = mapper.writeValueAsString(map);
        List<AdapterDatasetModel> list = datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), condition, null, null, null);
        return null; //TODO: Use jackson
//        List<AdapterDatasetModel> list = datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
//
//        if (list != null && list.size() > 0) {
//            return list.get(0);
//        } else {
//            return null;
//        }
        if (list != null && list.size() > 0) {
            return list.get(0);
        } else {
            return null;
        }
    }
    /******************************** 标准版本 *****************************************************/
@@ -162,8 +179,14 @@ public class StdService implements IStdService {
     * @throws Exception
     */
    public List<StdMetaDataModel> metadatasAllVersionList(Map<String, Object> params) {
        return null; //TODO: Use jackson
//        return stdMetadataService.getAllVersionMetadataList(net.sf.json.JSONObject.fromObject(params).toString());
        ObjectMapper mapper = new ObjectMapper();
        String condition = null;
        try {
            condition = mapper.writeValueAsString(params);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return stdMetadataService.getAllVersionMetadataList(condition);
    }
    /**

hos-admin/src/main/java/com/yihu/hos/standard/controller/StdDatasetController.java

@@ -1,5 +1,7 @@
package com.yihu.hos.standard.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.standard.service.standard.StdDatasetService;
import com.yihu.hos.web.framework.model.DetailModelResult;
@@ -107,6 +109,7 @@ public class StdDatasetController extends BaseController {
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        Map<String,String> condition = new HashMap<String,String>();
        ObjectMapper mapper = new ObjectMapper();
        if(!StringUtil.isEmpty(q)){
            condition.put("name", q);
            rows = 10;
@@ -114,9 +117,12 @@ public class StdDatasetController extends BaseController {
        else if(!StringUtil.isEmpty(initVal)){
            condition.put("initVal", initVal);//默认值
        }
        return null;//TODO: Use jackson
//        JSONObject jsonpObject = JSONObject.fromObject(condition);
//        return stdDatasetService.getDatasetSelectList(stdVersion, jsonpObject.toString(), order, rows, 0);
        String conditionStr = null;
        try {
             conditionStr = mapper.writeValueAsString(condition);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return stdDatasetService.getDatasetSelectList(stdVersion, conditionStr, order, rows, 0);
    }
}

hos-admin/src/main/java/com/yihu/hos/standard/controller/StdDictController.java

@@ -1,6 +1,9 @@
package com.yihu.hos.standard.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.standard.model.standard.StdDictionaryModel;
import com.yihu.hos.standard.service.standard.StdDictService;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.DictionaryResult;
@@ -15,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -116,10 +120,15 @@ public class StdDictController extends BaseController {
            condition.put("initVal", initVal);//默认值
        }
        return null; //TODO: Use jackson
//        JSONObject jsonpObject = JSONObject.fromObject(condition);
//        List<StdDictionaryModel> dictList = stdDictService.getDictList(StdDictionaryModel.class, stdVersion, jsonpObject.toString(), order, rows, 0);
//        return stdDictService.getDictSelectList(dictList);
        ObjectMapper mapper = new ObjectMapper();
        String conditionStr = null;
        try {
            conditionStr = mapper.writeValueAsString(condition);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        List<StdDictionaryModel> dictList = stdDictService.getDictList(StdDictionaryModel.class, stdVersion, conditionStr, order, rows, 0);
        return stdDictService.getDictSelectList(dictList);
    }
    /**

hos-admin/src/main/java/com/yihu/hos/standard/controller/StdDictEntryController.java

@@ -1,5 +1,7 @@
package com.yihu.hos.standard.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.standard.service.standard.StdDictEntryService;
import com.yihu.hos.web.framework.model.DetailModelResult;
@@ -122,8 +124,13 @@ public class StdDictEntryController extends BaseController {
            condition.put("name", q);
        }
        return null; //TODO: Use jackson
//        JSONObject jsonpObject = JSONObject.fromObject(condition);
//        return stdDictEntryService.getDictEntrySelectList(stdVersion, dictId, jsonpObject.toString(), order, rows, 0);
        ObjectMapper mapper = new ObjectMapper();
        String conditionStr = null;
        try {
            conditionStr = mapper.writeValueAsString(condition);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return stdDictEntryService.getDictEntrySelectList(stdVersion, dictId, conditionStr, order, rows, 0);
    }
}

hos-admin/src/main/java/com/yihu/hos/standard/controller/StdMetadataController.java

@@ -1,5 +1,7 @@
package com.yihu.hos.standard.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.standard.service.standard.StdDictService;
import com.yihu.hos.standard.service.standard.StdMetadataService;
@@ -125,9 +127,13 @@ public class StdMetadataController extends BaseController {
        }else{
            condition.put("name", q);
        }
        return null; //TODO: Use jackson
//        JSONObject jsonpObject = JSONObject.fromObject(condition);
//        return stdMetadataService.getMetadataSelectList(stdVersion, datasetId, jsonpObject.toString(), order, rows, 0);
        ObjectMapper mapper = new ObjectMapper();
        String conditionStr = null;
        try {
            conditionStr = mapper.writeValueAsString(condition);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return stdMetadataService.getMetadataSelectList(stdVersion, datasetId, conditionStr, order, rows, 0);
    }
}

hos-admin/src/main/java/com/yihu/hos/standard/service/adapter/AdapterMetadataService.java

@@ -1,6 +1,7 @@
package com.yihu.hos.standard.service.adapter;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
@@ -391,20 +392,31 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("stdDatasetId", datasetId);
        String tableName="adapter_metadata_"+adapterVersion;
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            String condition =objectMapper.writeValueAsString(map);
            List<AdapterMetadataModel> metadataModelList = getList(AdapterMetadataModel.class,tableName, condition, null, null, null);
            return metadataModelList;
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return null;
        return null; //TODO: Use jackson
//        List<AdapterMetadataModel> metadataModelList = getList(AdapterMetadataModel.class,tableName,  net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
//        return metadataModelList;
    }
    public AdapterDatasetModel getAdapterDataset(String adapterVersion,Integer datasetId){
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("stdDatasetId", datasetId);
        String tableName="adapter_dataset_"+adapterVersion;
        return null; //TODO: Use jackson
//        List<AdapterDatasetModel> datasetModel = getList(AdapterDatasetModel.class,tableName,  net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
//        return datasetModel.get(0);
        ObjectMapper mapper = new ObjectMapper();
        String condition = null;
        try {
            condition = mapper.writeValueAsString(map);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        List<AdapterDatasetModel> datasetModel = getList(AdapterDatasetModel.class,tableName, condition, null, null, null);
        return datasetModel.get(0);
    }
    public AdapterMetadataModel getAdapterMetadata(String version, Integer adapterMetadataId) {
        try {

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

@@ -1,17 +1,20 @@
package com.yihu.hos.system.service;
import com.yihu.hos.web.framework.model.DataGridResult;
import com.yihu.hos.web.framework.model.Result;
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.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 java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -37,7 +40,7 @@ public class AuthorityManager implements IAuthorityManager {
    @Override
    public Result getMenuList(String roleId) throws Exception {
        DataGridResult r = new DataGridResult();
        ObjectMapper mapper = new ObjectMapper();
        //找出全部的
        List<SystemMenu> systemMenus = menuDao.getAllMenut(new HashMap<>());
        List<SystemMenuAction> systemMenuActions = menuActionDao.getAllMenutAction(new HashMap<>());
@@ -45,63 +48,63 @@ public class AuthorityManager implements IAuthorityManager {
        //找出已经选中
        List<SystemRoleMenu> systemRoleMenus = systemRoleMenuDao.getSystemRoleMenuListByRoleId(roleId);
        List<SystemRoleAction> systemRoleActions = systemRoleActionDao.getSystemRoleActionListByRoleId(roleId);
        //TODO: Use jackson
//        JSONArray jr = new JSONArray();
//        //设置角色菜单回填
//        for (int i = 0; i < systemMenus.size(); i++) {
//            boolean addFlag = true;
//            for (int j = 0; j < systemRoleMenus.size(); j++) {
//                if (systemRoleMenus.get(j).getMenuId().equals(systemMenus.get(i).getId())) {
//                    JSONObject jo = new JSONObject();
//                    jo.put("id", systemMenus.get(i).getId());
//                    jo.put("pid", systemMenus.get(i).getPid());
//                    jo.put("name", systemMenus.get(i).getName());
//                    jo.put("systemRoleMenuId", systemRoleMenus.get(j).getId());
//                    jo.put("checked", "true");
//                    jo.put("type", "menu");
//                    jr.add(jo);
//                    addFlag = false;
//                }
//            }
//            if (addFlag) {
//                JSONObject jo = new JSONObject();
//                jo.put("id", systemMenus.get(i).getId());
//                jo.put("pid", systemMenus.get(i).getPid());
//                jo.put("name", systemMenus.get(i).getName());
//                jo.put("checked", "false");
//                jo.put("type", "menu");
//                jr.add(jo);
//            }
//        }
//        //设置角色按钮菜单回填
//        for (int i = 0; i < systemMenuActions.size(); i++) {
//            boolean addFlag = true;
//            for (int j = 0; j < systemRoleActions.size(); j++) {
//                if (systemRoleActions.get(j).getActionId().equals(systemMenuActions.get(i).getId())) {
//                    JSONObject jo = new JSONObject();
//                    jo.put("id", systemMenuActions.get(i).getId());
//                    jo.put("pid", systemMenuActions.get(i).getMenuId());
//                    jo.put("name", systemMenuActions.get(i).getName());
//                    jo.put("name", systemMenuActions.get(i).getName());
//                    jo.put("systemRoleActionId", systemRoleActions.get(j).getId());
//                    jo.put("checked", "true");
//                    jo.put("type", "action");
//                    jr.add(jo);
//                    addFlag = false;
//                }
//            }
//            if (addFlag) {
//                JSONObject jo = new JSONObject();
//                jo.put("id", systemMenuActions.get(i).getId());
//                jo.put("pid", systemMenuActions.get(i).getMenuId());
//                jo.put("name", systemMenuActions.get(i).getName());
//                jo.put("checked", "false");
//                jo.put("type", "action");
//                jr.add(jo);
//            }
//        }
//
//        r.setDetailModelList(jr);
        List<ObjectNode> jr = new ArrayList<>();
        //设置角色菜单回填
        for (int i = 0; i < systemMenus.size(); i++) {
            boolean addFlag = true;
            for (int j = 0; j < systemRoleMenus.size(); j++) {
                if (systemRoleMenus.get(j).getMenuId().equals(systemMenus.get(i).getId())) {
                    ObjectNode jo = mapper.createObjectNode();
                    jo.put("id", systemMenus.get(i).getId());
                    jo.put("pid", systemMenus.get(i).getPid());
                    jo.put("name", systemMenus.get(i).getName());
                    jo.put("systemRoleMenuId", systemRoleMenus.get(j).getId());
                    jo.put("checked", "true");
                    jo.put("type", "menu");
                    jr.add(jo);
                    addFlag = false;
                }
            }
            if (addFlag) {
                ObjectNode jo = mapper.createObjectNode();
                jo.put("id", systemMenus.get(i).getId());
                jo.put("pid", systemMenus.get(i).getPid());
                jo.put("name", systemMenus.get(i).getName());
                jo.put("checked", "false");
                jo.put("type", "menu");
                jr.add(jo);
            }
        }
        //设置角色按钮菜单回填
        for (int i = 0; i < systemMenuActions.size(); i++) {
            boolean addFlag = true;
            for (int j = 0; j < systemRoleActions.size(); j++) {
                if (systemRoleActions.get(j).getActionId().equals(systemMenuActions.get(i).getId())) {
                    ObjectNode jo = mapper.createObjectNode();
                    jo.put("id", systemMenuActions.get(i).getId());
                    jo.put("pid", systemMenuActions.get(i).getMenuId());
                    jo.put("name", systemMenuActions.get(i).getName());
                    jo.put("name", systemMenuActions.get(i).getName());
                    jo.put("systemRoleActionId", systemRoleActions.get(j).getId());
                    jo.put("checked", "true");
                    jo.put("type", "action");
                    jr.add(jo);
                    addFlag = false;
                }
            }
            if (addFlag) {
                ObjectNode jo = mapper.createObjectNode();
                jo.put("id", systemMenuActions.get(i).getId());
                jo.put("pid", systemMenuActions.get(i).getMenuId());
                jo.put("name", systemMenuActions.get(i).getName());
                jo.put("checked", "false");
                jo.put("type", "action");
                jr.add(jo);
            }
        }
        r.setDetailModelList(jr);
        return r;
    }

hos-admin/src/main/resources/application.yml

@@ -14,6 +14,14 @@ spring:
    view:
      prefix: /WEB-INF/ehr/jsp/
      suffix: .jsp
  data:
    mongodb:
      host: 172.19.103.86
      port: 27017
      username: esb
      password: esb
      authenticationDatabase: admin
      database: configuration
  application:
    name: ESB

hos-core/src/main/java/com/yihu/hos/core/httpclient/HttpHelper.java

@@ -1,5 +1,7 @@
package com.yihu.hos.core.httpclient;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
@@ -13,6 +15,7 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import java.io.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.zip.GZIPInputStream;
@@ -236,22 +239,29 @@ public class HttpHelper {
    /**
     * 通过网关获取数据
     */
//    public static HttpResponse getByGateway(String code) {
//        Map<String, Object> params = new HashMap<String, Object>();
//        params.put("api", code);
//        params.put("param", "{}");
//        return HttpClientUtil.request("GET", httpGateway, params, null, null, null, null);
//    }
    public static HttpResponse getByGateway(String code) {
        Map<String, Object> params = new HashMap<String, Object>();
        params.put("api", code);
        params.put("param", "{}");
        return HttpClientUtil.request("GET", httpGateway, params, null, null, null, null);
    }
    /**
     * 通过网关获取数据
     */
//    public static HttpResponse getByGateway(String code, Map<String, Object> queryParams) {
//        Map<String, Object> params = new HashMap<String, Object>();
//        params.put("api", code);
//        params.put("param", net.sf.json.JSONObject.fromObject(queryParams).toString());
//        return HttpClientUtil.request("GET", httpGateway, params, null, null, null, null);
//    }
    public static HttpResponse getByGateway(String code, Map<String, Object> queryParams) {
        Map<String, Object> params = new HashMap<String, Object>();
        ObjectMapper mapper = new ObjectMapper();
        params.put("api", code);
        String query = null;
        try {
            query = mapper.writeValueAsString(queryParams);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        params.put("param",query);
        return HttpClientUtil.request("GET", httpGateway, params, null, null, null, null);
    }
    public static String getWebPage(String url) {

hos-web-framework/src/main/java/com/yihu/hos/web/framework/util/controller/BaseController.java

@@ -1,6 +1,8 @@
package com.yihu.hos.web.framework.util.controller;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import com.yihu.hos.web.framework.model.DetailModelResult;
@@ -11,6 +13,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
//import net.sf.json.JSONArray;
@@ -38,7 +42,7 @@ public class BaseController extends AbstractController {
        result.setTotalCount(totalCount);
        result.setCurrPage(currPage);
        result.setPageSize(rows);
        if(result.getTotalCount() % result.getPageSize() > 0) {
        if (result.getTotalCount() % result.getPageSize() > 0) {
            result.setTotalPage(result.getTotalCount() / result.getPageSize() + 1);
        } else {
            result.setTotalPage(result.getTotalCount() / result.getPageSize());
@@ -49,7 +53,7 @@ public class BaseController extends AbstractController {
    public String encodeStr(String str) {
        try {
            return str == null?null:new String(str.getBytes("ISO-8859-1"), "UTF-8");
            return str == null ? null : new String(str.getBytes("ISO-8859-1"), "UTF-8");
        } catch (UnsupportedEncodingException var3) {
            logger.error(var3.getMessage());
            return null;
@@ -57,21 +61,23 @@ public class BaseController extends AbstractController {
    }
    public List jsonArrayToList(String jsonArray, Class tClass) {
//        JSONArray newJsonArray = JSONArray.fromObject(jsonArray);
//        List collection = JSONArray.toList(newJsonArray);
//        ArrayList list = new ArrayList();
//        if(!CollectionUtil.isEmpty(collection)) {
//            Iterator it = collection.iterator();
//
//            while(it.hasNext()) {
//                JSONObject jsonObj = JSONObject.fromObject(it.next());
//                Object model = JSONObject.toBean(jsonObj, tClass);
//                list.add(model);
//            }
//        }
//
//        return list;
        return null; //TODO: Use jackson
        ObjectMapper mapper = new ObjectMapper();
        ArrayList list = new ArrayList();
        ArrayNode newJsonArray = null;
        try {
            newJsonArray = mapper.readValue(jsonArray, ArrayNode.class);
            if (newJsonArray != null && newJsonArray.size() > 0) {
                Iterator it = newJsonArray.iterator();
                while (it.hasNext()) {
                    JsonNode jsonObj = (JsonNode) it.next();
                    Object model = mapper.readValue(jsonObj.toString(), tClass);
                    list.add(model);
                }
            }
        } catch (IOException e) {
            e.printStackTrace();
        }
        return list;
    }
    public Object jsonToObject(String json, Class tClass) {