jackjson 注入使用

hos-admin/src/main/java/com/yihu/hos/config/WebMvcConfig.java

@@ -1,5 +1,6 @@
package com.yihu.hos.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.filter.HibernateFilter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -58,6 +59,11 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
    }
    @Bean
    public ObjectMapper objectMapper() {
        return new ObjectMapper();
    }
    /* hibernate配置 */
//    @Bean

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

@@ -27,6 +27,7 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +57,9 @@ public class CrawlerService {
    @Resource(name = AdapterSchemeService.BEAN_ID)
    private AdapterSchemeService adapterSchemeService;
    @Autowired
    private ObjectMapper objectMapper;
    public static Map<Integer, List<FlowLines>> getLineCache() {
        return lineCache;
    }
@@ -69,8 +73,7 @@ public class CrawlerService {
     * @throws Exception
     */
    public ActionResult saveDataSetRelation(String version, String json) throws Exception {
        ObjectMapper mapper = new ObjectMapper();
        ObjectNode root = mapper.readValue(json,ObjectNode.class);
        ObjectNode root = objectMapper.readValue(json,ObjectNode.class);
        ArrayNode jsonList = (ArrayNode) root.get("lines");
        ArrayNode entrances = (ArrayNode) root.get("entrances");
        AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(version));
@@ -123,9 +126,7 @@ public class CrawlerService {
        String condition = null;
        if (datasetName != null && !"".equals(datasetName)) {
            map.put("name", datasetName);
            //TODO: Use Jackson
//            condition = net.sf.json.JSONObject.fromObject(map).toString();
            condition = objectMapper.writeValueAsString(condition);
        }
        List<AdapterDatasetModel> adapterDatasetModelList = adapterDatasetService.getDatasetList(AdapterDatasetModel.class, versionModel.getVersion(), condition, null, null, null);
        // 筛选掉 未适配数据
@@ -177,8 +178,7 @@ public class CrawlerService {
     * @throws Exception
     */
    public void saveJobData(String json, Integer rows, Integer page) throws Exception {
        ObjectMapper mapper = new ObjectMapper();
        ArrayNode jsonList = mapper.readValue(json,ArrayNode.class);
        ArrayNode jsonList = objectMapper.readValue(json,ArrayNode.class);
        //清空当页数据
        deleteCurrentPage(rows, page);
@@ -397,27 +397,25 @@ public class CrawlerService {
     * @return
     */
    public String getRelations(Integer schemeVersionId, String datasetIdStr, String lineStr) {
        return "";  //TODO: Use jackson
//        JSONObject jsonObject = new JSONObject();
//        try {
//            List<MappingDataset> datasets = getSchemeDatasetByChecked(schemeVersionId, datasetIdStr);
//            List<FlowLines> lines = getFlowLines(schemeVersionId);
//            if (StringUtil.isEmpty(lineStr)) {
//                lines = getFlowLines(schemeVersionId);
//            } else {
//                lines = lineCache.get(schemeVersionId);
//            }
//            jsonObject.put("tables", datasets);
//            jsonObject.put("rels", lines);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return jsonObject.toString();
        ObjectNode jsonObject = objectMapper.createObjectNode();
        try {
            List<MappingDataset> datasets = getSchemeDatasetByChecked(schemeVersionId, datasetIdStr);
            List<FlowLines> lines = getFlowLines(schemeVersionId);
            if (StringUtil.isEmpty(lineStr)) {
                lines = getFlowLines(schemeVersionId);
            } else {
                lines = lineCache.get(schemeVersionId);
            }
            jsonObject.set("tables", objectMapper.valueToTree(datasets));
            jsonObject.set("rels", objectMapper.valueToTree(lines));
        } catch (Exception e) {
            e.printStackTrace();
        }
        return jsonObject.toString();
    }
    public void setLinesCache(Integer schemeVersionId, String lines) throws IOException {
        ObjectMapper objectMapper = new ObjectMapper();
        ObjectNode rootNode = objectMapper.readValue(lines, ObjectNode.class);
        String lineJson = rootNode.get("lines").toString();
        List<FlowLines> line = objectMapper.readValue(lineJson, List.class);

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

@@ -15,6 +15,7 @@ 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 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;
@@ -49,6 +50,9 @@ public class DataCollectController extends BaseController {
    @Resource(name = AdapterSchemeService.BEAN_ID)
    private AdapterSchemeService adapterSchemeService;
    @Autowired
    private ObjectMapper objectMapper;
    /****************************
     * 任务管理
@@ -79,9 +83,8 @@ public class DataCollectController extends BaseController {
            //获取方案列表
            List data = stdService.getSchemeVersion();
            ObjectMapper mapper = new ObjectMapper();
            String jsonlist = mapper.writeValueAsString(data);
            ArrayNode jsonArray = mapper.readValue(jsonlist,ArrayNode.class);
            String jsonlist = objectMapper.writeValueAsString(data);
            ArrayNode jsonArray = objectMapper.readValue(jsonlist,ArrayNode.class);
            model.addAttribute("schemeList", "{\"detailModelList\":" + (CollectionUtil.isEmpty(data) ? "[]" : jsonArray) + "}");
            model.addAttribute("contentPage", "/datacollect/editorJob");

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

@@ -16,7 +16,10 @@ 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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +37,9 @@ public class DatacollectManager implements IDatacollectManager {
    @Resource(name = Services.StdService)
    private IStdService stdManager;
    @Autowired
    private ObjectMapper objectMapper;
//    @Autowired
//    private QuartzManager quartzManager;
@@ -114,9 +120,8 @@ public class DatacollectManager implements IDatacollectManager {
    public DataGridResult getSchemeDataset(String schemeId, String schemeVersion, String jobId) throws Exception {
        //获取适配数据集总和
        List<AdapterDatasetModel> datasetString = stdManager.getDatasetByScheme(schemeVersion);
        ObjectMapper mapper = new ObjectMapper();
        String jsonlist = mapper.writeValueAsString(datasetString);
        ArrayNode jsonArray = mapper.readValue(jsonlist, ArrayNode.class);
        String jsonlist = objectMapper.writeValueAsString(datasetString);
        ArrayNode jsonArray = objectMapper.readValue(jsonlist, ArrayNode.class);
        //获取任务数据集
        List<RsJobDataset> jobDataset = datacollectDao.getJobDataset(jobId);
@@ -165,27 +170,26 @@ public class DatacollectManager implements IDatacollectManager {
     */
    @Override
    public DataGridResult getSchemeDatasetCol(String schemeId, String schemeVersion, String datasetId) throws Exception {
        return null; //TODO: Use jackson
//        //获取适配字段
//        List datacolString = stdManager.getDatacolByScheme(schemeVersion, datasetId);
//        JSONArray datacolList = JSONArray.fromObject(datacolString);
//
//        DataGridResult re = new DataGridResult();
//        List<DtoDatasetCol> list = new ArrayList<>();
//        for(Object item : datacolList)
//        {
//            JSONObject jsonItem = JSONObject.fromObject(item);
//            DtoDatasetCol obj = new DtoDatasetCol();
//            obj.setCode(jsonItem.getString("adapterMetadataCode"));
//            obj.setText(jsonItem.getString("adapterMetadataName"));
//            obj.setType(jsonItem.getString("adapterMetadataType"));
//            obj.setDict(jsonItem.getString("stdDictId"));
//
//            list.add(obj);
//        }
//        re.setDetailModelList(list);
//
//        return re;
        //获取适配字段
        List datacolString = stdManager.getDatacolByScheme(schemeVersion, datasetId);
        JSONArray datacolList = JSONArray.fromObject(datacolString);
        DataGridResult re = new DataGridResult();
        List<DtoDatasetCol> list = new ArrayList<>();
        for(Object item : datacolList)
        {
            JSONObject jsonItem = JSONObject.fromObject(item);
            DtoDatasetCol obj = new DtoDatasetCol();
            obj.setCode(jsonItem.getString("adapterMetadataCode"));
            obj.setText(jsonItem.getString("adapterMetadataName"));
            obj.setType(jsonItem.getString("adapterMetadataType"));
            obj.setDict(jsonItem.getString("stdDictId"));
            list.add(obj);
        }
        re.setDetailModelList(list);
        return re;
    }
    /**
@@ -284,16 +288,15 @@ public class DatacollectManager implements IDatacollectManager {
    public DataGridResult getDatasetSource(String stdVersion) throws Exception {
        //获取版本下全部数据集
        List<StdDataSetModel> stdDataSetModelList = stdManager.getDatasetByVersion(stdVersion);
        ObjectMapper mapper = new ObjectMapper();
        String jsonlist = mapper.writeValueAsString(stdDataSetModelList);
        ArrayNode datasetList = mapper.readValue(jsonlist, ArrayNode.class);
        String jsonlist = objectMapper.writeValueAsString(stdDataSetModelList);
        ArrayNode datasetList = objectMapper.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();
            ObjectNode dd = objectMapper.createObjectNode();
            dd.put("datasetId", obj.get("id").asText());
            dd.put("datasetCode", obj.get("code").asText());
            dd.put("datasetName", obj.get("name").asText());
@@ -493,8 +496,7 @@ public class DatacollectManager implements IDatacollectManager {
            //清空任务关联数据集
            datacollectDao.deleteJobDatasetByJobId(jobId);
            ObjectMapper mapper = new ObjectMapper();
            ArrayNode array = mapper.readValue(jobDataset,ArrayNode.class);
            ArrayNode array = objectMapper.readValue(jobDataset,ArrayNode.class);
            if (array != null && array.size() > 0) {
                for (JsonNode obj : array) {
                    RsJobDataset rs = new RsJobDataset();

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

@@ -30,6 +30,7 @@ import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -57,6 +58,8 @@ public class DatacollectService implements IDatacollectService {
    private IDatacollectDao datacollectDao;
    @Resource(name = "DatacollectLogDao")
    private IDatacollectLogDao datacollectLogDao;
    @Autowired
    private ObjectMapper objectMapper;
    /**
     * 根据连接字符串获取数据库类型
@@ -775,7 +778,6 @@ public class DatacollectService implements IDatacollectService {
        DBType dbType = DBType.Oracle;//********** 先定死Oracle ****************************
        //webservice地址
        ObjectMapper objectMapper = new ObjectMapper();
        Map<String, String> mapConfig = objectMapper.readValue(config, Map.class);
        if (mapConfig.containsKey("protocol") && mapConfig.containsKey("url")) {
            String url = mapConfig.get("protocol") + "://" + mapConfig.get("url");

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

@@ -52,7 +52,8 @@ public class RsResourceServiceImpl implements IRsResourceService {
    @Autowired
    private IStdService stdService;
    @Autowired
    private ObjectMapper objectMapper;
    @Override
    public List<TreeResult> getResourceTreeList(String name) throws Exception {
@@ -329,8 +330,7 @@ public class RsResourceServiceImpl implements IRsResourceService {
    @Override
    public String searchRomoteResourceList(String code, Map<String, Object> params) throws Exception {
        String result = HttpHelper.getByGateway(code, params).getBody();
        ObjectMapper mapper = new ObjectMapper();
        JsonNode jsonobject = mapper.readValue(result,JsonNode.class);
        JsonNode jsonobject = objectMapper.readValue(result,JsonNode.class);
        Object response_params = jsonobject.get("responseResult");
        if (response_params.equals("null")) {
            return "";
@@ -341,7 +341,6 @@ public class RsResourceServiceImpl implements IRsResourceService {
    @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) {
@@ -356,8 +355,8 @@ public class RsResourceServiceImpl implements IRsResourceService {
        } else {
            RsResourceDataset rd = resourceDatasetDao.getEntity(RsResourceDataset.class, (String) params.get("datasetId"));
            List list = new ArrayList();
            String jsonStr = mapper.writeValueAsString(rd);
            ObjectNode jo = mapper.readValue(jsonStr,ObjectNode.class);
            String jsonStr = objectMapper.writeValueAsString(rd);
            ObjectNode jo = objectMapper.readValue(jsonStr,ObjectNode.class);
            jo.put("checked", "true");
            list.add(jo);
            re.setDetailModelList(list);
@@ -385,12 +384,11 @@ public class RsResourceServiceImpl implements IRsResourceService {
        Map<String, Object> paramsTemp = new HashMap<String, Object>();
        ObjectMapper mapper = new ObjectMapper();
        paramsTemp.put("condition",mapper.writeValueAsString(params));
        paramsTemp.put("condition",objectMapper.writeValueAsString(params));
        List responseParasm = stdService.metadatasAllVersionList(params);
        String jsonlist = mapper.writeValueAsString(responseParasm);
        ArrayNode array = mapper.readValue(jsonlist, ArrayNode.class);
        String jsonlist = objectMapper.writeValueAsString(responseParasm);
        ArrayNode array = objectMapper.readValue(jsonlist, ArrayNode.class);
        if (array.size() == 0) {
            throw new Exception("该数据集没有数据元");
        }
@@ -468,13 +466,12 @@ 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);
        String jsonlist = mapper.writeValueAsString(responseParasm);
        ArrayNode jr = mapper.readValue(jsonlist,ArrayNode.class);
        String jsonlist = objectMapper.writeValueAsString(responseParasm);
        ArrayNode jr = objectMapper.readValue(jsonlist,ArrayNode.class);
        if (!StringUtils.isEmpty(datasetId)) {
            List<RsResourceMetadata> md = resourceMetadataDao.getMetadataByLocalDatssetId(datasetId);
            for (int i = 0; i < jr.size(); i++) {
@@ -492,23 +489,22 @@ 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();
            org.apache.commons.beanutils.BeanUtils.populate(rsResourceDataset, mapper.readValue(dataset, Map.class));
            org.apache.commons.beanutils.BeanUtils.populate(rsResourceDataset, objectMapper.readValue(dataset, Map.class));
            rsResourceDataset.setId(datasetID);
            resourceDatasetDao.saveEntity(rsResourceDataset);
            ArrayNode array = mapper.readValue(metaData,ArrayNode.class);
            ArrayNode array = objectMapper.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));
                org.apache.commons.beanutils.BeanUtils.populate(rsResourceMetadata, objectMapper.readValue(jsonObject.toString(),Map.class));
                rsResourceMetadata.setDataSupportType(1);
                rsResourceMetadata.setDatasetId(datasetID);
                rsResourceMetadata.setResourceId(reourceId);
@@ -519,11 +515,11 @@ public class RsResourceServiceImpl implements IRsResourceService {
            //修改
            resourceMetadataDao.deleteLogicDataSupportMetaDataByLocalDataSetId(datasetId);
            ArrayNode array = mapper.readValue(metaData, ArrayNode.class);
            ArrayNode array = objectMapper.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));
                org.apache.commons.beanutils.BeanUtils.populate(rsResourceMetadata, objectMapper.readValue(jsonObject.toString(),Map.class));
                rsResourceMetadata.setDataSupportType(1);
                rsResourceMetadata.setResourceId(reourceId);
                rsResourceMetadata.setDatasetId(resource.getDatasetCode());

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

@@ -20,6 +20,7 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -46,6 +47,8 @@ public class StdService implements IStdService {
    private AdapterDatasetService datasetService;
    @Resource(name = AdapterSchemeVersionService.BEAN_ID)
    private AdapterSchemeVersionService adapterSchemeVersion;
    @Autowired
    private ObjectMapper objectMapper;
    /**************************** 适配方案 **************************************************/
@@ -71,10 +74,9 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("adapterDatasetId", adapterDatasetId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        ObjectMapper mapper = new ObjectMapper();
        String conditon = null;
        try {
            conditon = mapper.writeValueAsString(map);
            conditon = objectMapper.writeValueAsString(map);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
@@ -88,8 +90,7 @@ 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);
        ObjectMapper mapper = new ObjectMapper();
        String condition = mapper.writeValueAsString(map);
        String condition = objectMapper.writeValueAsString(map);
        return metadataService.getInfoList(schemeVersion, condition, null, null, null);
    }
@@ -100,10 +101,9 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDictId", dictId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        ObjectMapper mapper = new ObjectMapper();
        String condition = null;
        try {
            condition = mapper.writeValueAsString(map);
            condition = objectMapper.writeValueAsString(map);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
@@ -119,8 +119,7 @@ public class StdService implements IStdService {
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("stdDictId", dictId);
        AdapterVersion version = new AdapterVersion(schemeVersion);
        ObjectMapper mapper = new ObjectMapper();
        String condition = mapper.writeValueAsString(map);
        String condition = objectMapper.writeValueAsString(map);
        List<AdapterDictEntryModel> dictentryList = dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), condition, null, null, null);
@@ -151,8 +150,7 @@ 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);
        String condition = objectMapper.writeValueAsString(map);
        List<AdapterDatasetModel> list = datasetService.getList(AdapterDatasetModel.class, version.getDataSetTableName(), condition, null, null, null);

hos-admin/src/main/java/com/yihu/hos/services/ServiceFlowEventService.java

@@ -3,6 +3,7 @@ package com.yihu.hos.services;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
@@ -16,6 +17,9 @@ public class ServiceFlowEventService {
//    @Autowired
//    private Queue queue;
    @Autowired
    private ObjectMapper objectMapper;
    /**
     * 当外界组件通知一个新的processor处理器被定义时，该事件被触发。
     *
@@ -57,7 +61,6 @@ public class ServiceFlowEventService {
    }
    private void sendMsg(String event, String serviceFlow, String packageName, String className, String path) {
        ObjectMapper objectMapper = new ObjectMapper();
        ObjectNode objectNode = objectMapper.createObjectNode();
        objectNode.put("event", event);
        objectNode.put("serviceFlow", serviceFlow);

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

@@ -2,7 +2,6 @@ package com.yihu.hos.standard.service.adapter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.standard.model.adapter.AdapterDatasetRelationModel;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.web.framework.constrant.ErrorCode;
@@ -30,7 +29,6 @@ public class AdapterDatasetRelationService extends SQLGeneralDAO {
    public AdapterDatasetRelationModel add(String adapterVersion, String datasetRelation) {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterDatasetRelationModel adapterDatasetRelationModel = objectMapper.readValue(datasetRelation, AdapterDatasetRelationModel.class);
            Session session = getCurrentSession();
            String sql = "select max(id) from " + version.getMetaDataTableName();
@@ -70,7 +68,6 @@ public class AdapterDatasetRelationService extends SQLGeneralDAO {
    public AdapterDatasetRelationModel modify(String adapterVersion, String datasetRelation) {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterDatasetRelationModel adapterDatasetRelationModel = objectMapper.readValue(datasetRelation, AdapterDatasetRelationModel.class);
            JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(adapterDatasetRelationModel));
            SqlCreator sqlCreator = new SqlCreator(AdapterDatasetRelationModel.class);

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

@@ -2,18 +2,8 @@ package com.yihu.hos.standard.service.adapter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.model.TreeView;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.sql.BeanTransformer;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterDictModel;
import com.yihu.hos.standard.model.adapter.AdapterMetadataModel;
@@ -21,6 +11,15 @@ import com.yihu.hos.standard.model.standard.StdDataSetModel;
import com.yihu.hos.standard.model.standard.StdMetaDataModel;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.standard.service.bo.StandardVersion;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.model.TreeView;
import com.yihu.hos.web.framework.util.sql.BeanTransformer;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
@@ -44,7 +43,6 @@ public class AdapterDatasetService extends SQLGeneralDAO {
    public Result add(String adapterVersion, String dataset) {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterDatasetModel adapterDatasetModel = objectMapper.readValue(dataset, AdapterDatasetModel.class);
            adapterDatasetModel.setId(getMaxId(version.getDataSetTableName()));
            JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(adapterDatasetModel));
@@ -80,7 +78,6 @@ public class AdapterDatasetService extends SQLGeneralDAO {
    public Result modify(String adapterVersion, String dataset) {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterDatasetModel adapterDatasetModel = objectMapper.readValue(dataset, AdapterDatasetModel.class);
            JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(adapterDatasetModel));
            SqlCreator sqlCreator = new SqlCreator(AdapterDatasetModel.class);
@@ -125,7 +122,6 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        AdapterVersion adapterVersion = new AdapterVersion(version);
        String tableName = adapterVersion.getDataSetTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        if (!StringUtil.isEmpty(condition)) {
            JsonNode jsonNode = objectMapper.readTree(condition);
            String name = jsonNode.get("name").asText();
@@ -155,7 +151,6 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        try {
            String tableName = adapterVersion.getDataSetTableName();
            SqlCreator sqlCreator = new SqlCreator(tClass);
            ObjectMapper objectMapper = new ObjectMapper();
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);
                String name = jsonNode.get("name").asText();
@@ -543,7 +538,6 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        try {
            StringBuffer sql = new StringBuffer();
            sql.append("SELECT * FROM ").append(adapterVersion.getDataSetTableName());
            ObjectMapper objectMapper = new ObjectMapper();
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);
                String column = jsonNode.get("column").asText();

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

@@ -2,15 +2,8 @@ package com.yihu.hos.standard.service.adapter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import com.yihu.hos.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.hos.standard.model.adapter.AdapterDictModel;
import com.yihu.hos.standard.model.adapter.AdapterSchemeModel;
@@ -18,6 +11,12 @@ import com.yihu.hos.standard.model.adapter.resultModel.AdapterDictEntryResultDet
import com.yihu.hos.standard.model.standard.StdDictionaryModel;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.standard.service.bo.StandardVersion;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
@@ -31,6 +30,7 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
    public static final String BEAN_ID = "AdapterDictEntryService";
    public AdapterDictEntryService() {
    }
@@ -41,7 +41,6 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
    public Result add(String adapterVersion, String dictentry) {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterDictEntryModel adapterDictEntryModel = objectMapper.readValue(dictentry, AdapterDictEntryModel.class);
            Session session = getCurrentSession();
            String sql = "select max(id) from " + version.getDictEntryTableName();
@@ -79,7 +78,6 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
    public Result modify(String adapterVersion, String dictentry) {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterDictEntryModel adapterDictEntryModel = objectMapper.readValue(dictentry, AdapterDictEntryModel.class);
            JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(adapterDictEntryModel));
            SqlCreator sqlCreator = new SqlCreator(AdapterDictEntryModel.class);
@@ -123,7 +121,6 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
        AdapterVersion version = new AdapterVersion(adapterVersion);
        String tableName = version.getDictEntryTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        if (!StringUtil.isEmpty(condition)) {
            try {
                JsonNode jsonNode = objectMapper.readTree(condition);
@@ -207,7 +204,6 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
        AdapterVersion version = new AdapterVersion(adapterVersion);
        String tableName = version.getDictEntryTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        if (!StringUtil.isEmpty(condition)) {
            try {
                JsonNode jsonNode = objectMapper.readTree(condition);
@@ -230,7 +226,6 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
    public DetailModelResult updateDictEntrys(String adapterVersion, String list) {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            List<AdapterDictEntryResultDetailModel> adapterDictEntryList = Arrays.asList(objectMapper.readValue(list, AdapterDictEntryResultDetailModel[].class));
            List<Integer> idList = new ArrayList<>();
            Map<Integer, AdapterDictEntryResultDetailModel> dictEntryResultMap = new HashMap<>();

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

@@ -2,14 +2,13 @@ package com.yihu.hos.standard.service.adapter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.standard.model.adapter.AdapterDictModel;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import com.yihu.hos.standard.model.adapter.AdapterDictModel;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
@@ -33,7 +32,6 @@ public class AdapterDictService extends SQLGeneralDAO {
    public Result add(String adapterVersion, String dict) {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterDictModel adapterDictModel = objectMapper.readValue(dict, AdapterDictModel.class);
            Session session = getCurrentSession();
            String sql = "select max(id) from " + version.getMetaDataTableName();
@@ -74,7 +72,6 @@ public class AdapterDictService extends SQLGeneralDAO {
    public Result modify(String adapterVersion, String dict) {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterDictModel adapterDictModel = objectMapper.readValue(dict, AdapterDictModel.class);
            JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(adapterDictModel));
@@ -120,7 +117,6 @@ public class AdapterDictService extends SQLGeneralDAO {
        AdapterVersion version = new AdapterVersion(adapterVersion);
        String tableName = version.getDictTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);
@@ -156,7 +152,6 @@ public class AdapterDictService extends SQLGeneralDAO {
        AdapterVersion version = new AdapterVersion(adapterVersion);
        String tableName = version.getDictTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);

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

@@ -3,17 +3,8 @@ 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;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.sql.BeanTransformer;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
import com.yihu.hos.standard.model.adapter.AdapterMetadataModel;
import com.yihu.hos.standard.model.adapter.AdapterSchemeModel;
@@ -23,6 +14,14 @@ import com.yihu.hos.standard.model.standard.StdDataSetModel;
import com.yihu.hos.standard.model.standard.StdMetaDataModel;
import com.yihu.hos.standard.service.bo.AdapterVersion;
import com.yihu.hos.standard.service.bo.StandardVersion;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.sql.BeanTransformer;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;
import org.hibernate.Session;
@@ -47,7 +46,6 @@ public class AdapterMetadataService extends SQLGeneralDAO {
    public Result add(String adapterVersion, String metadata) throws Exception {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterMetadataModel adapterMetadataModel = objectMapper.readValue(metadata, AdapterMetadataModel.class);
            Session session = getCurrentSession();
            String sql = "select max(id) from " + version.getMetaDataTableName();
@@ -86,7 +84,6 @@ public class AdapterMetadataService extends SQLGeneralDAO {
    public Result modify(String adapterVersion, String metadata) throws Exception {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterMetadataModel adapterMetadataModel = objectMapper.readValue(metadata, AdapterMetadataModel.class);
            JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(adapterMetadataModel));
@@ -131,7 +128,6 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        AdapterVersion version = new AdapterVersion(adapterVersion);
        String tableName = version.getMetaDataTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        if (!StringUtil.isEmpty(condition)) {
            try {
@@ -221,7 +217,6 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        AdapterVersion version = new AdapterVersion(adapterVersion);
        String tableName = version.getMetaDataTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        if (!StringUtil.isEmpty(condition)) {
            try {
                JsonNode jsonNode = objectMapper.readTree(condition);
@@ -298,7 +293,6 @@ public class AdapterMetadataService extends SQLGeneralDAO {
    public DetailModelResult updateMetadatas(String adapterVersion, String list) {
        try {
            AdapterVersion version = new AdapterVersion(adapterVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            List<ApiMetadataResultDetailModel> adapterMetadataList = Arrays.asList(objectMapper.readValue(list, ApiMetadataResultDetailModel[].class));
            List<String> sqlList = new ArrayList<>();
            List<Integer> idList = new ArrayList<>();
@@ -392,7 +386,6 @@ 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);
@@ -408,10 +401,9 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("stdDatasetId", datasetId);
        String tableName="adapter_dataset_"+adapterVersion;
        ObjectMapper mapper = new ObjectMapper();
        String condition = null;
        try {
            condition = mapper.writeValueAsString(map);
            condition = objectMapper.writeValueAsString(map);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
@@ -434,7 +426,6 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        try {
            StringBuffer sql = new StringBuffer();
            sql.append("SELECT * FROM ").append(adapterVersion.getMetaDataTableName());
            ObjectMapper objectMapper = new ObjectMapper();
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);
                String column = jsonNode.get("column").asText();

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

@@ -1,10 +1,9 @@
package com.yihu.hos.standard.service.adapter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.standard.model.adapter.AdapterSchemeDispatchModel;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.standard.model.adapter.AdapterSchemeDispatchModel;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,7 +18,6 @@ public class AdapterSchemeDispatchService extends SQLGeneralDAO {
    public AdapterSchemeDispatchModel add(String dispatcher) {
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterSchemeDispatchModel model = objectMapper.readValue(dispatcher, AdapterSchemeDispatchModel.class);
            saveEntity(model);
            return model;
@@ -39,7 +37,6 @@ public class AdapterSchemeDispatchService extends SQLGeneralDAO {
    public AdapterSchemeDispatchModel update(String dispatcher) {
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterSchemeDispatchModel model = objectMapper.readValue(dispatcher, AdapterSchemeDispatchModel.class);
            updateEntity(model);
            return model;

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

@@ -1,7 +1,6 @@
package com.yihu.hos.standard.service.adapter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.model.DetailModelResult;
@@ -48,7 +47,6 @@ public class AdapterSchemeService extends SQLGeneralDAO {
    public Result add(String scheme) {
        Boolean existFlg = false;
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterSchemeModel model = objectMapper.readValue(scheme, AdapterSchemeModel.class);
            existFlg = schemeNameValidate(model.getName());
            if (!existFlg) {
@@ -113,7 +111,6 @@ public class AdapterSchemeService extends SQLGeneralDAO {
    public Result update(String scheme) {
        Boolean existFlg = false;
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterSchemeModel model = objectMapper.readValue(scheme, AdapterSchemeModel.class);
            existFlg = schemeNameValidate(model.getId(), model.getName());
            if (!existFlg) {
@@ -147,7 +144,6 @@ public class AdapterSchemeService extends SQLGeneralDAO {
        try {
            String name = SqlConstants.EMPTY;
            if (!StringUtil.isEmpty(condition)) {
                ObjectMapper objectMapper = new ObjectMapper();
                try {
                    JsonNode jsonNode = objectMapper.readTree(condition);
                    if (jsonNode.get("name") != null) {

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

@@ -1,6 +1,5 @@
package com.yihu.hos.standard.service.adapter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.constrant.SqlConstants;
@@ -64,7 +63,6 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
    public Result add(String version) {
        Boolean existFlg = false;
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterSchemeVersionModel versionModel = objectMapper.readValue(version, AdapterSchemeVersionModel.class);
            existFlg = schemeVersionNameValidate(versionModel.getSchemeId(), versionModel.getName());
            if (!existFlg) {
@@ -113,7 +111,6 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
    public Result update(String version) {
        Boolean existFlg = false;
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            AdapterSchemeVersionModel versionModel = objectMapper.readValue(version, AdapterSchemeVersionModel.class);
            existFlg = schemeVersionNameValidate(versionModel.getSchemeId(), versionModel.getId(), versionModel.getName());
            if (!existFlg) {

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

@@ -24,6 +24,7 @@ import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -72,7 +73,6 @@ public class StandardService extends SQLGeneralDAO {
        Boolean existCodeFlg = false;
        Boolean existNameFlg = false;
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            StandardModel standardModel = objectMapper.readValue(standard, StandardModel.class);
            existCodeFlg = standardCodeValidate(standardModel.getCode());
            existNameFlg = standardNameValidate(standardModel.getName());
@@ -175,7 +175,6 @@ public class StandardService extends SQLGeneralDAO {
        Boolean existCodeFlg = false;
        Boolean existNameFlg = false;
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            StandardModel standardModel = objectMapper.readValue(standard, StandardModel.class);
            existCodeFlg = standardCodeValidate(standardModel.getId(), standardModel.getCode());
            existNameFlg = standardNameValidate(standardModel.getId(), standardModel.getName());
@@ -330,7 +329,6 @@ public class StandardService extends SQLGeneralDAO {
        String name = SqlConstants.EMPTY;
        Integer type = null;
        if (!StringUtil.isEmpty(condition)) {
            ObjectMapper objectMapper = new ObjectMapper();
            try {
                JsonNode jsonNode = objectMapper.readTree(condition);
                if (jsonNode.get("type") != null) {

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

@@ -19,6 +19,7 @@ import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +35,8 @@ import java.util.*;
public class StandardVersionService extends SQLGeneralDAO {
    public static final String BEAN_ID = "StandardVersionService";
    @Autowired
    private ObjectMapper objectMapper;
    public DictionaryResult getDictionaryResult(Integer standardId, String condition, String order, Integer rows, Integer page) {
        try {
@@ -97,7 +100,6 @@ public class StandardVersionService extends SQLGeneralDAO {
    public Result add(String version) throws Exception {
        Boolean existFlg = false;
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            StandardVersionModel versionModel = objectMapper.readValue(version, StandardVersionModel.class);
            existFlg = versionNameValidate(versionModel.getStandardId(), versionModel.getName());
            if (!existFlg) {
@@ -176,7 +178,6 @@ public class StandardVersionService extends SQLGeneralDAO {
    public Result update(String version) throws Exception {
        Boolean existFlg = false;
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            StandardVersionModel versionModel = objectMapper.readValue(version, StandardVersionModel.class);
            existFlg = versionNameValidate(versionModel.getStandardId(), versionModel.getId(), versionModel.getName());
            if (!existFlg) {

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

@@ -1,14 +1,13 @@
package com.yihu.hos.standard.service.standard;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.standard.model.standard.StandardModel;
import com.yihu.hos.standard.model.standard.StdCDACatalogModel;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.util.sql.RequestParamTransformer;
import com.yihu.hos.standard.model.standard.StandardModel;
import com.yihu.hos.standard.model.standard.StdCDACatalogModel;
import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
@@ -52,7 +51,6 @@ public class StdCDACatalogService extends SQLGeneralDAO {
    public Object add(String catalog) {
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            StdCDACatalogModel standardModel = objectMapper.readValue(catalog, StdCDACatalogModel.class);
            this.add(standardModel);
@@ -77,7 +75,6 @@ public class StdCDACatalogService extends SQLGeneralDAO {
    public Object update(String catalog) {
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            StdCDACatalogModel standardModel = objectMapper.readValue(catalog, StdCDACatalogModel.class);
            this.update(standardModel);

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

@@ -1,16 +1,15 @@
package com.yihu.hos.standard.service.standard;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.standard.model.standard.StdCDADatasetModel;
import com.yihu.hos.standard.service.bo.StandardVersion;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.sql.BeanTransformer;
import com.yihu.hos.web.framework.util.sql.RequestParamTransformer;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import com.yihu.hos.standard.model.standard.StdCDADatasetModel;
import com.yihu.hos.standard.service.bo.StandardVersion;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
@@ -58,7 +57,6 @@ public class StdCDADatasetService extends SQLGeneralDAO {
        }
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdCDADatasetModel stdCdaDatasetModel = objectMapper.readValue(cdaDataset, StdCDADatasetModel.class);
            this.add(standardVersion, stdCdaDatasetModel);
@@ -100,7 +98,6 @@ public class StdCDADatasetService extends SQLGeneralDAO {
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdCDADatasetModel stdCdaDatasetModel = objectMapper.readValue(cdaDataset, StdCDADatasetModel.class);
            this.modify(standardVersion, stdCdaDatasetModel);
@@ -162,7 +159,6 @@ public class StdCDADatasetService extends SQLGeneralDAO {
        Session session = getCurrentSession();
        String cdaDatasetTableName = standardVersion.getCDADatasetTableName();
        ObjectMapper objectMapper = new ObjectMapper();
        String sql = "select max(id) from " + cdaDatasetTableName;
        Query query = session.createSQLQuery(sql);
        Object object = query.uniqueResult();

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

@@ -1,16 +1,15 @@
package com.yihu.hos.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.standard.model.standard.StdCDAModel;
import com.yihu.hos.standard.service.bo.StandardVersion;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.sql.BeanTransformer;
import com.yihu.hos.web.framework.util.sql.RequestParamTransformer;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import com.yihu.hos.standard.model.standard.StdCDAModel;
import com.yihu.hos.standard.service.bo.StandardVersion;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
@@ -53,7 +52,6 @@ public class StdCDAService extends SQLGeneralDAO {
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdCDAModel stdCdaModel = objectMapper.readValue(cda, StdCDAModel.class);
            this.add(standardVersion, stdCdaModel);
@@ -90,7 +88,6 @@ public class StdCDAService extends SQLGeneralDAO {
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdCDAModel stdCdaModel = objectMapper.readValue(cda, StdCDAModel.class);
            this.modify(standardVersion, stdCdaModel);
            return stdCdaModel;
@@ -130,7 +127,6 @@ public class StdCDAService extends SQLGeneralDAO {
    private void modify(StandardVersion standardVersion, StdCDAModel stdCdaModel) throws IOException {
        String cdaTableName = standardVersion.getCDATableName();
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(stdCdaModel));
        SqlCreator sqlCreator = new SqlCreator(StdCDAModel.class);
        String sql = sqlCreator.updateDataByTableKey(cdaTableName, jsonNode);
@@ -140,7 +136,6 @@ public class StdCDAService extends SQLGeneralDAO {
    private void add(StandardVersion standardVersion, StdCDAModel stdCdaModel) throws IOException {
        String cdaTableName = standardVersion.getCDATableName();
        ObjectMapper objectMapper = new ObjectMapper();
        Session session = getCurrentSession();
        String sql = "select max(id) from " + cdaTableName;
        Query query = session.createSQLQuery(sql);

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

@@ -49,7 +49,6 @@ public class StdDatasetCatalogService extends SQLGeneralDAO {
    public Object add(String catalog) throws Exception {
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            StdDatasetCatalogModel stdDatasetCatalogModel = objectMapper.readValue(catalog, StdDatasetCatalogModel.class);
            this.add(stdDatasetCatalogModel);
@@ -74,7 +73,6 @@ public class StdDatasetCatalogService extends SQLGeneralDAO {
    public Object update(String catalog) throws Exception {
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            StdDatasetCatalogModel stdDatasetCatalogModel = objectMapper.readValue(catalog, StdDatasetCatalogModel.class);
            this.modify(stdDatasetCatalogModel);
@@ -112,7 +110,6 @@ public class StdDatasetCatalogService extends SQLGeneralDAO {
    }
    private void add(StdDatasetCatalogModel stdDatasetCatalogModel)  throws Exception {
        ObjectMapper objectMapper = new ObjectMapper();
        Session session = getCurrentSession();
        String sql = "select max(id) from " + StdDatasetCatalogModel.TABLE_NAME;
        Query query = session.createSQLQuery(sql);

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

@@ -76,7 +76,6 @@ public class StdDatasetService extends SQLGeneralDAO {
        Boolean existFlg = false;
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdDataSetModel stdDataSetModel = objectMapper.readValue(dataset, StdDataSetModel.class);
            existFlg = datasetCodeValidate(standardVersion, stdDataSetModel.getCode());
            if (!existFlg) {
@@ -142,7 +141,6 @@ public class StdDatasetService extends SQLGeneralDAO {
        Boolean existFlg = false;
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdDataSetModel stdDataSetModel = objectMapper.readValue(dataset, StdDataSetModel.class);
            existFlg = datasetCodeValidate(standardVersion, stdDataSetModel.getId(), stdDataSetModel.getCode());
            if (!existFlg) {
@@ -192,7 +190,6 @@ public class StdDatasetService extends SQLGeneralDAO {
    }
    private void update(StandardVersion standardVersion, StdDataSetModel stdDataSetModel) throws IOException {
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(stdDataSetModel));
        SqlCreator sqlCreator = new SqlCreator(StdDataSetModel.class);
        String dataSetTable = standardVersion.getDataSetTableName();
@@ -214,7 +211,6 @@ public class StdDatasetService extends SQLGeneralDAO {
    }
    private void add(String dataSetTable, StdDataSetModel stdDataSetModel) throws IOException {
        ObjectMapper objectMapper = new ObjectMapper();
        stdDataSetModel.setId(getMaxId(dataSetTable));
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(stdDataSetModel));
@@ -263,7 +259,6 @@ public class StdDatasetService extends SQLGeneralDAO {
        StandardVersion standardVersion = new StandardVersion(stdVersion);
        String tableName = standardVersion.getDataSetTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        if (!StringUtil.isEmpty(condition)) {
            JsonNode jsonNode = objectMapper.readTree(condition);
            if(jsonNode.get("initVal")!=null && !jsonNode.get("initVal").asText().isEmpty()){
@@ -306,7 +301,6 @@ public class StdDatasetService extends SQLGeneralDAO {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            String tableName = standardVersion.getDataSetTableName();
            SqlCreator sqlCreator = new SqlCreator(tClass);
            ObjectMapper objectMapper = new ObjectMapper();
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);
                String name = jsonNode.get("name").asText();
@@ -537,7 +531,6 @@ public class StdDatasetService extends SQLGeneralDAO {
                        metaData.setDatasetId(stdDataSetModel.getId());
                        metaData.setId(metaDataMaxId++);
                        metaData.setStandardId(2);
                        ObjectMapper objectMapper = new ObjectMapper();
                        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(metaData));
                        sql = sqlCreator.insertData(metadataTable, jsonNode);
                        Query query = getExeuteQuery(sqlCreator, sql);

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

@@ -1,20 +1,19 @@
package com.yihu.hos.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.standard.model.Select2;
import com.yihu.hos.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.hos.standard.service.bo.StandardVersion;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.sql.RequestParamTransformer;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import com.yihu.hos.standard.model.Select2;
import com.yihu.hos.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.hos.standard.service.bo.StandardVersion;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
@@ -57,7 +56,6 @@ public class StdDictEntryService extends SQLGeneralDAO {
        Boolean existFlg = false;
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdDictionaryEntryModel stdDictionaryEntryModel = objectMapper.readValue(dictEntry, StdDictionaryEntryModel.class);
            existFlg = dictEntryCodeValidate(standardVersion, stdDictionaryEntryModel.getDictId(), stdDictionaryEntryModel.getCode());
            if (!existFlg) {
@@ -120,7 +118,6 @@ public class StdDictEntryService extends SQLGeneralDAO {
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdDictionaryEntryModel stdDictionaryEntryModel = objectMapper.readValue(dictEntry, StdDictionaryEntryModel.class);
            existFlg = dictEntryCodeValidate(standardVersion, stdDictionaryEntryModel.getDictId(), stdDictionaryEntryModel.getId(), stdDictionaryEntryModel.getCode());
            if (!existFlg) {
@@ -166,7 +163,6 @@ public class StdDictEntryService extends SQLGeneralDAO {
        Integer id = object == null ? 1 : Integer.parseInt(object.toString()) + 1;
        stdDictionaryEntryModel.setId(id);
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(stdDictionaryEntryModel));
        SqlCreator sqlCreator = new SqlCreator(StdDictionaryEntryModel.class);
        sql = sqlCreator.insertData(dictEntryTableName, jsonNode);
@@ -191,7 +187,6 @@ public class StdDictEntryService extends SQLGeneralDAO {
        StandardVersion standardVersion = new StandardVersion(stdVersion);
        String tableName = standardVersion.getDictEntryTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        sqlCreator.equalCondition("dictId", dictId);
        if (!StringUtil.isEmpty(condition)) {
            try {
@@ -232,7 +227,6 @@ public class StdDictEntryService extends SQLGeneralDAO {
        StandardVersion standardVersion = new StandardVersion(stdVersion);
        String tableName = standardVersion.getDictEntryTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        sqlCreator.equalCondition("dictId", dictId);
        if (!StringUtil.isEmpty(condition)) {
            try {
@@ -300,7 +294,6 @@ public class StdDictEntryService extends SQLGeneralDAO {
    }
    private void modify(StandardVersion standardVersion, StdDictionaryEntryModel stdDictionaryEntryModel) throws IOException {
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(stdDictionaryEntryModel));
        SqlCreator sqlCreator = new SqlCreator(StdDictionaryEntryModel.class);
        String dictEntryTableName = standardVersion.getDictEntryTableName();

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

@@ -2,24 +2,23 @@ package com.yihu.hos.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.standard.model.Select2;
import com.yihu.hos.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.hos.standard.model.standard.StdDictionaryModel;
import com.yihu.hos.standard.service.bo.StandardVersion;
import com.yihu.hos.web.framework.constrant.ErrorCode;
import com.yihu.hos.web.framework.constrant.SqlConstants;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import com.yihu.hos.web.framework.exception.ApiException;
import com.yihu.hos.web.framework.model.DetailModelResult;
import com.yihu.hos.web.framework.model.DictItem;
import com.yihu.hos.web.framework.model.DictionaryResult;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.web.framework.util.sql.BeanTransformer;
import com.yihu.hos.web.framework.util.sql.RequestParamTransformer;
import com.yihu.hos.web.framework.util.sql.SqlCreator;
import com.yihu.hos.standard.model.Select2;
import com.yihu.hos.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.hos.standard.model.standard.StdDictionaryModel;
import com.yihu.hos.standard.service.bo.StandardVersion;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +66,6 @@ public class StdDictService extends SQLGeneralDAO {
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdDictionaryModel stdDictionaryModel = objectMapper.readValue(dict, StdDictionaryModel.class);
            existFlg = dictCodeValidate(standardVersion, stdDictionaryModel.getCode());
            if (!existFlg) {
@@ -154,7 +152,6 @@ public class StdDictService extends SQLGeneralDAO {
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdDictionaryModel stdDictionaryModel = objectMapper.readValue(dict, StdDictionaryModel.class);
            existFlg = dictCodeValidate(standardVersion, stdDictionaryModel.getId(), stdDictionaryModel.getCode());
            if (!existFlg) {
@@ -203,7 +200,6 @@ public class StdDictService extends SQLGeneralDAO {
    }
    private void modify(StandardVersion standardVersion, StdDictionaryModel stdDictionaryModel) throws IOException {
        ObjectMapper objectMapper = new ObjectMapper();
        String strTableName = standardVersion.getDictTableName();
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(stdDictionaryModel));
        SqlCreator sqlCreator = new SqlCreator(StdDictionaryModel.class);
@@ -226,7 +222,6 @@ public class StdDictService extends SQLGeneralDAO {
    private void add(StandardVersion standardVersion, StdDictionaryModel stdDictionaryModel) throws IOException {
        Session session = getCurrentSession();
        ObjectMapper objectMapper = new ObjectMapper();
        String strTableName = standardVersion.getDictTableName();
        String sql = null;
        sql = "select max(id) from " + strTableName;
@@ -324,7 +319,6 @@ public class StdDictService extends SQLGeneralDAO {
        StandardVersion standardVersion = new StandardVersion(stdVersion);
        String tableName = standardVersion.getDictTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);
@@ -365,7 +359,6 @@ public class StdDictService extends SQLGeneralDAO {
        StandardVersion standardVersion = new StandardVersion(stdVersion);
        String tableName = standardVersion.getDictTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);

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

@@ -67,7 +67,6 @@ public class StdMetadataService extends SQLGeneralDAO {
        Boolean existFlg = false;
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdMetaDataModel stdMetaDataModel = objectMapper.readValue(metadata, StdMetaDataModel.class);
            existFlg = metadataCodeValidate(standardVersion, stdMetaDataModel.getDatasetId(), stdMetaDataModel.getCode());
            if (!existFlg) {
@@ -128,7 +127,6 @@ public class StdMetadataService extends SQLGeneralDAO {
        Boolean existFlg = false;
        try {
            StandardVersion standardVersion = new StandardVersion(stdVersion);
            ObjectMapper objectMapper = new ObjectMapper();
            StdMetaDataModel stdMetaDataModel = objectMapper.readValue(metadata, StdMetaDataModel.class);
            existFlg = metadataCodeValidate(standardVersion, stdMetaDataModel.getDatasetId(), stdMetaDataModel.getId(), stdMetaDataModel.getCode());
            if (!existFlg) {
@@ -170,7 +168,6 @@ public class StdMetadataService extends SQLGeneralDAO {
    private void modify(StandardVersion standardVersion, StdMetaDataModel stdMetaDataModel) throws IOException {
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(stdMetaDataModel));
        SqlCreator sqlCreator = new SqlCreator(StdMetaDataModel.class);
        String metaDataTableName = standardVersion.getMetaDataTableName();
@@ -196,7 +193,6 @@ public class StdMetadataService extends SQLGeneralDAO {
        Object object = query.uniqueResult();
        stdMetaDataModel.setId(object == null ? 1 : Integer.parseInt(object.toString()) + 1);
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(stdMetaDataModel));
        SqlCreator sqlCreator = new SqlCreator(StdMetaDataModel.class);
        sql = sqlCreator.insertData(metaDataTableName, jsonNode);
@@ -242,7 +238,6 @@ public class StdMetadataService extends SQLGeneralDAO {
        StandardVersion standardVersion = new StandardVersion(stdVersion);
        String tableName = standardVersion.getMetaDataTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        sqlCreator.equalCondition("datasetId", datasetId);
        if (!StringUtil.isEmpty(condition)) {
            try {
@@ -283,7 +278,6 @@ public class StdMetadataService extends SQLGeneralDAO {
        StandardVersion standardVersion = new StandardVersion(stdVersion);
        String tableName = standardVersion.getMetaDataTableName();
        SqlCreator sqlCreator = new SqlCreator(tClass);
        ObjectMapper objectMapper = new ObjectMapper();
        sqlCreator.equalCondition("datasetId", datasetId);
        if (!StringUtil.isEmpty(condition)) {
            try {
@@ -332,7 +326,6 @@ public class StdMetadataService extends SQLGeneralDAO {
        try {
            Map<String,List<StdDataSetModel>> version2DataSetMap = new HashMap<>();
            String sql;
            ObjectMapper objectMapper = new ObjectMapper();
            String code = SqlConstants.EMPTY;
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);

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

@@ -35,12 +35,13 @@ public class AuthorityManager implements IAuthorityManager {
    private ISystemRoleMenuDao systemRoleMenuDao;
    @Autowired
    private IAppDao appdao;
    @Autowired
    private ObjectMapper objectMapper;
    @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<>());
@@ -54,7 +55,7 @@ public class AuthorityManager implements IAuthorityManager {
            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();
                    ObjectNode jo = objectMapper.createObjectNode();
                    jo.put("id", systemMenus.get(i).getId());
                    jo.put("pid", systemMenus.get(i).getPid());
@@ -67,7 +68,7 @@ public class AuthorityManager implements IAuthorityManager {
                }
            }
            if (addFlag) {
                ObjectNode jo = mapper.createObjectNode();
                ObjectNode jo = objectMapper.createObjectNode();
                jo.put("id", systemMenus.get(i).getId());
                jo.put("pid", systemMenus.get(i).getPid());
                jo.put("name", systemMenus.get(i).getName());
@@ -81,7 +82,7 @@ public class AuthorityManager implements IAuthorityManager {
            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();
                    ObjectNode jo = objectMapper.createObjectNode();
                    jo.put("id", systemMenuActions.get(i).getId());
                    jo.put("pid", systemMenuActions.get(i).getMenuId());
                    jo.put("name", systemMenuActions.get(i).getName());
@@ -94,7 +95,7 @@ public class AuthorityManager implements IAuthorityManager {
                }
            }
            if (addFlag) {
                ObjectNode jo = mapper.createObjectNode();
                ObjectNode jo = objectMapper.createObjectNode();
                jo.put("id", systemMenuActions.get(i).getId());
                jo.put("pid", systemMenuActions.get(i).getMenuId());
                jo.put("name", systemMenuActions.get(i).getName());

hos-web-framework/src/main/java/com/yihu/hos/web/framework/dao/SQLGeneralDAO.java

@@ -17,6 +17,7 @@ import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.hibernate.jdbc.Work;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
@@ -49,6 +50,9 @@ import java.util.Map;
public class SQLGeneralDAO implements XSQLGeneralDAO {
    static private final Logger logger = LoggerFactory.getLogger(SQLGeneralDAO.class);
    @Autowired
    protected ObjectMapper objectMapper;
    @Resource(
            name = "jdbcTemplate"
    )