20220606

xiaoyong931011

2022-07-08 bd4ab82f2e0c485f36a254e3cbf72f21dabfd628

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java

@@ -104,7 +104,7 @@
                        cmsTemplate.setType(1);
                    }
                    cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : templateFile.getName());
                    cmsTemplate.setPath(IdUtil.simpleUUID()+templateFile.getName());
                    cmsTemplate.setPath(templateFile.getName());

                    this.baseMapper.insert(cmsTemplate);
                }
@@ -126,7 +126,7 @@
                    cmsTemplate.setType(1);
                }
                cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : file.getName());
                cmsTemplate.setPath(IdUtil.simpleUUID()+file.getName());
                cmsTemplate.setPath(file.getName());

                this.baseMapper.insert(cmsTemplate);
            }
@@ -156,7 +156,6 @@
        Long companyId = LoginUserUtil.getCompanyId();
        QueryWrapper<CmsTemplateEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("company_id",companyId);
        objectQueryWrapper.eq("company_id",companyId);
        List<CmsTemplateEntity> cmsTemplateEntities = this.baseMapper.selectList(objectQueryWrapper);
        return Result.ok(cmsTemplateEntities);
    }
@@ -166,23 +165,22 @@

    @Override
    public Result viewTemplateInfo(Long id) {
        Long companyId = LoginUserUtil.getCompanyId();
        Result result = new Result();
        CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectById(id);
        String baseUrl = cmsProperties.getBaseUrl();
        String templatePath = cmsProperties.getTemplatePath();
        String htmlUrl = baseUrl + templatePath;
        String pathName = htmlUrl + "/" + cmsTemplateEntity.getPath();
        String pathName = FileUtils.path(templatePath, cmsTemplateEntity.getPath());

        byte[] bytes = new byte[0];
        try {
            bytes = Files.readAllBytes(Paths.get(pathName));
        } catch (IOException e) {
            e.printStackTrace();
            return Result.ok("未找到模板");
            return result.fail("未找到模板");
        }

        String content = new String(bytes, StandardCharsets.UTF_8);
        return Result.ok(content );
        result.setData(content);
        return result;
    }

}