原因code码表修改,结果表数据修改2

src/main/java/cn/quantgroup/qgblservice/service/impl/BlackListToolsManagerServiceImpl.java

@@ -37,10 +37,7 @@ import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -1604,15 +1601,13 @@ public class BlackListToolsManagerServiceImpl implements IBlackListToolsManagerS
                     updateBeanList = new ArrayList<>();
 
                     for (BlackGreyListResult resultBean : tmpQueryList) {
-                        if(resultBean.getReasons()!=null){
-
+                        /*if(resultBean.getReasons()!=null){
                             List<ReasonsVo> reasonsList = null;
                             try {
                                 reasonsList = JSON.parseArray(resultBean.getReasons(), ReasonsVo.class);
                             }catch (Exception e){
                                log.info("reasons转换异常, bean: {} ", JSON.toJSONString(resultBean));
                             }
-
                             if(reasonsList!=null && reasonsList.size()>0){
                                 for (ReasonsVo rvo : reasonsList){
                                     if("1".equals(rvo.getReason())){
@@ -1639,6 +1634,68 @@ public class BlackListToolsManagerServiceImpl implements IBlackListToolsManagerS
                                 resultBean.setReasons(JSON.toJSONString(reasonsList));
                                 updateBeanList.add(resultBean);
                             }
+                        }*/
+
+                        if(StringUtils.isNotEmpty(resultBean.getTypes())){
+
+                            String[] types = resultBean.getTypes().split(",");
+                            if(types.length>2){
+
+                                Map<String, ReasonsVo> reasonsMap = new HashMap<>();
+                                try {
+                                    List<ReasonsVo> reasonsList = JSON.parseArray(resultBean.getReasons(), ReasonsVo.class);
+                                    if(reasonsList!=null && reasonsList.size()>0){
+                                        for (ReasonsVo tmp: reasonsList){
+                                            reasonsMap.put(tmp.getType(), tmp);
+                                        }
+                                    }
+                                }catch (Exception e){
+                                    log.info("reasons转换异常, bean: {} ", JSON.toJSONString(resultBean));
+                                }
+
+                                StringBuffer sqlInTypes = new StringBuffer();
+                                for(String type: types){
+                                    if(!reasonsMap.containsKey(type)){
+                                        if(sqlInTypes.length()==0){
+                                            sqlInTypes.append("'").append(type).append("'");
+                                        }else{
+                                            sqlInTypes.append(",").append("'").append(type).append("'");
+                                        }
+                                    }
+                                }
+
+                                if(sqlInTypes.length()>0 ){
+                                    List<ReasonsVo> tmpQueryResonList = null;
+                                    try{
+                                        String sql_query = " select d.type, d.reason_code, d.created_at from  black_grey_list_details d where d.r_id='"+resultBean.getRId()+"' AND d.type in ("+sqlInTypes.toString()+")";
+                                        tmpQueryResonList = blackListJdbcTemplate.query(sql_query, new RowMapper<ReasonsVo>() {
+                                            @Override
+                                            public ReasonsVo mapRow(ResultSet rs, int rowNum) throws SQLException {
+                                                ReasonsVo bean = new ReasonsVo();
+                                                bean.setType(rs.getString("type"));
+                                                bean.setReason(rs.getString("reason_code"));
+                                                bean.setUtcTime(rs.getTimestamp("created_at").getTime());
+                                                return bean;
+                                            }
+                                        });
+                                    }catch (Exception e){
+                                        log.info("详情表查询reason异常, bean: {} ", JSON.toJSONString(resultBean));
+                                    }
+                                    if(tmpQueryResonList!=null && tmpQueryResonList.size()>0){
+                                        for(ReasonsVo queryVo : tmpQueryResonList){
+                                            if(!reasonsMap.containsKey(queryVo.getType())){
+                                                reasonsMap.put(queryVo.getType(), queryVo);
+                                            }
+                                        }
+                                    }
+                                }
+
+                                if(reasonsMap!=null && reasonsMap.size()>0){
+                                    Collection<ReasonsVo> values = reasonsMap.values();
+                                    resultBean.setReasons(JSON.toJSONString(values));
+                                    updateBeanList.add(resultBean);
+                                }
+                            }
                         }
                     }