Commit 3267a90f by v_vjyjiang

d

parent 0f369eb2
......@@ -4,11 +4,12 @@ class ArticleCtl extends CtlBase {
constructor() {
super("common", CtlBase.getServiceName(ArticleCtl));
}
async create(p,q,req){
p.creator_id=p.userid
p.creator=p.username
let rtn=await this.service.create(p,q,req)
async create (p, q, req) {
p.creator_id = p.userid
p.creator = p.username
let rtn = await this.service.create(p, q, req)
return system.getResult(rtn)
}
}
module.exports = ArticleCtl;
......@@ -4,35 +4,35 @@ class TreearchCtl extends CtlBase {
constructor() {
super("common", CtlBase.getServiceName(TreearchCtl));
}
async getTreeArchByCode(p,q,req){
let code=p.code;
let archName=p.archName;
let rtn=await this.service.getTreeArchByCode(archName,code)
async getTreeArchByCode (p, q, req) {
let code = p.code;
let archName = p.archName;
let rtn = await this.service.getTreeArchByCode(archName, code)
return system.getResult(rtn)
}
async getRegions(p,q,req){
let regionjson=await this.service.getRegions();
return system.getResult({regionJson:regionjson})
}
async getSysArchJSON(p,q,req){
let sysArchJSON=await this.service.getSysArchJSON();
return system.getResult({sysArchJSON:sysArchJSON})
}
async saveSysArchJSON(p,q,req){
let sysArchJSON=await this.service.saveSysArchJSON(p.sysArchJSON);
return system.getResult({sysArchJSON:sysArchJSON})
}
async saveRegions(p,q,req){
let regionjson=await this.service.saveRegions(p.regionJson);
return system.getResult({regionJson:regionjson})
}
async getProductcats(p,q,req){
let productcatJson=await this.service.getProductcats();
return system.getResult({productcatJson:productcatJson})
}
async saveProductcats(p,q,req){
let productcatJson=await this.service.saveProductcats(p.productcatJson);
return system.getResult({productcatJson:productcatJson})
}
async getRegions (p, q, req) {
let regionjson = await this.service.getRegions();
return system.getResult({ regionJson: regionjson })
}
async getSysArchJSON (p, q, req) {
let sysArchJSON = await this.service.getSysArchJSON();
return system.getResult({ sysArchJSON: sysArchJSON })
}
async saveSysArchJSON (p, q, req) {
let sysArchJSON = await this.service.saveSysArchJSON(p.sysArchJSON, p);
return system.getResult({ sysArchJSON: sysArchJSON })
}
async saveRegions (p, q, req) {
let regionjson = await this.service.saveRegions(p.regionJson);
return system.getResult({ regionJson: regionjson })
}
async getProductcats (p, q, req) {
let productcatJson = await this.service.getProductcats();
return system.getResult({ productcatJson: productcatJson })
}
async saveProductcats (p, q, req) {
let productcatJson = await this.service.saveProductcats(p.productcatJson);
return system.getResult({ productcatJson: productcatJson })
}
}
module.exports = TreearchCtl;
......@@ -4,33 +4,44 @@ class TreeArchService extends ServiceBase {
constructor() {
super("common", ServiceBase.getDaoName(TreeArchService));
}
async getRegions() {
async getRegions () {
let rs = await this.dao.model.findAll({ attributes: ['regionJSON'] })
return JSON.parse(rs[0].regionJSON)
}
async getSysArchJSON() {
async getSysArchJSON () {
let rs = await this.dao.model.findAll({ attributes: ['sysArchJSON'] })
return JSON.parse(rs[0].sysArchJSON)
}
async saveSysArchJSON(sysArchJSON) {
let rs = await this.dao.model.findAll()
let upobj = rs[0]
upobj.sysArchJSON = JSON.stringify(sysArchJSON)
upobj.save()
return sysArchJSON
async saveSysArchJSON (sysArchJSON, p) {
var self = this
return this.db.transaction(async function (t) {
let rs = await self.dao.model.findAll({ transaction: t })
let upobj = rs[0]
upobj.sysArchJSON = JSON.stringify(sysArchJSON)
upobj.save({ transaction: t })
//节点删除,判断是否有子,如果有不能删除
if (p.olddata && p.olddata.orgpath != p.curdata.orgpath) {//如果路径编码修改了
let ats = await self.db.models.article.findAll({ where: { archpath: p.olddata.orgpath }, transaction: t })
for (let at of ats) {
at.archpath = p.curdata.orgpath
await at.save({ transaction: t })
}
}
return sysArchJSON
})
}
async saveRegions(regionJson) {
async saveRegions (regionJson) {
let rs = await this.dao.model.findAll()
let upobj = rs[0]
upobj.regionJSON = JSON.stringify(regionJson)
upobj.save()
return regionJson
}
async getProductcats() {
async getProductcats () {
let rs = await this.dao.model.findAll({ attributes: ['productcatJSON'] })
return JSON.parse(rs[0].productcatJSON)
}
async saveProductcats(productcatJson) {
async saveProductcats (productcatJson) {
let rs = await this.dao.model.findAll()
let upobj = rs[0]
upobj.productcatJSON = JSON.stringify(productcatJson)
......@@ -55,7 +66,7 @@ class TreeArchService extends ServiceBase {
// }
// })
// }
findNodeByCode(jsontree, code, results) {
findNodeByCode (jsontree, code, results) {
jsontree.forEach(item => {
if (item.code == code) {
if (item.children) {
......@@ -67,20 +78,20 @@ class TreeArchService extends ServiceBase {
}
results.push(tmp)
})
//this.findNodeByCode(item.children, code, results)
//this.findNodeByCode(item.children, code, results)
}
}else{
if(item.children){
} else {
if (item.children) {
this.findNodeByCode(item.children, code, results)
}
}
})
}
async getTreeArchByCode(archName,code) {
async getTreeArchByCode (archName, code) {
let results = []
let rs = await this.dao.model.findAll({ attributes: [archName] })
let jsontree = JSON.parse(rs[0][archName])
this.findNodeByCode(jsontree,code,results)
this.findNodeByCode(jsontree, code, results)
console.log(results)
return results;
}
......
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