瀏覽代碼

合并冲突内容

lijie 3 年之前
父節點
當前提交
0f25647386

+ 0 - 12
src/main/java/com/persagy/proxy/dictionary/controller/AdmDictController.java

@@ -202,18 +202,6 @@ public class AdmDictController {
     public AdmResponse syncProjectObjectInfo() throws Exception {
         return AdmResponse.success(new ArrayList<>());
     }
-    /***
-     * Description:统计-根据条件统计返回信息点
-     * @return : com.persagy.proxy.adm.request.AdmResponse
-     * @author : lijie
-     * @date :2021/11/15 14:02
-     * Update By lijie 2021/11/15 14:02
-     */
-    @PostMapping("/delivered/infos")
-    @Deprecated
-    public AdmResponse equipDictInfos(@RequestBody AdmEquipDictInfos admEquipDictInfos) throws Exception {
-        return service.queryEquipDictInfos(admEquipDictInfos);
-    }
 
     /**
      * 需采集信息同步到所有项目

+ 2 - 11
src/main/java/com/persagy/proxy/dictionary/service/IAdmDictService.java

@@ -6,8 +6,8 @@ import com.persagy.proxy.adm.request.AdmDictQueryCriteria;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
+import com.persagy.proxy.dictionary.model.AdmDictDeliverieInfosRequest;
 import com.persagy.proxy.dictionary.model.AdmEquipDictInfos;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -74,14 +74,5 @@ public interface IAdmDictService<T> extends IAdmDictBaseService<T>{
      * @param request
      * @return
      */
-    AdmResponse queryDictDeliveredInfos(InstanceUrlParam context,AdmDictDeliverieInfosRequest request, Class<T> clazz);
-
-    /***
-     * Description:统计-根据条件统计返回信息点
-     * @return : com.persagy.proxy.adm.request.AdmResponse
-     * @author : lijie
-     * @date :2021/11/15 14:02
-     * Update By lijie 2021/11/15 14:02
-     */
-    AdmResponse queryEquipDictInfos(AdmEquipDictInfos admEquipDictInfos);
+    AdmResponse queryDictDeliveredInfos(InstanceUrlParam context, AdmDictDeliverieInfosRequest request, Class<T> clazz);
 }

+ 2 - 26
src/main/java/com/persagy/proxy/dictionary/service/impl/AdmDictServiceImpl.java

@@ -1,7 +1,6 @@
 package com.persagy.proxy.dictionary.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
@@ -14,12 +13,9 @@ import com.persagy.proxy.adm.request.AdmCreateRequest;
 import com.persagy.proxy.adm.request.AdmDictQueryCriteria;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.dictionary.model.AdmEquipDictInfos;
+import com.persagy.proxy.dictionary.model.*;
 import com.persagy.proxy.dictionary.service.IAdmDictService;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
-import com.persagy.proxy.dictionary.model.AdmDefFuncIdGather;
-import com.persagy.proxy.dictionary.model.AdmDict;
-import com.persagy.proxy.dictionary.model.AdmObjectType;
 import com.persagy.proxy.object.model.*;
 import com.persagy.proxy.object.service.IAdmEquipmentService;
 import com.persagy.proxy.object.service.IAdmShaftService;
@@ -447,26 +443,6 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
         admResponse.setContent(admObjectInfos);
         return admResponse;
     }
-    /***
-     * Description:统计-根据条件统计返回信息点
-     * @return : com.persagy.proxy.adm.request.AdmResponse
-     * @author : lijie
-     * @date :2021/11/15 14:02
-     * Update By lijie 2021/11/15 14:02
-     */
-    @Override
-    public AdmResponse queryEquipDictInfos(AdmEquipDictInfos admEquipDictInfos) {
-        if (StrUtil.isBlank(admEquipDictInfos.getClassCode())){
-            //设备类型为空 直接返回
-            return AdmResponse.success(new ArrayList<>());
-        }
-        if (StrUtil.isBlank(admEquipDictInfos.getObjType())){
-            return AdmResponse.success("对象类型不可以为空");
-        }
-        return null;
-    }
-
-
 
     /**
      * 转换排序字段
@@ -734,7 +710,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
      * @return
      */
     @Override
-    public AdmResponse queryDictDeliveredInfos(InstanceUrlParam context,AdmDictDeliverieInfosRequest request, Class<T> clazz) {
+    public AdmResponse queryDictDeliveredInfos(InstanceUrlParam context, AdmDictDeliverieInfosRequest request, Class<T> clazz) {
         String classCode = request.getClassCode();
         String objType = request.getObjType();
         //根据类型查询信息点