From 045546b340b87721a0d56580040ffdeb277db894 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 13:56:20 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/dao/BizMessageMapper.java | 2 +- .../impl/BizMessageConsumerServiceImpl.java | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 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 ab19cc6..677fb87 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 @@ -16,6 +16,6 @@ public interface BizMessageMapper extends BaseMapper { Boolean updateState(@Param("userId") String userId,@Param("messageId") String messageId); - IPage findMessageVoList(@Param("param") IPage page,BizMessageVo vo); + List findMessageVoList(BizMessageVo vo); } 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 995be68..6eecc4c 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 @@ -15,6 +15,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -109,17 +110,19 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService if(vo.getAuthorizestate()==null||"".equals(vo.getAuthorizestate())){ vo.setAuthorizestate("0"); } - PageDTO page = new PageDTO(); - page.setPageSize(vo.getSize()); - IPage pageEntity = mapper.findMessageVoList(new Page(page.getPageNo(), page.getPageSize()),vo); + List list = mapper.findMessageVoList(vo); - List list = pageEntity.getRecords(); + List rList = new ArrayList<>(); - list.forEach(l->{ - l.setDatanum(pageEntity.getTotal()); - }); + for(int i = 0 ; i < list.size();i++){ + if(i Date: Tue, 10 Aug 2021 14:01:23 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 1 - 1 file changed, 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 99b262e..1e4fbe5 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 @@ -61,7 +61,6 @@ and biz_message_template.type = #{templatetype} ORDER BY createtime DESC - LIMIT #{size} \ No newline at end of file From 403ce0e4ea2c94a7231d5e95fd59427b439ac92f Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 14:15:57 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=B7=B2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizMessageConsumerController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 84e2830..ad1e56d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -77,4 +77,18 @@ public class BizMessageConsumerController { return service.selectMsgListByType(vo); } + + /** + * 信息已阅 + * + * @return + */ + @ApiOperation("信息已阅") + @GetMapping("selectMsgRead/{id}") + @ResponseStatus(code = HttpStatus.OK) + public Boolean selectMsgRead( @ApiParam(value = "待查询的消息id", required = true) @PathVariable("id") String id) { + //已读 + this.service.updateState(id); + return true; + } } From 4129aa947c214c94f0d32f2089ab29a3679c348e Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 16:00:49 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=B7=B2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/controller/BizMessageConsumerController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index ad1e56d..d7e12dc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -59,7 +59,7 @@ public class BizMessageConsumerController { vo.setMsgId(source.getId()); BeanUtils.copyProperties(source, vo); //已读 - this.service.updateState(source.getId()); + //this.service.updateState(source.getId()); return vo; }).orElseGet(DescribeSiteMsgDetailVO::new); From 83568accad8d6f176fa484cd6cc3552f269797ce Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 16:27:49 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=B7=B2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BizMessageConsumerController.java | 8 +++++--- .../bizmessage/dao/BizMessageMapper.java | 3 +++ .../bizmessage/dao/mapper/BizMessageMapper.xml | 18 ++++++++++++++++++ .../service/BizMessageConsumerService.java | 8 ++++++++ .../impl/BizMessageConsumerServiceImpl.java | 18 +++++++++++++++++- .../bizmessage/vo/DescribeSiteMsgDetailVO.java | 1 + 6 files changed, 52 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index d7e12dc..2c4157c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.controller; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService; @@ -58,9 +59,10 @@ public class BizMessageConsumerController { DescribeSiteMsgDetailVO vo = new DescribeSiteMsgDetailVO(); vo.setMsgId(source.getId()); BeanUtils.copyProperties(source, vo); - //已读 - //this.service.updateState(source.getId()); - + BizMessageAuthorize authorize = new BizMessageAuthorize(); + authorize.setMessageId(source.getId()); + authorize = this.service.getAuthorize(authorize); + vo.setAuthorizestate(authorize.getState()); return vo; }).orElseGet(DescribeSiteMsgDetailVO::new); } 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 677fb87..f3e4724 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 @@ -3,6 +3,7 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import org.apache.ibatis.annotations.Param; @@ -18,4 +19,6 @@ public interface BizMessageMapper extends BaseMapper { List findMessageVoList(BizMessageVo vo); + List findAuthorizeList(BizMessageAuthorize vo); + } 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 1e4fbe5..0200e59 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 @@ -63,4 +63,22 @@ ORDER BY createtime DESC + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java index 2fb4082..40fab11 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.service; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO; @@ -17,4 +18,11 @@ public interface BizMessageConsumerService { Boolean updateState(String id); List selectMsgListByType(BizMessageVo vo); + + /** + * 查询读取状态 + * @param authorize + * @return + */ + BizMessageAuthorize getAuthorize(BizMessageAuthorize authorize); } 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 6eecc4c..1f2c92e 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 @@ -6,6 +6,7 @@ import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageMapper; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; +import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.BizMessagePage; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; @@ -69,7 +70,8 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService */ @Override public BizMessage getDetailById(String id) { - return mapper.selectById(id); + BizMessage message = mapper.selectById(id); + return message; } /** @@ -125,4 +127,18 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService return rList; } + + + /** + * 查询读取状态 + * @param authorize + * @return + */ + @Override + public BizMessageAuthorize getAuthorize(BizMessageAuthorize authorize){ + + authorize.setUserId(service.getCacheUser().getUserId()); + List authorizes = this.mapper.findAuthorizeList(authorize); + return authorizes!=null?authorizes.get(0):new BizMessageAuthorize(); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java index 5b9d27e..55d254e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java @@ -26,4 +26,5 @@ public class DescribeSiteMsgDetailVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp createtime; + private String authorizestate; } From 5c87824c4514d008c20018f34265647ee8b5b6e5 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 10 Aug 2021 16:33:09 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=B7=B2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml | 1 - 1 file changed, 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 0200e59..9858806 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 @@ -79,6 +79,5 @@ and state = #{state} - ORDER BY createtime DESC \ No newline at end of file From ed85aa6aef1aeeb8aeeaaf24fca19794ae4e15cf Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 11 Aug 2021 10:31:41 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/controller/BizMessageConsumerController.java | 1 + .../mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 2c4157c..86ec5fa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -63,6 +63,7 @@ public class BizMessageConsumerController { authorize.setMessageId(source.getId()); authorize = this.service.getAuthorize(authorize); vo.setAuthorizestate(authorize.getState()); + vo.setServicecode(source.getServicecode()); return vo; }).orElseGet(DescribeSiteMsgDetailVO::new); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java index 55d254e..585ac74 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/vo/DescribeSiteMsgDetailVO.java @@ -27,4 +27,5 @@ public class DescribeSiteMsgDetailVO { private Timestamp createtime; private String authorizestate; + private String servicecode; } From cdad36d8e68cb591ad37554458f9f57e56f0fa69 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Mon, 16 Aug 2021 10:09:57 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bizmessage/service/impl/BizMessageConsumerServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1f2c92e..7028181 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 @@ -139,6 +139,6 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService authorize.setUserId(service.getCacheUser().getUserId()); List authorizes = this.mapper.findAuthorizeList(authorize); - return authorizes!=null?authorizes.get(0):new BizMessageAuthorize(); + return authorizes!=null&&authorizes.size()>0?authorizes.get(0):new BizMessageAuthorize(); } } From 18fd9953c23a9857f40ad368bb74af632458d2b9 Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 19 Aug 2021 14:22:11 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/RiskManageRegulationService.java | 36 +++++++ .../RiskManageRegulationGroupOuterVO.java | 40 ++++++++ .../feign/utils/CallRegulationUtil.java | 93 +++++++++++++++++++ .../controller/RiskManageController.java | 64 +++++++++++++ .../entity/RiskManageRegulation.java | 44 +++++++++ .../RiskManageRegulationGroupApply.java | 43 +++++++++ .../entity/RiskManageRegulationVO.java | 23 +++++ .../service/IRiskManageService.java | 18 ++++ .../service/impl/RiskManageServiceImpl.java | 62 +++++++++++++ 9 files changed, 423 insertions(+) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/risk/RiskManageRegulationGroupOuterVO.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/feign/utils/CallRegulationUtil.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/controller/RiskManageController.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulation.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationVO.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/IRiskManageService.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java new file mode 100644 index 0000000..95575b5 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java @@ -0,0 +1,36 @@ +package com.chinaunicom.mall.ebtp.extend.feign.client; + +/** + * 风险管控接口调用 + * @author daixc + * @date 2021/08/18 + */ +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulation; +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationGroupApply; +import com.chinaunicom.mall.ebtp.extend.feign.entity.risk.RiskManageRegulationGroupOuterVO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +@FeignClient(value = "${mconfig.feign.name.strategy-center}",path = "/outer/v1.0/riskManageRegulation") +public interface RiskManageRegulationService { + + /** + * 查询规则模型列表接口 + * @param riskManageRegulation 风险管控规则模型 + * @return 返回结果 + */ + @PostMapping({"/findRegulationParams"}) + BaseResponse> findRegulationParams(@RequestBody RiskManageRegulation riskManageRegulation); + + /** + * 执行风控规则 + * @param regulationGroupApply 风控规则对象 + * @return 返回结果 + */ + @PostMapping({"/applyRegulation"}) + BaseResponse applyRegulation(@RequestBody RiskManageRegulationGroupApply regulationGroupApply); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/risk/RiskManageRegulationGroupOuterVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/risk/RiskManageRegulationGroupOuterVO.java new file mode 100644 index 0000000..7ab36b8 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/risk/RiskManageRegulationGroupOuterVO.java @@ -0,0 +1,40 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity.risk; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * 风险管控规则接口返回对象 + * @author daixc + * @date 2021/08/18 + */ +@Data +@ApiModel("风险管控规则接口返回对象") +public class RiskManageRegulationGroupOuterVO implements Serializable { + + @ApiModelProperty("规则主键") + private String regulationGroupId; + @ApiModelProperty("规则集合编号") + private String regulationGroupCode; + @ApiModelProperty("规则名称") + private String regulationGroupName; + @ApiModelProperty("模型主键") + private String regulationId; + @ApiModelProperty("规则所需的字段标识") + private String regulationField; + @ApiModelProperty("产品范围类型") + private String regulationProductRangeType; + @ApiModelProperty("风险识别条件所需的字段标识") + private String regulationConditionField; + @ApiModelProperty("识别条件") + private String regulationCondition; + @ApiModelProperty("是否需要上传竞争合理性文件：Y：是 N：否") + private String regulationPromotionUploadFiles; + @ApiModelProperty("返回参数集") + private List> regulations; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/utils/CallRegulationUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/utils/CallRegulationUtil.java new file mode 100644 index 0000000..30f134a --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/utils/CallRegulationUtil.java @@ -0,0 +1,93 @@ +package com.chinaunicom.mall.ebtp.extend.feign.utils; + +import cn.hutool.core.collection.CollUtil; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.feign.entity.risk.RiskManageRegulationGroupOuterVO; + +import java.util.*; + +/** + * 风险管控处理辅助类 + * @author daixc + * @date 2021/08/18 + */ +public class CallRegulationUtil { + + public static List getCallRegulationMap(Map param, BaseResponse> regulationParams, String orgId) throws NoSuchFieldException, IllegalAccessException { + List regulationParamsList = regulationParams.getData(); + Iterator var4 = regulationParamsList.iterator(); + + while(var4.hasNext()) { + RiskManageRegulationGroupOuterVO groupOuterVo = (RiskManageRegulationGroupOuterVO)var4.next(); + List> regulationList = groupOuterVo.getRegulations(); + List> parameterList = new ArrayList(); + Iterator var8 = regulationList.iterator(); + + while(var8.hasNext()) { + Map map = (Map)var8.next(); + Map regulationObj = (Map)map.get("parameters"); + Map regulationMap = new HashMap(); + Map value = new HashMap(); + if (regulationObj.get("fields") != null) { + Iterator var13 = ((List)regulationObj.get("fields")).iterator(); + + while(var13.hasNext()) { + Object field = var13.next(); +// Class cls = param.getClass(); +// Field f = cls.getDeclaredField(field.toString()); +// f.setAccessible(true); +// Object object = f.get(param); +// value.put(field.toString(), object); + value.put(field.toString(), param.get(field)); + } + + regulationMap.put("fields", value); + } + + List productList = (List)regulationObj.get("products"); + if (CollUtil.isNotEmpty(productList) && productList.get(0) != null) { + value = new HashMap(); + Iterator var21 = productList.iterator(); + + while(var21.hasNext()) { + String field = (String)var21.next(); +// Class cls = param.getClass(); +// Field f = cls.getDeclaredField(field); +// f.setAccessible(true); +// Object object = f.get(param); + value.put(field, param.get(field)); + } + + regulationMap.put("products", value); + } + + List conditionFields = (List)regulationObj.get("conditionFields"); + if (!conditionFields.isEmpty() && !"".equals(conditionFields.get(0))) { + value = new HashMap(); + Iterator var24 = conditionFields.iterator(); + + while(var24.hasNext()) { + String field = (String)var24.next(); +// Class cls = param.getClass(); +// Field f = cls.getDeclaredField(field); +// f.setAccessible(true); +// Object object = f.get(param); +// value.put(field, object); + value.put(field, param.get(field)); + } + + regulationMap.put("conditionFields", value); + } + + regulationMap.put("orgOu", orgId); + Map params = new HashMap(); + params.put("regulationId", map.get("regulationId")); + params.put("parameters", regulationMap); + params.put("uploadFiles", map.get("uploadFiles")); + parameterList.add(params); + } + groupOuterVo.setRegulations(parameterList); + } + return regulationParamsList; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/controller/RiskManageController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/controller/RiskManageController.java new file mode 100644 index 0000000..19e83ea --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/controller/RiskManageController.java @@ -0,0 +1,64 @@ +package com.chinaunicom.mall.ebtp.extend.riskmanage.controller; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.feign.client.RiskManageRegulationService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.risk.RiskManageRegulationGroupOuterVO; +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulation; +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationGroupApply; +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationVO; +import com.chinaunicom.mall.ebtp.extend.riskmanage.service.IRiskManageService; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author daixc + * @date daixc + */ + +@RestController +@Api(tags = "风险管控") +@RequestMapping("/v1/risk") +public class RiskManageController { + + @Resource + private RiskManageRegulationService regulationService; + + @Resource + private IRiskManageService riskManageService; + + /** + * 查询规则模型列表接口 + * @param riskManageRegulation 风险管控规则模型 + * @return 返回结果 + */ + @PostMapping({"/findRegulationParams"}) + public BaseResponse> findRegulationParams(@RequestBody RiskManageRegulation riskManageRegulation){ + return regulationService.findRegulationParams(riskManageRegulation); + } + + /** + * 执行风控规则 + * @param regulationGroupApply 风控规则对象 + * @return 返回结果 + */ + @PostMapping({"/applyRegulation"}) + public BaseResponse applyRegulation(@RequestBody RiskManageRegulationGroupApply regulationGroupApply){ + return regulationService.applyRegulation(regulationGroupApply); + } + + /** + * 查询规则模型列表接口 + * @param riskManageRegulation 风险管控规则模型 + * @return 返回结果 + */ + @PostMapping({"/findApplyRegulation"}) + public BaseResponse findApplyRegulation(@RequestBody RiskManageRegulationVO riskManageRegulation){ + return BaseResponse.success(riskManageService.findApplyRegulation(riskManageRegulation)); + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulation.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulation.java new file mode 100644 index 0000000..e34f073 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulation.java @@ -0,0 +1,44 @@ +package com.chinaunicom.mall.ebtp.extend.riskmanage.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 风险管控规则模型 + * @author daixc + * @date 2021/08/18 + */ +@Data +@ApiModel("RiskManageRegulation规则模型对象") +public class RiskManageRegulation implements Serializable { + + @ApiModelProperty("主键") + private String regulationGroupModuleId; + + @ApiModelProperty("规则集合主键") + private String regulationGroupId; + + @ApiModelProperty("规则集合编号") + private String regulationGroupCode; + + @ApiModelProperty("调用模块类别名称") + private String callCategoryName; + + @ApiModelProperty("调用模块类别编号") + private String callCategory; + + @ApiModelProperty("风险调用模块名称") + private String callModuleName; + + @ApiModelProperty("风险调用模块") + private String callModuleCode; + + @ApiModelProperty("调用节点(多个用英文逗号隔开)") + private String callPointName; + + @ApiModelProperty("调用节点编号(多个用英文逗号隔开)") + private String callPointCode; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java new file mode 100644 index 0000000..c6051ab --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationGroupApply.java @@ -0,0 +1,43 @@ +package com.chinaunicom.mall.ebtp.extend.riskmanage.entity; + +import com.chinaunicom.mall.ebtp.extend.feign.entity.risk.RiskManageRegulationGroupOuterVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 风控规则 + * @author daixc + * @date 2021/08/18 + */ +@Data +@ApiModel("风控规则对象") +public class RiskManageRegulationGroupApply implements Serializable { + + @ApiModelProperty("业务id") + private String businessId; + + @ApiModelProperty("调用模块类别编号") + private String callCategoryCode; + + @ApiModelProperty("调用模块类别名称") + private String callCategoryName; + + @ApiModelProperty("风险调用模块编号") + private String callModuleCode; + + @ApiModelProperty("风险调用模块名称") + private String callModuleName; + + @ApiModelProperty("调用节点编号") + private String callPointCode; + + @ApiModelProperty("调用节点名称") + private String callPointName; + + @ApiModelProperty("应用规则所需的参数") + private List outerVoList; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationVO.java new file mode 100644 index 0000000..5708889 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/entity/RiskManageRegulationVO.java @@ -0,0 +1,23 @@ +package com.chinaunicom.mall.ebtp.extend.riskmanage.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Map; + +/** + * 风险管控规则模型 + * @author daixc + * @date 2021/08/18 + */ +@Data +@ApiModel("执行接口请求对象") +public class RiskManageRegulationVO { + + @ApiModelProperty("请求参数对象") + private Map params; + + @ApiModelProperty("规则模型对象") + private RiskManageRegulation riskManageRegulation; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/IRiskManageService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/IRiskManageService.java new file mode 100644 index 0000000..7e5c5b6 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/IRiskManageService.java @@ -0,0 +1,18 @@ +package com.chinaunicom.mall.ebtp.extend.riskmanage.service; + +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationVO; + +/** + * 风控接口 + * @author daixc + * @date 2021/08/19 + */ +public interface IRiskManageService { + + /** + * 分控中心校验是否通过 + * @param riskManageRegulation 访问实体 + * @return 返回结果 + */ + Object findApplyRegulation(RiskManageRegulationVO riskManageRegulation); +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java new file mode 100644 index 0000000..0758047 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/riskmanage/service/impl/RiskManageServiceImpl.java @@ -0,0 +1,62 @@ +package com.chinaunicom.mall.ebtp.extend.riskmanage.service.impl; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; +import com.chinaunicom.mall.ebtp.extend.feign.client.RiskManageRegulationService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.risk.RiskManageRegulationGroupOuterVO; +import com.chinaunicom.mall.ebtp.extend.feign.utils.CallRegulationUtil; +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulation; +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationGroupApply; +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationVO; +import com.chinaunicom.mall.ebtp.extend.riskmanage.service.IRiskManageService; +import lombok.SneakyThrows; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * 风险管控接口实现 + * @author daixc + * @date 2021/08/19 + */ +@Service +public class RiskManageServiceImpl implements IRiskManageService { + + @Resource + private RiskManageRegulationService regulationService; + + @Resource + private IBaseCacheUserService cacheUserService; + + @SneakyThrows + @Override + public Object findApplyRegulation(RiskManageRegulationVO riskManageRegulation) { + + Map params = riskManageRegulation.getParams(); + RiskManageRegulation regulation = riskManageRegulation.getRiskManageRegulation(); + + //查询模型信息 + BaseResponse> regulationParams = regulationService.findRegulationParams(regulation); + + RiskManageRegulationGroupApply regulationGroupApply = new RiskManageRegulationGroupApply(); + regulationGroupApply.setBusinessId(params.get("id").toString()); + //模块分类 + regulationGroupApply.setCallCategoryCode(regulation.getCallCategory()); + regulationGroupApply.setCallCategoryName(regulation.getCallCategoryName()); + //调用模块 + regulationGroupApply.setCallModuleCode(regulation.getCallModuleCode()); + regulationGroupApply.setCallModuleName(regulation.getCallModuleName()); + //调用节点 + regulationGroupApply.setCallPointCode(regulation.getCallPointCode()); + regulationGroupApply.setCallPointName(regulation.getCallPointName()); + + BaseCacheUser cacheUser = cacheUserService.getCacheUser(); + regulationGroupApply.setOuterVoList(CallRegulationUtil.getCallRegulationMap(params,regulationParams,cacheUser.getOrganizationId())); + + //校验信息 + return regulationService.applyRegulation(regulationGroupApply); + } +} From 2b5457676da5d363ab5ddd5592b2b63240d5d522 Mon Sep 17 00:00:00 2001 From: dxc Date: Thu, 19 Aug 2021 16:19:42 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/RiskManageRegulationService.java | 4 ++- ...anageRegulationServiceFallbackFactory.java | 33 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/RiskManageRegulationServiceFallbackFactory.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java index 95575b5..d1ff15b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/RiskManageRegulationService.java @@ -6,6 +6,7 @@ package com.chinaunicom.mall.ebtp.extend.feign.client; * @date 2021/08/18 */ import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.feign.client.factory.RiskManageRegulationServiceFallbackFactory; import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulation; import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationGroupApply; import com.chinaunicom.mall.ebtp.extend.feign.entity.risk.RiskManageRegulationGroupOuterVO; @@ -15,7 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -@FeignClient(value = "${mconfig.feign.name.strategy-center}",path = "/outer/v1.0/riskManageRegulation") +@FeignClient(value = "${mconfig.feign.name.strategy-center}",path = "/outer/v1.0/riskManageRegulation", + fallbackFactory = RiskManageRegulationServiceFallbackFactory.class) public interface RiskManageRegulationService { /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/RiskManageRegulationServiceFallbackFactory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/RiskManageRegulationServiceFallbackFactory.java new file mode 100644 index 0000000..da45c43 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/factory/RiskManageRegulationServiceFallbackFactory.java @@ -0,0 +1,33 @@ +package com.chinaunicom.mall.ebtp.extend.feign.client.factory; + +import cn.hutool.core.exceptions.ExceptionUtil; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.feign.client.RiskManageRegulationService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.risk.RiskManageRegulationGroupOuterVO; +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulation; +import com.chinaunicom.mall.ebtp.extend.riskmanage.entity.RiskManageRegulationGroupApply; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +@Slf4j +public class RiskManageRegulationServiceFallbackFactory implements FallbackFactory { + @Override + public RiskManageRegulationService create(Throwable throwable) { + log.error(ExceptionUtil.stacktraceToString(throwable)); + return new RiskManageRegulationService() { + @Override + public BaseResponse> findRegulationParams(RiskManageRegulation riskManageRegulation) { + return null; + } + + @Override + public BaseResponse applyRegulation(RiskManageRegulationGroupApply regulationGroupApply) { + return null; + } + }; + } +} From 537311a1f4ee989b5aa852ed56918a9d997dff1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 23 Aug 2021 10:19:24 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A0=B9=E6=8D=AEbi?= =?UTF-8?q?d=E8=8E=B7=E5=8F=96=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExpertSignatureServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 8d44059..28b858f 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 @@ -2,9 +2,11 @@ package com.chinaunicom.mall.ebtp.extend.signature.service.impl; import cn.hutool.core.io.FileUtil; +import com.aspose.words.FontSettings; import com.aspose.words.License; import com.aspose.words.SaveFormat; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.api.AttachmentClient; +import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentDetail; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.export.service.templateFile.TemplateFileService; @@ -26,10 +28,7 @@ import sun.misc.BASE64Decoder; import java.io.*; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Slf4j @Service @@ -63,9 +62,10 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { //获取专家签名文件 InputStream expertSign = getExpertSign(signature, path); //获取bid的word文件 - AttachmentEntity entity = attachmentClient.findByObjectId(signature.getBid()).orElse(new AttachmentEntity()); + AttachmentDetail attachmentDetail = attachmentClient.findByBusinessId(Collections.singletonList(signature.getBid())).orElse(new AttachmentDetail()); + AttachmentEntity entity = attachmentDetail.get(signature.getBid()).stream().findAny().orElseThrow(() -> new RuntimeException("文档查询失败")); - byte[] bytes = attachmentClient.downloadFileByObjectId(signature.getBid()).orElse(new byte[0]); + byte[] bytes = attachmentClient.downloadFileByObjectId(signature.getBid()).orElseThrow(() -> new RuntimeException("文档下载失败")); InputStream word = new ByteArrayInputStream(bytes); //合并word 转为pdf @@ -116,7 +116,7 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { File f = new File(path + "merged.pdf"); FileOutputStream fos = new FileOutputStream(f); - + FontSettings.getDefaultInstance().setDefaultFontName("MS YaHei"); try { com.aspose.words.Document doc = new com.aspose.words.Document(path + "merged.docx"); doc.save(fos, SaveFormat.PDF); From 88f319f9c5ff28124935c7d606979e0ee4ceca67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E9=91=AB?= Date: Mon, 23 Aug 2021 13:41:10 +0800 Subject: [PATCH 12/15] Update Dockerfile-uat --- Dockerfile-uat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile-uat b/Dockerfile-uat index c441d3f..380716f 100644 --- a/Dockerfile-uat +++ b/Dockerfile-uat @@ -1,7 +1,7 @@ FROM harbor.dcos.guangzhou.unicom.local/eshop/jdk8_springboot_agent:v1.6 -ENV LC_ALL=zh_CN.utf8 -ENV LANG=zh_CN.utf8 -ENV LANGUAGE=zh_CN.utf8 -RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 +#ENV LC_ALL=zh_CN.utf8 +#ENV LANG=zh_CN.utf8 +#ENV LANGUAGE=zh_CN.utf8 +#RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 ADD /target/biz_service_ebtp_extend-0.0.1.jar /biz_service_ebtp_extend-0.0.1.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/skywalking/agent/skywalking-agent.jar","-jar", "/biz_service_ebtp_extend-0.0.1.jar"] From a37fb36daa90ab853455fd76a43cc7c5c63f0b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 23 Aug 2021 13:43:50 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A0=B9=E6=8D=AEbi?= =?UTF-8?q?d=E8=8E=B7=E5=8F=96=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ExpertSignatureServiceImpl.java | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 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 28b858f..1553c98 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 @@ -8,6 +8,7 @@ import com.aspose.words.SaveFormat; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.api.AttachmentClient; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentDetail; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; +import com.chinaunicom.mall.ebtp.common.util.JsonUtils; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.export.service.templateFile.TemplateFileService; import com.chinaunicom.mall.ebtp.extend.signature.entity.ExpertSignature; @@ -63,9 +64,11 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { InputStream expertSign = getExpertSign(signature, path); //获取bid的word文件 AttachmentDetail attachmentDetail = attachmentClient.findByBusinessId(Collections.singletonList(signature.getBid())).orElse(new AttachmentDetail()); - AttachmentEntity entity = attachmentDetail.get(signature.getBid()).stream().findAny().orElseThrow(() -> new RuntimeException("文档查询失败")); - - byte[] bytes = attachmentClient.downloadFileByObjectId(signature.getBid()).orElseThrow(() -> new RuntimeException("文档下载失败")); + AttachmentEntity entity = attachmentDetail.get(signature.getBid()).stream().findAny() + .orElseGet(() -> attachmentClient.findByObjectId(signature.getBid()).orElseThrow(() -> new RuntimeException("文档查询失败"))); + log.info("----------AttachmentEntity --------: " + JsonUtils.objectToJson(entity)); + byte[] bytes = attachmentClient.downloadFileByObjectId(entity.getId()).orElseThrow(() -> new RuntimeException("文档下载失败")); + log.info("----------AttachmentEntity --------: " + bytes.length); InputStream word = new ByteArrayInputStream(bytes); //合并word 转为pdf @@ -138,22 +141,6 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { private boolean getLicense() { boolean result = false; InputStream is = ExpertSignatureServiceImpl.class.getClassLoader().getResourceAsStream("/license/aspose-license.xml"); -// String licenseStr = -// "\n" + -// " \n" + -// " \n" + -// " Aspose.Total for Java\n" + -// " Aspose.Words for Java\n" + -// " \n" + -// " Enterprise\n" + -// " 20991231\n" + -// " 20991231\n" + -// " 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7\n" + -// " \n" + -// " sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=\n" + -// ""; -// InputStream is = null; -// is = new ByteArrayInputStream(licenseStr.getBytes(StandardCharsets.UTF_8)); License license = new License(); try { license.setLicense(is); From c94fec02462e1423ac0640e1c66c8b65d18934fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 23 Aug 2021 14:23:33 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E5=BA=93=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signature/service/impl/ExpertSignatureServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1553c98..29e473c 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 @@ -119,7 +119,7 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { File f = new File(path + "merged.pdf"); FileOutputStream fos = new FileOutputStream(f); - FontSettings.getDefaultInstance().setDefaultFontName("MS YaHei"); + FontSettings.getDefaultInstance().setFontsFolder("/storage/fonts/",true); try { com.aspose.words.Document doc = new com.aspose.words.Document(path + "merged.docx"); doc.save(fos, SaveFormat.PDF); From 7d4c91c2e25930ab9cbbcc2a09b87a332c376e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 23 Aug 2021 15:21:44 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E5=BA=93=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExpertSignatureServiceImpl.java | 9 +++++++-- src/main/resources/application-dev.yml | 1 + src/main/resources/application-local.yml | 1 + src/main/resources/application-mster.yml | 1 + src/main/resources/application-uat.yml | 1 + 5 files changed, 11 insertions(+), 2 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 29e473c..12fcc34 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 @@ -44,6 +44,9 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { @Value("${mconfig.file.upload-address}") private String uploadAddress; + @Value("${mconfig.file.font-address}") + private String fontAddress; + private String getUploadAddress(String assessRoomId) { SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); @@ -81,7 +84,9 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { //上传pdf到文档中心 String pdfId = PropertyUtils.getSnowflakeId(); - attachmentClient.upload(pdfId, entity.getFilename(), pdf); + String filename = entity.getFilename(); + filename = filename.substring(0, filename.lastIndexOf(".")) + ".pdf"; + attachmentClient.upload(pdfId, filename, pdf); return pdfId; } @@ -119,7 +124,7 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { File f = new File(path + "merged.pdf"); FileOutputStream fos = new FileOutputStream(f); - FontSettings.getDefaultInstance().setFontsFolder("/storage/fonts/",true); + FontSettings.getDefaultInstance().setFontsFolder(fontAddress, true); try { com.aspose.words.Document doc = new com.aspose.words.Document(path + "merged.docx"); doc.save(fos, SaveFormat.PDF); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ef4944f..f3ea5e3 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -173,6 +173,7 @@ mconfig: documentcenter: core-service-document-center #文档中心 usercenter: core-service-usercenter-public #用户中心 file: + font-address: /storage/fonts/ upload-address: /storage/reviewReport/ document: clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 4f3a9c1..22add41 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -165,6 +165,7 @@ mconfig: documentcenter: core-service-document-center #文档中心 usercenter: core-service-usercenter-public #用户中心 file: + font-address: /storage/fonts/ upload-address: /storage/reviewReport/ document: diff --git a/src/main/resources/application-mster.yml b/src/main/resources/application-mster.yml index aacb2f2..53412c8 100644 --- a/src/main/resources/application-mster.yml +++ b/src/main/resources/application-mster.yml @@ -168,6 +168,7 @@ mconfig: documentcenter: core-service-document-center #文档中心 usercenter: core-service-usercenter-public #用户中心 file: + font-address: /storage/fonts/ upload-address: /storage/reviewReport/ document: clientHttpUrl: http://10.238.25.112:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index 5d1ae5c..c176d9b 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -168,6 +168,7 @@ mconfig: documentcenter: core-service-document-center #文档中心 usercenter: core-service-usercenter-public #用户中心 file: + font-address: /storage/fonts/ upload-address: /storage/reviewReport/ document: clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749