五微服务bug修改

puhanshu

2022-02-25 9fb332433b5994fb8a980adaf5bd224461601bc8

五微服务bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsServiceImportExcelListen.java

@@ -151,12 +151,12 @@
                } else {
                    log.info("业务层处理逻辑失败");
                }
                if (!mistakes.isEmpty()) {
                    log.info("将错误数据缓存到redis中");
                    valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                    log.info("将错误数据缓存到redis中成功");
                    throw new ServiceException("500", key);
                }
            }
            if (!mistakes.isEmpty()) {
                log.info("将错误数据缓存到redis中");
                valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                log.info("将错误数据缓存到redis中成功");
                throw new ServiceException("500", key);
            }
        } catch (NumberFormatException e) {
            log.info("处理数据时失败");

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsTeamMemberImportExcelListen.java

@@ -160,22 +160,16 @@
                    List<ComFmsTeamMemberImportMistakeExcelVO> list =
                            JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComFmsTeamMemberImportMistakeExcelVO.class);
                    mistakes.addAll(list);
                    if (!mistakes.isEmpty()) {
                        log.info("将错误数据存入redis中");
                        valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                        log.info("将错误数据存入redis中成功");
                        throw new ServiceException("500", key);
                    }
                } else {
                    log.info("业务层处理逻辑失败");
                    if (!mistakes.isEmpty()) {
                        log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
                        valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                        log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
                        throw new ServiceException("500", key);
                    }
                }
            }
            if (!mistakes.isEmpty()) {
                log.info("将错误数据存入redis中");
                valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                log.info("将错误数据存入redis中成功");
                throw new ServiceException("500", key);
            }
        } catch (NumberFormatException e) {
            log.info("处理数据时失败");
            e.printStackTrace();

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComFmsApi.java

@@ -611,7 +611,7 @@
        }
    }

    @ApiOperation(value = "testJob")
    @ApiOperation(value = "手动触发微服务自动评价定时任务")
    @PostMapping("/service/timeJob")
    public R timeJobFmsService() {
        return communityService.timedTaskFmsServiceDefaultPraise();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java

@@ -67,9 +67,11 @@
    public R addFmsServiceAdmin(AddFmsServiceAdminDTO adminDTO) {
        ComFmsService comFmsService = new ComFmsService();
        BeanUtils.copyProperties(adminDTO, comFmsService);
        comFmsService.setServiceStatus(ComFmsService.ServiceStatus.dpj);
        comFmsService.setServiceStatus(ComFmsService.ServiceStatus.ywc);
        comFmsService.setApprovalAt(new Date());
        int num = this.baseMapper.insert(comFmsService);
        if (num > 0) {
            //服务记录
            ComFmsServiceRecord comFmsServiceRecord = new ComFmsServiceRecord();
            comFmsServiceRecord.setServiceId(comFmsService.getId());
            comFmsServiceRecord.setContent(adminDTO.getServiceProcess());
@@ -77,6 +79,13 @@
            comFmsServiceRecord.setStage(ComFmsServiceRecord.Stage.WCFW);
            comFmsServiceRecord.setCreatedBy(adminDTO.getCreatedBy());
            comFmsServiceRecordDAO.insert(comFmsServiceRecord);
            //默认好评
            ComFmsServiceEvaluations evaluation = new ComFmsServiceEvaluations();
            evaluation.setServiceId(comFmsService.getId());
            evaluation.setStarLevel(5);
            evaluation.setEvaluateContent("系统默认好评！");
            evaluation.setUserId(comFmsService.getUserId());
            comFmsServiceEvaluationsDAO.insert(evaluation);
            return R.ok();
        }
        return R.fail("操作失败，请重新尝试");
@@ -196,7 +205,7 @@
            comFmsService.setCommunityId(communityId);
            comFmsService.setCreatedBy(userId);
            comFmsService.setUpdatedBy(userId);
            comFmsService.setServiceStatus(ComFmsService.ServiceStatus.dpj);
            comFmsService.setServiceStatus(ComFmsService.ServiceStatus.ywc);
            int num = this.baseMapper.insert(comFmsService);
            if (num > 0) {
                ComFmsServiceRecord comFmsServiceRecord = new ComFmsServiceRecord();
@@ -205,6 +214,14 @@
                comFmsServiceRecord.setStage(ComFmsServiceRecord.Stage.WCFW);
                comFmsServiceRecord.setCreatedBy(userId);
                comFmsServiceRecordDAO.insert(comFmsServiceRecord);

                //默认好评
                ComFmsServiceEvaluations evaluation = new ComFmsServiceEvaluations();
                evaluation.setServiceId(comFmsService.getId());
                evaluation.setStarLevel(5);
                evaluation.setEvaluateContent("系统默认好评！");
                evaluation.setUserId(comFmsService.getUserId());
                comFmsServiceEvaluationsDAO.insert(evaluation);
            }
        });
        return R.ok();