Procházet zdrojové kódy

创建设备、部件初始化名称

lvxianyun před 3 roky
rodič
revize
2654061937

+ 12 - 2
src/main/java/com/persagy/proxy/adm/controller/AdmComponentController.java

@@ -1,12 +1,14 @@
 package com.persagy.proxy.adm.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.persagy.proxy.adm.model.AdmComponent;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmComponentService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
+import com.persagy.proxy.adm.utils.ObjectNameUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -36,8 +38,7 @@ public class AdmComponentController {
      * @throws Exception
      */
     @PostMapping("/count")
-    public AdmResponse count(
-                             @RequestBody AdmQueryCriteria request) throws Exception {
+    public AdmResponse count(@RequestBody AdmQueryCriteria request) throws Exception {
         request.setName(AdmComponent.OBJ_TYPE);
         request.setOnlyCount(true);
         return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmComponent.class);
@@ -51,6 +52,15 @@ public class AdmComponentController {
     @PostMapping("/create")
     public AdmResponse create(@RequestBody AdmCreateRequest<AdmComponent> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         List<AdmComponent> vos = CollUtil.newArrayList(createRequest.getContent());
+        if(CollUtil.isEmpty(vos)){
+            return AdmResponse.success();
+        }
+        //创建部件
+        vos.stream().forEach(component -> {
+            if (StrUtil.isEmpty(component.getName())){
+                component.setName(ObjectNameUtil.objectName("部件-"));
+            }
+        });
         vos = service.doInsertExt(AdmContextUtil.toDmpContext(), AdmComponent.class, vos);
         return AdmResponse.success(vos);
     }

+ 21 - 4
src/main/java/com/persagy/proxy/adm/controller/AdmEquipmentController.java

@@ -8,6 +8,7 @@ import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmEquipmentService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
+import com.persagy.proxy.adm.utils.ObjectNameUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,8 +34,7 @@ public class AdmEquipmentController {
      * @throws Exception
      */
     @PostMapping("/count")
-    public AdmResponse count(
-                             @RequestBody AdmQueryCriteria request) throws Exception {
+    public AdmResponse count(@RequestBody AdmQueryCriteria request) throws Exception {
         request.setName(AdmEquipment.OBJ_TYPE);
         request.setOnlyCount(true);
         return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmEquipment.class);
@@ -49,6 +49,15 @@ public class AdmEquipmentController {
     @PostMapping("/create")
     public AdmResponse create(@RequestBody AdmCreateRequest<AdmEquipment> createRequest) throws Exception {
         List<AdmEquipment> vos = CollUtil.newArrayList(createRequest.getContent());
+        if(CollUtil.isEmpty(vos)){
+            return AdmResponse.success();
+        }
+        //创建设备
+        vos.stream().forEach(equipment -> {
+            if (StrUtil.isEmpty(equipment.getName())){
+                equipment.setName(ObjectNameUtil.objectName("设备-"));
+            }
+        });
         vos = service.doInsertEuip(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
         return AdmResponse.success(vos);
     }
@@ -130,8 +139,7 @@ public class AdmEquipmentController {
      * @throws Exception
      */
     @GetMapping("/query-equip")
-    public AdmResponse queryEquip(
-                                  @RequestBody AdmQueryCriteria request) throws Exception {
+    public AdmResponse queryEquip(@RequestBody AdmQueryCriteria request) throws Exception {
         //request.setName("equipment");
         if(StrUtil.isNotEmpty(request.getFilters())){
             request.setFilters(String.join(";",request.getFilters(),"objType in ['equipment','component']"));
@@ -150,6 +158,15 @@ public class AdmEquipmentController {
     @PostMapping("/creat-equip-pro")
     public AdmResponse createExt(@RequestBody AdmCreateRequest<AdmEquipment> admEquipment) throws Exception {
         List<AdmEquipment> vos = CollUtil.newArrayList(admEquipment.getContent());
+        if(CollUtil.isEmpty(vos)){
+            return AdmResponse.success();
+        }
+        //创建设备
+        vos.stream().forEach(equipment -> {
+            if (StrUtil.isEmpty(equipment.getName())){
+                equipment.setName(ObjectNameUtil.objectName("设备-"));
+            }
+        });
         vos = service.doInsertExt(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
         return AdmResponse.success(vos);
     }

+ 1 - 7
src/main/java/com/persagy/proxy/adm/service/impl/AdmEquipmentServiceImpl.java

@@ -127,17 +127,11 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
 
     @Override
     public List<AdmEquipment> doInsertExt(InstanceUrlParam context, Class<AdmEquipment> clazz, List<AdmEquipment> voList) {
-
-        //创建设备
         List<AdmEquipment> vos = doInsert(context, AdmEquipment.class, voList);
         //TODO 创建资产
         //TODO 创建设备和系统关系 systemList
-        return null;
+        return vos;
     }
-
-
-
-
     private DmpResult<List<ObjRelationDTO>> queryRelation(InstanceUrlParam context, Map<String, AdmEquipment> voMap){
         QueryCriteria dmpRequest = new QueryCriteria();
         ObjectNode criteria = JsonNodeFactory.instance.objectNode();