Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
5a2ecfb9bb
10 changed files with 79 additions and 122 deletions
  1. +10
    -9
      mallinkService/src/main/java/com/iformall/print/PrintDataHandler.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/print/PrintDataParseHandler.java
  3. +25
    -0
      mallinkService/src/main/java/com/iformall/print/entity/PrintComponent.java
  4. +0
    -29
      mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTable.java
  5. +0
    -39
      mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTxt.java
  6. +0
    -36
      mallinkService/src/main/java/com/iformall/print/entity/PrintTemplate.java
  7. +22
    -0
      mallinkService/src/main/java/com/iformall/print/entity/component/table/PrintBraidTable.java
  8. +3
    -3
      mallinkService/src/main/java/com/iformall/print/entity/component/table/PrintBraidTableColumns.java
  9. +2
    -2
      mallinkService/src/main/java/com/iformall/print/entity/component/table/PrintBraidTableColumnsTrSet.java
  10. +13
    -0
      mallinkService/src/main/java/com/iformall/print/entity/component/txt/PrintBraidTxt.java

+ 10
- 9
mallinkService/src/main/java/com/iformall/print/PrintDataHandler.java View File

@@ -12,10 +12,11 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.iformall.domain.po.WxFinancePrintData;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.print.entity.PrintDataBraidTable;
import com.iformall.print.entity.PrintDataBraidTableColumns;
import com.iformall.print.entity.PrintDataBraidTableColumnsTrSet;
import com.iformall.print.entity.PrintDataBraidTxt;
import com.iformall.print.entity.PrintComponent;
import com.iformall.print.entity.component.table.PrintBraidTable;
import com.iformall.print.entity.component.table.PrintBraidTableColumns;
import com.iformall.print.entity.component.table.PrintBraidTableColumnsTrSet;
import com.iformall.print.entity.component.txt.PrintBraidTxt;

@Data
public class PrintDataHandler implements Serializable {
@@ -25,7 +26,7 @@ public class PrintDataHandler implements Serializable {
public static Object parseComponent(WxFinancePrintData data) {
JSONObject dataJson = JSON.parseObject(data.getPrintDataJson());
if("braid-txt".equals(data.getPrintDataType())) {
PrintDataBraidTxt txt = new PrintDataBraidTxt();
PrintBraidTxt txt = new PrintBraidTxt();
txt.setTitle(data.getName());
txt.setIsEdit(data.getIsEdit());
txt.setName(dataJson.getString("fieldName"));
@@ -33,19 +34,19 @@ public class PrintDataHandler implements Serializable {
txt.setDefaultValue(txt.getTitle());
return txt;
}else if ("braid-table".equals(data.getPrintDataType())) {
PrintDataBraidTable table = new PrintDataBraidTable();
PrintBraidTable table = new PrintBraidTable();
table.setTitle(data.getName());
table.setIsEdit(data.getIsEdit());
table.setName(dataJson.getString("fieldName"));
table.setValue("{"+data.getName()+"}");
List<PrintDataBraidTableColumns> columnsAttr = new ArrayList<PrintDataBraidTableColumns>();
List<PrintBraidTableColumns> columnsAttr = new ArrayList<PrintBraidTableColumns>();
JSONArray columns = dataJson.getJSONArray("columns");
if (null != columns) {
List<Map> defaultvalues = new ArrayList<Map>();
Map dv = new HashMap();
for (int i = 0 ; i < columns.size() ; i ++) {
JSONObject o = columns.getJSONObject(i);
PrintDataBraidTableColumns tc = new PrintDataBraidTableColumns();
PrintBraidTableColumns tc = new PrintBraidTableColumns();
tc.setTitle(o.getString("title"));
tc.setValue("{"+tc.getTitle()+"}");
tc.setName(o.getString("fieldName"));
@@ -53,7 +54,7 @@ public class PrintDataHandler implements Serializable {
columnsAttr.add(tc);
JSONObject trsets = o.getJSONObject("trSet");
if (null != trsets) {
PrintDataBraidTableColumnsTrSet ptrset = new PrintDataBraidTableColumnsTrSet();
PrintBraidTableColumnsTrSet ptrset = new PrintBraidTableColumnsTrSet();
ptrset.setTitle(trsets.getString("title"));
ptrset.setCol(trsets.getInteger("col"));
ptrset.setMargin(trsets.getString("margin"));


+ 4
- 4
mallinkService/src/main/java/com/iformall/print/PrintDataParseHandler.java View File

@@ -12,10 +12,10 @@ import com.alibaba.fastjson.JSONObject;
import com.iformall.domain.po.WxFinancePrintData;
import com.iformall.enums.EnumFinancePrintDataType;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.print.entity.PrintDataBraidTable;
import com.iformall.print.entity.PrintDataBraidTableColumns;
import com.iformall.print.entity.PrintDataBraidTableColumnsTrSet;
import com.iformall.print.entity.PrintDataBraidTxt;
import com.iformall.print.entity.PrintComponent;
import com.iformall.print.entity.component.table.PrintBraidTable;
import com.iformall.print.entity.component.table.PrintBraidTableColumns;
import com.iformall.print.entity.component.table.PrintBraidTableColumnsTrSet;

@Data
public class PrintDataParseHandler implements Serializable {


+ 25
- 0
mallinkService/src/main/java/com/iformall/print/entity/PrintComponent.java View File

@@ -0,0 +1,25 @@
package com.iformall.print.entity;

import lombok.Data;
import java.io.Serializable;

@Data
public class PrintComponent implements Serializable {

private static final long serialVersionUID = 1L;

//模板类型 braid-txt / braid-table / braid-html / braid-image / bar-code
protected String type;
//是否可编辑
protected Integer isEdit;
//打印项名称
protected String title;
//动态打印项数据名称(对应打印数据 key-name)
protected String name;
//打印项内容
protected String value;

//LODOP 默认打印项样式
//protected lodopStyle;
}

+ 0
- 29
mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTable.java View File

@@ -1,29 +0,0 @@
package com.iformall.print.entity;

import lombok.Data;
import java.io.Serializable;
import java.util.List;

@Data
public class PrintDataBraidTable implements Serializable {

private static final long serialVersionUID = 1L;

//模板类型 braid-txt / braid-table / braid-html / braid-image / bar-code
private String type="braid-table";
//是否可编辑
private Integer isEdit;
//打印项名称
private String title;
//动态打印项数据名称(对应打印数据 key-name)
private String name;
//打印项内容
private String value;
//打印项默认内容
private List defaultValue;
private String tabelHtml;
//表格列
private List<PrintDataBraidTableColumns> columnsAttr;
//LODOP 默认打印项样式
//private lodopStyle;
}

+ 0
- 39
mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTxt.java View File

@@ -1,39 +0,0 @@
package com.iformall.print.entity;

import lombok.Data;
import java.io.Serializable;

@Data
public class PrintDataBraidTxt implements Serializable {

private static final long serialVersionUID = 1L;

//模板类型 braid-txt / braid-table / braid-html / braid-image / bar-code
private String type="braid-txt";
//是否可编辑
private Integer isEdit;
//打印项名称
private String title;
//动态打印项数据名称(对应打印数据 key-name)
private String name;
//打印项内容
private String value;
//打印项默认内容
private String defaultValue;
// //是否可拖拽
// private Boolean dragable;
// //尺寸是否可变
// private Boolean resizable;
// //打印项宽度(px)
// private BigDecimal width;
// //打印项高度(px)
// private BigDecimal height;
// //左偏移量(px)
// private BigDecimal left;
// //上偏移量(px)
// private BigDecimal top;

//LODOP 默认打印项样式
//private lodopStyle;
}

+ 0
- 36
mallinkService/src/main/java/com/iformall/print/entity/PrintTemplate.java View File

@@ -1,36 +0,0 @@
package com.iformall.print.entity;

import lombok.Data;
import java.io.Serializable;

@Data
public class PrintTemplate implements Serializable {

private static final long serialVersionUID = 1L;

private Integer defaultValue = 0;
//是否可编辑
private String title;
//类型
private Integer type;
//动态打印项数据名称(对应打印数据 key-name)
private String name;
//打印项内容
private String value;
// //是否可拖拽
// private Boolean dragable;
// //尺寸是否可变
// private Boolean resizable;
// //打印项宽度(px)
// private BigDecimal width;
// //打印项高度(px)
// private BigDecimal height;
// //左偏移量(px)
// private BigDecimal left;
// //上偏移量(px)
// private BigDecimal top;

//LODOP 默认打印项样式
//private lodopStyle;
}

+ 22
- 0
mallinkService/src/main/java/com/iformall/print/entity/component/table/PrintBraidTable.java View File

@@ -0,0 +1,22 @@
package com.iformall.print.entity.component.table;

import lombok.Data;
import java.io.Serializable;
import java.util.List;

import com.iformall.print.entity.PrintComponent;

@Data
public class PrintBraidTable extends PrintComponent {

private static final long serialVersionUID = 1L;

private String type="braid-table";
//打印项默认内容
private List defaultValue;
private String tabelHtml;
//表格列
private List<PrintBraidTableColumns> columnsAttr;
//LODOP 默认打印项样式
//private lodopStyle;
}

mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTableColumns.java → mallinkService/src/main/java/com/iformall/print/entity/component/table/PrintBraidTableColumns.java View File

@@ -1,15 +1,15 @@
package com.iformall.print.entity;
package com.iformall.print.entity.component.table;

import lombok.Data;
import java.io.Serializable;
import java.util.List;

@Data
public class PrintDataBraidTableColumns implements Serializable {
public class PrintBraidTableColumns implements Serializable {

private static final long serialVersionUID = 1L;
private String title;
private String value;
private String name;
private PrintDataBraidTableColumnsTrSet trSet;
private PrintBraidTableColumnsTrSet trSet;
}

mallinkService/src/main/java/com/iformall/print/entity/PrintDataBraidTableColumnsTrSet.java → mallinkService/src/main/java/com/iformall/print/entity/component/table/PrintBraidTableColumnsTrSet.java View File

@@ -1,11 +1,11 @@
package com.iformall.print.entity;
package com.iformall.print.entity.component.table;

import lombok.Data;
import java.io.Serializable;
import java.util.List;

@Data
public class PrintDataBraidTableColumnsTrSet implements Serializable {
public class PrintBraidTableColumnsTrSet implements Serializable {

private static final long serialVersionUID = 1L;
private String title;

+ 13
- 0
mallinkService/src/main/java/com/iformall/print/entity/component/txt/PrintBraidTxt.java View File

@@ -0,0 +1,13 @@
package com.iformall.print.entity.component.txt;

import lombok.Data;
import com.iformall.print.entity.PrintComponent;

@Data
public class PrintBraidTxt extends PrintComponent {

private static final long serialVersionUID = 1L;
private String type="braid-txt";
//打印项默认内容
private String defaultValue;
}

Loading…
Cancel
Save