Merge remote-tracking branch 'remotes/origin/dev-2.12.0' into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/intelligentManagement/modular/rgb/controller/RGBTransformerController.java

@@ -64,11 +64,20 @@ public class RGBTransformerController {
         BigDecimal canvasLengthBig = new BigDecimal(canvasLength);
         BigDecimal canvasWidthBig = new BigDecimal(canvasWidth);
         BigDecimal oneBig = new BigDecimal(1);
-        BigDecimal lengthRatioBig = canvasLengthBig.divide(pointNumLBig.add(oneBig), 0, BigDecimal.ROUND_DOWN);// 长 每个测温点之间的距离
+        /*BigDecimal lengthRatioBig = canvasLengthBig.divide(pointNumLBig.add(oneBig), 0, BigDecimal.ROUND_DOWN);// 长 每个测温点之间的距离
         BigDecimal wideOne = pointNumWBig.add(oneBig);
         BigDecimal widthRatioBig = canvasWidthBig.divide(wideOne, 0, BigDecimal.ROUND_DOWN); //宽 每个测温点之间的距离
         int lengthRatio = Integer.parseInt(lengthRatioBig.toString()); //长 每个测温点之间的距离 四舍五入保留整数
+        int widthRatio = Integer.parseInt(widthRatioBig.toString()); //宽 每个测温点之间的距离*/
+
+        BigDecimal lengthRatioBig = canvasLengthBig.divide(pointNumWBig.add(oneBig), 0, BigDecimal.ROUND_DOWN);// 长 每个测温点之间的距离
+        BigDecimal wideOne = pointNumLBig.add(oneBig);
+        BigDecimal widthRatioBig = canvasWidthBig.divide(wideOne, 0, BigDecimal.ROUND_DOWN); //宽 每个测温点之间的距离
+        int lengthRatio = Integer.parseInt(lengthRatioBig.toString()); //长 每个测温点之间的距离 四舍五入保留整数
         int widthRatio = Integer.parseInt(widthRatioBig.toString()); //宽 每个测温点之间的距离
+        //System.out.println(lengthRatio+"***********"+widthRatio);
+
+
 
 
         /*Random rand = new Random();