From d60151008305441b76ff97ee8705fd4b4545d831 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Sat, 2 Apr 2022 14:27:01 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 6 ++++++ .../mall/ebtp/extend/bizmessage/dto/PageDTO.java | 5 +++++ .../mall/ebtp/extend/bizmessage/entity/BizMessageVo.java | 3 +++ .../service/impl/BizMessageConsumerServiceImpl.java | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index cfcee88..968d4fb 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -33,6 +33,12 @@ INNER JOIN ( SELECT * FROM biz_message_authorize WHERE user_id = #{userId}) b ON a.id = b.message_id + + and biz_message.templatecode + + #{item, jdbcType=NUMERIC} + + ORDER BY createtime DESC diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java index 91af3da..3c7fae0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java @@ -3,6 +3,8 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * 分页明细 * @@ -26,4 +28,7 @@ public class PageDTO { this.pageSize = 15; } + @ApiModelProperty(required = false, value = "指定消息类型,null 查全部") + private List templatecodes; + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java index b15db1b..ed16473 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java @@ -2,6 +2,8 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; import lombok.Data; +import java.util.List; + @Data public class BizMessageVo extends BizMessage{ @@ -11,4 +13,5 @@ public class BizMessageVo extends BizMessage{ private Long datanum; private Integer size; + private List templatecodes; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java index 7028181..7bf9102 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java @@ -42,9 +42,9 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService @Override public IBizMessagePage listOutline(PageDTO page) { page = createPageCondition(page); + IPage pageEntity = new Page(page.getPageNo(), page.getPageSize()); - IPage pageEntity = mapper.findMessageVo(new Page(page.getPageNo(), page.getPageSize()), - service.getCacheUser().getUserId()); + pageEntity = mapper.findMessageVo(pageEntity,service.getCacheUser().getUserId()); // DAT -> VO 转换 IBizMessagePage result = new BizMessagePage<>(); From 470a6e741183fdf742f3259f95b977aaf0cdca2d Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Sat, 2 Apr 2022 14:33:53 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 968d4fb..fbd5075 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -34,7 +34,7 @@ ( SELECT * FROM biz_message_authorize WHERE user_id = #{userId}) b ON a.id = b.message_id - and biz_message.templatecode + and biz_message.templatecode in #{item, jdbcType=NUMERIC} From f6f4aae30260f1cec674fa61073c046f998d9c9c Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Sat, 2 Apr 2022 14:36:28 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java | 2 +- .../bizmessage/service/impl/BizMessageConsumerServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index 46c2e4c..738fa9c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -13,7 +13,7 @@ public interface BizMessageMapper extends BaseMapper { IPage findMessage(@Param("param") IPage page, @Param("userId") String userId); - IPage findMessageVo(@Param("param") IPage page, @Param("userId") String userId); + IPage findMessageVo(@Param("param") IPage page, @Param("userId") String userId,@Param("templatecodes") List templatecodes); Boolean updateState(@Param("userId") String userId,@Param("messageId") String messageId); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java index 7bf9102..8db6a00 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java @@ -44,7 +44,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService page = createPageCondition(page); IPage pageEntity = new Page(page.getPageNo(), page.getPageSize()); - pageEntity = mapper.findMessageVo(pageEntity,service.getCacheUser().getUserId()); + pageEntity = mapper.findMessageVo(pageEntity,service.getCacheUser().getUserId(),page.getTemplatecodes()); // DAT -> VO 转换 IBizMessagePage result = new BizMessagePage<>(); From 8b1063e2a440eab7194ab6e3076bcc25213d6348 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Sat, 2 Apr 2022 14:45:48 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/BizMessageMapper.xml | 22 +++++++++++++------ .../bizmessage/entity/BizMessageVo.java | 2 -- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index fbd5075..18001c1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -23,22 +23,30 @@ FROM biz_message left join biz_message_template on biz_message.templatecode = biz_message_template.code WHERE authorize = 0 + + and biz_message.templatecode in + + #{item, jdbcType=NUMERIC} + + UNION ALL SELECT a.*,IFNULL(b.state,1) as authorizestate FROM ( SELECT biz_message.*,biz_message_template.type as templatetype FROM biz_message left join biz_message_template on biz_message.templatecode = biz_message_template.code - WHERE authorize = 1) a + WHERE authorize = 1 + + and biz_message.templatecode in + + #{item, jdbcType=NUMERIC} + + + ) a INNER JOIN ( SELECT * FROM biz_message_authorize WHERE user_id = #{userId}) b ON a.id = b.message_id - - and biz_message.templatecode in - - #{item, jdbcType=NUMERIC} - - + ORDER BY createtime DESC diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java index ed16473..346ab95 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java @@ -12,6 +12,4 @@ public class BizMessageVo extends BizMessage{ private String userId; private Long datanum; private Integer size; - - private List templatecodes; } From 90710da445608cc2479cf6310b27d07b1772d655 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 6 Apr 2022 16:06:28 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 6 ++++++ .../mall/ebtp/extend/bizmessage/entity/BizMessageVo.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 18001c1..486b164 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -74,6 +74,12 @@ and biz_message_template.type = #{templatetype} + + and biz_message.templatecode in + + #{item, jdbcType=NUMERIC} + + ORDER BY createtime DESC diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java index 346ab95..55ecfaf 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/entity/BizMessageVo.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -12,4 +13,7 @@ public class BizMessageVo extends BizMessage{ private String userId; private Long datanum; private Integer size; + + @ApiModelProperty(required = false, value = "指定消息类型,null 查全部") + private List templatecodes; } From 76f9f448c6300cb0dc2010866a0394418df6b5f0 Mon Sep 17 00:00:00 2001 From: fuqingji <51312040@qq.com> Date: Wed, 13 Apr 2022 10:35:03 +0800 Subject: [PATCH 06/12] 20220315-bugs --- .../service/impl/ExpertSignatureServiceImpl.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/signature/service/impl/ExpertSignatureServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/signature/service/impl/ExpertSignatureServiceImpl.java index 722b64e..41829f5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/signature/service/impl/ExpertSignatureServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/signature/service/impl/ExpertSignatureServiceImpl.java @@ -124,10 +124,9 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { } File f = new File(path + "merged.pdf"); - FileOutputStream fos = null; + FontSettings.getDefaultInstance().setFontsFolder(fontAddress, true); - try { - fos = new FileOutputStream(f); + try (FileOutputStream fos = new FileOutputStream(f);) { com.aspose.words.Document doc = new com.aspose.words.Document(path + "merged.docx"); doc.save(fos, SaveFormat.PDF); } catch (Exception e) { @@ -135,11 +134,6 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { } finally { source.close(); addObj.close(); - if (fos != null) { - fos.flush(); - fos.close(); - } - } long l1 = System.currentTimeMillis(); From fe0365cce607d79af097d533ebaf513e9ae0970c Mon Sep 17 00:00:00 2001 From: fuqingji <51312040@qq.com> Date: Mon, 18 Apr 2022 11:01:56 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=9F=A5=E8=AF=A2query=5Ftype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/export/bean/BizExportDict.java | 2 +- .../mall/ebtp/extend/export/dao/mapper/BizExportDictMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizExportDict.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizExportDict.java index deea169..6744c22 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizExportDict.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BizExportDict.java @@ -56,7 +56,7 @@ public class BizExportDict implements Serializable { * */ @ApiModelProperty(value = "") - private Integer queryType; + private String queryType; /** * 使能：0、不可用，1、可用 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/mapper/BizExportDictMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/mapper/BizExportDictMapper.xml index 24717c5..2fef5f7 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/mapper/BizExportDictMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/dao/mapper/BizExportDictMapper.xml @@ -9,6 +9,7 @@ + @@ -22,7 +23,7 @@