|
@@ -6,7 +6,6 @@ import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
@@ -62,7 +61,7 @@ public class RWDLoadUtil {
|
|
|
{
|
|
|
File root = new File(infoPath);
|
|
|
File[] files = root.listFiles();
|
|
|
- Map<String, SceneDataSet> infoArrayDic = new HashMap<String, SceneDataSet>();
|
|
|
+ Map<String, SceneDataSet> infoArrayDic = new ConcurrentHashMap<String, SceneDataSet>();
|
|
|
for (File file : files) {
|
|
|
int index_ = file.getName().indexOf('.');
|
|
|
String code = file.getName().substring(0, index_);
|
|
@@ -108,7 +107,7 @@ public class RWDLoadUtil {
|
|
|
{
|
|
|
File root = new File(objectPath);
|
|
|
File[] files = root.listFiles();
|
|
|
- Map<String, SceneDataSet> objectArrayDic = new HashMap<String, SceneDataSet>();
|
|
|
+ Map<String, SceneDataSet> objectArrayDic = new ConcurrentHashMap<String, SceneDataSet>();
|
|
|
for (File file : files) {
|
|
|
int index_ = file.getName().indexOf('.');
|
|
|
String code = file.getName().substring(0, index_);
|
|
@@ -121,8 +120,8 @@ public class RWDLoadUtil {
|
|
|
if (code.equals("OTSECB")) {
|
|
|
for (int ii = 0; ii < array.size(); ii++) {
|
|
|
JSONObject arrayItem = (JSONObject) array.get(ii);
|
|
|
- Map<String, String> concentrateMap = new HashMap<String, String>();
|
|
|
- Map<String, String> concentrateUnitMap = new HashMap<String, String>();
|
|
|
+ Map<String, String> concentrateMap = new ConcurrentHashMap<String, String>();
|
|
|
+ Map<String, String> concentrateUnitMap = new ConcurrentHashMap<String, String>();
|
|
|
for (int iii = 1; iii <= 5; iii++) {
|
|
|
if (arrayItem.containsKey("concentrateSensorType" + iii) && arrayItem.containsKey("concentrate" + iii)) {
|
|
|
String sensorType = (String) arrayItem.get("concentrateSensorType" + iii);
|
|
@@ -193,9 +192,9 @@ public class RWDLoadUtil {
|
|
|
}
|
|
|
|
|
|
{
|
|
|
- Map<String, Map<String, SceneDataObject>> objType2id2Value = new HashMap<String, Map<String, SceneDataObject>>();
|
|
|
+ Map<String, Map<String, SceneDataObject>> objType2id2Value = new ConcurrentHashMap<String, Map<String, SceneDataObject>>();
|
|
|
for (String objType : Constant.objType_hasRelation.keySet()) {
|
|
|
- Map<String, SceneDataObject> id2Value = new HashMap<String, SceneDataObject>();
|
|
|
+ Map<String, SceneDataObject> id2Value = new ConcurrentHashMap<String, SceneDataObject>();
|
|
|
SceneDataSet sdvList = Repository.objectArrayDic.get(objType);
|
|
|
for (SceneDataObject sdv : sdvList.set) {
|
|
|
String id = (String) sdv.value_object.get("id").value_prim.value;
|
|
@@ -208,14 +207,14 @@ public class RWDLoadUtil {
|
|
|
|
|
|
String relationPath = validPath + Constant.getSeperator() + "relation";
|
|
|
{
|
|
|
- Map<String, Map<String, SceneDataSet>> relationArrayDic = new HashMap<String, Map<String, SceneDataSet>>();
|
|
|
- Map<String, SceneDataSet> graphCodeDic = new HashMap<String, SceneDataSet>();
|
|
|
- Map<String, SceneDataSet> relCodeDic = new HashMap<String, SceneDataSet>();
|
|
|
+ Map<String, Map<String, SceneDataSet>> relationArrayDic = new ConcurrentHashMap<String, Map<String, SceneDataSet>>();
|
|
|
+ Map<String, SceneDataSet> graphCodeDic = new ConcurrentHashMap<String, SceneDataSet>();
|
|
|
+ Map<String, SceneDataSet> relCodeDic = new ConcurrentHashMap<String, SceneDataSet>();
|
|
|
File root = new File(relationPath);
|
|
|
File[] dirs = root.listFiles();
|
|
|
for (File dir : dirs) {
|
|
|
File[] files = dir.listFiles();
|
|
|
- Map<String, SceneDataSet> oneDic = new HashMap<String, SceneDataSet>();
|
|
|
+ Map<String, SceneDataSet> oneDic = new ConcurrentHashMap<String, SceneDataSet>();
|
|
|
SceneDataSet graphCodeSet = new SceneDataSet(false);
|
|
|
for (File file : files) {
|
|
|
int index_ = file.getName().indexOf('.');
|
|
@@ -551,7 +550,7 @@ public class RWDLoadUtil {
|
|
|
SceneDataSet.set = RWDUtil.array2SDOList(classArray);
|
|
|
Repository.ZKTClassArray = SceneDataSet;
|
|
|
}
|
|
|
- Map<String, Map<String, SceneDataSet>> objectArrayDicZKT = new HashMap<String, Map<String, SceneDataSet>>();
|
|
|
+ Map<String, Map<String, SceneDataSet>> objectArrayDicZKT = new ConcurrentHashMap<String, Map<String, SceneDataSet>>();
|
|
|
for (int i = 0; i < classArray.size(); i++) {
|
|
|
JSONObject classItem = (JSONObject) classArray.get(i);
|
|
|
String ibmsSceneCode = (String) classItem.get("ibmsSceneCode");
|
|
@@ -559,7 +558,7 @@ public class RWDLoadUtil {
|
|
|
String code = (String) classItem.get("code");
|
|
|
String flag = (String) classItem.get("flag");
|
|
|
if (!objectArrayDicZKT.containsKey(ibmsSceneCode)) {
|
|
|
- objectArrayDicZKT.put(ibmsSceneCode, new HashMap<String, SceneDataSet>());
|
|
|
+ objectArrayDicZKT.put(ibmsSceneCode, new ConcurrentHashMap<String, SceneDataSet>());
|
|
|
}
|
|
|
Map<String, SceneDataSet> mapInner = objectArrayDicZKT.get(ibmsSceneCode);
|
|
|
log.info(objectPath + Constant.getSeperator() + ibmsSceneCode + " " + ibmsClassCode);
|
|
@@ -666,7 +665,7 @@ public class RWDLoadUtil {
|
|
|
});
|
|
|
for (File dir : dirs) {
|
|
|
String product = dir.getName();
|
|
|
- Map<String, SceneDataSet> infoArrayDic = new HashMap<String, SceneDataSet>();
|
|
|
+ Map<String, SceneDataSet> infoArrayDic = new ConcurrentHashMap<String, SceneDataSet>();
|
|
|
File[] files = dir.listFiles();
|
|
|
for (File file : files) {
|
|
|
int index_ = file.getName().indexOf('.');
|
|
@@ -956,7 +955,7 @@ public class RWDLoadUtil {
|
|
|
calendar.setTime(currDate);
|
|
|
int year = calendar.get(Calendar.YEAR);
|
|
|
String projectId = RepositoryContainer.RepositoryBase.projectId;
|
|
|
- Map<String, String> modelMap = new HashMap<String, String>();
|
|
|
+ Map<String, String> modelMap = new ConcurrentHashMap<String, String>();
|
|
|
{
|
|
|
JSONObject param = new JSONObject();
|
|
|
param.put("userId", "0");
|