箱码合一导出功能暂时关闭

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrBoxCodeUnityController.java

@@ -105,9 +105,9 @@ public class QrBoxCodeUnityController {
     @ApiOperation(value = "导出数据")
     @GetMapping("downloadExcelData")
     public void downloadExcelData(ListQrBoxCodeMappingExportReq req, HttpServletResponse response) throws Exception {
-        List<QrBoxExportProperty> res = qrBoxMappingService.downloadExcelData(req);
-
-        ExcelInputFactory.downloadExcelData("箱码合一", response, res, QrBoxExportProperty.class);
+//        List<QrBoxExportProperty> res = qrBoxMappingService.downloadExcelData(req);
+//
+//        ExcelInputFactory.downloadExcelData("箱码合一", response, res, QrBoxExportProperty.class);
     }
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListQrBoxCodeMappingExportReq.java

@@ -17,4 +17,5 @@ public class ListQrBoxCodeMappingExportReq implements Serializable {
 
     @ApiModelProperty(value = "激活状态 0-未激活 1-已激活 9-已作废")
     private Integer activeStatus;
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrBoxMappingServiceImpl.java

@@ -276,7 +276,9 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
 
     @Override
     public List<QrBoxExportProperty> downloadExcelData(ListQrBoxCodeMappingExportReq req) {
+
         List<QrBoxMappingVO> qrBoxMappingVOList = qrBoxMappingMapper.listQrBoxCodeMapping(req);
+
         List<QrBoxExportProperty> qrBoxExportProperties = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(qrBoxMappingVOList)){
             for (QrBoxMappingVO qrBoxMappingVO:qrBoxMappingVOList) {

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxMappingMapper.xml

@@ -43,8 +43,8 @@
             qbm.create_user_name,qbm.create_time,qbm.active_time,qbm.active_user_name,qbm.active_status,qbm.package_id,
             qbm.invalid,bf.factory_name,qbm.begin_qr_code,qbm.end_qr_code
         from qr_box_mapping qbm
-        inner join qr_package qp on qp.id=qbm.package_id
-        left join base_factory bf on bf.id=qp.factory_beer_id
+            inner join qr_package qp on qp.id=qbm.package_id
+            left join base_factory bf on bf.id=qp.factory_beer_id
         <where>
             qbm.is_delete = 0
             <if test="req.activeStatus != null ">

abi-cloud-qr-platform-server/src/test/java/com/abi/qms/platform/EncryptionTest.java

@@ -63,7 +63,7 @@ public class EncryptionTest {
         // 单个字符串解码
         // String content = "aLI5iXza3R/w7aJ2AsYhUT7EGS0Zqk94k1nXK9rT8AvJGMbMUJytae53f82pFphWy0bmnEGv4fWb6RcpE9m3tQ==";
         // 文件解码
-        String content = readToString("D:\\whole.txt");
+        String content = readToString("C:\\Users\\ThinkPad\\Downloads\\8905ecf5-bfaa-4962-9743-04a5ca2a8807\\1.txt");
         String decodeStr = AesEncodeUtil.aesDecode(content, key);
         System.out.println(decodeStr);
     }