代码提交

liusheng

4 天以前 2212759d051a0f60b4f0ada73d678cf150e29c84

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -255,34 +255,34 @@
        List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
        List<ServiceSubtask> serviceSubtaskList = new ArrayList<>();
        //获取分数
        for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
            //计算患者的分数
            if (serviceSubtask.getScore() == null || BigDecimal.ZERO.equals(serviceSubtask.getScore())) {
                //如果为空的话，去detail里拿到每个题的选项分，如果是作答题，直接拿题目分（前题，该模板是分数类型）
                Map<String, Object> map = getScore(serviceSubtask, serviceSubtaskVO.getDetailResult());
                serviceSubtask.setScore((BigDecimal) map.get("score"));
                serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                if ((Boolean) map.get("isExist") == true) {
                    //测试完删除（应付测试用的）
                    serviceSubtaskList.add(serviceSubtask);
                }
            } else {
                //测试完删除（应付测试用的）
                if (!StringUtils.isEmpty(serviceSubtaskVO.getDetailResult())) {
                    ServiceSubtaskDetail serviceSubtaskDetail = new ServiceSubtaskDetail();
                    serviceSubtaskDetail.setSubId(serviceSubtask.getId());
                    List<ServiceSubtaskDetail> serviceSubtaskDetails = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
                    for (ServiceSubtaskDetail ssd : serviceSubtaskDetails) {
                        if (ssd.getAsrtext().equals(serviceSubtaskVO.getDetailResult())) {
                            serviceSubtaskList.add(serviceSubtask);
                        }
                    }
                }else {
                    serviceSubtaskList.add(serviceSubtask);
                }
            }
        }
        return serviceSubtaskList;
//        for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
//            //计算患者的分数
//            if (serviceSubtask.getScore() == null || BigDecimal.ZERO.equals(serviceSubtask.getScore())) {
//                //如果为空的话，去detail里拿到每个题的选项分，如果是作答题，直接拿题目分（前题，该模板是分数类型）
//                Map<String, Object> map = getScore(serviceSubtask, serviceSubtaskVO.getDetailResult());
//                serviceSubtask.setScore((BigDecimal) map.get("score"));
//                serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
//                if ((Boolean) map.get("isExist") == true) {
//                    //测试完删除（应付测试用的）
//                    serviceSubtaskList.add(serviceSubtask);
//                }
//            } else {
//                //测试完删除（应付测试用的）
//                if (!StringUtils.isEmpty(serviceSubtaskVO.getDetailResult())) {
//                    ServiceSubtaskDetail serviceSubtaskDetail = new ServiceSubtaskDetail();
//                    serviceSubtaskDetail.setSubId(serviceSubtask.getId());
//                    List<ServiceSubtaskDetail> serviceSubtaskDetails = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
//                    for (ServiceSubtaskDetail ssd : serviceSubtaskDetails) {
//                        if (ssd.getAsrtext().equals(serviceSubtaskVO.getDetailResult())) {
//                            serviceSubtaskList.add(serviceSubtask);
//                        }
//                    }
//                }else {
//                    serviceSubtaskList.add(serviceSubtask);
//                }
//            }
//        }
        return selectServiceSubtaskList;
    }

    @Override
@@ -2224,12 +2224,15 @@
    }

    private String getOutPath(String phone, Long tid, String taskName, Long pId, Integer type) {
        log.info("tid的值为：{},pid的值为：{}",tid,pId);
        //对url中两个参数加密
        RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
        String taskId = rsaPublicKeyExample.encryptedData(tid.toString(), pub_key);
        String taskId = rsaPublicKeyExample.encryptedData(tid.toString(), pub_key).toString();
        String outpath = null;
        try {
            String patid = rsaPublicKeyExample.encryptedData(pId.toString(), pub_key);
            String patid = rsaPublicKeyExample.encryptedData(pId.toString(), pub_key).toString();

            log.info("tid加密后的值为：{},pid加密后的值为：{}",taskId,patid);
            SendMagParam sendMagParam = new SendMagParam();
            sendMagParam.setType("4");
            if (type == 1) {