|
@@ -5,10 +5,11 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.fasterxml.jackson.core.type.TypeReference;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
-import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
-import com.persagy.bdtp.adm.dao.*;
|
|
|
+import com.persagy.bdtp.adm.dao.AdmComponentMapper;
|
|
|
+import com.persagy.bdtp.adm.dao.AdmInfosConfigMapper;
|
|
|
+import com.persagy.bdtp.adm.dao.AdmPipeConfigMapper;
|
|
|
+import com.persagy.bdtp.adm.dao.AdmRelsConfigMapper;
|
|
|
import com.persagy.bdtp.adm.entity.*;
|
|
|
-import com.persagy.bdtp.adm.service.ISyncModel;
|
|
|
import com.persagy.bdtp.adm.service.ISyncOldAdm;
|
|
|
import com.persagy.bdtp.adm.test.data.InfosCfgs;
|
|
|
import com.persagy.bdtp.adm.test.data.PipeCfgs;
|
|
@@ -22,7 +23,10 @@ import org.springframework.core.io.ResourceLoader;
|
|
|
import org.springframework.test.context.junit4.SpringRunner;
|
|
|
|
|
|
import java.io.File;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
@RunWith(SpringRunner.class)
|
|
|
@SpringBootTest
|
|
@@ -46,26 +50,11 @@ public class AdmApplicationTests {
|
|
|
}
|
|
|
|
|
|
@Autowired
|
|
|
- private ISyncModel syncModel;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private AdmObjectMapper admObjectMapper;
|
|
|
-
|
|
|
- @Test
|
|
|
- public void testMq(){
|
|
|
- AdmObject obj = admObjectMapper.selectOne(new QueryWrapper<AdmObject>().eq("id", "Eq000222001100a450f006274c85811a13ee0650bd94"));
|
|
|
- obj.getInfos().put("comp_type", "FFFAAL-声光报警器");
|
|
|
- D2mMessage msg = new D2mMessage();
|
|
|
- msg.setAddItems(Arrays.asList(obj));
|
|
|
- syncModel.sendMessageToModel(msg);
|
|
|
- }
|
|
|
-
|
|
|
- @Autowired
|
|
|
private AdmInfosConfigMapper infosConfigMapper;
|
|
|
@Test
|
|
|
|
|
|
public void testInfosCfg(){
|
|
|
- String type = "ac";
|
|
|
+ String type = "se";
|
|
|
|
|
|
List<AdmComponent> compList = componentMapper.selectList(null);
|
|
|
HashMap<String, List<AdmComponent>> compMap = new HashMap<>();
|
|
@@ -84,6 +73,8 @@ public class AdmApplicationTests {
|
|
|
for(AdmInfosConfig item : list) {
|
|
|
item.setFlag(type);
|
|
|
|
|
|
+ setServeAreaToInfo(item.getInfos());
|
|
|
+
|
|
|
List<AdmComponent> comps = compMap.get(item.getClassCode());
|
|
|
if(comps != null)
|
|
|
setCompsToInfo(item.getInfos(), null, comps);
|
|
@@ -190,6 +181,20 @@ public class AdmApplicationTests {
|
|
|
info.put("options", ops);
|
|
|
}
|
|
|
|
|
|
+ private void setServeAreaToInfo(List infos){
|
|
|
+ Map info = new HashMap();
|
|
|
+ info.put("group", "静态信息");
|
|
|
+ info.put("code", "serve_area");
|
|
|
+ info.put("label", "服务区域");
|
|
|
+ info.put("dataType", "string");
|
|
|
+ info.put("inputType", "edit:serve_area");
|
|
|
+
|
|
|
+ infos.add(info);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ * 为自定义新增设备类设置uuid
|
|
|
+ */
|
|
|
@Autowired
|
|
|
ObjectMapper objectMapper;
|
|
|
@Autowired
|
|
@@ -206,6 +211,9 @@ public class AdmApplicationTests {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ * 为关系配置表增加direction字段
|
|
|
+ */
|
|
|
@Test
|
|
|
public void setRelCfgDirection(){
|
|
|
try {
|
|
@@ -238,4 +246,12 @@ public class AdmApplicationTests {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @Test
|
|
|
+ public void testMyBatis(){
|
|
|
+ AdmComponent comp = componentMapper.selectList(null).get(0);
|
|
|
+ comp.setCompCode(null);
|
|
|
+ comp.setClassCode(null);
|
|
|
+ componentMapper.updateById(comp);
|
|
|
+ }
|
|
|
+
|
|
|
}
|