上传表格

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpSoftwareUpgradeServiceImpl.java

@@ -58,7 +58,9 @@ public class DmpSoftwareUpgradeServiceImpl extends AbstractCrudService<DmpSoftwa
         IPage<DmpSoftwareUpgrade> page = new Page<>(dsRequest.getCurrent(), dsRequest.getSize());
         LambdaQueryWrapper<DmpSoftwareUpgrade> lambdaQuery = Wrappers.lambdaQuery();
         lambdaQuery
-                .like(StringUtils.isNotBlank(dsRequest.getName()),DmpSoftwareUpgrade::getVersionName,dsRequest.getName());
+                .like(StringUtils.isNotBlank(dsRequest.getName()),DmpSoftwareUpgrade::getVersionName,dsRequest.getName())
+                .orderByDesc(DmpSoftwareUpgrade::getId);
+
         page = this.page(page,lambdaQuery);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
@@ -68,29 +70,13 @@ public class DmpSoftwareUpgradeServiceImpl extends AbstractCrudService<DmpSoftwa
         InputStream inputStream = null;
         List<DmpSoftwareSubpackage> list = new ArrayList<>();
         try {
-//            byte [] byteArr=multipartFile.getBytes();
             inputStream = new BufferedInputStream(multipartFile.getInputStream());
             //创建规定大小的byte数组
             byte[] b = new byte[num];
             //name为以后的小文件命名做准备
             int name = 0;
             //遍历将大文件读入byte数组中，当byte数组读满后写入对应的小文件中
-            int len,crc,cur = 0;
-//            while((len = inputStream.read(b))!=-1) {
-//                crc = 0;
-//                for(int i=0;i<len;i++) {
-//                    crc = (crc + (b[i]&0x00ff))&0xffff;
-//                }
-//                DmpSoftwareSubpackage dmpSoftwareSubpackage = new DmpSoftwareSubpackage();
-//                dmpSoftwareSubpackage.setUpgradeId(dmpSoftwareUpgrade.getId());
-//                dmpSoftwareSubpackage.setSubpackageNumber(cur);
-//                byte[] bytes = Arrays.copyOf(b, len);
-//                dmpSoftwareSubpackage.setApplyPackage(bytes);
-//                dmpSoftwareSubpackage.setSubpackageLength(String.valueOf(len));
-//                dmpSoftwareSubpackage.setCheckCode(Integer.toHexString(crc));
-//                list.add(dmpSoftwareSubpackage);
-//                cur++;
-//            }
+            int len = 0;
             while ((len = inputStream.read(b)) != -1) {
                 int chk = 0x0000;
                 for(int i=0;i<len;i++){
@@ -118,13 +104,4 @@ public class DmpSoftwareUpgradeServiceImpl extends AbstractCrudService<DmpSoftwa
         }
         return list;
     }
-
-
-    public static byte[] subBytes(byte[]src,int begin,int count){
-        byte[]bs=new byte[count];
-        for(int i=begin;i<begin+count;i++){
-            bs[i-begin]=src[i];
-        }
-        return bs;
-    }
 }