diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 0a167f8..682c8a8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -19,7 +19,10 @@ 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.util.*; +import cn.estsh.impp.framework.boot.util.ImppRedis; +import cn.estsh.impp.framework.boot.util.LocaleUtils; +import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -31,10 +34,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Description : @@ -392,16 +392,27 @@ public class WhiteController extends CoreBaseController { } } - - @GetMapping("/sys-organize/enum") - @ApiOperation(value = "获取全部组织", notes = "获取全部组织") - public ResultBean getEnum(){ + /** + * 查询未翻译的资源 + * @return 处理结果 + */ + @PostMapping(value = "/locale-resource/no-resource") + @ApiOperation(value = "查询未翻译的资源",notes = "查询未翻译的资源") + public ResultBean findSysConfigAll(){ try { - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(Arrays.asList(CommonEnumUtil.IS_VAILD.values())); + Set keys = redisRes.getKeysSet(CommonConstWords.REDIS_PREFIX_CACHE_NO_RES+"*"); + List list = new ArrayList<>(); + for (String key : keys) { + list.add(redisRes.getObject(key).toString()); + } + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(list); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ResourceImportUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ResourceImportUtil.java index fe5c926..1558035 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ResourceImportUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ResourceImportUtil.java @@ -28,7 +28,7 @@ public class ResourceImportUtil { public static void main(String[] args) { File file = new File("C:\\Users\\yunha\\Desktop\\资源文件.xlsx"); - File sql = new File("C:\\Users\\yunha\\Desktop\\imppRource.sql"); + File sql = new File("C:\\Users\\yunha\\Desktop\\imppResource.sql"); int i = 1; try { FileWriter fileWritter = new FileWriter(sql,false); @@ -92,7 +92,7 @@ public class ResourceImportUtil { sysLocaleResource.setResourceValue(row.getCell(3).getStringCellValue()); System.out.println(sql(sysLocaleResource)); - if(isContainChinese(row.getCell(2).getStringCellValue())){ + if(isContainChinese(row.getCell(3).getStringCellValue())){ bufferWritter.write(sql(sysLocaleResource)); } @@ -124,7 +124,7 @@ public class ResourceImportUtil { sysLocaleResource.setResourceValue(row.getCell(3).getStringCellValue()); System.out.println(sql(sysLocaleResource)); - if(isContainChinese(row.getCell(2).getStringCellValue())){ + if(isContainChinese(row.getCell(3).getStringCellValue())){ bufferWritter.write(sql(sysLocaleResource)); } @@ -143,28 +143,34 @@ public class ResourceImportUtil { Sheet enumSheet = wb.getSheet("ENUM"); i =1; for (; i < enumSheet.getLastRowNum(); i++) { - row = wmsSheet.getRow(i); + row = enumSheet.getRow(i); System.out.println(snowflakeIdMaker.nextId()+" ENUM 行:"+i); + // 模块 + row.getCell(0).setCellType(CellType.STRING); + // 枚举名称 + row.getCell(1).setCellType(CellType.STRING); + // 枚举项名称 row.getCell(2).setCellType(CellType.STRING); + // 国际化（汉） row.getCell(3).setCellType(CellType.STRING); + // 国际化（英） +// row.getCell(4).setCellType(CellType.STRING); sysLocaleResource.setId(snowflakeIdMaker.nextId()); sysLocaleResource.setLanguageCode("CN/zh"); sysLocaleResource.setLanguageNameRdd("简体中文"); - sysLocaleResource.setResourceType( getType(row.getCell(1).getStringCellValue())); - sysLocaleResource.setResourceKey(row.getCell(2).getStringCellValue()); - sysLocaleResource.setResourceValue(row.getCell(2).getStringCellValue()); + sysLocaleResource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.ENUM.getValue()); + sysLocaleResource.setResourceKey(row.getCell(1).getStringCellValue()+":"+row.getCell(2).getStringCellValue()); + sysLocaleResource.setResourceValue(row.getCell(3).getStringCellValue()); System.out.println(sql(sysLocaleResource)); - if(isContainChinese(row.getCell(2).getStringCellValue())){ - bufferWritter.write(sql(sysLocaleResource)); - } + bufferWritter.write(sql(sysLocaleResource)); sysLocaleResource.setId(snowflakeIdMaker.nextId()); sysLocaleResource.setLanguageCode("US/en"); sysLocaleResource.setLanguageNameRdd("English"); - sysLocaleResource.setResourceType( getType(row.getCell(1).getStringCellValue())); - sysLocaleResource.setResourceKey(row.getCell(2).getStringCellValue()); + sysLocaleResource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.ENUM.getValue()); + sysLocaleResource.setResourceKey(row.getCell(1).getStringCellValue()+":"+row.getCell(2).getStringCellValue()); sysLocaleResource.setResourceValue(row.getCell(3).getStringCellValue()); System.out.println(sql(sysLocaleResource)); @@ -198,7 +204,7 @@ public class ResourceImportUtil { for (; i < configSheet.getLastRowNum(); i++) { row = configSheet.getRow(i); - System.out.println(snowflakeIdMaker.nextId()+" 参数 行:"+i); + System.out.println(snowflakeIdMaker.nextId() + " 参数 行:" + i); row.getCell(0).setCellType(CellType.STRING); row.getCell(1).setCellType(CellType.STRING); row.getCell(2).setCellType(CellType.STRING); @@ -240,7 +246,7 @@ public class ResourceImportUtil { "values " + "("+sysLocaleResource.getId()+",1,2,\"system\",\"" + TimeTool.getNowTime(true)+"\",\"system\",\"" + TimeTool.getNowTime(true)+ "\","+sysLocaleResource.getResourceType()+",\""+sysLocaleResource.getLanguageCode()+"\",\""+sysLocaleResource.getLanguageNameRdd()+"\",\"" - +sysLocaleResource.getResourceKey().replaceAll("\"","\\\\\\\"")+"\",\""+sysLocaleResource.getResourceValue().replaceAll("\"","\\\\\\\"")+"\",1);\n"; + +sysLocaleResource.getResourceKey().replaceAll("\"","\\\\\\\"").trim()+"\",\""+sysLocaleResource.getResourceValue().replaceAll("\"","\\\\\\\"").trim()+"\",1);\n"; }