diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java index 092b3a260..feda7ceee 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java @@ -1,5 +1,6 @@ package com.iformall.controller.market; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.iformall.annotation.TenantIgnore; import com.iformall.common.Result; import com.iformall.common.ResultData; @@ -31,6 +32,9 @@ import org.springframework.web.bind.annotation.RestController; /** * https://www.lodop.net/index.html https://github.com/myliuxia/kr-print-designer?tab=readme-ov-file + +打印项目是独立部署,无法跟后台集成登录。 + * @author Administrator */ @RestController @@ -83,6 +87,20 @@ public class WxFinancePrintController extends BaseController { return new ResultData(); } + @ApiOperation("费用区间列表") + @PostMapping("copyTemplates") + @TenantIgnore + public ResultData copyTemplates(@RequestBody WxFinancePrintTemplate record) { + if (null == record.getId()) { + return new ResultData(Result.ERROR,"参数不对"); + } + WxFinancePrintTemplate template = wxFinancePrintService.getTemplateById(record.getId()); + template.setId(null); + template.setName(template.getName()+"复制"); + wxFinancePrintService.saveOrUpdate(template); + return new ResultData(); + } + @ApiOperation("费用区间列表") @PostMapping("setTemplatesDel") @TenantIgnore @@ -94,4 +112,14 @@ public class WxFinancePrintController extends BaseController { return new ResultData(); } + @ApiOperation("预览") + @GetMapping("getTemplateData") + @TenantIgnore + public ResultData viewTemplate(@RequestBody String tenantId,Integer type,List dataIds) { + if (StringUtils.isBlank(tenantId)||null == dataIds || dataIds.size() <= 0 || null == type) { + return new ResultData(Result.ERROR,"参数不对"); + } + return new ResultData(wxFinancePrintService.parseTemplateData(tenantId,type,dataIds)); + } + } diff --git a/mallinkService/src/main/java/com/iformall/print/PrintDataParseHandler.java b/mallinkService/src/main/java/com/iformall/print/PrintDataParseHandler.java deleted file mode 100644 index 9fd4ff18f..000000000 --- a/mallinkService/src/main/java/com/iformall/print/PrintDataParseHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.iformall.print; - -import lombok.Data; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -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.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 { - - private static final long serialVersionUID = 1L; - - //根据类型来解析传进来的对象 - private Map getComponentValuesMap(EnumFinancePrintDataType type,Object object) { - return null; - } - public static JSONObject parseData(EnumFinancePrintDataType type,WxFinancePrintData data,Map valueMap) { - return null; - } - -} diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java b/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java index b262d211b..898cbc8a0 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java @@ -1,6 +1,8 @@ package com.iformall.service; import java.util.List; +import java.util.Map; + import com.iformall.domain.po.WxFinancePrintData; import com.iformall.domain.po.WxFinancePrintTemplate; /** @@ -12,4 +14,5 @@ public interface WxFinancePrintService { WxFinancePrintTemplate getTemplateById(Long id); void saveOrUpdate(WxFinancePrintTemplate record); void setTemplatesDel(WxFinancePrintTemplate record); + List parseTemplateData(String tenantId,Integer type,List dataIds); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index ba15dc4c1..fca793bcb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -4,22 +4,27 @@ package com.iformall.service.impl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.WxFinancePrintData; import com.iformall.domain.po.WxFinancePrintTemplate; -import com.iformall.enums.EnumYesOrNo; +import com.iformall.domain.po.WxFinanceReceive; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumFinancePrintDataType; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxFinancePrintDataMapper; import com.iformall.mapper.WxFinancePrintTemplateMapper; import com.iformall.service.WxFinancePrintService; - +import com.iformall.service.WxFinanceService; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** */ @@ -32,6 +37,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { @Autowired WxFinancePrintTemplateMapper wxFinancePrintTemplateMapper; + @Lazy + @Autowired + WxFinanceService wxFinanceService; + @Override public List printDataList(WxFinancePrintData record) { return wxFinancePrintDataMapper.findList(record); @@ -49,19 +58,30 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { @Override public void saveOrUpdate(WxFinancePrintTemplate record) { + boolean isGenarated = false; + if (StringUtils.isBlank(record.getContent())) { + Map map = new HashMap(); + map.put("title", record.getName()); + map.put("type", record.getType()); + map.put("width", 770); + map.put("height", 500); + map.put("pageWidth", 215); + map.put("pageHeight", 140); + map.put("id", String.valueOf(record.getId())); + map.put("defaultValue", 0); + record.setContent(JSON.toJSONString(map)); + isGenarated = true; + } Date date = new Date(); if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setCreateTime(date); record.setUpdateTime(date); - if (null != record.getContentJson()) { - JSONObject o = record.getContentJson(); - o.put("type", record.getType()); - o.put("id", String.valueOf(record.getId())); - o.put("defaultValue", 0); - record.setContent(JSON.toJSONString(o)); - } + JSONObject o = record.getContentJson(); + o.put("defaultValue", 0); + o.put("title", record.getName()); + record.setContent(JSON.toJSONString(o)); try { wxFinancePrintTemplateMapper.insert(record); } catch (Exception e) { @@ -71,9 +91,8 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { } else { if (null != record.getContentJson()) { JSONObject o = record.getContentJson(); - o.put("type", record.getType()); - o.put("id", String.valueOf(record.getId())); o.put("defaultValue", 0); + o.put("title", record.getName()); record.setContent(JSON.toJSONString(o)); } record.setUpdateTime(date); @@ -87,5 +106,17 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { wxFinancePrintTemplateMapper.updateById(record); } + @Override + public List parseTemplateData(String tenantId, Integer type, List dataIds) { + EnumFinancePrintDataType printDatatype = EnumFinancePrintDataType.getEnum(type); +// //付款单 +// if (printDatatype.getCode().intValue() == EnumFinancePrintDataType.FINANCE_RECEIVE.getCode()) { +// TenantEntity tenantEntity = new TenantEntity(); +// tenantEntity.setTenantId(tenantId); +// WxFinanceReceive receive = wxFinanceService.getReceiveById(tenantEntity, id); +// } + return null; + } + }