student 3 veckor sedan
förälder
incheckning
66cab33584

+ 180 - 1
ApiWeb/ApiProcessToken/Controllers/balance.cs

@@ -346,7 +346,7 @@ namespace ApiProcess.Controllers
                     logger.Info("hiddenCamGetList response : " + response.ToString());
                     return Ok(response);
                 }
-
+                logger.Info("hiddenCamGetList start select : ");
                 string _rowsOnPage, _seqPage, _totalPage;
                 List<campaignObj> list = getListCommon.getListHiddenCam(id, users, name, code, fromDate, toDate, order, rowsOnPage, seqPage, status,
                     out _rowsOnPage, out _seqPage, out _totalPage, isDefault, isMyservice);
@@ -3576,6 +3576,185 @@ namespace ApiProcess.Controllers
             return Ok(response);
         }
 
+        [HttpPost]
+        public IActionResult svGetListRole([FromBody] dynamic sendData)
+        {
+
+            logger.Info("New request income balanceGetList :" + sendData.ToString());
+            serviceObjList response = new serviceObjList();
+            response.responseCode = "-1";
+            response.responseMessage = "Err unknow";
+
+            try
+            {
+
+                var userObj = JObject.Parse(sendData.ToString());
+
+                string users = Convert.ToString(userObj["users"]);
+                string id = Convert.ToString(userObj["id"]);
+
+
+                string name = Convert.ToString(userObj["name"]);
+                string code = Convert.ToString(userObj["code"]);
+                string fromDate = Convert.ToString(userObj["fromDate"]);
+                string toDate = Convert.ToString(userObj["toDate"]);
+
+                string order = Convert.ToString(userObj["order"]);
+                string rowsOnPage = Convert.ToString(userObj["rowsOnPage"]);
+                string seqPage = Convert.ToString(userObj["seqPage"]);
+                if (string.IsNullOrEmpty(name)) name = "-1";
+                if (string.IsNullOrEmpty(code)) code = "-1";
+                if (string.IsNullOrEmpty(fromDate)) fromDate = "-1";
+                if (string.IsNullOrEmpty(toDate)) toDate = "-1";
+                if (string.IsNullOrEmpty(order)) order = "asc";
+                if (string.IsNullOrEmpty(rowsOnPage)) rowsOnPage = "1000000000000";
+                if (string.IsNullOrEmpty(seqPage)) seqPage = "1";
+                string isActive = Convert.ToString(userObj["isActive"]);
+                if (string.IsNullOrEmpty(isActive)) isActive = "-1";
+
+
+                if (string.IsNullOrEmpty(users)) users = "-1";
+                if (string.IsNullOrEmpty(id)) id = "-1";
+
+
+                string token = Convert.ToString(userObj["token"]);
+                string channel = Convert.ToString(userObj["channel"]);
+                string language = Convert.ToString(userObj["language"]);
+                if (string.IsNullOrEmpty(language)) language = "-1";
+
+                string RedisIp = Common.GetValuesAppSetting("webConfig", "RedisIp");
+                string RedisPort = Common.GetValuesAppSetting("webConfig", "RedisPort");
+                string RedisPass = Common.GetValuesAppSetting("webConfig", "RedisPass");
+                var clientIp = HttpContext.Connection.RemoteIpAddress.ToString();
+
+
+                //---------------------Lay ra va luu mot redis tu cache-----------------------------
+                redisConnection _redis;
+                memoryCache.TryGetValue("redis", out _redis);
+                if (_redis == null)
+                {
+                    var cacheExpiryOptions = new MemoryCacheEntryOptions
+                    {
+                        AbsoluteExpiration = DateTime.Now.AddMonths(12),
+                        Priority = CacheItemPriority.High,
+                        SlidingExpiration = TimeSpan.FromMinutes(2),
+                        Size = 1024,
+                    };
+                    _redis = new redisConnection(RedisIp, RedisPort, RedisPass);
+                    _redis.connet();
+                    memoryCache.Set("redis", _redis, cacheExpiryOptions);
+                }
+                if (!_redis.isConnet())
+                {
+                    if (!_redis.connet())
+                    {
+                        logger.Info("Connect to redis false");
+                        response.responseCode = "-2";
+                        response.responseMessage = "System Update";
+                        logger.Info("confirmTicket response : " + response.ToString());
+                        return Ok(response);
+                    }
+                    else
+                    {
+                        var cacheExpiryOptions = new MemoryCacheEntryOptions
+                        {
+                            AbsoluteExpiration = DateTime.Now.AddMonths(12),
+                            Priority = CacheItemPriority.High,
+                            SlidingExpiration = TimeSpan.FromMinutes(2),
+                            Size = 1024,
+                        };
+                        memoryCache.Set("redis", _redis, cacheExpiryOptions);
+
+                    }
+                }
+                //----------------------Ket thuc lay redis tu cache -------------------------------------
+
+                tokenObj _tokenObj = null;
+                if (!CommonFunction.checkToken(clientIp, token, channel, _redis, logger, out _tokenObj))
+                {
+                    logger.Info("Authen token false");
+                    response.responseCode = "35";
+                    response.responseMessage = CommonObj.common.CommonFunction.getErrCodeObjFromRedis(_redis, channel, response.responseCode, language);
+                    logger.Info("confirmTicket response : " + response.ToString());
+                    return Ok(response);
+                }
+
+
+
+
+
+
+                DataSet ds_regist = balanceDataAccess.svGetListRole(id, users, name, code, fromDate, toDate, order, rowsOnPage, seqPage, isActive);
+                logger.Info("Call database balGetList success:");
+                response.responseCode = "0";
+                response.responseMessage = "Success";
+                if (ds_regist != null & ds_regist.Tables[0].Rows.Count > 0)
+                {
+
+
+                    response.rowsOnPage = ds_regist.Tables[0].Rows[0]["ROW_ON_PAGE"].ToString();
+                    response.seqPage = ds_regist.Tables[0].Rows[0]["SEQ_PAGE"].ToString();
+                    response.totalPage = ds_regist.Tables[0].Rows[0]["TOTAL_PAGE"].ToString();
+
+
+                    response.list = new serviceObj[ds_regist.Tables[0].Rows.Count];
+                    for (int j = 0; j < ds_regist.Tables[0].Rows.Count; j++)
+                    {
+                        serviceObj _obj = new serviceObj();
+
+                        _obj.id = ds_regist.Tables[0].Rows[j]["ID"].ToString();
+                        _obj.code = ds_regist.Tables[0].Rows[j]["CODE"].ToString();
+                        _obj.name = ds_regist.Tables[0].Rows[j]["NAME"].ToString();
+                        _obj.description = ds_regist.Tables[0].Rows[j]["DESCRIPTION"].ToString();
+                        _obj.shortCode = ds_regist.Tables[0].Rows[j]["SHORT_CODE"].ToString();
+                        _obj.command = ds_regist.Tables[0].Rows[j]["COMMAND_REGISTER"].ToString();
+
+
+                        _obj.contentEn = ds_regist.Tables[0].Rows[j]["CONTENT_EN"].ToString();
+                        _obj.contentFr = ds_regist.Tables[0].Rows[j]["CONTENT_FR"].ToString();
+                        _obj.contentLc = ds_regist.Tables[0].Rows[j]["CONTENT_LC"].ToString();
+                        _obj.note = ds_regist.Tables[0].Rows[j]["NOTE"].ToString();
+                        _obj.companyId = ds_regist.Tables[0].Rows[j]["COMPANY_ID"].ToString();
+
+                        _obj.usersCreated = ds_regist.Tables[0].Rows[j]["USERS_CREATED"].ToString();
+                        _obj.dateCreated = ds_regist.Tables[0].Rows[j]["DATE_CREATED"].ToString();
+                        _obj.usersUpdate = ds_regist.Tables[0].Rows[j]["USERS_UPDATE"].ToString();
+                        _obj.dateUpdate = ds_regist.Tables[0].Rows[j]["DATE_UPDATE"].ToString();
+
+                        _obj.dateUpdate = ds_regist.Tables[0].Rows[j]["DATE_UPDATE"].ToString();
+
+                        _obj.msgRegisterSuccess = ds_regist.Tables[0].Rows[j]["USSD_MSG_REGISTER_SUC"].ToString();
+                        _obj.msgRegisterFlase = ds_regist.Tables[0].Rows[j]["USSD_MSG_REGISTER_FAIL"].ToString();
+                        _obj.msgConfirm = ds_regist.Tables[0].Rows[j]["USSD_CONFIRM"].ToString();
+
+                        _obj.isActive = ds_regist.Tables[0].Rows[j]["IS_ACTIVE"].ToString();
+                        _obj.isMyService = ds_regist.Tables[0].Rows[j]["IS_MYSERVICE"].ToString();
+
+                        _obj.serviceGroupName = ds_regist.Tables[0].Rows[j]["SERVICE_GROUP_NAME"].ToString();
+                        _obj.serviceGroupId = ds_regist.Tables[0].Rows[j]["SERVICE_GROUP_ID"].ToString();
+                        _obj.apiServiceId = ds_regist.Tables[0].Rows[j]["WEBSERVICE_ID"].ToString();
+
+                        response.list[j] = _obj;
+                    }
+
+                }
+
+
+
+
+            }
+            catch (Exception ex)
+            {
+                logger.Info("exception: " + ex.ToString());
+                response.responseCode = "-2";
+                response.responseMessage = "System upgrade";
+
+            }
+            logger.Info("Responase to web: " + response.ToString());
+            return Ok(response);
+        }
+
+
         [HttpPost]
         public IActionResult svGroupGetList([FromBody] dynamic sendData)
         {

+ 42 - 0
ApiWeb/ApiProcessToken/Models/banlance/balanceDataAccess.cs

@@ -1118,6 +1118,48 @@ namespace ResfullApi.Models.balance
 
             return DataAccess.getDataFromProcedure(str, "", parms);
         }
+
+
+        public static DataSet svGetListRole(string v_id, string v_users, string v_name, string v_code, string v_fromDate, string v_toDate
+            , string v_order, string v_rowsOnPage, string v_seqPage, string isActive)
+        {
+
+            string str;
+            str = "";
+            str = "BALANCE_PKG.SV_GETROLE";
+            OracleParameter[] parms;
+            parms = new OracleParameter[]
+                            {
+
+                                new OracleParameter("v_id", OracleDbType.NVarchar2),
+                                new OracleParameter("v_users", OracleDbType.NVarchar2),
+
+                                 new OracleParameter("v_name", OracleDbType.NVarchar2),
+                                new OracleParameter("v_code", OracleDbType.NVarchar2),
+                                new OracleParameter("v_fromDate", OracleDbType.NVarchar2),
+                                new OracleParameter("v_toDate", OracleDbType.NVarchar2),
+
+                                new OracleParameter("v_order", OracleDbType.NVarchar2),
+                                new OracleParameter("v_rowsOnPage", OracleDbType.NVarchar2),
+                                new OracleParameter("v_seqPage", OracleDbType.NVarchar2),
+                                new OracleParameter("v_isActive", OracleDbType.NVarchar2),
+
+                                new OracleParameter("P_RESULT",OracleDbType.RefCursor,ParameterDirection.Output),
+            };
+            parms[0].Value = v_id;
+            parms[1].Value = v_users;
+
+            parms[2].Value = v_name;
+            parms[3].Value = v_code;
+            parms[4].Value = v_fromDate;
+            parms[5].Value = v_toDate;
+            parms[6].Value = v_order;
+            parms[7].Value = v_rowsOnPage;
+            parms[8].Value = v_seqPage;
+            parms[9].Value = isActive;
+
+            return DataAccess.getDataFromProcedure(str, "", parms);
+        }
         public static DataSet svGroupGetList(string v_id, string v_users)
         {
 

+ 1 - 1
ApiWeb/ApiProcessToken/appsettings.json

@@ -25,7 +25,7 @@
     //"RedisPass": "p@ss$12E45",
 
     "RedisIp": "171.244.50.177",
-    "RedisPort": "9379",
+    "RedisPort": "6379",
     "RedisPass": "p@ss$12E45",
 
     "MPS_IP": "171.244.50.177",

+ 5 - 3
SuperAdmin/SuperAdmin/Controllers/AdminController.cs

@@ -1013,9 +1013,11 @@ namespace SuperAdmin.Controllers
             req.rowsOnPage = "1000000";
             req.seqPage = "1";
             req.order = "desc";
+            string account = HttpContext.Session.GetString("account");
+            req.users = account;
 
 
-            String url = GetParameter(CommonUtils.WsType.SvGetList);
+            String url = GetParameter(CommonUtils.WsType.SvGetListRole);
             ServiceGetListRes res = ServiceGetListRes.Parse(SendPost(req, url));
             HttpContext.Session.SetComplexData("listService", res.list);
             return PartialView("../Partial/_Services", res.list);
@@ -1033,9 +1035,9 @@ namespace SuperAdmin.Controllers
                 });
             }
             string account = HttpContext.Session.GetString("account");
-
+            request.users = account;
             // check update or add
-            string url = GetParameter(CommonUtils.WsType.SvGetList);
+            string url = GetParameter(CommonUtils.WsType.SvGetListRole);
             var res = ServiceGetListRes.Parse(SendPost(request, url));
 
             return Json(new

+ 1 - 0
SuperAdmin/SuperAdmin/Source/CommonUtils.cs

@@ -248,6 +248,7 @@ namespace SuperAdmin.Source
             public const String CamSvRemove = "wsCamSvRemove";
             public const String SvGroupGetList = "svGroupGetList";
             public const String SvGetList = "wsSvGetList";
+            public const String SvGetListRole = "wsSvGetListRole";
             public const String SvInsert = "wsSvInsert";
             public const String SvUpdate = "wsSvUpdate";
 

+ 2 - 1
SuperAdmin/SuperAdmin/appsettings.json

@@ -35,6 +35,7 @@
   "wsSvGetList": "http://127.0.0.1:8989/api/balance/svGetList/data",
   "wsSvInsert": "http://127.0.0.1:8989/api/balance/svInsert/data",
   "wsSvUpdate": "http://127.0.0.1:8989/api/balance/svUpdate/data",
+  "wsSvGetListRole": "http://127.0.0.1:8989/api/balance/svGetListRole/data",
   "wsMsisdnSearch": "http://127.0.0.1:8989/api/balance/blacklistGetList/data",
   "wsMsisdnAddUpdate": "http://127.0.0.1:8989/api/balance/blacklistInsertData/data",
 
@@ -94,7 +95,7 @@
   "wsFunctionWebCmsInsert": "http://127.0.0.1:8989/api/systemApi/sysFunctionWebCmsInsert/data",
   "wsFunctionWebCmsUpdate": "http://127.0.0.1:8989/api/systemApi/sysFunctionWebCmsUpdate/data",
   "wsFunctionWebCmsDelete": "http://127.0.0.1:8989/api/systemApi/sysFunctionWebCmsDelete/data",
-   
+
   // real server
   "service_id": 1,
   "newsGetById": "http://127.0.0.1:8989/api/newsWeb/newsGetById/data",