From 7fc564f30d27f47158061e015511595eebefd3b0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 20 五月 2025 20:22:39 +0800
Subject: [PATCH] zjh20250520
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 8
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 9
ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java | 9
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 6
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 6
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java | 10
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjReportService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java | 452 +++++++++++++++++++++++++-------------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java | 11
12 files changed, 272 insertions(+), 251 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java b/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
index eecd774..3448596 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
@@ -17,6 +17,7 @@
import com.ltkj.db.DataSourceContextHolder;
import com.ltkj.hosp.domain.SysAttachment;
import com.ltkj.hosp.service.ISysAttachmentService;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -50,8 +51,8 @@
@Autowired
private ServerConfig serverConfig;
- @Value("${path.xdtfilePath}")
- private String value;
+// @Value("${path.xdtfilePath}")
+// private String value;
private static final String FILE_DELIMETER = ",";
@@ -67,6 +68,8 @@
private ISysAttachmentService sysAttachmentService;
@Autowired
private ISysDictDataService sysDictDataService;
+ @Autowired
+ private ISysConfigService configService;
/**
@@ -288,7 +291,9 @@
@ApiOperation(value = "蹇冪數鍥炬姤鍛婁笂浼犲浘鐗囨柟娉�")
public AjaxResult uploadXdtFile(@ApiParam("鏂囦欢") @RequestPart("file") MultipartFile file,
@ApiParam("浣撴鍙�") String tjh,@ApiParam("椤圭洰id") String proId) throws Exception {
+
try {
+ String value = configService.selectConfigByKey("path_xdtfilePath");
// 涓婁紶鏂囦欢璺緞
// 绗竴姝ワ細鐢熸垚鏂囦欢骞朵繚瀛�
String key = DataSourceContextHolder.getDataSourceKey();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index 76a89f0..a0e8a4d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -21,6 +21,7 @@
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -75,8 +76,8 @@
private IDictCompService compService;
@Resource
private ITjReportTemplateService reportTemplateService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@Resource
private LtkjHybgdService ltkjHybgdService;
@Resource
@@ -85,6 +86,8 @@
private LtkjExamJcbgdService jcbgdService;
@Resource
private LtkjExamJcsqdService jcsqdService;
+ @Autowired
+ private ISysConfigService configService;
/**
@@ -440,7 +443,7 @@
}
final UUID uuid = UUID.randomUUID();
final String substring = uuid.toString().substring(0, 5);
-
+ String value = configService.selectConfigByKey("path_filePath");
// String userId = SecurityUtils.getLoginUser().getUsername();
PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
//String filePath = one.getPath();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java
index a979d98..845ed03 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java
@@ -5,6 +5,7 @@
import com.ltkj.common.core.page.TableDataInfo;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -47,8 +48,10 @@
private TjProConsumablesService proConsumablesService;
@Resource
private ITjConsumablesService consumablesService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
+ @Autowired
+ private ISysConfigService configService;
/**
* 鎵撳嵃鏉＄爜
*/
@@ -58,7 +61,7 @@
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = tjOrderService.getOne(wq);
-
+ String value = configService.selectConfigByKey("path_filePath");
if (tjOrder!=null){
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
@@ -110,7 +113,7 @@
@GetMapping("/GetByCode")
@ApiOperation(value = "鏍规嵁鍥剧墖璇嗗埆鏉＄爜")
public AjaxResult GetByCode(String path) {
- path=value+"10001230306223716钃濊壊澶寸洊绠�.jpg";
+// path=value+"10001230306223716钃濊壊澶寸洊绠�.jpg";
//璇嗗埆鏉＄爜
String s = QRCodeUtils.deEncodeByPath(path);
return AjaxResult.success(s);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index dc43449..95519f5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -95,8 +95,8 @@
private LtkjHysqdService ltkjHysqdService;
@Autowired
private LtkjGetexamreportinfoService ltkjGetexamreportinfoService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@Value("${path.reportServer}")
private String urlValue;
@Autowired
@@ -875,6 +875,7 @@
String s2 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_title");
String s3 = sysConfigService.selectConfigByKey("tjreport_font_size_result_title");
String s4 = sysConfigService.selectConfigByKey("tjreport_font_size_zongjian");
+ String value = sysConfigService.selectConfigByKey("path_filePath");
// String hospName = sysDeptController.getdangqiandengluyuanqu().get("msg").toString();
if (StrUtil.isNotBlank(s1) && Integer.parseInt(s1) > 10) DEFAULT_FONT_SIZE = Integer.parseInt(s1);
else DEFAULT_FONT_SIZE = 10;
@@ -2075,6 +2076,7 @@
*/
private void savePDFFile(String outputFileName1, TjOrder tjOrder, TjCustomer customer, ByteArrayOutputStream finalOutPut) throws IOException, DocumentException, InterruptedException {
// 绗竴姝ワ細鐢熸垚鏂囦欢骞朵繚瀛�
+ String value = sysConfigService.selectConfigByKey("path_filePath");
String key = DataSourceContextHolder.getDataSourceKey();
key = key.replace("ltkjpeis10_","");
String outputPath1 = value + File.separator + key + File.separator;
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 2c3519a..ccca65b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -144,8 +144,8 @@
private ITbTransitionService transitionService;
@Resource
private ISysConfigService configService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@Resource
private ITjOrderRemarkService remarkService;
@Resource
@@ -3081,7 +3081,7 @@
TjReport tjReport = new TjReport();
tjReport.setTjNumber(String.valueOf(tjNumber));
tjReport.setPath(urlValue + outputFileName1);
- String outputPath1 = value + File.separator;
+// String outputPath1 = value + File.separator;
// String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
// tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index c8e5a93..c9118b5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -663,4 +663,7 @@
throw new RuntimeException(e);
}
}
+
+
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 9756f76..a16ea26 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -83,8 +83,8 @@
private IDictCompService dictCompService;
@Resource
private ITjReportTemplateService reportTemplateService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@Value("${path.reportServer}")
private String urlValue;
@Resource
@@ -358,6 +358,7 @@
}
public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
+ String value = configService.selectConfigByKey("path_filePath");
AjaxResult ajaxResult = null;
try {
ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
@@ -908,6 +909,7 @@
// if (one == null) {
// return;
// }
+ String value = configService.selectConfigByKey("path_filePath");
String key = DataSourceContextHolder.getDataSourceKey();
key = key.replace("ltkjpeis10_","");
// String userId = SecurityUtils.getLoginUser().getUsername();
@@ -982,7 +984,7 @@
}
String key = DataSourceContextHolder.getDataSourceKey();
key = key.replace("ltkjpeis10_","");
-
+ String value = configService.selectConfigByKey("path_filePath");
// String userId = SecurityUtils.getLoginUser().getUsername();
// PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + key + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
String filePath = value + File.separator + key + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java
index fc7012d..5285323 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportTemplateController.java
@@ -13,6 +13,7 @@
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.hosp.domain.TjReport;
import com.ltkj.hosp.domain.TjReservation;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -48,9 +49,11 @@
public class TjReportTemplateController extends BaseController {
@Autowired
private ITjReportTemplateService tjReportTemplateService;
+ @Autowired
+ private ISysConfigService configService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
/**
* 鏌ヨtemplate鍒楄〃
@@ -132,6 +135,7 @@
if (one == null) {
return;
}
+ String value = configService.selectConfigByKey("path_filePath");
String userId = SecurityUtils.getLoginUser().getUsername();
PDFBinaryUtil.base64StringToPDF(one.getTemplate(), FileUtil.mkdir(value).getPath() + File.separator + userId + reportTemId + "_妯℃澘棰勮.pdf");
String filePath = value + File.separator + userId + reportTemId + "_妯℃澘棰勮.pdf";
@@ -194,7 +198,7 @@
@GetMapping("/zhiYeTable/{flag}")
@ApiOperation(value = "涓嬭浇鑱屼笟鍋ュ悍琛�")
public void zhiYeTable(HttpServletResponse response, @PathVariable("flag") boolean flag) {
-
+ String value = configService.selectConfigByKey("path_filePath");
LambdaQueryWrapper<TjReportTemplate> we = new LambdaQueryWrapper<>();
we.eq(TjReportTemplate::getName, "鑱屼笟鍋ュ悍浣撴涓汉淇℃伅琛�");
TjReportTemplate one = tjReportTemplateService.getOne(we);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index bf6ae58..03b1e22 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -103,12 +103,13 @@
@Autowired
private ITjDwGroupingService tjDwGroupingService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@PostMapping("/importTemplate")
@ApiOperation(value = "瀵煎嚭excel琛ㄦā鏉�")
public void importTemplate(HttpServletResponse response) {
+ String value = configService.selectConfigByKey("path_filePath");
//鍘熸潵鐨勪笅杞芥ā鏉胯皟鐢ㄦ帴鍙�
try {
String base64String = PDFBinaryUtil.getPDFBinary(value + File.separator + "瑗垮畨璺嘲鏈虹數绉戞妧鏈夐檺鍏徃.xls");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index 5955a86..9829b3c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -76,8 +76,6 @@
private LtkjExamJcsqdService jcsqdService;
@Autowired
private TjJcycxmService jcycxmService;
- @Value("${path.xdtfilePath}")
- private String value;
/**
* 鏌ヨ浣撴蹇冪數鍥剧鐞嗗垪琛�
*/
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjReportService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjReportService.java
index c0d9b8f..ad8d90f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjReportService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjReportService.java
@@ -64,7 +64,7 @@
public int deleteTjReportByReId(Long reId);
- public AjaxResult getTjReport(String tjNumber);
+// public AjaxResult getTjReport(String tjNumber);
Integer getSelectCount(Wrapper<TjReport> queryWrapper);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
index 337ad2d..80d2292 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java
@@ -145,234 +145,234 @@
return tjReportMapper.deleteTjReportByReId(reId);
}
- @Value("${path.filePath}")
+// @Value("${path.filePath}")
private String value;
- @Override
- public AjaxResult getTjReport(String tjNumber) {
- //鏍规嵁浣撴鍙�
- //鍦╫rder閲屾煡璇綋妫�鐘舵�� 鍒ゆ柇浣撴鏄惁瀹屾垚
- LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder tjOrder = tjOrderService.getOne(wq);
- if (null != tjOrder) {
- Integer checkStatus = tjOrder.getCheckStatus();
- if (checkStatus == 1) {
- //鏌ュ嚭瀹㈡埛涓汉淇℃伅 閫氳繃user_id
- LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
- TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
-
- //鏍规嵁order琛ㄧ殑鍗曚綅id鏌ュ嚭鍗曚綅鍚嶇О
- LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
- wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
- DictComp dictComp = dictCompService.getOne(wq111);
-
- //鏌ュ嚭璁板綍璇︽儏 閫氳繃order_id
- LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
- List<TjOrderDetail> list = tjOrderDetailService.list(wq2);
-
- //閬嶅巻瀹㈡埛鎵�閫夌殑椤圭洰(鍖呭惈瀛愰」鐖堕」)
- for (TjOrderDetail tjOrderDetail : list) {
- //鏌ュ嚭鍗曚釜椤圭洰瀵硅薄 璧嬪�肩粰瀵硅薄灞炴��
- TjProject tjProject = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
- tjOrderDetail.setProject(tjProject);
- }
- /*
- * ====================绗竴閮ㄥ垎 濉厖浣撴鎶ュ憡灏侀潰妯℃澘
- * */
- //鏍规嵁鏁版嵁搴撲腑鐨勬ā鏉夸簩杩涘埗鏂囦欢 杞琾df 鍒涘缓鏂囦欢澶� 灏唒df鏀捐繘鏂囦欢澶�
- LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
- TjReportTemplate one1 = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
- String template = one1.getTemplate(); //鎷垮埌浜岃繘鍒�
-
- //鏈湴鍒涘缓涓存椂鏂囦欢澶�
- //String userId ="10000";
- //褰撳墠鐧诲綍鐨勪汉宸ュ彿
- String userId = SecurityUtils.getLoginUser().getUsername();
- //浜岃繘鍒惰浆pdf 瀛樺偍鍦ㄤ复鏃舵枃浠跺す涓�
- PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
-
- // 妯℃澘鏂囦欢璺緞
- String inputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf";
- // 鐢熸垚鐨勬枃浠惰矾寰�
- String outputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf";
- OutputStream os = null;
- PdfStamper ps = null;
- PdfReader reader = null;
- File file = new File(outputFileName);
- try {
- os = Files.newOutputStream(file.toPath());
- // 璇诲叆pdf琛ㄥ崟
- reader = new PdfReader(inputFileName);
- // 鏍规嵁琛ㄥ崟鐢熸垚涓�涓柊鐨刾df
- ps = new PdfStamper(reader, os);
- // 鑾峰彇pdf琛ㄥ崟
- AcroFields form = ps.getAcroFields();
- // 缁欒〃鍗曟坊鍔犱腑鏂囧瓧浣�
- //String prefixFont = "C:Windows\\Fonts" + File.separator + "STFANGSO.TTF";
- //璇ュ瓧浣撻�犳垚绫诲瀷涓嶅潎鍖�锛屼絾鏄痯df杞浘鐗囦笉涔辩爜
- //BaseFont bf = BaseFont.createFont("C:Windows\\Fonts\\simfang.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
- BaseFont bf = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
- form.addSubstitutionFont(bf);
-
- // 濉厖鏁版嵁缁欒〃鏍�
- Map<String, Object> data = new HashMap<>();
- data.put("name", tjCustomer.getCusName());
- //濉厖鎬у埆锛氬垽鏂敺濂�
- Long cusSex = tjCustomer.getCusSex();
- String sex;
- if (cusSex == 0) {
- sex = "鐢�";
- } else {
- sex = "濂�";
- }
- data.put("sex", sex);
- data.put("age", DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- data.put("tjnumber", tjNumber);
- data.put("tjdate", DateUtils.parseDateToStr("yyyy/MM/dd", tjOrder.getCreateTime()));
- data.put("phone", tjCustomer.getCusPhone());
- if (dictComp == null) {
- data.put("work", "鏃�");
- } else {
- data.put("work", dictComp.getCnName());
- }
-
- data.put("remark", "绀轰緥锛氳韩楂樹綋閲�" +
- "\n1銆佸悎鐞嗘帶鍒堕ギ椋燂紝灏戝悆鐐�" +
- "\n蹇冪數鍥�" +
- "\n璇锋敞鎰忎繚鎸侊紒锛侊紒杩欓噷鏀惧缓璁�/寮傚父鍟ョ殑銆傘�傘�傘�傛垨鎬绘寤鸿" + tjOrder.getCheckAdvice());
- // 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
- for (String key : data.keySet()) {
- form.setField(key, data.get(key).toString());
- }
- //璁剧疆涓烘棤娉曠紪杈�
- ps.setFormFlattening(true);
-
- ps.close();
- os.close();
- reader.close();
- /*
- * ==========================绗簩閮ㄥ垎 鐢熸垚椤圭洰璇︽儏
- */
- //鏂囨。瀵硅薄 瀹炵幇A4绾搁〉闈�
- Document document = new Document(PageSize.A4);
- //document.setMarginMirroring(true);
- //璁剧疆鏂囨。鐨勯〉杈硅窛灏辨槸璺濈椤甸潰杈逛笂鐨勮窛绂伙紝鍒嗗埆涓猴細宸﹁竟璺濓紝鍙宠竟璺濓紝涓婅竟璺濓紝涓嬭竟璺�
- document.setMargins(70, 70, 40, 40);
- //杩欎釜鏄敓鎴恜df鐨勪綅缃互鍙婂悕绉�
- String fileName = value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
- OutputStream outputStream = Files.newOutputStream(Paths.get(fileName));
- PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
-
- // 娣诲姞椤电湁/椤佃剼/姘村嵃
- pdfWriter.setPageEvent((PdfPageEvent) new MyHeaderFooter());// 椤电湁椤佃剼锛堥渶瑕佹椂璁剧疆锛�
-
- //鎵撳紑鏂囨。
- document.open();
-
- // 鑾峰彇鏁版嵁
- Map<TjOrderRemark, List<TjPdfVO>> tjOrderRemarkObjectMap = addTable(tjNumber);
- for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : tjOrderRemarkObjectMap.entrySet()) {
- List<TjPdfVO> value = entry.getValue();
- LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjProject::getProId, entry.getKey().getProId());
- TjProject one11 = projectService.getOne(wqqq);
-
- String titleName = one11.getProName();
- // 璁剧疆鏍囬瀛椾綋鏍峰紡
- Font titleFonts = PdfUtils.setFont(9);
- Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
-
- // 璁剧疆琛ㄦ牸
- // 瀹氫箟鍒楀悕
- String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅", "鍙傝�冭寖鍥�"};
- // 鑾峰彇鍒楄〃鏁版嵁
- //璁剧疆琛ㄥご瀛椾綋鏍峰紡
- Font headFont = PdfUtils.setFont(9);
- // 璁剧疆姝ｆ枃瀛椾綋鏍峰紡锛�12鍙�
- Font textFont = PdfUtils.setFont(9);
- //鍒涘缓琛ㄦ牸 灏嗚〃澶村瓧浣撳拰姝ｆ枃瀛椾綋鏀捐繘鍘�
- PdfPTable table = setTable(headFont, textFont, titles, value);
-
- // 濉厖琛ㄦ牸鍐呭
- document.add(paragraph);
- document.add(table);
-
- //鍒ゆ柇澶囨敞鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
- if (entry.getKey().getRemark() == null) {
- entry.getKey().setRemark("");
- }
-
- //澶囨敞
- String remark = "澶囨敞锛�" + entry.getKey().getRemark();
- Font remarkFonts = PdfUtils.setFont(9);
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
- document.add(pp);
-
- //涓绘鍖诲笀
- String doctorName = "涓绘鍖诲笀锛�" + entry.getKey().getDoctorName();
- Font doctorFonts = PdfUtils.setFont(9);
- Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
- df.setAlignment(Element.ALIGN_RIGHT);
- document.add(df);
-
- //鍒嗗壊绾�
- LineSeparator objectName = new LineSeparator();
- document.add(objectName);
- }
- /*
- * document鍏抽棴鐨勫叾瀹炴槸鏂囦欢鐨勭洃鍚姸鎬侊紝writer鍏抽棴鐨勬槸io娴侊紝writer鍒涘缓鍦╠ocument涔嬪悗
- * */
- document.close();
- pdfWriter.close();
- outputStream.close();
-
- //=============================== 绗笁閮ㄥ垎 鍚堝苟浣撴鎶ュ憡灏侀潰椤靛拰浣撴鎶ュ憡椤圭洰璇︽儏椤�
- String[] files1 = {value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
- String outputPath1 = value + File.separator;
- String outputFileName1 = tjNumber + "浣撴鎶ュ憡.pdf";
-
- File file1 = new File(outputPath1 + outputFileName1);
- List<File> f = new ArrayList<>();
- for (String s : files1) {
- f.add(new File(s));
- }
- MergePdf.mergeFileToPDF(f, file1);
-
- //============================= 绗洓閮ㄥ垎 灏唒df璺緞瀛樺偍鏁版嵁搴� 鏂囦欢杞簩杩涘埗瀛樺偍鍜屽拰璺緞瀛樺偍
- TjReport tjReport = new TjReport();
- tjReport.setTjNumber(String.valueOf(tjNumber));
- tjReport.setPath(outputPath1 + outputFileName1);
- String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
- tjReport.setReport(pdfBinary);
- tjReportService.save(tjReport);
-
- //灏嗕复鏃舵枃浠跺す涓殑鍥涗釜鏂囦欢鍒犻櫎
- //FileUtil.del(value+"\\"+tjNumber + "浣撴鎶ュ憡.pdf");
- FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
- FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
- FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
-
- //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
- LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
- updateWrapper.set(TjOrder::getReportTime, new Date());
- tjOrderService.update(updateWrapper);
-
-
- return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
-
- } catch (Exception e) {
- e.printStackTrace();
- return AjaxResult.error("PDF瀵煎嚭澶辫触");
- }
- }
- }
- return null;
- }
+// @Override
+// public AjaxResult getTjReport(String tjNumber) {
+// //鏍规嵁浣撴鍙�
+// //鍦╫rder閲屾煡璇綋妫�鐘舵�� 鍒ゆ柇浣撴鏄惁瀹屾垚
+// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjOrder::getTjNumber, tjNumber);
+// TjOrder tjOrder = tjOrderService.getOne(wq);
+// if (null != tjOrder) {
+// Integer checkStatus = tjOrder.getCheckStatus();
+// if (checkStatus == 1) {
+// //鏌ュ嚭瀹㈡埛涓汉淇℃伅 閫氳繃user_id
+// LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
+// TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+//
+// //鏍规嵁order琛ㄧ殑鍗曚綅id鏌ュ嚭鍗曚綅鍚嶇О
+// LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
+// wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
+// DictComp dictComp = dictCompService.getOne(wq111);
+//
+// //鏌ュ嚭璁板綍璇︽儏 閫氳繃order_id
+// LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+// wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+// List<TjOrderDetail> list = tjOrderDetailService.list(wq2);
+//
+// //閬嶅巻瀹㈡埛鎵�閫夌殑椤圭洰(鍖呭惈瀛愰」鐖堕」)
+// for (TjOrderDetail tjOrderDetail : list) {
+// //鏌ュ嚭鍗曚釜椤圭洰瀵硅薄 璧嬪�肩粰瀵硅薄灞炴��
+// TjProject tjProject = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
+// tjOrderDetail.setProject(tjProject);
+// }
+// /*
+// * ====================绗竴閮ㄥ垎 濉厖浣撴鎶ュ憡灏侀潰妯℃澘
+// * */
+// //鏍规嵁鏁版嵁搴撲腑鐨勬ā鏉夸簩杩涘埗鏂囦欢 杞琾df 鍒涘缓鏂囦欢澶� 灏唒df鏀捐繘鏂囦欢澶�
+// LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+// tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
+// TjReportTemplate one1 = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
+// String template = one1.getTemplate(); //鎷垮埌浜岃繘鍒�
+//
+// //鏈湴鍒涘缓涓存椂鏂囦欢澶�
+// //String userId ="10000";
+// //褰撳墠鐧诲綍鐨勪汉宸ュ彿
+// String userId = SecurityUtils.getLoginUser().getUsername();
+// //浜岃繘鍒惰浆pdf 瀛樺偍鍦ㄤ复鏃舵枃浠跺す涓�
+// PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
+//
+// // 妯℃澘鏂囦欢璺緞
+// String inputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf";
+// // 鐢熸垚鐨勬枃浠惰矾寰�
+// String outputFileName = value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf";
+// OutputStream os = null;
+// PdfStamper ps = null;
+// PdfReader reader = null;
+// File file = new File(outputFileName);
+// try {
+// os = Files.newOutputStream(file.toPath());
+// // 璇诲叆pdf琛ㄥ崟
+// reader = new PdfReader(inputFileName);
+// // 鏍规嵁琛ㄥ崟鐢熸垚涓�涓柊鐨刾df
+// ps = new PdfStamper(reader, os);
+// // 鑾峰彇pdf琛ㄥ崟
+// AcroFields form = ps.getAcroFields();
+// // 缁欒〃鍗曟坊鍔犱腑鏂囧瓧浣�
+// //String prefixFont = "C:Windows\\Fonts" + File.separator + "STFANGSO.TTF";
+// //璇ュ瓧浣撻�犳垚绫诲瀷涓嶅潎鍖�锛屼絾鏄痯df杞浘鐗囦笉涔辩爜
+// //BaseFont bf = BaseFont.createFont("C:Windows\\Fonts\\simfang.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
+// BaseFont bf = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
+// form.addSubstitutionFont(bf);
+//
+// // 濉厖鏁版嵁缁欒〃鏍�
+// Map<String, Object> data = new HashMap<>();
+// data.put("name", tjCustomer.getCusName());
+// //濉厖鎬у埆锛氬垽鏂敺濂�
+// Long cusSex = tjCustomer.getCusSex();
+// String sex;
+// if (cusSex == 0) {
+// sex = "鐢�";
+// } else {
+// sex = "濂�";
+// }
+// data.put("sex", sex);
+// data.put("age", DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+// data.put("tjnumber", tjNumber);
+// data.put("tjdate", DateUtils.parseDateToStr("yyyy/MM/dd", tjOrder.getCreateTime()));
+// data.put("phone", tjCustomer.getCusPhone());
+// if (dictComp == null) {
+// data.put("work", "鏃�");
+// } else {
+// data.put("work", dictComp.getCnName());
+// }
+//
+// data.put("remark", "绀轰緥锛氳韩楂樹綋閲�" +
+// "\n1銆佸悎鐞嗘帶鍒堕ギ椋燂紝灏戝悆鐐�" +
+// "\n蹇冪數鍥�" +
+// "\n璇锋敞鎰忎繚鎸侊紒锛侊紒杩欓噷鏀惧缓璁�/寮傚父鍟ョ殑銆傘�傘�傘�傛垨鎬绘寤鸿" + tjOrder.getCheckAdvice());
+// // 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
+// for (String key : data.keySet()) {
+// form.setField(key, data.get(key).toString());
+// }
+// //璁剧疆涓烘棤娉曠紪杈�
+// ps.setFormFlattening(true);
+//
+// ps.close();
+// os.close();
+// reader.close();
+// /*
+// * ==========================绗簩閮ㄥ垎 鐢熸垚椤圭洰璇︽儏
+// */
+// //鏂囨。瀵硅薄 瀹炵幇A4绾搁〉闈�
+// Document document = new Document(PageSize.A4);
+// //document.setMarginMirroring(true);
+// //璁剧疆鏂囨。鐨勯〉杈硅窛灏辨槸璺濈椤甸潰杈逛笂鐨勮窛绂伙紝鍒嗗埆涓猴細宸﹁竟璺濓紝鍙宠竟璺濓紝涓婅竟璺濓紝涓嬭竟璺�
+// document.setMargins(70, 70, 40, 40);
+// //杩欎釜鏄敓鎴恜df鐨勪綅缃互鍙婂悕绉�
+// String fileName = value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf";
+// OutputStream outputStream = Files.newOutputStream(Paths.get(fileName));
+// PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
+//
+// // 娣诲姞椤电湁/椤佃剼/姘村嵃
+// pdfWriter.setPageEvent((PdfPageEvent) new MyHeaderFooter());// 椤电湁椤佃剼锛堥渶瑕佹椂璁剧疆锛�
+//
+// //鎵撳紑鏂囨。
+// document.open();
+//
+// // 鑾峰彇鏁版嵁
+// Map<TjOrderRemark, List<TjPdfVO>> tjOrderRemarkObjectMap = addTable(tjNumber);
+// for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : tjOrderRemarkObjectMap.entrySet()) {
+// List<TjPdfVO> value = entry.getValue();
+// LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
+// wqqq.eq(TjProject::getProId, entry.getKey().getProId());
+// TjProject one11 = projectService.getOne(wqqq);
+//
+// String titleName = one11.getProName();
+// // 璁剧疆鏍囬瀛椾綋鏍峰紡
+// Font titleFonts = PdfUtils.setFont(9);
+// Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
+//
+// // 璁剧疆琛ㄦ牸
+// // 瀹氫箟鍒楀悕
+// String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅", "鍙傝�冭寖鍥�"};
+// // 鑾峰彇鍒楄〃鏁版嵁
+// //璁剧疆琛ㄥご瀛椾綋鏍峰紡
+// Font headFont = PdfUtils.setFont(9);
+// // 璁剧疆姝ｆ枃瀛椾綋鏍峰紡锛�12鍙�
+// Font textFont = PdfUtils.setFont(9);
+// //鍒涘缓琛ㄦ牸 灏嗚〃澶村瓧浣撳拰姝ｆ枃瀛椾綋鏀捐繘鍘�
+// PdfPTable table = setTable(headFont, textFont, titles, value);
+//
+// // 濉厖琛ㄦ牸鍐呭
+// document.add(paragraph);
+// document.add(table);
+//
+// //鍒ゆ柇澶囨敞鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
+// if (entry.getKey().getRemark() == null) {
+// entry.getKey().setRemark("");
+// }
+//
+// //澶囨敞
+// String remark = "澶囨敞锛�" + entry.getKey().getRemark();
+// Font remarkFonts = PdfUtils.setFont(9);
+// Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
+// document.add(pp);
+//
+// //涓绘鍖诲笀
+// String doctorName = "涓绘鍖诲笀锛�" + entry.getKey().getDoctorName();
+// Font doctorFonts = PdfUtils.setFont(9);
+// Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
+// df.setAlignment(Element.ALIGN_RIGHT);
+// document.add(df);
+//
+// //鍒嗗壊绾�
+// LineSeparator objectName = new LineSeparator();
+// document.add(objectName);
+// }
+// /*
+// * document鍏抽棴鐨勫叾瀹炴槸鏂囦欢鐨勭洃鍚姸鎬侊紝writer鍏抽棴鐨勬槸io娴侊紝writer鍒涘缓鍦╠ocument涔嬪悗
+// * */
+// document.close();
+// pdfWriter.close();
+// outputStream.close();
+//
+// //=============================== 绗笁閮ㄥ垎 鍚堝苟浣撴鎶ュ憡灏侀潰椤靛拰浣撴鎶ュ憡椤圭洰璇︽儏椤�
+// String[] files1 = {value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf", value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf"};
+// String outputPath1 = value + File.separator;
+// String outputFileName1 = tjNumber + "浣撴鎶ュ憡.pdf";
+//
+// File file1 = new File(outputPath1 + outputFileName1);
+// List<File> f = new ArrayList<>();
+// for (String s : files1) {
+// f.add(new File(s));
+// }
+// MergePdf.mergeFileToPDF(f, file1);
+//
+// //============================= 绗洓閮ㄥ垎 灏唒df璺緞瀛樺偍鏁版嵁搴� 鏂囦欢杞簩杩涘埗瀛樺偍鍜屽拰璺緞瀛樺偍
+// TjReport tjReport = new TjReport();
+// tjReport.setTjNumber(String.valueOf(tjNumber));
+// tjReport.setPath(outputPath1 + outputFileName1);
+// String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+// tjReport.setReport(pdfBinary);
+// tjReportService.save(tjReport);
+//
+// //灏嗕复鏃舵枃浠跺す涓殑鍥涗釜鏂囦欢鍒犻櫎
+// //FileUtil.del(value+"\\"+tjNumber + "浣撴鎶ュ憡.pdf");
+// FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
+// FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡椤圭洰璇︽儏椤�.pdf");
+// FileUtil.del(value + File.separator + userId + "浣撴鎶ュ憡灏侀潰椤�.pdf");
+//
+// //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
+// LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
+// updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
+// updateWrapper.set(TjOrder::getReportTime, new Date());
+// tjOrderService.update(updateWrapper);
+//
+//
+// return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
+//
+// } catch (Exception e) {
+// e.printStackTrace();
+// return AjaxResult.error("PDF瀵煎嚭澶辫触");
+// }
+// }
+// }
+// return null;
+// }
@Override
public Integer getSelectCount(Wrapper<TjReport> queryWrapper) {
--
Gitblit v1.8.0