设备程序管理显示及翻页问题修改

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/ProgramServiceImpl.java

@@ -234,9 +234,11 @@ public class ProgramServiceImpl extends SuperServiceImpl<ProgramMapper, Program>
         return null;
     }
 
+    @Override
     public Boolean synchronousNumericalProgram(Program data){
         if (data.getResourceList() != null && data.getResourceList().size() > 0){
-
+            // 先查找设备ip，端口
+            //
         }
 
         return null;

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

@@ -194,7 +194,16 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
         //int count = productionresourceviewMapper.getCount(map);
 
         Map<String, Object> retMap = new HashMap<String, Object> ();
-        retMap.put("data",list);
+        if(list.size() > size){
+            if(list.size() - current > size){
+                retMap.put("data",list.subList(current,size));
+            }else{
+                retMap.put("data",list.subList(current,current + list.size() - current));
+            }
+        }else{
+            retMap.put("data",list);
+        }
+
         retMap.put("count",list.size());
         return retMap;
     }
@@ -828,10 +837,6 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
 
                 //String category = item.get("category")==null?"":item.get("category").toString();
 
-                if(searchProductionStatus.equals(productionStatus)){
-                    returnList.add(item);
-                }
-
                 String showStatus = item.get("showStatus")==null?"0":item.get("showStatus").toString();
                 if("1".equals(showStatus)){
 //                item.put("linkStatus",buildMap(linkMap.get(linkStatus)));
@@ -840,6 +845,15 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
                     //直接存汉字
                     item.put("controlStatusCN",controlStatus);
                     item.put("productionStatusCN",productionStatus);
+
+                    if(StringUtils.isNotBlank(searchProductionStatus)){
+                        if(searchProductionStatus.equals(productionStatus)){
+                            returnList.add(item);
+                        }
+                    }else{
+                        returnList.add(item);
+                    }
+
                 }else {
 //                item.put("linkStatus","");
                     item.put("controlStatus","");

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

@@ -107,9 +107,10 @@
         <if test="isAutoCode != null and isAutoCode != ''">
             and v.is_auto_code = #{isAutoCode}
         </if>
-        <if test="current != null">
-            limit  ${current},${size}
-        </if>
+        order by v.id
+<!--        <if test="current != null">-->
+<!--            limit  ${current},${size}-->
+<!--        </if>-->
     </select>