From b7f7e952f29acd12f454942ccf21bd59ebedf5d5 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 6 Jun 2023 11:33:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E6=A0=A1=E9=AA=8C=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java | 2 ++ .../service/ISarBussStandSnService.java | 1 + .../service/impl/SarBussStandSnServiceImpl.java | 5 +++++ .../sarBussionessStand/dao/SarBussionessStandDao.java | 2 ++ .../service/ISarBussionessStandService.java | 2 ++ .../service/impl/SarBussionessStandServiceImpl.java | 11 +++++++++-- .../mapper/sarBussStandSn/SarBussStandSnMapper.xml | 3 +++ .../sarBussionessStand/SarBussionessStandMapper.xml | 3 +++ 8 files changed, 27 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java index aaa86294..717bd587 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java @@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SarBussStandSnDao extends BaseMapper { String selectMaxStandnSn(); + + String selectMaxStandSn(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java index c61e0c37..237e6461 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java @@ -19,4 +19,5 @@ public interface ISarBussStandSnService extends IService { String selectMaxStandnSn(); + String selectMaxStandSn(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java index f55ac7c4..39f9b3a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java @@ -65,4 +65,9 @@ public class SarBussStandSnServiceImpl extends ServiceImpl { @Select("select * from sar_bussioness_stand where TEXT_STATUS_BUSS is not null") List selectAllStandStatus(); + + String selectMaxStandSn(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 98dcdb08..cb89c2ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -70,5 +70,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage cleaningDataReview(); ResponseMessage repeal(String id, String type); + + String selectMaxStandSn(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 8442b060..b33089b6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -223,8 +223,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0){ + if(count > 0 && MaxSn.equals(standMaxSn)){ QueryWrapper qw = new QueryWrapper(); qw.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ","")); qw.eq("TASK_ID",taskId); @@ -261,7 +263,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList,String standId,String attfId) { //重复的集合 List chongfu = new ArrayList<>(); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml index 8018e2e0..fd7c7529 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml @@ -5,5 +5,8 @@ + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 5f2e9f67..80eaffcd 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1257,6 +1257,9 @@ resultType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand"> select * from sar_bussioness_stand where stand_code = #{standCode} and VALID_FLAG = 0 limit 1 + update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile} From be1fc9a7b2c2e81e5814ab545e38a47928b042ba Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 6 Jun 2023 15:51:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E6=A0=A1=E9=AA=8C=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarBussStandSn/dao/SarBussStandSnDao.java | 3 +++ .../service/ISarBussStandSnService.java | 2 ++ .../service/impl/SarBussStandSnServiceImpl.java | 5 +++++ .../service/impl/SarBussionessStandServiceImpl.java | 12 +++++++++--- .../mapper/sarBussStandSn/SarBussStandSnMapper.xml | 3 +++ .../sarBussionessStand/SarBussionessStandMapper.xml | 2 +- 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java index 717bd587..15c0c482 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarBussStandSn.dao; import com.adc.da.slrs.sarBussStandSn.entity.SarBussStandSn; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; /** *

@@ -16,4 +17,6 @@ public interface SarBussStandSnDao extends BaseMapper { String selectMaxStandnSn(); String selectMaxStandSn(String standSort); + + String selectStandSort(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java index 237e6461..462326bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java @@ -20,4 +20,6 @@ public interface ISarBussStandSnService extends IService { String selectMaxStandnSn(); String selectMaxStandSn(String standSort); + + String selectStandSort(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java index 39f9b3a3..c3984c0b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java @@ -70,4 +70,9 @@ public class SarBussStandSnServiceImpl extends ServiceImpl select Max(STAND_SN) from sar_buss_stand_sn where STAND_SORT = #{standSort} and VALID_FLAG = '0' + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 80eaffcd..64b18639 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -351,7 +351,7 @@ From 0c8ff6d181335f8b8920a462b3813ddbe1193dd8 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 6 Jun 2023 16:57:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/convert/mq/SendConvertMQService.java | 2 +- .../service/impl/AttFileEOServiceImpl.java | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java index d8921279..94d3c848 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java @@ -242,7 +242,7 @@ public class SendConvertMQService { convertMqEO.setId(convertId); convertMqEO.setMqState(2); convertMqEOService.updateById(convertMqEO); - this.restartUploadConvert(convertMqEO); +// this.restartUploadConvert(convertMqEO); return Result.error("r0072", "文件转换失败，请重试"); } } diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index 66882fc2..b66a1ed1 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -10,6 +10,7 @@ import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.WordUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.docx4j.Docx4J; @@ -621,6 +622,40 @@ public class AttFileEOServiceImpl extends ServiceImpl i fontMapper.put("Calibri", font); wordMLPackage.setFontMapper(fontMapper); OutputStream os = new java.io.FileOutputStream(src+fileInfo.getFilePath()+filePdfName); + //加载字体文件（解决linux环境下无中文字体问题） + if (PhysicalFonts.get("SimSun") == null) { + PhysicalFonts.addPhysicalFonts("SimSun", WordUtils.class.getResource("/simsun.ttc")); + } + fontMapper.put("隶书", PhysicalFonts.get("LiSu")); + fontMapper.put("宋体", PhysicalFonts.get("SimSun")); + fontMapper.put("微软雅黑", PhysicalFonts.get("Microsoft Yahei")); + fontMapper.put("黑体", PhysicalFonts.get("SimHei")); + fontMapper.put("楷体", PhysicalFonts.get("KaiTi")); + fontMapper.put("新宋体", PhysicalFonts.get("NSimSun")); + fontMapper.put("华文行楷", PhysicalFonts.get("STXingkai")); + fontMapper.put("华文仿宋", PhysicalFonts.get("STFangsong")); + fontMapper.put("仿宋", PhysicalFonts.get("FangSong")); + fontMapper.put("幼圆", PhysicalFonts.get("YouYuan")); + fontMapper.put("华文宋体", PhysicalFonts.get("STSong")); + fontMapper.put("华文中宋", PhysicalFonts.get("STZhongsong")); + fontMapper.put("等线", PhysicalFonts.get("SimSun")); + fontMapper.put("等线 Light", PhysicalFonts.get("SimSun")); + fontMapper.put("华文琥珀", PhysicalFonts.get("STHupo")); + fontMapper.put("华文隶书", PhysicalFonts.get("STLiti")); + fontMapper.put("华文新魏", PhysicalFonts.get("STXinwei")); + fontMapper.put("华文彩云", PhysicalFonts.get("STCaiyun")); + fontMapper.put("方正姚体", PhysicalFonts.get("FZYaoti")); + fontMapper.put("方正舒体", PhysicalFonts.get("FZShuTi")); + fontMapper.put("华文细黑", PhysicalFonts.get("STXihei")); + fontMapper.put("宋体扩展", PhysicalFonts.get("simsun-extB")); + fontMapper.put("仿宋_GB2312", PhysicalFonts.get("FangSong_GB2312")); + fontMapper.put("新細明體", PhysicalFonts.get("SimSun")); + //解决宋体（正文）和宋体（标题）的乱码问题 + PhysicalFonts.put("PMingLiU", PhysicalFonts.get("SimSun")); + PhysicalFonts.put("新細明體", PhysicalFonts.get("SimSun")); + //宋体&新宋体 + PhysicalFont simsunFont = PhysicalFonts.get("SimSun"); + fontMapper.put("SimSun", simsunFont); FOSettings foSettings = Docx4J.createFOSettings(); foSettings.setWmlPackage(wordMLPackage); Docx4J.toFO(foSettings, os, Docx4J.FLAG_EXPORT_PREFER_XSL);