Browse Source

oracle util 底层方法修改

huangwenjie 5 years ago
parent
commit
f8c58bb29c
2 changed files with 29 additions and 36 deletions
  1. 1 1
      src/server/repository/oracle/participant.repo.js
  2. 28 35
      src/server/util/oracledb.util.js

+ 1 - 1
src/server/repository/oracle/participant.repo.js

@ -245,7 +245,7 @@ class ParticipantRepo {
     * @param handler
     */
    static existsParticipant(sessionId, userId, handler) {
        let sql = "SELECT CASE WHEN COUNT(*) > 0 THEN 'true' ELSE 'false' END EXIST FROM PARTICIPANTS W WHERE W.SESSION_ID =:SESSION_ID AND W.PARTICIPANT_ID = :PARTICIPANT_ID ";
        let sql = "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END \"exist\" FROM PARTICIPANTS W WHERE W.SESSION_ID =:SESSION_ID AND W.PARTICIPANT_ID = :PARTICIPANT_ID ";
        log.info("用户是否在指定Session中:sql:" + sql);
        log.info("用户是否在指定Session中:args:" + [sessionId, userId]);
        oracledbUtil.query({

+ 28 - 35
src/server/util/oracledb.util.js

@ -27,42 +27,35 @@ let query = function(options){
                return handler(err, null);
            }
            connection.execute(sql, args, function (err, result)
            {
                if (err) {
                    log.error(err.message)
                    log.error("Execute SQL failed: sql" + sql);
                    log.error("Execute SQL failed: args" + args);
            if(sql.indexOf("INSERT") >0 || sql.indexOf("UPDATE") >0){
                connection.execute(sql, args, {autoCommit:true},function (err, result)
                {
                    if (err) {
                        log.error(err.message)
                        log.error("Execute SQL failed: sql" + sql);
                        log.error("Execute SQL failed: args" + args);
                        doRelease(connection);
                        return handler(err, result);
                    }
                    console.log(result);
                    handler(null, result.rows);
                    doRelease(connection);
                });
            }else{
                connection.execute(sql, args, function (err, result)
                {
                    if (err) {
                        log.error(err.message)
                        log.error("Execute SQL failed: sql" + sql);
                        log.error("Execute SQL failed: args" + args);
                        doRelease(connection);
                        return handler(err, result);
                    }
                    console.log(result);
                    handler(null, result.rows);
                    doRelease(connection);
                    return handler(err, result);
                }
                // log.info(result.toString());
                // result.rows.map((v)=>
                // {
                //     return result.metaData.reduce((p, key, i)=>
                //     {
                //         p[key.name] = v[i];
                //         log.info("p[key.name]:"+p[key.name])
                //         log.info("v[i]:"+v[i])
                //         return p;
                //     }, {})
                // });
                console.log(result);
                // console.log("result.metaData:"+result.metaData.toString());
                // console.log("result.rows[0]:"+result.rows[0]);
                handler(null, result.rows);
                //
                // //console.log(result.metaData);
                // callback(result.rows.map((v)=>
                // {
                //     return result.metaData.reduce((p, key, i)=>
                //     {
                //         p[key.name] = v[i];
                //         return p;
                //     }, {})
                // }));
                doRelease(connection);
            });
                });
            }
        }
    );
}