1

app/models/buildOperate_log.js

@@ -15,7 +15,7 @@ var tableNameYear=d.getFullYear();
 
 module.exports = (sequelize, DataTypes) => {
 
-    const operateLog = sequelize.define('operate_log', {
+    const operateLog = sequelize.define('buildOperate_log', {
         id : {type: DataTypes.INTEGER(11), primaryKey: true, autoIncrement: true},
         logType: DataTypes.INTEGER,
 

app/service/cloudBuildEditionService.js

@@ -118,7 +118,7 @@ var cloudService={
         }
 
         //获得指定数据
-        var curingList = await models.cloud_curing.getCuringInMobile(mobile);
+        var curingList = await models.cloud_build.getCuringInMobile(mobile);
        
         //组合同步云版数据
         var falg=false;
@@ -143,7 +143,7 @@ var cloudService={
                         cid: STAFF.cid,
                         status: 2,
                     };
-                var detail = await models.cloud_curing.create(obj);
+                var detail = await models.cloud_build.create(obj);
         	}
         	
         });
@@ -247,7 +247,7 @@ var cloudService={
 
                 
         //本地养护用户
-        userData['curingInfo']=await models.cloud_curing.getCuringBySsoid(ssoid);
+        userData['curingInfo']=await models.cloud_build.getCuringBySsoid(ssoid);
         client_id=userData['curingInfo']['client_id'];
 
         var detail =[];
@@ -275,7 +275,7 @@ var cloudService={
         //获得操作日志
         userData['operateLog']=[];
         if(hash.isExistence(userData['curingInfo'])){
-            userData['operateLog']=await models.operate_log.findByCondition(1,hash.hashDecode(userData['curingInfo']['id']));
+            userData['operateLog']=await models.buildOperate_log.findByCondition(1,hash.hashDecode(userData['curingInfo']['id']));
         }
 
         return userData;
@@ -292,7 +292,7 @@ var cloudService={
         result=JSON.parse(result);
 
         if(result.error==0){   //接口更新成
-            var curingDetail=await models.cloud_curing.getCuringByMobile(data.mobile);
+            var curingDetail=await models.cloud_build.getCuringByMobile(data.mobile);
             var id='';
             if(hash.isExistence(curingDetail)){ //是否需要同步同步到本地库中
                 var url= GCLOUDURL+'/getUsersAndCompilation?ssoID='+ ssoid;
@@ -311,7 +311,7 @@ var cloudService={
                 var where={
                     where: {id: curingDetail['id']}
                 };
-                await models.cloud_curing.update(values,where);
+                await models.cloud_build.update(values,where);
                 id=curingDetail['id'];
             }else{
             	sid=hash.hashDecode(STAFF.sid);
@@ -327,13 +327,13 @@ var cloudService={
                     //addtime: new Date().getTime(),
                     updateTotal: 1
                 };
-                var detail=await models.cloud_curing.create(obj);
+                var detail=await models.cloud_build.create(obj);
                 id=detail['cloud_curing']['id'];
             }
 
             var operation=STAFF.username+'升级'+data.name;
             //记录锁日志
-            await models.operate_log.createOperateLog(1,id,operation);
+            await models.buildOperate_log.createOperateLog(1,id,operation);
 
             return true;
         }else{
@@ -353,7 +353,7 @@ var cloudService={
             return false;
         }
 
-        var curingDetail=await models.cloud_curing.getCuringBySsoid(ssoId);
+        var curingDetail=await models.cloud_build.getCuringBySsoid(ssoId);
         if(hash.isExistence(curingDetail)) {
 
             var clientDetail=await models.CLD_client.findById(cid);
@@ -367,11 +367,11 @@ var cloudService={
                 var where={
                     where: {id: id}
                 };
-                await models.cloud_curing.update(values,where);
+                await models.cloud_build.update(values,where);
 
                 //记录操作日志
                 var operation=STAFF.username+'关联CLD联系人'+clientDetail.clientname;
-                await models.operate_log.createOperateLog(1,id,operation);
+                await models.buildOperate_log.createOperateLog(1,id,operation);
                 return true;
             }else{
                 return false;
@@ -391,7 +391,7 @@ var cloudService={
             return false;
         }
 
-        var curingDetail=await models.cloud_curing.getCuringBySsoid(ssoId);
+        var curingDetail=await models.cloud_build.getCuringBySsoid(ssoId);
         if(hash.isExistence(curingDetail)) {
         	var id=hash.hashDecode(curingDetail['id']);
         	//更新数量
@@ -401,12 +401,12 @@ var cloudService={
             var where={
                 where: {id: id}
             };
-            await models.cloud_curing.update(values,where);
+            await models.cloud_build.update(values,where);
 
             var clientDetail=await models.CLD_client.findById(curingDetail['client_id']);
             //记录操作日志
             var operation=STAFF.username+'移除CLD联系人'+clientDetail.clientname;
-            await models.operate_log.createOperateLog(1,id,operation);
+            await models.buildOperate_log.createOperateLog(1,id,operation);
 
             return true;
         }else{
@@ -428,7 +428,7 @@ var cloudService={
 
     //获取本地养护数据--可能废弃
     getBindCuringByMobile:async function (mobile){
-        var curingList = await models.cloud_curing.getCuringByMobile(mobile);
+        var curingList = await models.cloud_build.getCuringByMobile(mobile);
         if (curingList!=null){
             var cid=[curingList['client_id']];
             var attributes= ['cid', 'clientname', 'companyid', 'companyname'];