diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java index 8807063..802271e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java @@ -5,8 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; -import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile; +import cn.estsh.impp.framework.boot.fileservice.ImppFileService; +import cn.estsh.i3plus.pojo.base.bean.ImppFile; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -15,7 +15,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; /** * @Description : @@ -33,7 +32,7 @@ public class DemoUploadController extends CoreBaseController{ /********************** 文件上传 ***********************/ @Autowired - private FastDFSClient dfsClient; + private ImppFileService fileService; @GetMapping("/") public String index() { @@ -64,7 +63,7 @@ public class DemoUploadController extends CoreBaseController{ @ApiOperation(value = "文件上传",notes = "文件上传") public ResultBean singleFileUpload(@RequestParam("file") MultipartFile file) { try { - FastDFSFile dfsFile = dfsClient.saveFile(file); + ImppFile dfsFile = fileService.upload(file); return ResultBean.success("上传成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(dfsFile); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index b866da4..f8fb82d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -17,7 +17,8 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; +import cn.estsh.impp.framework.boot.fileservice.ImppFileService; +import cn.estsh.i3plus.pojo.base.bean.ImppFile; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; @@ -64,7 +65,7 @@ public class SysFileController extends CoreBaseController { private ISysDictionaryService dictionaryService; @Autowired - private FastDFSClient dfsClient; + private ImppFileService fileService; /** * 修改文件资源 @@ -106,7 +107,12 @@ public class SysFileController extends CoreBaseController { ValidatorBean.checkNotNull(sysFile, "文件信息不存在"); LOGGER.info("FastDFS删除文件 == groupName: {}，name：{}", sysFile.getDfsGroupName(), sysFile.getDfsFileName()); - dfsClient.deleteFile(sysFile.getDfsGroupName(), sysFile.getDfsFileName()); + + ImppFile imppFile = new ImppFile(); + imppFile.setDfsGroupName(sysFile.getDfsGroupName()); + imppFile.setDfsFileName(sysFile.getDfsFileName()); + + fileService.deleteFile(imppFile); sysFileService.deleteSysFileById(Long.parseLong(idStr)); @@ -312,7 +318,11 @@ public class SysFileController extends CoreBaseController { .build(); } - InputStream fis = dfsClient.downFile(sysFile.getDfsGroupName(), sysFile.getDfsFileName()); + ImppFile imppFile = new ImppFile(); + imppFile.setDfsGroupName(sysFile.getDfsGroupName()); + imppFile.setDfsFileName(sysFile.getDfsFileName()); + + InputStream fis = fileService.downFile(imppFile); if (fis == null) { throw ImppExceptionBuilder.newInstance() diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java index e8d840d..a61645e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java @@ -25,8 +25,8 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; -import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile; +import cn.estsh.impp.framework.boot.fileservice.ImppFileService; +import cn.estsh.i3plus.pojo.base.bean.ImppFile; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -82,7 +82,7 @@ public class SysLocaleResourceController extends CoreBaseController { private EntityManager entityManager; @Autowired - private FastDFSClient dfsClient; + private ImppFileService fileService; /** * 新增语言资源 @@ -487,10 +487,10 @@ public class SysLocaleResourceController extends CoreBaseController { // 查询服务器中是否存在模板文件 SysFile sysFile = sysFileService.getSysFileByFileCode(importTemplateCode); if(sysFile == null){ - FastDFSFile fastDFSFile = new FastDFSFile(SysLocaleResource.class.getSimpleName() + "ImportTemplate.xls", + ImppFile fastDFSFile = new ImppFile(SysLocaleResource.class.getSimpleName() + "ImportTemplate.xls", excelTool.importTemplate(SysLocaleResource.class), ".xls"); - sysFile = dfsClient.upload(fastDFSFile,CommonEnumUtil.SOFT_TYPE.CORE.getValue()); + sysFile = fileService.upload(fastDFSFile,CommonEnumUtil.SOFT_TYPE.CORE.getValue()); sysFile.setFileCode(importTemplateCode); sysFileService.insertSysFile(sysFile); } @@ -563,7 +563,9 @@ public class SysLocaleResourceController extends CoreBaseController { @ApiOperation(value = "批量转换缺失资源") public ResultBean doBatchConversionMissResource(@RequestBody List missResourceModelList){ try { - sysLocaleResourceService.doConversionMissResourceByKeys(missResourceModelList); + ValidatorBean.checkNotNull(missResourceModelList,"请选择缺失数据信息"); + + sysLocaleResourceService.doConversionMissResourceByKeys(missResourceModelList, AuthUtil.getSessionUser().getUserName()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { @@ -607,7 +609,7 @@ public class SysLocaleResourceController extends CoreBaseController { String fileName = "locale_" + System.currentTimeMillis() + ".xls"; File file = new File(tempDir,fileName); - if (file.createNewFile()) { + if (!file.createNewFile()) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.IO_EXCEPTION_FILE.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java index ea3b86f..4c145c5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -21,8 +21,8 @@ import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; -import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile; +import cn.estsh.impp.framework.boot.fileservice.ImppFileService; +import cn.estsh.i3plus.pojo.base.bean.ImppFile; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -67,7 +67,7 @@ public class SysOrderNoRuleController extends CoreBaseController { private ISysMessageService sysMessageService; @Autowired - private FastDFSClient dfsClient; + private ImppFileService fileService; @Autowired private EntityManager entityManager; @@ -333,10 +333,10 @@ public class SysOrderNoRuleController extends CoreBaseController { // 查询服务器中是否存在模板文件 SysFile sysFile = sysFileService.getSysFileByFileCode(importTemplateCode); if(sysFile == null){ - FastDFSFile fastDFSFile = new FastDFSFile(SysOrderNoRule.class.getSimpleName() + "ImportTemplate.xls", + ImppFile fastDFSFile = new ImppFile(SysOrderNoRule.class.getSimpleName() + "ImportTemplate.xls", excelTool.importTemplate(SysOrderNoRule.class), ".xls"); - sysFile = dfsClient.upload(fastDFSFile,CommonEnumUtil.SOFT_TYPE.CORE.getValue()); + sysFile = fileService.upload(fastDFSFile,CommonEnumUtil.SOFT_TYPE.CORE.getValue()); sysFile.setFileCode(importTemplateCode); sysFileService.insertSysFile(sysFile); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java index 20385a5..2bec7ca 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java @@ -16,8 +16,8 @@ import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository; import cn.estsh.i3plus.pojo.platform.repository.SysFileRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; -import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile; +import cn.estsh.impp.framework.boot.fileservice.ImppFileService; +import cn.estsh.i3plus.pojo.base.bean.ImppFile; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -47,7 +47,7 @@ public class SysFileServiceImpl implements ISysFileService { private SysDictionaryRepository sysDictionaryRDao; @Autowired - private FastDFSClient dfsClient; + private ImppFileService fileService; @Override @ApiOperation(value = "新增资源信息") @@ -173,15 +173,15 @@ public class SysFileServiceImpl implements ISysFileService { sysFile.setFileSoftType(CommonEnumUtil.SOFT_TYPE.CORE.getValue()); } - FastDFSFile fastDFSFile; + ImppFile fastDFSFile; SysFile uploadFile; // 判断参数类型 if (file instanceof File) { - fastDFSFile = new FastDFSFile(((File) file).getName(), FileTool.file2Byte(((File) file).getPath()), + fastDFSFile = new ImppFile(((File) file).getName(), FileTool.file2Byte(((File) file).getPath()), StringTool.getStringFileSuffix(((File) file).getName(), true)); - uploadFile = dfsClient.upload(fastDFSFile, sysFile.getFileSoftTypeVal()); + uploadFile = fileService.upload(fastDFSFile, sysFile.getFileSoftTypeVal()); } else { - uploadFile = dfsClient.saveFile((MultipartFile) file, sysFile.getFileSoftTypeVal()); + uploadFile = fileService.upload((MultipartFile) file, sysFile.getFileSoftTypeVal()); } uploadFile.setId(sysFile.getId()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java index 38f380f..e413d37 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.BeanCopyTool; import cn.estsh.i3plus.platform.common.tool.JsonUtilTool; @@ -257,7 +258,7 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { } @Override - public void doConversionMissResourceByKeys(List missResourceModelList) { + public void doConversionMissResourceByKeys(List missResourceModelList,String userName) { Map langCodeMap = sysLocaleLanguageRDao.list() .stream() .collect( @@ -278,6 +279,9 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { sysLocaleResource.setResourceValue(resourceModel.getResourceValue()); sysLocaleResource.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + // 数据初始化 + ConvertBean.serviceModelInitialize(sysLocaleResource,userName); + insertSysLocaleResource(sysLocaleResource); redisRes.deleteKey(resourceModel.getKey()); }