Commit a6a3ba05 by mahx

替换fastjson

parent d4b187ae
package com.keymobile.metadata.metadataRelation.controller;
import com.alibaba.fastjson.JSONObject;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.keymobile.metadata.metadataRelation.pojo.BaseRelationship;
import com.keymobile.metadata.metadataRelation.pojo.MetaData;
import com.keymobile.metadata.metadataRelation.pojo.returnBean.Edge;
......@@ -13,20 +22,16 @@ import com.keymobile.metadata.metadataRelation.service.impl.MongoDbServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.bson.Document;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import sun.misc.BASE64Encoder;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
@RestController
@Api(value = "把metadata写入neo4j数据库", tags = "metadata to neo4j")
public class MetaDataController {
......@@ -421,8 +426,11 @@ public class MetaDataController {
}
@PostMapping("/addTempRelation")
public void addTempRelation(@RequestParam String catalogName, @RequestBody List<JSONObject> list) {
mongoDbService.saveTempRelation(list, catalogName);
public void addTempRelation(@RequestParam String catalogName, @RequestBody List<Map<String, Object>> list) {
if (!CollectionUtils.isEmpty(list)) {
List<Document> collect = list.stream().map(Document::new).collect(Collectors.toList());
mongoDbService.saveTempRelation(collect, catalogName);
}
}
@PostMapping("/removeTempRelation")
......
package com.keymobile.metadata.metadataRelation.service.impl;
import com.alibaba.fastjson.JSONObject;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import com.keymobile.metadata.metadataRelation.config.Neo4jConfig;
import com.keymobile.metadata.metadataRelation.pojo.*;
import com.keymobile.metadata.metadataRelation.pojo.returnBean.Edge;
......@@ -12,8 +17,8 @@ import com.keymobile.metadata.metadataRelation.service.IBaseRelationshipService;
import com.keymobile.metadata.metadataRelation.service.IMetadataService;
import com.keymobile.metadata.metadataRelation.util.Neo4jTool;
import org.apache.commons.lang.StringUtils;
import org.bson.Document;
import org.neo4j.driver.v1.*;
import org.neo4j.driver.v1.Record;
import org.neo4j.driver.v1.types.Node;
import org.neo4j.driver.v1.types.Path;
import org.neo4j.driver.v1.types.Relationship;
......@@ -27,12 +32,6 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import sun.misc.BASE64Encoder;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
@Service
public class MetadataServiceImpl implements IMetadataService {
......@@ -640,8 +639,8 @@ public class MetadataServiceImpl implements IMetadataService {
Map<String, Long> nameIdMap = new HashMap<>();
long tatalPage = Math.round(Math.ceil(totalElement / (pageSize + 0.0)));
for (; page < tatalPage; page++) {
List<JSONObject> list = mongoDbServiceImpl.findTempRelationByPage(PageRequest.of(page, pageSize, Sort.by("etlJobId")), catalogName);
for (JSONObject relation : list) {
List<Document> list = mongoDbServiceImpl.findTempRelationByPage(PageRequest.of(page, pageSize, Sort.by("etlJobId")), catalogName);
for (Document relation : list) {
String sqlId = relation.getString("etlSqlId");
String etlScriptId = relation.getString("etlScriptId");
String etlJobId = relation.getString("etlJobId");
......
package com.keymobile.metadata.metadataRelation.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.keymobile.metadata.metadataRelation.pojo.RelationMongo;
import org.bson.Document;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -54,7 +54,7 @@ public class MongoDbServiceImpl {
}
public void saveTempRelation(List<JSONObject> list, String catalogName) {
public void saveTempRelation(List<Document> list, String catalogName) {
if (CollectionUtils.isEmpty(list)) {
return;
}
......@@ -66,15 +66,15 @@ public class MongoDbServiceImpl {
mongoTemplate.remove(query, PREFIX_MD_RELATION_TEMP_NODE + catalogName);
}
public List<JSONObject> findTempRelationByPage(Pageable pageable, String catalogName) {
public List<Document> findTempRelationByPage(Pageable pageable, String catalogName) {
Query query = new Query();
query.with(pageable);
return mongoTemplate.find(query, JSONObject.class, PREFIX_MD_RELATION_TEMP_NODE + catalogName);
return mongoTemplate.find(query, Document.class, PREFIX_MD_RELATION_TEMP_NODE + catalogName);
}
public long countTempRelation(Pageable pageable, String catalogName) {
Query query = new Query();
query.with(pageable);
return mongoTemplate.count(query, JSONObject.class, PREFIX_MD_RELATION_TEMP_NODE + catalogName);
return mongoTemplate.count(query, Document.class, PREFIX_MD_RELATION_TEMP_NODE + catalogName);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment