Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
13365f6e by 肖初晴
Options

【DAOP-1.0】企业认证 

【功能点】功能开发
1 parent 69b06d38
Inline Side-by-side
Showing 6 changed files with 102 additions and 88 deletions
src/main/java/com/csbr/qingcloud/portal/service/EnterpriseChangeApproveService.java
...@@ -16,6 +16,4 @@ public interface EnterpriseChangeApproveService { ...@@ -16,6 +16,4 @@ public interface EnterpriseChangeApproveService {
16 ChangeApproveVO changeDetail(String guid); 16 ChangeApproveVO changeDetail(String guid);
17 17
18 void changeUpdate(BizCallbackDTO dto); 18 void changeUpdate(BizCallbackDTO dto);
19
20 List<ChangeInfoVO> getChange(String tenantName);
21 } 19 }
......
src/main/java/com/csbr/qingcloud/portal/service/EnterpriseService.java
1 package com.csbr.qingcloud.portal.service; 1 package com.csbr.qingcloud.portal.service;
2 2
3 import com.csbr.qingcloud.portal.domain.vo.ChangeInfoVO;
3 import com.csbr.qingcloud.portal.domain.vo.EnterpriseRQVO; 4 import com.csbr.qingcloud.portal.domain.vo.EnterpriseRQVO;
4 import csbr.cloud.entity.domain.base.vo.PageListVO; 5 import csbr.cloud.entity.domain.base.vo.PageListVO;
5 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 6 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
...@@ -72,4 +73,6 @@ public interface EnterpriseService { ...@@ -72,4 +73,6 @@ public interface EnterpriseService {
72 void flowCallBack(BizCallbackDTO dto); 73 void flowCallBack(BizCallbackDTO dto);
73 74
74 Boolean check(EnterpriseRQVO vo); 75 Boolean check(EnterpriseRQVO vo);
76
77 List<ChangeInfoVO> getChange(String tenantName);
75 } 78 }
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseChangeApproveServiceImpl.java
...@@ -54,91 +54,13 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -54,91 +54,13 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
54 @Resource 54 @Resource
55 private PersonelFeign personelFeign; 55 private PersonelFeign personelFeign;
56 56
57 /** 生成变更信息列表 */
58 @Override
59 public List<ChangeInfoVO> getChange(String tenantName){
60 LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
61 queryWrapper.eq(MfEnterpriseChangeApprove::getTenantName,tenantName);
62 queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
63 List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
64 if(CollectionUtils.isEmpty(approveList)){
65 return new ArrayList<>();
66 }
67 List<ChangeApproveBean> beanList = getChangeBeanList(approveList);
68 try {
69 return getChangeList(beanList);
70 } catch (IllegalAccessException e) {
71 e.printStackTrace();
72 }
73 return new ArrayList<>();
74 }
75 57
76 public static void test(){
77 List<ChangeApproveBean> beanList = new ArrayList<>();
78 ChangeApproveBean bean = new ChangeApproveBean();
79
80 MfEnterprise oldBean = new MfEnterprise();
81 oldBean.setBankTaxNo("999");
82 oldBean.setTenantName("武汉小米");
83 oldBean.setCreateTime(new Date());
84
85 MfEnterprise newBean = new MfEnterprise();
86 newBean.setBankTaxNo("666");
87 newBean.setTenantName("武汉大米");
88 newBean.setCreateTime(new Date());
89
90 bean.oldBean = oldBean;
91 bean.newBean = newBean;
92 beanList.add(bean);
93 List<ChangeInfoVO> list = new ArrayList<>();
94 try {
95 list = getChangeList(beanList);
96 } catch (IllegalAccessException e) {
97 e.printStackTrace();
98 }
99 log.info("变更内容：{}", JSON.toJSONString(list));
100 }
101 58
102 /** 计算变更信息 */
103 public static List<ChangeInfoVO> getChangeList(List<ChangeApproveBean> beanList) throws IllegalAccessException {
104 List<ChangeInfoVO> list = new ArrayList<>();
105 //循环对比每组记录生来变更内容
106 for(ChangeApproveBean item : beanList){
107 List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
108 for(CompareResult diffItem : diffList){
109 ChangeInfoVO vo = new ChangeInfoVO();
110 vo.setName(diffItem.getFieldComment());
111 vo.setDate(DateUtil.formatDate(item.oldBean.getCreateTime(),"yyyy-MM-dd"));
112 vo.setBefore(diffItem.getOldValue().toString());
113 vo.setAfter(diffItem.getNewValue().toString());
114 list.add(vo);
115 }
116 }
117 59
118 return list;
119 }
120 60
121 /** 准备变更对比实体 */
122 private List<ChangeApproveBean> getChangeBeanList(List<MfEnterpriseChangeApprove> list){
123 List<ChangeApproveBean> beanList = new ArrayList<>();
124 for(MfEnterpriseChangeApprove item : list){
125 if("1".equals(item.getDataType())){
126 ChangeApproveBean bean = new ChangeApproveBean();
127 bean.oldBean = csbrBeanUtil.convert(item,MfEnterprise.class);
128 beanList.add(bean);
129 }
130 if("2".equals(item.getDataType())){
131 ChangeApproveBean bean = beanList.get(beanList.size() - 1);
132 bean.newBean = csbrBeanUtil.convert(item,MfEnterprise.class);
133 }
134 }
135 return beanList;
136 }
137 61
138 public static class ChangeApproveBean{ 62
139 public MfEnterprise oldBean; 63
140 public MfEnterprise newBean;
141 }
142 64
143 /** 保存变更数据 */ 65 /** 保存变更数据 */
144 @Override 66 @Override
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
1 package com.csbr.qingcloud.portal.service.impl; 1 package com.csbr.qingcloud.portal.service.impl;
2 2
3 import com.alibaba.fastjson.JSON;
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 5 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
5 import com.csbr.cloud.common.enums.SystemError; 6 import com.csbr.cloud.common.enums.SystemError;
6 import com.csbr.cloud.common.enums.WorkFlowBizEnum; 7 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
7 import com.csbr.qingcloud.portal.domain.vo.*; 8 import com.csbr.qingcloud.portal.domain.vo.*;
8 import com.csbr.qingcloud.portal.feign.PersonelFeign; 9 import com.csbr.qingcloud.portal.feign.PersonelFeign;
10 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
11 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService;
9 import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService; 12 import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService;
13 import com.csbr.qingcloud.portal.util.ObjectUtil;
10 import csbr.cloud.entity.enums.ApprovalStateEnum; 14 import csbr.cloud.entity.enums.ApprovalStateEnum;
11 import com.csbr.cloud.common.exception.CsbrSystemException; 15 import com.csbr.cloud.common.exception.CsbrSystemException;
12 import com.csbr.cloud.common.util.CommonUtil; 16 import com.csbr.cloud.common.util.CommonUtil;
...@@ -21,6 +25,7 @@ import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; ...@@ -21,6 +25,7 @@ import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
21 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise; 25 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
22 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService; 26 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
23 import com.csbr.qingcloud.portal.service.EnterpriseService; 27 import com.csbr.qingcloud.portal.service.EnterpriseService;
28 import io.seata.common.util.DateUtil;
24 import jakarta.annotation.Resource; 29 import jakarta.annotation.Resource;
25 import lombok.extern.slf4j.Slf4j; 30 import lombok.extern.slf4j.Slf4j;
26 import org.apache.commons.collections.CollectionUtils; 31 import org.apache.commons.collections.CollectionUtils;
...@@ -30,6 +35,7 @@ import io.seata.spring.annotation.GlobalTransactional; ...@@ -30,6 +35,7 @@ import io.seata.spring.annotation.GlobalTransactional;
30 import org.springframework.transaction.annotation.Transactional; 35 import org.springframework.transaction.annotation.Transactional;
31 36
32 import java.util.ArrayList; 37 import java.util.ArrayList;
38 import java.util.Date;
33 import java.util.List; 39 import java.util.List;
34 40
35 /** 41 /**
...@@ -63,7 +69,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -63,7 +69,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
63 private PersonelFeign personelFeign; 69 private PersonelFeign personelFeign;
64 70
65 @Resource 71 @Resource
66 private EnterpriseChangeApproveService enterpriseChangeApproveService; 72 private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService;
67 73
68 /** 74 /**
69 * 企业信息分页查询 75 * 企业信息分页查询
...@@ -108,10 +114,95 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -108,10 +114,95 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
108 } 114 }
109 EnterpriseRSVO vo = convertToVO(entity); 115 EnterpriseRSVO vo = convertToVO(entity);
110 //生成变更信息 116 //生成变更信息
111 vo.setChangeList(enterpriseChangeApproveService.getChange(entity.getTenantName())); 117 vo.setChangeList(getChange(entity.getTenantName()));
112 return vo; 118 return vo;
113 } 119 }
114 120
121 /** 生成变更信息列表 */
122 @Override
123 public List<ChangeInfoVO> getChange(String tenantName){
124 LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = new LambdaQueryWrapper<>();
125 queryWrapper.eq(MfEnterpriseChangeApprove::getTenantName,tenantName);
126 queryWrapper.orderByDesc(MfEnterpriseChangeApprove::getCreateTime);
127 List<MfEnterpriseChangeApprove> approveList = mfEnterpriseChangeApproveService.list(queryWrapper);
128 if(CollectionUtils.isEmpty(approveList)){
129 return new ArrayList<>();
130 }
131 List<ChangeApproveBean> beanList = getChangeBeanList(approveList);
132 try {
133 return getChangeList(beanList);
134 } catch (IllegalAccessException e) {
135 e.printStackTrace();
136 }
137 return new ArrayList<>();
138 }
139
140 public static void test(){
141 List<ChangeApproveBean> beanList = new ArrayList<>();
142 ChangeApproveBean bean = new ChangeApproveBean();
143
144 MfEnterprise oldBean = new MfEnterprise();
145 oldBean.setBankTaxNo("999");
146 oldBean.setTenantName("武汉小米");
147 oldBean.setCreateTime(new Date());
148
149 MfEnterprise newBean = new MfEnterprise();
150 newBean.setBankTaxNo("666");
151 newBean.setTenantName("武汉大米");
152 newBean.setCreateTime(new Date());
153
154 bean.oldBean = oldBean;
155 bean.newBean = newBean;
156 beanList.add(bean);
157 List<ChangeInfoVO> list = new ArrayList<>();
158 try {
159 list = getChangeList(beanList);
160 } catch (IllegalAccessException e) {
161 e.printStackTrace();
162 }
163 log.info("变更内容：{}", JSON.toJSONString(list));
164 }
165
166 /** 准备变更对比实体 */
167 private List<ChangeApproveBean> getChangeBeanList(List<MfEnterpriseChangeApprove> list){
168 List<ChangeApproveBean> beanList = new ArrayList<>();
169 for(MfEnterpriseChangeApprove item : list){
170 if("1".equals(item.getDataType())){
171 ChangeApproveBean bean = new ChangeApproveBean();
172 bean.oldBean = csbrBeanUtil.convert(item,MfEnterprise.class);
173 beanList.add(bean);
174 }
175 if("2".equals(item.getDataType())){
176 ChangeApproveBean bean = beanList.get(beanList.size() - 1);
177 bean.newBean = csbrBeanUtil.convert(item,MfEnterprise.class);
178 }
179 }
180 return beanList;
181 }
182
183 public static class ChangeApproveBean{
184 public MfEnterprise oldBean;
185 public MfEnterprise newBean;
186 }
187
188 /** 计算变更信息 */
189 public static List<ChangeInfoVO> getChangeList(List<ChangeApproveBean> beanList) throws IllegalAccessException {
190 List<ChangeInfoVO> list = new ArrayList<>();
191 //循环对比每组记录生来变更内容
192 for(ChangeApproveBean item : beanList){
193 List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
194 for(CompareResult diffItem : diffList){
195 ChangeInfoVO vo = new ChangeInfoVO();
196 vo.setName(diffItem.getFieldComment());
197 vo.setDate(DateUtil.formatDate(item.oldBean.getCreateTime(),"yyyy-MM-dd"));
198 vo.setBefore(diffItem.getOldValue().toString());
199 vo.setAfter(diffItem.getNewValue().toString());
200 list.add(vo);
201 }
202 }
203
204 return list;
205 }
115 206
116 207
117 /** 208 /**
......
src/main/resources/logback-kafka.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <springProperty scope="context" name="app_name" source="spring.application.name"/> 4 <springProperty scope="context" name="app_name" source="spring.application.name"/>
5 <contextName>${app_name}</contextName> 5 <contextName>${app_name}</contextName>
6 <!-- 包含 logback 的基础配置，路径就是所在包 --> 6 <!-- 包含 logback 的基础配置，路径就是所在包 -->
7 <include resource="com/csbr/cloud/common/logback/logback-base.xml"/> 7 <include resource="com/csbr/cloud/base/logback/logback-base.xml"/>
8 <!-- 增加skywalking配置日志收集--> 8 <!-- 增加skywalking配置日志收集-->
9 <appender name="grpc-log" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender"> 9 <appender name="grpc-log" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
10 <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder"> 10 <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
27 <springProperty scope="context" name="topci_prefix" source="csbr.kafka.topic-prefix" /> 27 <springProperty scope="context" name="topci_prefix" source="csbr.kafka.topic-prefix" />
28 28
29 <!-- 输出到Kafka --> 29 <!-- 输出到Kafka -->
30 <appender name="kafkaAppender" class="com.csbr.cloud.common.logback.KafkaAppender"> 30 <appender name="kafkaAppender" class="com.csbr.cloud.log.logback.KafkaAppender">
31 <bootstrapServers>${kafka_server}</bootstrapServers> 31 <bootstrapServers>${kafka_server}</bootstrapServers>
32 <topic>csbr_fbt_log</topic> 32 <topic>csbr_fbt_log</topic>
33 <prefix>${topci_prefix}</prefix> 33 <prefix>${topci_prefix}</prefix>
34 <formatter class="com.csbr.cloud.common.logback.JsonFormatter"> 34 <formatter class="com.csbr.cloud.log.logback.JsonFormatter">
35 <expectJson>false</expectJson> 35 <expectJson>false</expectJson>
36 </formatter> 36 </formatter>
37 </appender> 37 </appender>
......
src/main/resources/logback.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!-- 本地服务的名称 --> 3 <!-- 本地服务的名称 -->
4 <property name="app_name" value="ms-data-circulation-portal-service"/> 4 <property name="app_name" value="ms-data-circulation-portal-service"/>
5 <!-- 包含 logback 的基础配置，路径就是所在包 --> 5 <!-- 包含 logback 的基础配置，路径就是所在包 -->
6 <include resource="com/csbr/cloud/common/logback/logback-base.xml"/> 6 <include resource="com/csbr/cloud/base/logback/logback-base.xml"/>
7 <!-- 控制打印输出的内容 --> 7 <!-- 控制打印输出的内容 -->
8 <root level="INFO"> 8 <root level="INFO">
9 <appender-ref ref="FILE_ERROR"/> 9 <appender-ref ref="FILE_ERROR"/>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!