Merge branch 'gsb-marketplat' of gitlab.gongsibao.com:jiangyong/zhichan into gsb-marketplat

gsb-marketplat/app/base/api/impl/action/template.js

@@ -10,6 +10,8 @@ class Template extends APIBase {
         this.templateinfoSve = system.getObject("service.template.templateinfoSve");
         this.templateinfoSve = system.getObject("service.template.templateinfoSve");
         this.templatelinkSve = system.getObject("service.template.templatelinkSve");
         this.templatelinkSve = system.getObject("service.template.templatelinkSve");
         this.formsubmitrecordSve= system.getObject("service.configmag.formsubmitrecordSve");
         this.formsubmitrecordSve= system.getObject("service.configmag.formsubmitrecordSve");
+        this.forminfoSve= system.getObject("service.configmag.forminfoSve");
+        this.redisClient = system.getObject("util.redisClient");
     }
     }
     /**
     /**
       * 接口跳转-POST请求
       * 接口跳转-POST请求
@@ -49,5 +51,20 @@ class Template extends APIBase {
         return opResult;
         return opResult;
     }
     }
 
 
+    async getFormInfoById(pobj, qobj, req){
+        var shaStr = "forminfo_"+pobj.id;
+        var rtn = await this.redisClient.get(shaStr);     // 先试图从redis读取数据 
+        //---- 从redis中读取到数据
+        if (rtn) {    
+            var rtnObj = JSON.parse(rtn);
+            return system.getResult(rtnObj);
+        } else {
+            let result = await this.forminfoSve.findOne({id:pobj.id},[]);
+            // 将数据保存到redis中
+            await this.redisClient.set(shaStr, JSON.stringify(result));
+            return system.getResult(result);
+        }
+        
+    }
 }
 }
 module.exports = Template;
 module.exports = Template;

gsb-marketplat/app/base/service/impl/configmag/forminfoSve.js

@@ -7,6 +7,7 @@ class ForminfoService extends ServiceBase {
         super("configmag", ServiceBase.getDaoName(ForminfoService));
         super("configmag", ServiceBase.getDaoName(ForminfoService));
         this.formitemDao = system.getObject("db.configmag.formitemDao");
         this.formitemDao = system.getObject("db.configmag.formitemDao");
         this.templateDao = system.getObject("db.template.templateinfoDao");
         this.templateDao = system.getObject("db.template.templateinfoDao");
+        this.redisClient = system.getObject("util.redisClient");
     }
     }
 
 
     /**
     /**
@@ -72,6 +73,7 @@ class ForminfoService extends ServiceBase {
         if(!itRt2){
         if(!itRt2){
             return system.getResultFail(-1,'创建联系方式表单失败');
             return system.getResultFail(-1,'创建联系方式表单失败');
         }
         }
+        
         return system.getResultSuccess();
         return system.getResultSuccess();
     }
     }
 
 
@@ -86,6 +88,8 @@ class ForminfoService extends ServiceBase {
             return system.getResultFail(-1,'表单已投入使用，不能删除')
             return system.getResultFail(-1,'表单已投入使用，不能删除')
         }
         }
         let del = await this.delete(pobj);
         let del = await this.delete(pobj);
+        var shaStr = "forminfo_"+pobj.id;
+        await this.redisClient.delete(shaStr);
         return system.getResult(del);
         return system.getResult(del);
     }
     }
 
 
@@ -101,7 +105,7 @@ class ForminfoService extends ServiceBase {
             form_describe: pobj.form_describe
             form_describe: pobj.form_describe
         }
         }
         var checkFormInfo = await this.dao.model.findOne({
         var checkFormInfo = await this.dao.model.findOne({
-            where:{name:pobj.name},raw:true
+            where:{name:pobj.name,id:{[this.db.Op.ne]:pobj.id}},raw:true
         });
         });
         if(checkFormInfo && checkFormInfo.id){
         if(checkFormInfo && checkFormInfo.id){
             return system.getResultFail(-300,'表单名称重复，操作失败');
             return system.getResultFail(-300,'表单名称重复，操作失败');
@@ -124,6 +128,8 @@ class ForminfoService extends ServiceBase {
         let form = await this.packageForm(itemData);
         let form = await this.packageForm(itemData);
         upData.form_table = form;
         upData.form_table = form;
         let result = await this.updateByWhere(upData,{id:pobj.id})
         let result = await this.updateByWhere(upData,{id:pobj.id})
+        var shaStr = "forminfo_"+pobj.id;
+        await this.redisClient.delete(shaStr);
         return system.getResult(result);
         return system.getResult(result);
     }
     }
 
 

gsb-marketplat/app/config/routes/api.js

@@ -53,4 +53,27 @@ module.exports = function (app) {
 			res.end(JSON.stringify(r));
 			res.end(JSON.stringify(r));
 		});
 		});
 	});
 	});
+	app.post('/external/:gname/:qname/:method', function (req, res) {
+		var classPath = req.params["qname"];
+        var methodName = req.params["method"];
+        var gname=req.params["gname"];
+        var params = [];
+		classPath=gname+"."+classPath;
+		var tClientIp = System.get_client_ip(req);
+		req.clientIp = tClientIp;
+		req.uagent= req.headers["user-agent"];
+		params.push(gname);
+		params.push(methodName);
+		params.push(req.body);
+        params.push(req.query);
+        params.push(req);
+		var p = null;
+		var invokeObj = System.getObject("api." + classPath);
+		if (invokeObj["doexec"]) {
+			p = invokeObj["doexec"].apply(invokeObj, params);
+		}
+		p.then(r => {
+			res.end(JSON.stringify(r));
+		});
+	});
 };
 };