Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation

Conflicts:

modules/all_models/a.js

@@ -1,3 +0,0 @@
-/**
- * Created by zhang on 2018/3/23.
- */

modules/all_models/counter.js

@@ -0,0 +1,10 @@
+/**
+ * Created by Tony on 2017/3/21.
+ */
+var mongoose = require('mongoose');
+var Schema = mongoose.Schema;
+var counterSchema = new Schema({
+    _id: String,
+    sequence_value: Number
+});
+mongoose.model("counters", counterSchema);

modules/all_models/std_glj_types.js

@@ -17,5 +17,4 @@ let RptCfgSchema = new Schema({
         }]
     }],
 });
-
 mongoose.model("std_glj_type", RptCfgSchema, "std_glj_type");

modules/all_schemas/b.js

@@ -1,3 +0,0 @@
-/**
- * Created by zhang on 2018/3/23.
- */

public/cache/std_glj_type_util.js

@@ -1,8 +1,9 @@
 /**
  * Created by Tony on 2017/7/6.
  */
+let mongoose = require('mongoose');
 let cacheUtil = require('./cacheUtil');
-let std_glj_type_mdl = require('../models/std_glj_types');
+let std_glj_type_mdl = mongoose.model('std_glj_type');//
 
 const STD_GLJ_GRP = 'std_glj_grp';
 

public/counter/counter.js

@@ -2,18 +2,7 @@
  * Created by Tony on 2017/3/21.
  */
 var mongoose = require('mongoose');
-var dbm = require("../../config/db/db_manager");
-var projectdb = dbm.getCfgConnection("scConstruct");
-
-var Schema = mongoose.Schema;
-var counterSchema = new Schema({
-    _id: String,
-    sequence_value: Number
-});
-counterSchema.statics.findAndModify = function (query, sort, doc, options, callback) {
-    return this.collection.findAndModify(query, sort, doc, options, callback);
-};
-var counterModel = projectdb.model("counters", counterSchema);
+var counterModel = mongoose.model("counters");
 
 // All counter Must predefine in DB
 const COUNTER_MODULE_NAME = {
@@ -54,9 +43,9 @@ counterDAO.prototype.getIDAfterCount = async function(moduleName, stepCount, cal
         sc = Math.round(stepCount + 0.5);
     }
     if (callback === null) {
-        return await counterModel.findAndModify({_id: moduleName}, [], { $inc: { sequence_value: sc } }, {'new':true});
+        return await counterModel.findOneAndUpdate({_id: moduleName}, { $inc: { sequence_value: sc } }, {'new':true});
     } else {
-        counterModel.findAndModify({_id: moduleName}, [], { $inc: { sequence_value: sc } }, {'new':true}, callback);
+        counterModel.findOneAndUpdate({_id: moduleName}, { $inc: { sequence_value: sc } }, {'new':true}, callback);
     }
 }
 

public/models/std_glj_types.js

@@ -1,25 +0,0 @@
-/**
- * Created by Tony on 2017/7/6.
- */
-let mongoose = require('mongoose');
-let dbm = require("../../config/db/db_manager");
-let smartcostdb = dbm.getCfgConnection("scConstruct");
-let Schema = mongoose.Schema;
-
-let RptCfgSchema = new Schema({
-    "typeName" : String,
-    "typesDefine": [{
-        "ID": Number,
-        "fullName": String,
-        "shortName": String,
-        "items": [{
-            "ID": Number,
-            "fullName": String,
-            "shortName": String
-        }]
-    }],
-});
-
-let std_glj_type_mdl = smartcostdb.model("std_glj_type", RptCfgSchema, "std_glj_type");
-
-module.exports = std_glj_type_mdl;