途宝报单新需求

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wx/AttachmngsController.java

@@ -92,26 +92,25 @@ public class AttachmngsController {
 
         System.out.println("水印前大小:" + file2.length() / 1024);
         AddWatermarkUtil.waterPress(file2, file2, Color.WHITE, 48, watermark);
-//        AddWatermarkUtil.addWaterMark(file2, file2, Color.DARK_GRAY, 48, watermark);
-
-//        MultipartFile multipartFile = AddWatermarkUtil.fileToTransfer(file2);
         System.out.println("压缩前大小:" + file2.length() / 1024);
-//        ByteArrayOutputStream f = new ByteArrayOutputStream();
-        String fileName = file2.getName();
-//        if (file2.length() > 50 * 1024) {
-        // 压缩
-        Thumbnails.of(file2)
-                .scale(0.6f) //图片大小（长宽）压缩比例 从0-1，1表示原图
-                .toFile("/usr/local/project/DaoHe/imgFiles/" + fileName + ".jpg");
-        File file1 = new File("/usr/local/project/DaoHe/imgFiles/" + fileName + ".jpg");
-        System.out.println("压缩中大小:" + file1.length() / 1024);
-//        }
-//        compressPicCycle(file2, 50L, 0.5);
-        System.out.println("压缩完成大小:" + file1.length() / 1024);
-
-        // 转二进制
-        byte[] bytes = AddWatermarkUtil.fileToTransfer(file1).getBytes();
-//        byte[] bytes = f.toByteArray();
+
+        byte[] bytes = null;
+
+        if (file2.length() / 1024 > 800) {
+            String fileName = file2.getName();
+            // 压缩
+            Thumbnails.of(file2)
+                    .scale(0.8f) //图片大小（长宽）压缩比例 从0-1，1表示原图
+                    .toFile("/usr/local/project/DaoHe/imgFiles/" + fileName + ".jpg");
+            File file1 = new File("/usr/local/project/DaoHe/imgFiles/" + fileName + ".jpg");
+            System.out.println("压缩中大小:" + file1.length() / 1024);
+            System.out.println("压缩完成大小:" + file1.length() / 1024);
+            // 转二进制
+            bytes = AddWatermarkUtil.fileToTransfer(file1).getBytes();
+        } else {
+            bytes = AddWatermarkUtil.fileToTransfer(file2).getBytes();
+        }
+
 
         // 存储到数据库
         AttachMngs attachMngs = new AttachMngs();

ruoyi-common/src/main/java/com/ruoyi/common/utils/AddWatermarkUtil.java

@@ -36,7 +36,7 @@ public class AddWatermarkUtil {
             File file = new File(new String(simsunPath.getBytes("utf-8"), "utf-8"));
             if (!file.exists()) {
                 //文件不存在
-                return new java.awt.Font("宋体", Font.PLAIN, 33);
+                return new java.awt.Font("宋体", Font.PLAIN, (int) fontSize);
             } else {
                 //文件存在！
             }
@@ -47,7 +47,7 @@ public class AddWatermarkUtil {
             return dynamicFontPt;
         } catch (Exception e) {
             e.printStackTrace();
-            return new java.awt.Font("宋体", Font.PLAIN, 20);
+            return new java.awt.Font("宋体", Font.PLAIN, (int) fontSize);
         }
     }
 
@@ -68,6 +68,12 @@ public class AddWatermarkUtil {
             g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
 //            Font font = new Font("宋体", Font.PLAIN, fontSize);
 
+
+            fontSize = srcImgWidth / 200 * 10;
+            if (fontSize == 0) {
+                fontSize = 10;
+            }
+
             Font font = loadStyleFont(Font.PLAIN, fontSize);
 
             // 水印透明度
@@ -123,7 +129,19 @@ public class AddWatermarkUtil {
                 int fontlen = getWatermarkLength(waterMarkContentsWrap.get(j), g);
                 //右下角
                 String s = waterMarkContentsWrap.get(j);
-                g.drawString(s, srcImgWidth - fontlen - 20, srcImgHeight - (contentLength - j) * fontSize - 70);
+
+
+                int offsetX = srcImgWidth / 200 * 2;
+                if (fontSize == 0) {
+                    fontSize = 2;
+                }
+
+                int offsetY = srcImgHeight / 200 * 7;
+                if (fontSize == 0) {
+                    fontSize = 7;
+                }
+
+                g.drawString(s, srcImgWidth - fontlen - offsetX, srcImgHeight - (contentLength - j) * fontSize - offsetY);
             }
 
 //            for (int j = 0; j < contentLength; j++) {

ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderBillsPlans.java

@@ -154,4 +154,9 @@ public class OrderBillsPlans {
     @TableField(jdbcType = JdbcType.CHAR)
     private String ifOrder2ed;
 
+    @TableField(jdbcType = JdbcType.CHAR)
+    private String oilfilLed;
+    @TableField(jdbcType = JdbcType.DOUBLE)
+    private Double repairamt;
+
 }

ruoyi-system/src/main/resources/mapper/system/OrderBillsPlansMapper.xml

@@ -40,23 +40,30 @@
     </update>
     <update id="updateOrderBillsPlansByOrderNo">
         update OrderBillsPlans
-        set loadetc        = #{loadetc},
-            loadtoll       = #{loadtoll},
-            oilhomeQty     = #{oilhomeQty},
-            oilhomeAmt     = #{oilhomeAmt},
-            oilappoint1Qty = #{oilappoint1Qty},
-            oilappoint1Amt = #{oilappoint1Amt},
-            oilappoint2Qty = #{oilappoint2Qty},
-            oilappoint2Amt = #{oilappoint2Amt},
-            oilappoint3Qty = #{oilappoint3Qty},
-            oilappoint3Amt = #{oilappoint3Amt},
-            oilcash1Qty    = #{oilcash1Qty},
-            oilcash1Amt    = #{oilcash1Amt},
-            oilcardQty     = #{oilcardQty},
-            oilcardAmt     = #{oilcardAmt},
-            oilcard1Qty     = #{oilcardQty},
-            oilcard1Amt     = #{oilcardAmt},
-            driverassdesc = #{driverassdesc}
+        set loadetc = #{loadetc},
+        loadtoll = #{loadtoll},
+        oilhomeQty = #{oilhomeQty},
+        oilhomeAmt = #{oilhomeAmt},
+        oilappoint1Qty = #{oilappoint1Qty},
+        oilappoint1Amt = #{oilappoint1Amt},
+        oilappoint2Qty = #{oilappoint2Qty},
+        oilappoint2Amt = #{oilappoint2Amt},
+        oilappoint3Qty = #{oilappoint3Qty},
+        oilappoint3Amt = #{oilappoint3Amt},
+        oilcash1Qty = #{oilcash1Qty},
+        oilcash1Amt = #{oilcash1Amt},
+        oilcardQty = #{oilcardQty},
+        oilcardAmt = #{oilcardAmt},
+        oilcard1Qty = #{oilcardQty},
+        oilcard1Amt = #{oilcardAmt},
+        <if test="oilfilLed != null and oilfilLed != ''">
+            oilfilLed = #{oilfilLed},
+        </if>
+
+        <if test="repairamt != null and repairamt != '' or repairamt == 0">
+            repairamt = #{repairamt},
+        </if>
+        driverassdesc = #{driverassdesc}
         where orderNo = #{orderNo}
     </update>
     <update id="updateOrderBillsPlansBySysidEntityidLineno">
@@ -359,31 +366,33 @@
              , o.carId
              , o.lineNo
              , o.actId
-             , b.entityID   loadBillsEntityId
-             , dr1.Empl     driver1Name
-             , dr1.mobile   driver1mobile
+             , b.entityID        loadBillsEntityId
+             , dr1.Empl          driver1Name
+             , dr1.mobile        driver1mobile
              , b.billStatus
-             , b.entityId   loadBillsEntityId
-             , b.sysId      loadBillsSysId
+             , b.entityId        loadBillsEntityId
+             , b.sysId           loadBillsSysId
              , o.driverassdesc
 
-             , o.ifLoaded      ifLoaded
-             , o.ifUnLoaded    ifUnLoaded
-             , o.ifStarted     ifStarted
+             , o.ifLoaded        ifLoaded
+             , o.ifUnLoaded      ifUnLoaded
+             , o.ifStarted       ifStarted
 
-             , o.CarRegNo   carRegNo
-             , o.loadAddr   loadAddr
-             , o.unLoadAddr unLoadAddr
-             , g.CName goodsCName
+             , o.CarRegNo        carRegNo
+             , o.loadAddr        loadAddr
+             , o.unLoadAddr      unLoadAddr
+             , g.CName           goodsCName
 
-             , o.loadQty loadQty
-             , o.loadDate loadDate
-             , o.unLoadQty unLoadQty
-             , o.unLoadDate unLoadDate
-             , o.ifOrder2ed ifOrder2ed
+             , o.loadQty         loadQty
+             , o.loadDate        loadDate
+             , o.unLoadQty       unLoadQty
+             , o.unLoadDate      unLoadDate
+             , o.ifOrder2ed      ifOrder2ed
              , o.detourEmptyMile detourEmptyMile
              , o.detourLoadMile  detourLoadMile
              , o.detourDesc      detourDesc
+             , o.oilfilLed       oilfilLed
+             , o.repairamt       repairamt
         FROM OrderBillsPlans o
                  INNER JOIN LoadBills b
                             ON
@@ -392,7 +401,7 @@
                                     AND o.LineNo = b.SrcLineNo
 
                  Left join Empls dr1 on dr1.EmplID = o.DRIVER1ID
-                 Left join Goods g on (g.SysID=b.SysID and g.GoodsID=b.GoodsID)
+                 Left join Goods g on (g.SysID = b.SysID and g.GoodsID = b.GoodsID)
         where o.orderNo = #{orderNo}
           and dr1.SysID = 1
     </select>