设备资源管理，设备管理状态状态查询不用主动接口查询改造

imcs-admin-boot/imcs-tenant-biz/src/main/java/com/github/zuihou/tenant/service/impl/ProductionresourceServiceImpl.java

@@ -188,7 +188,7 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
         Map<String, Object> retMap = new HashMap<String, Object> ();
         if(list.size() > size){
             if(list.size() - current > size){
-                retMap.put("data",list.subList(current,size));
+                retMap.put("data",list.subList(current,current + size));
             }else{
                 retMap.put("data",list.subList(current,current + list.size() - current));
             }
@@ -813,50 +813,67 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
         Map<String, DictionaryItem> productionMap = dictMap.get(DictionaryType.PRODUCTION_STATUS);
         Map<String, DictionaryItem> categoryMap = dictMap.get(DictionaryType.RESOURCES_CATEGORY);
 
-        String searchProductionStatus = map.containsKey("productionStatus")?map.get("productionStatus").toString():"";
+//        String searchProductionStatus = map.containsKey("productionStatus")?map.get("productionStatus").toString():"";
+//        List<Map>returnList = new ArrayList<>();
+//        try{
+//            Map <String,Map> equipMap = getEquipListByInterface();
+//
+//            List<Map> finalReturnList = returnList;
+//            list.stream().map((item) -> {
+//                //把三种状态，拼对象进去
+////            String linkStatus = item.get("linkStatus")==null?"0":item.get("linkStatus").toString();
+////            String controlStatus = item.get("controlStatus")==null?"0":item.get("controlStatus").toString();
+////            String productionStatus = item.get("productionStatus")==null?"0":item.get("productionStatus").toString();
+//                String no = item.get("code").toString();
+//                String controlStatus = equipMap.get(no)==null?"":equipMap.get(no).get("controlStatus").toString();
+//                String productionStatus = equipMap.get(no)==null?"":equipMap.get(no).get("status").toString();
+//
+//                //String category = item.get("category")==null?"":item.get("category").toString();
+//
+//                String showStatus = item.get("showStatus")==null?"0":item.get("showStatus").toString();
+//                if("1".equals(showStatus)){
+////                item.put("linkStatus",buildMap(linkMap.get(linkStatus)));
+//                    item.put("controlStatus",buildMap(controlMap.get(controlStatus)));
+//                    item.put("productionStatus",buildMap(productionMap.get(productionStatus)));
+//                    //直接存汉字
+//                    item.put("controlStatusCN",controlStatus);
+//                    item.put("productionStatusCN",productionStatus);
+//
+//                    if(StringUtils.isNotBlank(searchProductionStatus)){
+//                        if(searchProductionStatus.equals(productionStatus)){
+//                            finalReturnList.add(item);
+//                        }
+//                    }else{
+//                        finalReturnList.add(item);
+//                    }
+//
+//                }else {
+////                item.put("linkStatus","");
+//                    item.put("controlStatus","");
+//                    item.put("productionStatus","");
+//                    item.put("controlStatusCN","");
+//                    item.put("productionStatusCN","");
+//                    finalReturnList.add(item);
+//                }
+//
+//                //item.put("category",categoryMap.get(category));
+//                return item;
+//            }).collect(Collectors.toList());
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            returnList = list;
+//        }
         List<Map>returnList = new ArrayList<>();
         try{
-            Map <String,Map> equipMap = getEquipListByInterface();
-
-            List<Map> finalReturnList = returnList;
-            list.stream().map((item) -> {
-                //把三种状态，拼对象进去
-//            String linkStatus = item.get("linkStatus")==null?"0":item.get("linkStatus").toString();
-//            String controlStatus = item.get("controlStatus")==null?"0":item.get("controlStatus").toString();
-//            String productionStatus = item.get("productionStatus")==null?"0":item.get("productionStatus").toString();
-                String no = item.get("code").toString();
-                String controlStatus = equipMap.get(no)==null?"":equipMap.get(no).get("controlStatus").toString();
-                String productionStatus = equipMap.get(no)==null?"":equipMap.get(no).get("status").toString();
-
-                //String category = item.get("category")==null?"":item.get("category").toString();
-
+            returnList = list.stream().map((item) -> {
                 String showStatus = item.get("showStatus")==null?"0":item.get("showStatus").toString();
                 if("1".equals(showStatus)){
-//                item.put("linkStatus",buildMap(linkMap.get(linkStatus)));
-                    item.put("controlStatus",buildMap(controlMap.get(controlStatus)));
-                    item.put("productionStatus",buildMap(productionMap.get(productionStatus)));
+                    DictionaryItem dictionaryItem = productionMap.get(item.get("onlineStatus"));
+                    item.put("productionStatus",buildMap(dictionaryItem));
                     //直接存汉字
-                    item.put("controlStatusCN",controlStatus);
-                    item.put("productionStatusCN",productionStatus);
-
-                    if(StringUtils.isNotBlank(searchProductionStatus)){
-                        if(searchProductionStatus.equals(productionStatus)){
-                            finalReturnList.add(item);
-                        }
-                    }else{
-                        finalReturnList.add(item);
-                    }
-
-                }else {
-//                item.put("linkStatus","");
-                    item.put("controlStatus","");
-                    item.put("productionStatus","");
-                    item.put("controlStatusCN","");
-                    item.put("productionStatusCN","");
-                    finalReturnList.add(item);
+                    item.put("productionStatusCN",dictionaryItem.getName());
                 }
 
-                //item.put("category",categoryMap.get(category));
                 return item;
             }).collect(Collectors.toList());
         }catch (Exception e){

imcs-admin-boot/imcs-tenant-biz/src/main/resources/mapper_tenant/base/defaults/ProductionresourceviewMapper.xml

@@ -9,7 +9,8 @@
             control_status controlStatus,
             production_status productionStatus,
         </if>
-          v.id,
+            v.online_status onlineStatus,
+            v.id,
             v.ip,
             v.port,
             v.module_id moduleId,
@@ -107,6 +108,10 @@
         <if test="isAutoCode != null and isAutoCode != ''">
             and v.is_auto_code = #{isAutoCode}
         </if>
+        <if test="productionStatus != null and productionStatus != ''">
+            and v.online_status = #{productionStatus}
+        </if>
+
         order by v.id
 <!--        <if test="current != null">-->
 <!--            limit  ${current},${size}-->