소스 검색

Merge remote-tracking branch 'origin/develop' into develop

lvxianyun 3 년 전
부모
커밋
dfd2241319

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

@@ -147,7 +147,7 @@ public class AdmEquipmentController {
      * @return
      * @throws Exception
      */
-    @PostMapping("/create-equip-pro")
+    @PostMapping("/creat-equip-pro")
     public AdmResponse createExt(@RequestBody AdmCreateRequest<AdmEquipment> admEquipment) throws Exception {
         List<AdmEquipment> vos = CollUtil.newArrayList(admEquipment.getContent());
         vos = service.doInsertExt(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);

+ 22 - 19
src/main/java/com/persagy/proxy/adm/controller/RelationSyEqController.java

@@ -10,8 +10,10 @@ import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmRelationService;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.common.entity.RelationDTO;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -42,18 +44,20 @@ public class RelationSyEqController {
      * @throws Exception
      */
     @PostMapping(value = {"/link-sy-eq","/link"})
-    public AdmResponse create(@RequestParam("projectId") String projectId,
-                                @RequestBody JSONObject param) throws Exception {
-        String equipId = param.getString("equipId");
+    public AdmResponse create(@RequestBody JSONObject param) throws Exception {
+        //String equipId = param.getString("equipId");
+        JSONArray equipIdList = param.getJSONArray("equipIdList");
         String sysID = param.getString("sysId");
-        if(!StrUtil.isAllNotEmpty(equipId,sysID)) {
-            return AdmResponse.failure("必填项:EquipID(设备id)、SysID(系统id)");
+        if(StringUtils.isEmpty(sysID) || CollUtil.isEmpty(equipIdList)) {
+            return AdmResponse.failure("必填项:EquipIdList(设备id列表)、SysID(系统id)");
         }
         // 创建关系对象
         List<RelationDTO> voList = new ArrayList<>();
-        voList.add(new RelationDTO(null, "MechSubset", "Sy2Eq", null, sysID , equipId));
+        equipIdList.forEach(item->{
+            voList.add(new RelationDTO(null, "MechSubset", "Sy2Eq", null, sysID , item.toString()));
+        });
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         service.doSave(context, voList);
         return AdmResponse.success();
     }
@@ -66,13 +70,12 @@ public class RelationSyEqController {
      */
 
     @PostMapping("/unlink")
-    public AdmResponse delete(@RequestParam String projectId,
-                              @RequestBody JSONObject param) throws Exception {
+    public AdmResponse delete(@RequestBody JSONObject param) throws Exception {
         if(CollUtil.isEmpty(param)) {
             return AdmResponse.success();
         }
         // 组装上下文条件
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         // 组装条件
         QueryCriteria criteria = new QueryCriteria();
         String equipId = param.getString("equipId");
@@ -97,14 +100,13 @@ public class RelationSyEqController {
      * @return                  创建结果信息
      */
     @PostMapping("/link-eq")
-    public AdmResponse createBatchWithDeleteOldsysIdRelation(@RequestParam("projectId") String projectId,
-                              @RequestBody JSONObject syEqList) throws Exception {
+    public AdmResponse createBatchWithDeleteOldsysIdRelation(@RequestBody JSONObject syEqList) throws Exception {
         JSONArray equipIdList = syEqList.getJSONArray("equipIdList");
         String sysId = syEqList.getString("sysId");
         if(StrUtil.isBlank(sysId) || CollUtil.isEmpty(equipIdList)) {
             return AdmResponse.failure("必填项:EquipIdList(设备id列表)、SysID(系统id)");
         }
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context =AdmContextUtil.toDmpContext();
         QueryCriteria queryRequest = new QueryCriteria();
         ObjectNode node = JsonNodeFactory.instance.objectNode();
         node.put("graphCode", "MechSubset");
@@ -129,14 +131,13 @@ public class RelationSyEqController {
      * @return                  创建结果信息
      */
     @PostMapping("/link-sy")
-    public AdmResponse createDistinctEq(@RequestParam("projectId") String projectId,
-                              @RequestBody JSONObject param) throws Exception {
+    public AdmResponse createDistinctEq(@RequestBody JSONObject param) throws Exception {
         String equipId = param.getString("equipId");
-        String sysID = param.getString("sysId");
-        if(!StrUtil.isAllNotEmpty(equipId,sysID)) {
+        JSONArray sysIdList = param.getJSONArray("sysIdList");
+        if(StringUtils.isEmpty(equipId) || CollUtil.isEmpty(sysIdList)) {
             return AdmResponse.failure("必填项:EquipId(设备id)、sysIdList(系统id列表)");
         }
-        InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
+        InstanceUrlParam context = AdmContextUtil.toDmpContext();
         QueryCriteria queryRequest = new QueryCriteria();
         ObjectNode node = JsonNodeFactory.instance.objectNode();
         node.put("graphCode", "MechSubset");
@@ -146,7 +147,9 @@ public class RelationSyEqController {
         service.doDelete(context,queryRequest);
         // 创建关系对象
         List<RelationDTO> voList = new ArrayList<>();
-        voList.add(new RelationDTO(null, "MechSubset", "Sy2Eq", null, sysID , equipId));
+        sysIdList.forEach(item->{
+            voList.add(new RelationDTO(null, "MechSubset", "Sy2Eq", null, item.toString() , equipId));
+        });
         // 组装上下文条件
         service.doSave(context, voList);
         return AdmResponse.success();