daijunxiong/icrm-internation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: daijunxiong:dev
Branches Tags
daijunxiong:master
daijunxiong:dev
..
compare: daijunxiong:master
Branches Tags
daijunxiong:dev
daijunxiong:master

No commits in common. "dev" and "master" have entirely different histories.
dev ... master

9 changed files with 43 additions and 88 deletions
Show Stats Expand all files Collapse all files

4
pom.xml
View File

@ -30,7 +30,7 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.23</version>
<version>5.8.22</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -40,7 +40,7 @@
<dependency>
<groupId>com.mybatis-flex</groupId>
<artifactId>mybatis-flex-spring-boot-starter</artifactId>
<version>1.7.5</version>
<version>1.7.3</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>

30
src/main/java/com/blueland/common/core/controller/InternationalController.java
View File

@ -1,7 +1,6 @@
package com.blueland.common.core.controller;
import com.blueland.common.core.domain.International;
import com.blueland.common.core.utils.UserUtils;
import com.mybatisflex.core.paginate.Page;
import io.swagger.annotations.*;
import com.blueland.common.core.result.AjaxResult;
@ -113,23 +112,25 @@ public class InternationalController {
}
/**
* 一键翻译
* 一键复制
*
* @param targetLang 目标语言
* @param sourceLang 源语言
* @return {@link AjaxResult}<{@link Boolean}>
*/
@GetMapping("/translate")
@ApiOperation(value = "一键翻译")
@GetMapping("/copy")
@ApiOperation(value = "一键复制", notes = "例如：数据库只有中文，要翻译成英文")
@ApiImplicitParams(
{
@ApiImplicitParam(name = "tenantId", value = "租户id", dataType = "String", paramType = "query", required = false),
@ApiImplicitParam(name = "targetLang", value = "目标语言", dataType = "String", paramType = "query", required = true),
@ApiImplicitParam(name = "sourceLang", value = "源语言", dataType = "String", paramType = "query", required = true)
}
)
public AjaxResult<Boolean> translate(@RequestParam("targetLang") String targetLang,
@RequestParam("sourceLang") String sourceLang) {
return AjaxResult.operates(internationalService.translate(targetLang, sourceLang, UserUtils.getTenantId()));
public AjaxResult<Boolean> copy(@RequestParam("targetLang") String targetLang,
@RequestParam("sourceLang") String sourceLang,
@RequestParam(value = "tenantId", required = false) String tenantId) {
return AjaxResult.operates(internationalService.copy(targetLang, sourceLang, tenantId));
}
@GetMapping("/dowloadTemplate")
@ -153,24 +154,17 @@ public class InternationalController {
* @param sourceLang 源语言
* @return {@link AjaxResult}<{@link Boolean}>
*/
@GetMapping("/tenantIdTranslate")
@ApiOperation(value = "一键翻译（从其他租户复制）", notes = "例如：bio里面有en语言包，现在要复制到AHI里面")
@GetMapping("/tenantIdCopy")
@ApiOperation(value = "一键复制（从其他租户复制）", notes = "例如：bio里面有en语言包，现在要复制到AHI里面")
@ApiImplicitParams(
{
@ApiImplicitParam(name = "tenantId", value = "租户id", dataType = "String", paramType = "query", required = true),
@ApiImplicitParam(name = "sourceLang", value = "源语言", dataType = "String", paramType = "query", required = true)
}
)
public AjaxResult<Boolean> tenantIdTranslate(@RequestParam("sourceLang") String sourceLang,
public AjaxResult<Boolean> tenantIdCopy(@RequestParam("sourceLang") String sourceLang,
String tenantId) {
return AjaxResult.operates(internationalService.tenantIdTranslate(sourceLang, tenantId));
}
@GetMapping("/init")
@ApiOperation("初始化本租户的国际化数据")
public AjaxResult init() {
internationalService.init();
return AjaxResult.success();
return AjaxResult.operates(internationalService.tenantIdCopy(sourceLang, tenantId));
}
}

8
src/main/java/com/blueland/common/core/domain/BaseEntity.java
View File

@ -43,12 +43,16 @@ public class BaseEntity {
private Date updateTime;
@Column(ignore = true)
@JSONField(serialize = false)
@ApiModelProperty(value = "分页大小")
protected int pageSize;
@JsonIgnore
private int pageSize;
@Column(ignore = true)
@JSONField(serialize = false)
@ApiModelProperty(value = "分页页码")
protected int pageNum;
@JsonIgnore
private int pageNum;
@JsonIgnore
public Page getPage() {

4
src/main/java/com/blueland/common/core/handler/ExcelDicHandler.java
View File

@ -42,7 +42,7 @@ public class ExcelDicHandler implements IExcelDictHandler {
dictMap.put("dictValue", "前端");
list.add(dictMap);
dictMap = new HashMap<>();
dictMap.put("dictKey", "back");
dictMap.put("dictKey", "black");
dictMap.put("dictValue", "后端");
list.add(dictMap);
return list;
@ -72,7 +72,7 @@ public class ExcelDicHandler implements IExcelDictHandler {
if ("前端".equals(String.valueOf(value))) {
return "front";
}
return "back";
return "black";
} else if (SysConstan.LANG.equals(dict)) {
if ("中文".equals(String.valueOf(value))) {
return "zh";

5
src/main/java/com/blueland/common/core/service/InternationalService.java
View File

@ -62,7 +62,7 @@ public interface InternationalService extends IService<International> {
* @param tenantId
* @return boolean
*/
boolean translate(String targetLang, String sourceLang, String tenantId);
boolean copy(String targetLang, String sourceLang, String tenantId);
/**
@ -109,7 +109,6 @@ public interface InternationalService extends IService<International> {
* @param tenantId 保持ID
* @return {@link Boolean}
*/
Boolean tenantIdTranslate(String sourceLang, String tenantId);
Boolean tenantIdCopy(String sourceLang, String tenantId);
void init();
}

58
src/main/java/com/blueland/common/core/service/impl/InternationalServiceImpl.java
View File

@ -34,7 +34,6 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import static com.blueland.common.core.domain.table.InternationalTableDef.INTERNATIONAL;
import static com.mybatisflex.core.query.QueryMethods.notExists;
/**
* 国际化 服务层实现。
@ -132,8 +131,8 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
* @return boolean
*/
@Override
public boolean translate(String targetLang, String sourceLang, String tenantId) {
List<International> sourceLangList = selectNotExist(targetLang, sourceLang, tenantId);
public boolean copy(String targetLang, String sourceLang, String tenantId) {
List<International> sourceLangList = listByLang(sourceLang, tenantId, "");
List<String> nameList = sourceLangList.stream()
.map(International::getName)
@ -148,6 +147,7 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
futures.add(future);
}
CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
List<International> targetLangList = sourceLangList.stream()
.map(el -> {
International international = new International();
@ -159,7 +159,7 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
return international;
})
.collect(Collectors.toList());
Assert.notEmpty(targetLangList, "根据租户和语言查询不到数据");
boolean flag = saveBatch(targetLangList);
if (flag) {
RedisUtil.hashMultiSet(targetLang, targetLangList);
@ -167,26 +167,10 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
return flag;
}
private List<International> selectNotExist(String targetLang, String sourceLang, String tenantId) {
QueryWrapper where = QueryWrapper.create()
.select(INTERNATIONAL.CODE)
.from(INTERNATIONAL)
.where(INTERNATIONAL.LANG.eq(targetLang));
QueryWrapper wrapper = QueryWrapper.create()
.from(INTERNATIONAL).as("t1")
.where(INTERNATIONAL.LANG.eq(sourceLang))
.and(INTERNATIONAL.CODE.notIn(where));
return list(wrapper);
}
@Override
public boolean updateInternational(International international) {
boolean flag = updateById(international);
if (flag) {
international = getById(international.getId());
RedisUtil.hashSet(international);
}
return flag;
@ -228,14 +212,6 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
List<InternationalExport> importList;
try {
importList = ExcelImportUtil.importExcel(file.getInputStream(), InternationalExport.class, params);
importList.stream()
.collect(Collectors.groupingBy(el -> el.getCode() + el.getLang()))
.values()
.stream()
.filter(el -> el.size() > 1)
.forEach(el -> {
Assert.isTrue(false, StrUtil.format("编码【{}】语言【{}】重复", el.get(0).getCode(), el.get(0).getLang()));
});
// 校验数据完整性
for (InternationalExport export : importList) {
@ -256,7 +232,7 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e.getMessage());
throw new RuntimeException("导入失败");
}
List<International> list = BeanUtil.copyToList(importList, International.class);
boolean flag = saveBatch(list);
@ -282,7 +258,7 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
}
@Override
public Boolean tenantIdTranslate(String sourceLang, String tenantId) {
public Boolean tenantIdCopy(String sourceLang, String tenantId) {
List<International> list = listByLang(sourceLang, tenantId, "").stream()
.map(el -> {
el.setTenantId(UserUtils.getTenantId());
@ -295,32 +271,12 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
})
.collect(Collectors.toList());
boolean flag = saveBatch(list);
if (flag) {
if(flag){
RedisUtil.hashMultiSet(sourceLang, list);
}
return flag;
}
/**
* 根据租户初始化
*
* @return
*/
@Override
public void init() {
QueryWrapper wrapper = QueryWrapper.create()
.where(INTERNATIONAL.TENANT_ID.eq(UserUtils.getTenantId()));
List<International> list = list(wrapper);
if (CollUtil.isNotEmpty(list)) {
list.stream()
.collect(Collectors.groupingBy(International::getLang))
.forEach((k, v) -> {
RedisUtil.hashMultiSet(k, v);
});
}
}
public Map<String, International> list(List<InternationalExport> list) {
QueryWrapper wrapper = QueryWrapper.create();

4
src/main/java/com/blueland/common/core/utils/TranslateUtil.java
View File

@ -9,7 +9,6 @@ import com.tencentcloudapi.tmt.v20180321.TmtClient;
import com.tencentcloudapi.tmt.v20180321.models.TextTranslateBatchRequest;
import com.tencentcloudapi.tmt.v20180321.models.TextTranslateBatchResponse;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -42,8 +41,7 @@ public class TranslateUtil {
TextTranslateBatchResponse resp = client.TextTranslateBatch(req);
String[] targetTextList = resp.getTargetTextList();
for (int i = 0; i < targetTextList.length; i++) {
String value = targetTextList[i].replace("[", "【").replace("]", "】");
infoMap.put(query.get(i), value);
infoMap.put(query.get(i), targetTextList[i]);
}
} catch (TencentCloudSDKException e) {
throw new RuntimeException(e);

5
src/main/resources/application-test.yml
View File

@ -6,6 +6,9 @@ spring:
username: crm
password: crm@123
url: jdbc:mysql://192.168.1.13:3308/crm_usm?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
# redis:
# host: localhost
# port: 6379
redis:
database: 9
host: 192.168.1.169
@ -16,7 +19,7 @@ tm:
logging:
level:
com.blueland.common.core: debug
net.rzdata.internation: debug
mybatis-flex:
type-aliases-package: com.blueland.common.core.domain

11
src/main/resources/application.yml
View File

@ -13,11 +13,9 @@ spring:
database: 9
host: 192.168.1.169
password: ''
profiles:
active: test
tm:
secretId: AKID4IXccMhHdjcJm0wqPjndHhspkbDbGeJz
secretKey: aw3v5B3h8OPQO7j8JPGsFNHwMXTAcprf
secretId: AKIDVotjKflbCYjgOr53xb093h6FApFQN5Yl
secretKey: 1oMfqmSt52kDRYR4SaUAbmiOp1yf8MM7
server:
port: 8080
servlet:
@ -27,9 +25,12 @@ server:
name: crm-internation
logging:
level:
com.blueland.common.core: debug
net.rzdata.internation: debug
mybatis-flex:
type-aliases-package: com.blueland.common.core.domain
knife4j:
enable: true
openapi: