代码初始优化

ruoyi-admin/src/main/java/com/ruoyi/ptxlib/domain/PTXLabelText.java

@@ -7,7 +7,6 @@ import lombok.NoArgsConstructor;
 /**
  * 标签打印文字类
  */
-@Data
 public class PTXLabelText {
     /** 文字类型 0:英文，1：中文*/
     private Integer textType;
@@ -15,16 +14,16 @@ public class PTXLabelText {
     /** 标签间距 */
     private Integer spaceBetween;
 
-    /** x坐标 10 = 4毫米 */
+    /** x坐标 10 = 3 ~ 4毫米 */
     private Integer x;
 
     /** y坐标 最小为 标签间距 / 2 - 5 */
     private Integer y;
 
-    /** x轴垂直扩展 10 = 3毫米 */
+    /** x轴垂直扩展 字符宽度 10 = 3毫米 */
     private Integer xLineHeight;
 
-    /** y轴垂直扩展 10 = 3毫米 */
+    /** y轴垂直扩展 字符高度 10 = 3毫米 */
     private Integer yLineHeight;
 
     /** 打印的数据 */
@@ -56,4 +55,68 @@ public class PTXLabelText {
         this.printData = printData;
         this.tffFileName = tffFileName;
     }
+
+    public Integer getTextType() {
+        return textType;
+    }
+
+    public void setTextType(Integer textType) {
+        this.textType = textType;
+    }
+
+    public Integer getSpaceBetween() {
+        return spaceBetween;
+    }
+
+    public void setSpaceBetween(Integer spaceBetween) {
+        this.spaceBetween = spaceBetween;
+    }
+
+    public Integer getX() {
+        return x;
+    }
+
+    public void setX(Integer x) {
+        this.x = x;
+    }
+
+    public Integer getY() {
+        return y;
+    }
+
+    public void setY(Integer y) {
+        this.y = y;
+    }
+
+    public Integer getxLineHeight() {
+        return xLineHeight;
+    }
+
+    public void setxLineHeight(Integer xLineHeight) {
+        this.xLineHeight = xLineHeight;
+    }
+
+    public Integer getyLineHeight() {
+        return yLineHeight;
+    }
+
+    public void setyLineHeight(Integer yLineHeight) {
+        this.yLineHeight = yLineHeight;
+    }
+
+    public String getPrintData() {
+        return printData;
+    }
+
+    public void setPrintData(String printData) {
+        this.printData = printData;
+    }
+
+    public String getTffFileName() {
+        return tffFileName;
+    }
+
+    public void setTffFileName(String tffFileName) {
+        this.tffFileName = tffFileName;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/ptxlib/service/impl/PTXService.java

@@ -143,8 +143,8 @@ public class PTXService {
         // 检查y是否超出边界值
         y = checkY(y, spaceBetween);
 
-        Integer xLineHeight = ptxLabelText.getXLineHeight();
-        Integer yLineHeight = ptxLabelText.getYLineHeight();
+        Integer xLineHeight = ptxLabelText.getxLineHeight();
+        Integer yLineHeight = ptxLabelText.getyLineHeight();
         String printData = ptxLabelText.getPrintData();
 
         String tffFileName = ptxLabelText.getTffFileName();
@@ -188,8 +188,8 @@ public class PTXService {
         // 检查y是否超出边界值
         y = checkY(y, spaceBetween);
 
-        Integer xLineHeight = ptxLabelText.getXLineHeight();
-        Integer yLineHeight = ptxLabelText.getYLineHeight();
+        Integer xLineHeight = ptxLabelText.getxLineHeight();
+        Integer yLineHeight = ptxLabelText.getyLineHeight();
         String printData = ptxLabelText.getPrintData();
         if (StrUtil.isNotBlank(printData)) {
             // 去除中文

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,11 +6,11 @@ spring:
         druid:
             # 主库数据源
             master:
-                #url: jdbc:mysql://139.9.50.163:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://127.0.0.1:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://139.9.50.163:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://127.0.0.1:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #password: mysql@123456
+                password: ydl@123456
                 username: root
-                password: mysql@123456
-                #password: ydl@123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -79,7 +79,7 @@ spring:
     # 地址
     host: 127.0.0.1
     # 密码
-    password: redis@123456
+    password: # redis@123456
     # 端口，默认为6379
     port: 6379
     # 数据库索引