|
@@ -15,28 +15,20 @@ import cn.hutool.poi.excel.WorkbookUtil;
|
|
|
import cn.hutool.poi.excel.cell.CellUtil;
|
|
|
import cn.hutool.poi.excel.editors.TrimEditor;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.persagy.dmp.basic.dto.RequestData;
|
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
|
import com.persagy.dmp.common.constant.ResponseCode;
|
|
|
import com.persagy.dmp.common.context.AppContext;
|
|
|
import com.persagy.dmp.common.exception.BusinessException;
|
|
|
-import com.persagy.dmp.common.helper.SpringHelper;
|
|
|
-import com.persagy.dmp.common.model.entity.BaseEntity;
|
|
|
import com.persagy.dmp.common.model.response.CommonResult;
|
|
|
-import com.persagy.dmp.define.client.DigitalDefineFacade;
|
|
|
import com.persagy.dmp.define.client.DigitalObjectInfoFacade;
|
|
|
import com.persagy.dmp.define.entity.ObjectInfoDefine;
|
|
|
import com.persagy.dmp.define.entity.ObjectTypeDefine;
|
|
|
import com.persagy.dmp.digital.client.DigitalObjectFacade;
|
|
|
-import com.persagy.dmp.digital.entity.ObjectDigital;
|
|
|
import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
|
|
|
import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
|
import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
|
|
|
-import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
|
|
|
import com.persagy.proxy.adm.request.*;
|
|
|
import com.persagy.proxy.adm.service.IAdmRelationService;
|
|
|
import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
@@ -50,6 +42,7 @@ import com.persagy.proxy.dictionary.model.AdmObjectType;
|
|
|
import com.persagy.proxy.dictionary.service.IAdmDictService;
|
|
|
import com.persagy.proxy.object.model.AdmEquipment;
|
|
|
import com.persagy.proxy.object.model.AdmProject;
|
|
|
+import com.persagy.proxy.object.model.AdmSystem;
|
|
|
import com.persagy.proxy.object.service.IAdmEquipmentService;
|
|
|
import com.persagy.proxy.object.service.IAdmProjectService;
|
|
|
import com.persagy.proxy.report.model.EquipmentPointExcel;
|
|
@@ -92,7 +85,6 @@ public class AdmEquipmentController {
|
|
|
private IAdmDictService dictService;
|
|
|
@Autowired
|
|
|
private IAdmProjectService projectService;
|
|
|
-
|
|
|
|
|
|
* 统计
|
|
|
*
|
|
@@ -163,8 +155,6 @@ public class AdmEquipmentController {
|
|
|
return AdmCreateResponse.success();
|
|
|
}
|
|
|
filterVOs = service.doInsert(AdmContextUtil.toDmpContext(), AdmEquipment.class, filterVOs);
|
|
|
-
|
|
|
- processRelations(filterVOs);
|
|
|
return AdmCreateResponse.success(filterVOs);
|
|
|
}
|
|
|
|
|
@@ -178,122 +168,60 @@ public class AdmEquipmentController {
|
|
|
public AdmResponse delete( @RequestBody List<AdmEquipment> vos) throws Exception {
|
|
|
|
|
|
service.doDelete(AdmContextUtil.toDmpContext(), vos);
|
|
|
- QueryCriteria queryCriteria = new QueryCriteria();
|
|
|
- vos.forEach(vo -> {
|
|
|
-
|
|
|
- dealRelation(vo.getId(), queryCriteria, AdmRelationTypeEnum.EQ2BD.getRelCode());
|
|
|
- dealRelation(vo.getId(), queryCriteria, AdmRelationTypeEnum.EQ2FL.getRelCode());
|
|
|
- });
|
|
|
return AdmResponse.success();
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- * 更新
|
|
|
- * @param createRequest
|
|
|
- * @return
|
|
|
- * @throws Exception
|
|
|
- */
|
|
|
- @PostMapping("/update")
|
|
|
- public AdmResponse update(@RequestBody AdmCreateRequest<AdmEquipment> createRequest) throws Exception {
|
|
|
- List<AdmEquipment> vos = CollUtil.newArrayList(createRequest.getContent());
|
|
|
-
|
|
|
-
|
|
|
- if(CollUtil.isNotEmpty(vos)){
|
|
|
- Map<String, AdmEquipment> admEquipmentMap = CollUtil.fieldValueMap(vos, BaseEntity.PROP_ID);
|
|
|
- AdmRelationTypeEnum typeEnum = AdmRelationTypeEnum.EQ2BD;
|
|
|
- String graphCode = typeEnum.getGraphCode();
|
|
|
- QueryCriteria criteria = new QueryCriteria();
|
|
|
- ObjectNode node = JsonNodeFactory.instance.objectNode();
|
|
|
- node.put("graphCode", graphCode);
|
|
|
- admEquipmentMap.keySet().stream().forEach(equipId -> {
|
|
|
- AdmEquipment admEquipment = admEquipmentMap.get(equipId);
|
|
|
-
|
|
|
- int removeflBd = 0 ;
|
|
|
- String flowBuild = admEquipment.getFlowBuild();
|
|
|
- if(StrUtil.isNotEmpty(flowBuild)){
|
|
|
- if(!flowBuild.contains("-")){
|
|
|
- if(flowBuild.startsWith("Bd")){
|
|
|
- admEquipment.setBuildingId(flowBuild);
|
|
|
- if(StrUtil.isNotEmpty(admEquipment.getFloorId())){
|
|
|
- Map<String, Object> infos = new HashMap<String,Object>(16);
|
|
|
- infos.put("$remove", Arrays.asList("floorId"));
|
|
|
- admEquipment.setInfos(infos);
|
|
|
- removeflBd = 2;
|
|
|
- }
|
|
|
- }
|
|
|
- }else {
|
|
|
- String[] str = flowBuild.split("-");
|
|
|
- if(str[0].startsWith("Bd")){
|
|
|
- admEquipment.setBuildingId(str[0]);
|
|
|
- admEquipment.setFloorId(str[1]);
|
|
|
- }else{
|
|
|
- admEquipment.setBuildingId(str[1]);
|
|
|
- admEquipment.setFloorId(str[0]);
|
|
|
- }
|
|
|
- removeflBd = 3;
|
|
|
- }
|
|
|
- admEquipment.setFlowBuild(null);
|
|
|
- }else{
|
|
|
- if(StrUtil.isAllNotEmpty(admEquipment.getBuildingId(),admEquipment.getFloorId())){
|
|
|
- Map<String, Object> infos = new HashMap<String,Object>(16);
|
|
|
- infos.put("$remove",Arrays.asList("floorId","buildingId"));
|
|
|
- admEquipment.setInfos(infos);
|
|
|
- removeflBd = 3;
|
|
|
+
|
|
|
+ * 更新
|
|
|
+ * @param createRequest
|
|
|
+ * @return
|
|
|
+ * @throws Exception
|
|
|
+ */
|
|
|
+ @PostMapping("/update")
|
|
|
+ public AdmResponse update(@RequestBody AdmCreateRequest<AdmEquipment> createRequest) throws Exception {
|
|
|
+ List<AdmEquipment> vos = createRequest.getContent();
|
|
|
+ if(CollUtil.isEmpty(vos)) {
|
|
|
+ return AdmResponse.success(vos);
|
|
|
+ }
|
|
|
+ for(AdmEquipment vo:vos) {
|
|
|
+ if(StrUtil.isNotBlank(vo.getFlowBuild())) {
|
|
|
+
|
|
|
+ List<String> flows = StrUtil.splitTrim(vo.getFlowBuild(), "-");
|
|
|
+ for(String flow:flows) {
|
|
|
+ if(StrUtil.startWith(flow, "Bd")) {
|
|
|
+ vo.setBuildingId(flow);
|
|
|
+ } else if(StrUtil.startWith(flow, "fl")) {
|
|
|
+ vo.setFloorId(flow);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- if(removeflBd == 3 || removeflBd == 2){
|
|
|
- node.put("relCode", "Eq2Fl");
|
|
|
- node.put("objFrom", equipId);
|
|
|
- criteria.setCriteria(node);
|
|
|
- relationService.doDelete(AdmContextUtil.toDmpContext(), criteria);
|
|
|
- }
|
|
|
- if(removeflBd == 3 || removeflBd == 1){
|
|
|
- node.put("relCode", "Eq2Bd");
|
|
|
- node.put("objFrom", equipId);
|
|
|
- criteria.setCriteria(node);
|
|
|
- relationService.doDelete(AdmContextUtil.toDmpContext(), criteria);
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- List<RelationDTO> relationDTOList = new ArrayList<>(vos.size());
|
|
|
- admEquipmentMap.keySet().stream().forEach(equipId -> {
|
|
|
- if(StrUtil.isNotEmpty(admEquipmentMap.get(equipId).getBuildingId())){
|
|
|
- RelationDTO relationbd = new RelationDTO(null, graphCode, "Eq2Bd", null, equipId, admEquipmentMap.get(equipId).getBuildingId());
|
|
|
- relationDTOList.add(relationbd);
|
|
|
- }
|
|
|
- if(StrUtil.isNotEmpty(admEquipmentMap.get(equipId).getFloorId())) {
|
|
|
- RelationDTO relationfl = new RelationDTO(null, graphCode, "Eq2Fl", null, equipId, admEquipmentMap.get(equipId).getFloorId());
|
|
|
- relationDTOList.add(relationfl);
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- if(CollUtil.isNotEmpty(relationDTOList)){
|
|
|
- relationService.doSave(AdmContextUtil.toDmpContext(), relationDTOList);
|
|
|
+ vo.setFlowBuild(null);
|
|
|
}
|
|
|
-
|
|
|
- vos.stream().forEach(equipment -> {
|
|
|
-
|
|
|
- if(StrUtil.isNotEmpty(equipment.getBimLocation())){
|
|
|
- Map<String,Object> infos = equipment.getInfos();
|
|
|
- if(CollUtil.isEmpty(infos)){
|
|
|
- infos = new HashMap<String, Object>();
|
|
|
- infos.put("bimLocation", equipment.getBimLocation());
|
|
|
- equipment.setInfos(infos);
|
|
|
- }
|
|
|
- }
|
|
|
- if(CollUtil.isNotEmpty(equipment.getInfos())){
|
|
|
- Object localId = equipment.getInfos().get("localId");
|
|
|
- if(localId != null && StrUtil.isNotEmpty(localId.toString())){
|
|
|
- equipment.setLocalId(localId.toString());
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- vos = service.doUpdate(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
- return AdmResponse.success(vos);
|
|
|
- }
|
|
|
+
|
|
|
+ Set<String> nullList = CollUtil.newHashSet(vo.getNullList());
|
|
|
+ if(StrUtil.isBlank(vo.getFloorId())) {
|
|
|
+ nullList.add("floorId");
|
|
|
+ }
|
|
|
+ if(StrUtil.isBlank(vo.getBuildingId())) {
|
|
|
+ nullList.add("buildingId");
|
|
|
+ }
|
|
|
+ vo.setNullList(CollUtil.newArrayList(nullList));
|
|
|
+
|
|
|
+ Map<String,Object> infos = vo.getInfos();
|
|
|
+ if(infos == null) {
|
|
|
+ infos = new HashMap<String, Object>();
|
|
|
+ vo.setInfos(infos);
|
|
|
+ }
|
|
|
+ if(StrUtil.isNotEmpty(vo.getBimLocation())){
|
|
|
+ infos.put("bimLocation", vo.getBimLocation());
|
|
|
+ }
|
|
|
+ String localId = MapUtil.getStr(infos, "localId");
|
|
|
+ if(StrUtil.isNotEmpty(localId)){
|
|
|
+ vo.setLocalId(localId);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ vos = service.doUpdate(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
+ return AdmResponse.success(vos);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
* 查询
|
|
@@ -433,39 +361,23 @@ public class AdmEquipmentController {
|
|
|
if(CollUtil.isEmpty(vos)){
|
|
|
return AdmCreateResponse.success();
|
|
|
}
|
|
|
-
|
|
|
- vos.stream().forEach(equipment -> {
|
|
|
- if (StrUtil.isEmpty(equipment.getName())){
|
|
|
- equipment.setName(ObjectNameUtil.objectName("设备-"));
|
|
|
- }
|
|
|
- });
|
|
|
- List<AdmEquipment> reVos = new ArrayList<>(vos.size());
|
|
|
+
|
|
|
List<RelationDTO> relationDTOS = new ArrayList<>(16);
|
|
|
- vos.stream().forEach(admEq -> {
|
|
|
-
|
|
|
- List<AdmEquipment> vosR = service.doInsert(AdmContextUtil.toDmpContext(), AdmEquipment.class, CollUtil.newArrayList(admEq));
|
|
|
-
|
|
|
-
|
|
|
- if(CollUtil.isNotEmpty(vosR)){
|
|
|
- String equipId = vosR.get(0).getId();
|
|
|
- if(StrUtil.isNotEmpty(equipId)){
|
|
|
- if(CollUtil.isNotEmpty(admEq.getLinkSystem())){
|
|
|
- admEq.getLinkSystem().stream().forEach(admSystem -> {
|
|
|
- relationDTOS.add(new RelationDTO(null, "MechSubset", "Sy2Eq", null , admSystem.getId(), equipId));
|
|
|
- });
|
|
|
- }
|
|
|
- if(StrUtil.isNotEmpty(admEq.getBuildingId())){
|
|
|
- relationDTOS.add(new RelationDTO(null, "MechInArch", "Eq2Bd", null , equipId, admEq.getBuildingId()));
|
|
|
- }
|
|
|
- if(StrUtil.isNotEmpty(admEq.getFloorId())){
|
|
|
- relationDTOS.add(new RelationDTO(null, "MechInArch", "Eq2Fl", null , equipId, admEq.getFloorId()));
|
|
|
- }
|
|
|
- }
|
|
|
+ for(AdmEquipment vo:vos) {
|
|
|
+ if (StrUtil.isEmpty(vo.getName())){
|
|
|
+ vo.setName(ObjectNameUtil.objectName("设备-"));
|
|
|
+ }
|
|
|
+ List<AdmSystem> systems = vo.getLinkSystem();
|
|
|
+ if(CollUtil.isEmpty(systems)){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ for(AdmSystem system:systems) {
|
|
|
+ relationDTOS.add(new RelationDTO(null, "MechSubset", "Sy2Eq", null , system.getId(), vo.getId()));
|
|
|
}
|
|
|
- reVos.addAll(vosR);
|
|
|
- });
|
|
|
+ }
|
|
|
relationService.doSave(AdmContextUtil.toDmpContext(),relationDTOS);
|
|
|
- return AdmCreateResponse.success(reVos);
|
|
|
+ vos = service.doInsert(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
+ return AdmCreateResponse.success(vos);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -475,258 +387,6 @@ public class AdmEquipmentController {
|
|
|
* @param request
|
|
|
* @param response
|
|
|
*/
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- * 设备上传excel识别静态信息点
|
|
|
- *
|
|
|
- * @param file
|
|
|
- * @param request
|
|
|
- * @param response
|
|
|
- */
|
|
|
@RequestMapping("/import")
|
|
|
public AdmResponse importFile(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
|
|
|
if (file == null) {
|
|
@@ -1002,80 +662,6 @@ public class AdmEquipmentController {
|
|
|
}
|
|
|
|
|
|
|
|
|
- * 更新设备信息
|
|
|
- *
|
|
|
- * @param tempMap
|
|
|
- * @param groupCode
|
|
|
- * @param projectId
|
|
|
- * @param equipId
|
|
|
- * @return
|
|
|
- */
|
|
|
- private int updateEquipInfo(Map<String, Object> tempMap, String groupCode, String projectId, String equipId) {
|
|
|
- ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
|
|
|
-
|
|
|
- Set<String> keySet = tempMap.keySet();
|
|
|
- ObjectNode updateEquip = objectMapper.createObjectNode();
|
|
|
- for (String key : keySet) {
|
|
|
- Object obj = tempMap.get(key);
|
|
|
-
|
|
|
- updateEquip.put("id", equipId);
|
|
|
- if (obj instanceof Date) {
|
|
|
- updateEquip.putPOJO(key, obj);
|
|
|
- } else {
|
|
|
- updateEquip.put(key, obj.toString());
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- ObjectDigital updateOne = DigitalObjectFacade.updateOne(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, updateEquip);
|
|
|
- return updateOne == null ? 0 : 1;
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- * 获取类型定义
|
|
|
- *
|
|
|
- * @param code
|
|
|
- * @return
|
|
|
- */
|
|
|
- private ObjectTypeDefine getObjectTypeDefine(String groupCode, String projectId, String code) {
|
|
|
- QueryCriteria queryCriteria = new QueryCriteria();
|
|
|
- ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
|
|
|
- ObjectNode condition = objectMapper.createObjectNode();
|
|
|
- JSONObject arrays = new JSONObject();
|
|
|
- arrays.put("$ne", "system");
|
|
|
- condition.putPOJO("parentCode", arrays);
|
|
|
- condition.put("code", code);
|
|
|
- queryCriteria.setCriteria(condition);
|
|
|
-
|
|
|
- List<ObjectTypeDefine> objectType = DigitalDefineFacade.queryObjectType(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, queryCriteria);
|
|
|
- return CollectionUtil.isEmpty(objectType) ? null : objectType.get(0);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- * 获取设备
|
|
|
- *
|
|
|
- * @param groupCode
|
|
|
- * @param projectId
|
|
|
- * @param primaryKey
|
|
|
- * @param code
|
|
|
- * @param classCode
|
|
|
- * @return
|
|
|
- */
|
|
|
- private List<ObjectNode> getEquipmentList(String groupCode, String projectId, String primaryKey, String code, String classCode) {
|
|
|
- QueryCriteria queryCriteria = new QueryCriteria();
|
|
|
- ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
|
|
|
- ObjectNode condition = objectMapper.createObjectNode();
|
|
|
- if (StrUtil.isAllNotBlank(primaryKey, code)) {
|
|
|
- condition.put(primaryKey, code);
|
|
|
- }
|
|
|
- condition.put("classCode", classCode);
|
|
|
- queryCriteria.setCriteria(condition);
|
|
|
-
|
|
|
- List<ObjectNode> objectNodes = DigitalObjectFacade.query(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, queryCriteria);
|
|
|
- return objectNodes;
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
* 设置填充色
|
|
|
*
|
|
|
* @param workbook
|
|
@@ -1182,41 +768,6 @@ public class AdmEquipmentController {
|
|
|
this.setColor(workbook,56,94,15,createCell);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- * 添加绑定关系
|
|
|
- */
|
|
|
- private void processRelations(List<AdmEquipment> vosR){
|
|
|
- if(CollUtil.isNotEmpty(vosR)) {
|
|
|
- List<RelationDTO> relationDTOS = new ArrayList<>(vosR.size());
|
|
|
- vosR.forEach(admEquipment -> {
|
|
|
- if (StrUtil.isNotEmpty(admEquipment.getBuildingId())) {
|
|
|
- relationDTOS.add(new RelationDTO(null, AdmRelationTypeEnum.EQ2BD.getGraphCode(), AdmRelationTypeEnum.EQ2BD.getRelCode(), admEquipment.getClassCode(), admEquipment.getId(), admEquipment.getBuildingId()));
|
|
|
- }
|
|
|
- if (StrUtil.isNotEmpty(admEquipment.getFloorId())) {
|
|
|
- relationDTOS.add(new RelationDTO(null, AdmRelationTypeEnum.EQ2FL.getGraphCode(), AdmRelationTypeEnum.EQ2FL.getRelCode(), admEquipment.getClassCode(), admEquipment.getId(),admEquipment.getFloorId()));
|
|
|
- }
|
|
|
- });
|
|
|
- if (CollUtil.isNotEmpty(relationDTOS)) {
|
|
|
- relationService.doSave(AdmContextUtil.toDmpContext(), relationDTOS);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- * 删除关系
|
|
|
- * @param euipId
|
|
|
- * @param queryCriteria
|
|
|
- * @param relCode
|
|
|
- */
|
|
|
- private void dealRelation(String euipId, QueryCriteria queryCriteria, String relCode){
|
|
|
- ObjectNode rBd = JsonNodeFactory.instance.objectNode();
|
|
|
- rBd.put("objFrom",euipId);
|
|
|
- rBd.put("relCode",relCode);
|
|
|
- queryCriteria.setCriteria(rBd);
|
|
|
- relationService.doDelete(AdmContextUtil.toDmpContext(), queryCriteria);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
|
|
|
* 组装需要导出的设备信息点
|
|
|
* @param groupCode
|