Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service/blade-business/src/main/java/org/springblade/business/controller/ImageClassificationFileController.java

@@ -163,8 +163,8 @@ public class ImageClassificationFileController extends BladeController {
                     //需要删除的本地文件集合
                     List<String> removeList = new ArrayList<>();
 
-                    // 压缩到小于指定文件大小200kb
-                    double targetSize = 200 * 1024;
+                    // 压缩到小于指定文件大小500kb
+                    double targetSize = 500 * 1024;
 
                     for (ImageClassificationFile file : fileResult) {
                         //获取图片文件流
@@ -204,14 +204,16 @@ public class ImageClassificationFileController extends BladeController {
 
                                             //获取文件流
                                             byte[] bytes = CommonUtil.InputStreamToBytes(CommonUtil.getOSSInputStream(urls.get(i)));
+                                            byte[] a = new byte[(int) targetSize];
                                             //压缩文件大小
                                             while (bytes.length > targetSize) {
                                                 float reduceMultiple = 0.5f;
                                                 bytes = FileUtils.resizeImage(bytes, reduceMultiple);
+                                                a = bytes;
                                             }
 
                                             //创建图片
-                                            drawing.createPicture(anchor, workbook.addPicture(bytes, Workbook.PICTURE_TYPE_JPEG));
+                                            drawing.createPicture(anchor, workbook.addPicture(a, Workbook.PICTURE_TYPE_JPEG));
                                             //图片定位
                                             FileUtils.imageOrientation(sheet, anchor, i == 1 ? new DataVO(1, 28) : new DataVO(0, 0));
 
@@ -689,18 +691,18 @@ public class ImageClassificationFileController extends BladeController {
     }
 
     /**
-     *
      * @param urlStr
-     * @return  返回Url资源大小
+     * @return 返回Url资源大小
      * @throws IOException
      */
     public long getResourceLength(String urlStr) throws IOException {
-        URL url=new URL(urlStr);
-        URLConnection urlConnection=url.openConnection();
+        URL url = new URL(urlStr);
+        URLConnection urlConnection = url.openConnection();
         urlConnection.connect();
         //返回响应报文头字段Content-Length的值
         return urlConnection.getContentLength();
     }
+
     /**
      * 根据字节返回文件大小
      */

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsFormElementController.java

@@ -220,6 +220,13 @@ public class WbsFormElementController extends BladeController {
     public R<List<WbsNodeTableVO>> searchNodeTables(String nodeId, String excelTabId) {
         List<WbsNodeTableVO> list = wbsFormElementService.searchNodeTables(nodeId, excelTabId);
         if (list.size() > 0) {
+            list.forEach(l->{
+                if (l.getInitTableName() != null){
+                    if (!l.getInitTableName().contains("m_")) {
+                        l.setIsLinkTable(2);
+                    }
+                }
+            });
             return R.data(list, "查询成功");
         }
         return R.fail(200, "操作失败");

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreePrivateController.java

@@ -611,12 +611,11 @@ public class WbsTreePrivateController extends BladeController {
 
     /**
      * 解決项目电签信息重复问题接口
-     * @param pid
+     * @param pid 当前项目id
      * @return
      */
     @PostMapping("/eVisInfoRepeatDel")
     public R eVisInfoRepeatDel(String pid) {
-        //传入当前项目id
         wbsTreePrivateService.eVisInfoRepeatDel(pid);
         return R.status(true);
     }