Skip to content

T
ts-api-demo
Commit 245eb6ec authored by ml's avatar ml
Browse files
Options

国际化修改 增加站点逻辑

parent 4c19ae51
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 28 deletions
src/functional/mvc/control/i18n.control.ts
View file @ 245eb6ec
......@@ -17,6 +17,9 @@ export const list = async (req: any, infoPageVO: I18nInfoPageVO) => {
try {
infoPageVO.page = Optional.opt(infoPageVO, 'page', 1);
infoPageVO.size = Optional.opt(infoPageVO, 'size', 20);
if (!infoPageVO.site){
throw ErrorCode.PARAM_MISS;
}
let res = await i18nService.list(infoPageVO);
return Res3Utils.result(res);
......@@ -37,6 +40,9 @@ export const add = async (req: any, infoVO: I18nInfoVO) => {
try {
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
let currentUserId = await getCurrentUserId(req.cookies.session_id);
if (!infoVO.site){
throw ErrorCode.PARAM_MISS;
}
let res = await i18nService.add(infoVO,currentUserId,ip);
return Res3Utils.result(res);
}
......@@ -56,6 +62,9 @@ export const preview = async (req: any, infoVO: I18nInfoVO) => {
let cmd = req.path;
try {
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
if (!infoVO.site){
throw ErrorCode.PARAM_MISS;
}
let currentUserId = await getCurrentUserId(req.cookies.session_id);
let res = await i18nService.preview(infoVO,currentUserId,ip);
return Res3Utils.result(res);
......@@ -74,7 +83,10 @@ export const versionList = async (req: any, infoVO: I18nInfoVO) => {
let func_name = "i18nCtrl.versionList";
let cmd = req.path;
try {
let res = await i18nService.versionList();
if (!infoVO.site){
throw ErrorCode.PARAM_MISS;
}
let res = await i18nService.versionList(infoVO.site);
return Res3Utils.result(res);
}
catch (e) {
......
src/functional/mvc/control/i18nlog.control.ts
View file @ 245eb6ec
......@@ -20,6 +20,9 @@ export const list = async (req: any, i18nInfoLogVO: I18nInfoLogVO) => {
if (!i18nInfoLogVO.version){
throw ErrorCode.PARAM_MISS;
}
if (!i18nInfoLogVO.site){
throw ErrorCode.PARAM_MISS;
}
let res = await i18nLogService.list(i18nInfoLogVO);
return Res3Utils.result(res);
}
......@@ -40,6 +43,7 @@ export const revert = async (req: any, i18nInfoLogVO: I18nInfoLogVO) => {
let ip = isIp(req.ip) ? req.ip : '*.*.*.*';
let currentUserId = await getCurrentUserId(req.cookies.session_id);
ApiAssert.notNull(ErrorCode.PARAM_MISS, i18nInfoLogVO.version);
ApiAssert.notNull(ErrorCode.PARAM_MISS, i18nInfoLogVO.site);
let res = await i18nLogService.revert(i18nInfoLogVO,currentUserId,ip);
return Res3Utils.result(res);
}
......
src/functional/mvc/service/i18n.service.ts
View file @ 245eb6ec
......@@ -10,6 +10,8 @@ let _ = require('lodash');
export interface I18nInfoVO {
info_json: string;
site: string;
}
export interface I18nInfoPageVO extends I18nInfoVO {
......@@ -27,7 +29,9 @@ export interface I18nInfoPageVO extends I18nInfoVO {
}
export const list = async (infoPageVO: I18nInfoPageVO) => {
let condition = {};
let condition = {
site: infoPageVO.site
};
if (infoPageVO.platform) {
condition['platform'] = Number(infoPageVO.platform);
}
......@@ -59,7 +63,8 @@ export const add = async (infoVO: I18nInfoVO, currentUserId: any, ip: any) => {
throw ErrorCode.PARAM_MISS;
}
let infoList = JSON.parse(infoJson);
let lastVersionList = await getLastVersionList();
let lastVersionList = await getLastVersionList(infoVO.site);
let timestamp = new Date();
let insertHistoryList: any = [];
......@@ -86,25 +91,26 @@ export const add = async (infoVO: I18nInfoVO, currentUserId: any, ip: any) => {
let key = insertOne['platform'] + '_' + insertOne['module'] + '_' + insertOne['code'];
insertOne.version = version;
insertOne.sub_code = insertOne.sub_code ? insertOne.sub_code :
insertOne.site = infoVO.site;
insertOne.sub_code = insertOne.sub_code !== null ? insertOne.sub_code :
(lastVersionMap[key] ? lastVersionMap[key].sub_code : '');
insertOne.zh_cn = insertOne.zh_cn ? insertOne.zh_cn :
insertOne.zh_cn = insertOne.zh_cn !== null ? insertOne.zh_cn :
(lastVersionMap[key] ? lastVersionMap[key].zh_cn : '');
insertOne.en_us = insertOne.en_us ? insertOne.en_us :
insertOne.en_us = insertOne.en_us !== null ? insertOne.en_us :
(lastVersionMap[key] ? lastVersionMap[key].en_us : '');
insertOne.ja_jp = insertOne.ja_jp ? insertOne.ja_jp :
insertOne.ja_jp = insertOne.ja_jp !== null ? insertOne.ja_jp :
(lastVersionMap[key] ? lastVersionMap[key].ja_jp : '');
insertOne.ko_kr = insertOne.ko_kr ? insertOne.ko_kr :
insertOne.ko_kr = insertOne.ko_kr !== null ? insertOne.ko_kr :
(lastVersionMap[key] ? lastVersionMap[key].ko_kr : '');
insertOne.vi_vn = insertOne.vi_vn ? insertOne.vi_vn :
insertOne.vi_vn = insertOne.vi_vn !== null ? insertOne.vi_vn :
(lastVersionMap[key] ? lastVersionMap[key].vi_vn : '');
insertOne.ar_ae = insertOne.ar_ae ? insertOne.ar_ae :
insertOne.ar_ae = insertOne.ar_ae !== null ? insertOne.ar_ae :
(lastVersionMap[key] ? lastVersionMap[key].ar_ae : '');
insertOne.createdAt = timestamp;
......@@ -163,7 +169,7 @@ export const preview = async (infoVO: I18nInfoVO, currentUserId: any, ip: any) =
throw ErrorCode.PARAM_MISS;
}
let infoList = JSON.parse(infoJson);
let lastVersionList = await getLastVersionList();
let lastVersionList = await getLastVersionList(infoVO.site);
let timestamp = new Date().getTime();
let lastVersionMap: any = {};
......@@ -186,25 +192,25 @@ export const preview = async (infoVO: I18nInfoVO, currentUserId: any, ip: any) =
}
let key = insertOne['platform'] + '_' + insertOne['module'] + '_' + insertOne['code'];
insertOne.sub_code = insertOne.sub_code ? insertOne.sub_code :
insertOne.sub_code = insertOne.sub_code !== null ? insertOne.sub_code :
(lastVersionMap[key] ? lastVersionMap[key].sub_code : '');
insertOne.zh_cn = insertOne.zh_cn ? insertOne.zh_cn :
insertOne.zh_cn = insertOne.zh_cn !== null ? insertOne.zh_cn :
(lastVersionMap[key] ? lastVersionMap[key].zh_cn : '');
insertOne.en_us = insertOne.en_us ? insertOne.en_us :
insertOne.en_us = insertOne.en_us !== null ? insertOne.en_us :
(lastVersionMap[key] ? lastVersionMap[key].en_us : '');
insertOne.ja_jp = insertOne.ja_jp ? insertOne.ja_jp :
insertOne.ja_jp = insertOne.ja_jp !== null ? insertOne.ja_jp :
(lastVersionMap[key] ? lastVersionMap[key].ja_jp : '');
insertOne.ko_kr = insertOne.ko_kr ? insertOne.ko_kr :
insertOne.ko_kr = insertOne.ko_kr !== null ? insertOne.ko_kr :
(lastVersionMap[key] ? lastVersionMap[key].ko_kr : '');
insertOne.vi_vn = insertOne.vi_vn ? insertOne.vi_vn :
insertOne.vi_vn = insertOne.vi_vn !== null ? insertOne.vi_vn :
(lastVersionMap[key] ? lastVersionMap[key].vi_vn : '');
insertOne.ar_ae = insertOne.ar_ae ? insertOne.ar_ae :
insertOne.ar_ae = insertOne.ar_ae !== null ? insertOne.ar_ae :
(lastVersionMap[key] ? lastVersionMap[key].ar_ae : '');
insertOne.updatedAt = timestamp;
......@@ -218,10 +224,12 @@ export const preview = async (infoVO: I18nInfoVO, currentUserId: any, ip: any) =
return resList;
};
export const versionList = async () => {
export const versionList = async (site:any) => {
let options = {
attributes: ['version', 'createdAt', 'updatedAt'],
where: {},
where: {
site:Number(site)
},
order: [['version', 'desc']],
group: ['version', 'createdAt', 'updatedAt'],
raw: true
......@@ -240,11 +248,13 @@ export const versionList = async () => {
/**
* 查询版本记录
* 查询站点版本记录
*/
export async function getLastVersionList() {
export async function getLastVersionList(site: any) {
return await i18nInfo.prototype.findAll({
where: {},
where: {
site: Number(site)
},
order: [['id', 'asc']],
raw: true
});
......
src/functional/mvc/service/i18nlog.service.ts
View file @ 245eb6ec
......@@ -17,7 +17,8 @@ export interface I18nInfoLogVO extends I18nInfoPageVO {
export async function list(i18nInfoLogVO: I18nInfoLogVO) {
let condition = {
version:i18nInfoLogVO.version
version: i18nInfoLogVO.version,
site: Number(i18nInfoLogVO.site)
};
if (i18nInfoLogVO.platform) {
condition['platform'] = Number(i18nInfoLogVO.platform);
......@@ -48,7 +49,8 @@ export async function list(i18nInfoLogVO: I18nInfoLogVO) {
export async function revert(i18nInfoLogVO: I18nInfoLogVO, currentUserId: any, ip: any) {
let dbHistoryList = await i18nInfoHistory.prototype.findAll({
where: {
version: i18nInfoLogVO.version
version: i18nInfoLogVO.version,
site: Number(i18nInfoLogVO.site)
},
order: [['info_id', 'asc']],
raw: true,
......@@ -63,7 +65,7 @@ export async function revert(i18nInfoLogVO: I18nInfoLogVO, currentUserId: any, i
insertInfoList.push(item);
}
let currentVersionList = await getLastVersionList();
let currentVersionList = await getLastVersionList(i18nInfoLogVO.site);
let current_version = "";
for (let item of currentVersionList) {
......@@ -83,13 +85,16 @@ export async function revert(i18nInfoLogVO: I18nInfoLogVO, currentUserId: any, i
//删除历史版本
await i18nInfoHistory.prototype.destroy({
where: {
version: i18nInfoLogVO.version
version: i18nInfoLogVO.version,
site: Number(i18nInfoLogVO.site)
},
transaction: tx
});
//删除当前版本
await i18nInfo.prototype.destroy({
where: {},
where: {
site: Number(i18nInfoLogVO.site)
},
transaction: tx
});
//当前版本存入历史
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment