student 3 долоо хоног өмнө
parent
commit
beaf94b62e

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -249,125 +249,7 @@ namespace ApiProcess.Controllers
             return Ok(response);
         }
 
-        [HttpPost]
-        public IActionResult hiddenChangeStatus([FromBody] dynamic sendData)
-        {
-            logger.Info("New request income hiddenChangeStatus :" + sendData.ToString());
-            Response response = new Response();
-            response.responseCode = "-1";
-            response.responseMessage = "Err unknow";
-
-            try
-            {
-                var userObj = JObject.Parse(sendData.ToString());
-
-                string users = Convert.ToString(userObj["users"]);
-                string type = Convert.ToString(userObj["type"]);
-                string id = Convert.ToString(userObj["id"]);
-                string status = Convert.ToString(userObj["status"]);
-
-                if (string.IsNullOrEmpty(users)) users = "-1";
-                if (string.IsNullOrEmpty(type)) type = "-1";
-                if (string.IsNullOrEmpty(id)) id = "-1";
-                if (string.IsNullOrEmpty(status)) status = "-1";
-
-                string language;
-                if (!CheckWebToken(userObj, response, out language))
-                {
-                    logger.Info("hiddenChangeStatus response : " + response.ToString());
-                    return Ok(response);
-                }
-
-                DataSet ds_regist = balanceDataAccess.hiddenChangeStatus(type, id, status, users);
-
-                logger.Info("Call database hiddenChangeStatus success:");
-                if (ds_regist != null & ds_regist.Tables[0].Rows.Count > 0)
-                {
-                    response.responseCode = ds_regist.Tables[0].Rows[0]["status"].ToString();
-                    response.responseMessage = ds_regist.Tables[0].Rows[0]["msg"].ToString();
-                }
-                else
-                {
-                    response.responseCode = "-1";
-                    response.responseMessage = "Err unknow";
-                }
-            }
-            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 hiddenCamGetList([FromBody] dynamic sendData)
-        {
-            logger.Info("New request income hiddenCamGetList :" + sendData.ToString());
-            campaignObjList response = new campaignObjList();
-            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 isDefault = Convert.ToString(userObj["isDefault"]);
-                string isMyservice = Convert.ToString(userObj["isMyservice"]);
-                string status = Convert.ToString(userObj["status"]);
-                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";
-                if (string.IsNullOrEmpty(isDefault)) isDefault = "-1";
-                if (string.IsNullOrEmpty(isMyservice)) isMyservice = "-1";
-                if (string.IsNullOrEmpty(status)) status = "-1";
-                if (string.IsNullOrEmpty(users)) users = "-1";
-                if (string.IsNullOrEmpty(id)) id = "-1";
-
-                string language;
-                if (!CheckWebToken(userObj, response, out language))
-                {
-                    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);
-
-                response.responseCode = "0";
-                response.responseMessage = "Success";
-                response.rowsOnPage = _rowsOnPage;
-                response.seqPage = _seqPage;
-                response.totalPage = _totalPage;
-                response.list = list;
-            }
-            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);
-        }
 
 
         //{"id":"2","users":"quangbh","key":"jqB3Vi1fIlu+9a2ODQs65w=="}
@@ -4986,73 +4868,7 @@ namespace ApiProcess.Controllers
             return Ok(response);
         }
 
-        [HttpPost]
-        public IActionResult hiddenCamInsert([FromBody] dynamic sendData)
-        {
-            logger.Info("New request income hiddenCamInsert :" + sendData.ToString());
-            campaignInsert response = new campaignInsert();
-            response.responseCode = "-1";
-            response.responseMessage = "Err unknow";
-
-            try
-            {
-                var userObj = JObject.Parse(sendData.ToString());
-                string code = Convert.ToString(userObj["code"]);
-                string name = Convert.ToString(userObj["name"]);
-                string fromDate = Convert.ToString(userObj["fromDate"]);
-                string toDate = Convert.ToString(userObj["toDate"]);
-                string fromHour = Convert.ToString(userObj["fromHour"]);
-                string toHour = Convert.ToString(userObj["toHour"]);
-                string rule = Convert.ToString(userObj["rule"]);
-                string priority = Convert.ToString(userObj["priority"]);
-                string balanceId = Convert.ToString(userObj["balanceId"]);
-                string expireDateId = Convert.ToString(userObj["expireDateId"]);
-                string status = Convert.ToString(userObj["status"]);
-                string note = Convert.ToString(userObj["note"]);
-                string numberDisplay = Convert.ToString(userObj["numberDisplay"]);
-                string addType = Convert.ToString(userObj["addType"]);
-                string title = Convert.ToString(userObj["title"]);
-                string isDefault = Convert.ToString(userObj["isDefault"]);
-                string isMyservice = Convert.ToString(userObj["isMyservice"]);
-                string users = Convert.ToString(userObj["users"]);
-
-                if (string.IsNullOrEmpty(code)) code = "-1";
-                if (string.IsNullOrEmpty(numberDisplay)) numberDisplay = "1";
-                if (string.IsNullOrEmpty(addType)) addType = "1";
-                if (string.IsNullOrEmpty(users)) users = "-1";
 
-                string language;
-                if (!CheckWebToken(userObj, response, out language))
-                {
-                    logger.Info("hiddenCamInsert response : " + response.ToString());
-                    return Ok(response);
-                }
-
-                DataSet ds_regist = balanceDataAccess.hiddenCamInsert(code, name, fromDate, toDate, fromHour, toHour, rule,
-                    priority, balanceId, expireDateId, status, note, users, numberDisplay, addType, title, isDefault, isMyservice);
-                logger.Info("Call database hiddenCamInsert success:");
-
-                if (ds_regist != null & ds_regist.Tables[0].Rows.Count > 0)
-                {
-                    response.responseCode = ds_regist.Tables[0].Rows[0]["status"].ToString();
-                    response.responseMessage = ds_regist.Tables[0].Rows[0]["msg"].ToString();
-                    response.id = ds_regist.Tables[0].Rows[0]["id"].ToString();
-                }
-                else
-                {
-                    response.responseCode = "-1";
-                    response.responseMessage = "Err unknow";
-                }
-            }
-            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);
-        }
 
 
 
@@ -5203,74 +5019,7 @@ namespace ApiProcess.Controllers
             return Ok(response);
         }
 
-        [HttpPost]
-        public IActionResult hiddenCamUpdate([FromBody] dynamic sendData)
-        {
-            logger.Info("New request income hiddenCamUpdate :" + sendData.ToString());
-            Response response = new Response();
-            response.responseCode = "-1";
-            response.responseMessage = "Err unknow";
-
-            try
-            {
-                var userObj = JObject.Parse(sendData.ToString());
-                string id = Convert.ToString(userObj["id"]);
-                string code = Convert.ToString(userObj["code"]);
-                string name = Convert.ToString(userObj["name"]);
-                string fromDate = Convert.ToString(userObj["fromDate"]);
-                string toDate = Convert.ToString(userObj["toDate"]);
-                string fromHour = Convert.ToString(userObj["fromHour"]);
-                string toHour = Convert.ToString(userObj["toHour"]);
-                string rule = Convert.ToString(userObj["rule"]);
-                string priority = Convert.ToString(userObj["priority"]);
-                string balanceId = Convert.ToString(userObj["balanceId"]);
-                string expireDateId = Convert.ToString(userObj["expireDateId"]);
-                string status = Convert.ToString(userObj["status"]);
-                string note = Convert.ToString(userObj["note"]);
-                string type = Convert.ToString(userObj["type"]);
-                string numberDisplay = Convert.ToString(userObj["numberDisplay"]);
-                string addType = Convert.ToString(userObj["addType"]);
-                string title = Convert.ToString(userObj["title"]);
-                string isDefault = Convert.ToString(userObj["isDefault"]);
-                string isMyservice = Convert.ToString(userObj["isMyservice"]);
-                string users = Convert.ToString(userObj["users"]);
-
-                if (string.IsNullOrEmpty(id)) id = "-1";
-                if (string.IsNullOrEmpty(type)) type = "0";
-                if (string.IsNullOrEmpty(numberDisplay)) numberDisplay = "1";
-                if (string.IsNullOrEmpty(addType)) addType = "1";
-                if (string.IsNullOrEmpty(users)) users = "-1";
-
-                string language;
-                if (!CheckWebToken(userObj, response, out language))
-                {
-                    logger.Info("hiddenCamUpdate response : " + response.ToString());
-                    return Ok(response);
-                }
 
-                DataSet ds_regist = balanceDataAccess.hiddenCamUpdate(id, code, name, fromDate, toDate, fromHour, toHour, rule,
-                    priority, balanceId, expireDateId, status, note, users, type, numberDisplay, addType, title, isDefault, isMyservice);
-                logger.Info("Call database hiddenCamUpdate success:");
-                if (ds_regist != null & ds_regist.Tables[0].Rows.Count > 0)
-                {
-                    response.responseCode = ds_regist.Tables[0].Rows[0]["status"].ToString();
-                    response.responseMessage = ds_regist.Tables[0].Rows[0]["msg"].ToString();
-                }
-                else
-                {
-                    response.responseCode = "-1";
-                    response.responseMessage = "Err unknow";
-                }
-            }
-            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);
-        }
 
 
 
@@ -5396,54 +5145,7 @@ namespace ApiProcess.Controllers
             return Ok(response);
         }
 
-        [HttpPost]
-        public IActionResult hiddenCamCopy([FromBody] dynamic sendData)
-        {
-            logger.Info("New request income hiddenCamCopy :" + sendData.ToString());
-            campaignInsert response = new campaignInsert();
-            response.responseCode = "-1";
-            response.responseMessage = "Err unknow";
 
-            try
-            {
-                var userObj = JObject.Parse(sendData.ToString());
-                string id = Convert.ToString(userObj["id"]);
-                string users = Convert.ToString(userObj["users"]);
-
-                if (string.IsNullOrEmpty(id)) id = "-1";
-                if (string.IsNullOrEmpty(users)) users = "-1";
-
-                string language;
-                if (!CheckWebToken(userObj, response, out language))
-                {
-                    logger.Info("hiddenCamCopy response : " + response.ToString());
-                    return Ok(response);
-                }
-
-                DataSet ds_regist = balanceDataAccess.hiddenCamCopy(id);
-                logger.Info("Call database hiddenCamCopy success:");
-
-                if (ds_regist != null & ds_regist.Tables[0].Rows.Count > 0)
-                {
-                    response.responseCode = ds_regist.Tables[0].Rows[0]["status"].ToString();
-                    response.responseMessage = ds_regist.Tables[0].Rows[0]["msg"].ToString();
-                    response.id = ds_regist.Tables[0].Rows[0]["id"].ToString();
-                }
-                else
-                {
-                    response.responseCode = "-1";
-                    response.responseMessage = "Err unknow";
-                }
-            }
-            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);
-        }
 
 
 

+ 1 - 214
ApiWeb/ApiProcessToken/Models/banlance/balanceDataAccess.cs

@@ -1,4 +1,4 @@
-using Oracle.ManagedDataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
@@ -1542,49 +1542,7 @@ namespace ResfullApi.Models.balance
             return DataAccess.getDataFromProcedure(str, "", parms);
         }
 
-        public static DataSet hiddenCamGetList(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 v_status, string isDefault, string isMyservice)
-        {
-            return camGetListByProcedure("BALANCE_PKG.HIDDEN_CAM_GET", v_id, v_users, v_name, v_code, v_fromDate, v_toDate,
-                v_order, v_rowsOnPage, v_seqPage, v_status, isDefault, isMyservice);
-        }
-
-        private static DataSet camGetListByProcedure(string str, 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 v_status, string isDefault, string isMyservice)
-        {
-            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_status", OracleDbType.NVarchar2),
-                                new OracleParameter("v_isDefault", OracleDbType.NVarchar2),
-                                new OracleParameter("v_isMyservice", 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 = v_status;
-            parms[10].Value = isDefault;
-            parms[11].Value = isMyservice;
-            return DataAccess.getDataFromProcedure(str, "", parms);
-        }
 
         public static DataSet camGetListCalendar( string v_users, string v_fromDate, string v_toDate,string status)
         {
@@ -1677,95 +1635,7 @@ namespace ResfullApi.Models.balance
             return DataAccess.getDataFromProcedure(str, "", parms);
         }
 
-        public static DataSet hiddenChangeStatus(string v_type, string v_id, string v_status, string v_users)
-        {
-
-            string str;
-            str = "";
-            str = "BALANCE_PKG.HIDDEN_CHANGE_STATUS";
-            OracleParameter[] parms;
-            parms = new OracleParameter[]
-                            {
-
-                                new OracleParameter("v_type", OracleDbType.NVarchar2),
-                                new OracleParameter("v_id", OracleDbType.NVarchar2),
-                                new OracleParameter("v_status", OracleDbType.NVarchar2),
-                                new OracleParameter("v_users", OracleDbType.NVarchar2),
-
-
-
-                                new OracleParameter("P_RESULT",OracleDbType.RefCursor,ParameterDirection.Output),
-            };
-            parms[0].Value = v_type;
-            parms[1].Value = v_id;
-            parms[2].Value = v_status;
-            parms[3].Value = v_users;
-
-
-            return DataAccess.getDataFromProcedure(str, "", parms);
-        }
-
-        public static DataSet hiddenCamInsert(string V_CODE, string V_NAME, string V_FROM_DATE,
-            string V_TO_DATE, string V_FROM_HOUR, string V_TO_HOUR, string V_RULE_ADD,
-             string V_PRIORITY, string V_BALANCE_ID, string V_EXPIRE_DATE_ID, string V_STATUS, string V_NOTE, string V_USERS, string V_NUMBERDIS, string addType, string title, string isDefault, string isMyservice)
-        {
-            return camInsertByProcedure("BALANCE_PKG.HIDDEN_CAM_INSERT", V_CODE, V_NAME, V_FROM_DATE, V_TO_DATE, V_FROM_HOUR, V_TO_HOUR,
-                V_RULE_ADD, V_PRIORITY, V_BALANCE_ID, V_EXPIRE_DATE_ID, V_STATUS, V_NOTE, V_USERS, V_NUMBERDIS, addType, title, isDefault, isMyservice);
-        }
-
-        private static DataSet camInsertByProcedure(string str, string V_CODE, string V_NAME, string V_FROM_DATE,
-            string V_TO_DATE, string V_FROM_HOUR, string V_TO_HOUR, string V_RULE_ADD,
-             string V_PRIORITY, string V_BALANCE_ID, string V_EXPIRE_DATE_ID, string V_STATUS, string V_NOTE, string V_USERS, string V_NUMBERDIS, string addType, string title, string isDefault, string isMyservice)
-        {
-            OracleParameter[] parms;
-            parms = new OracleParameter[]
-                            {
-
-                                new OracleParameter("V_CODE", OracleDbType.NVarchar2),
-                                new OracleParameter("V_NAME", OracleDbType.NVarchar2),
-                                new OracleParameter("V_FROM_DATE", OracleDbType.NVarchar2),
 
-                                new OracleParameter("V_TO_DATE", OracleDbType.NVarchar2),
-                                new OracleParameter("V_FROM_HOUR", OracleDbType.NVarchar2),
-
-                                new OracleParameter("V_TO_HOUR", OracleDbType.NVarchar2),
-                                new OracleParameter("V_RULE_ADD", OracleDbType.NVarchar2),
-
-                                new OracleParameter("V_PRIORITY", OracleDbType.NVarchar2),
-                                new OracleParameter("V_BALANCE_ID", OracleDbType.NVarchar2),
-                                new OracleParameter("V_EXPIRE_DATE_ID", OracleDbType.NVarchar2),
-                                new OracleParameter("V_STATUS", OracleDbType.NVarchar2),
-                                new OracleParameter("V_NOTE", OracleDbType.NVarchar2),
-
-                                new OracleParameter("V_USERS", OracleDbType.NVarchar2),
-                                new OracleParameter("V_DISPLAY", OracleDbType.NVarchar2),
-                                new OracleParameter("V_ADD_TYPE", OracleDbType.NVarchar2),
-                                new OracleParameter("V_TITLE", OracleDbType.NVarchar2),
-                                new OracleParameter("V_DEFAULT", OracleDbType.NVarchar2),
-                                new OracleParameter("V_MYSERVICE", OracleDbType.NVarchar2),
-                                new OracleParameter("P_RESULT",OracleDbType.RefCursor,ParameterDirection.Output),
-            };
-            parms[0].Value = V_CODE;
-            parms[1].Value = V_NAME;
-            parms[2].Value = V_FROM_DATE;
-            parms[3].Value = V_TO_DATE;
-            parms[4].Value = V_FROM_HOUR;
-            parms[5].Value = V_TO_HOUR;
-            parms[6].Value = V_RULE_ADD;
-            parms[7].Value = V_PRIORITY;
-            parms[8].Value = V_BALANCE_ID;
-            parms[9].Value = V_EXPIRE_DATE_ID;
-            parms[10].Value = V_STATUS;
-            parms[11].Value = V_NOTE;
-            parms[12].Value = V_USERS;
-            parms[13].Value = V_NUMBERDIS;
-            parms[14].Value = addType;
-            parms[15].Value = title;
-            parms[16].Value = isDefault;
-            parms[17].Value = isMyservice;
-
-            return DataAccess.getDataFromProcedure(str, "", parms);
-        }
 
 
 
@@ -1834,72 +1704,7 @@ namespace ResfullApi.Models.balance
             return DataAccess.getDataFromProcedure(str, "", parms);
         }
 
-        public static DataSet hiddenCamUpdate(string V_ID, string V_CODE, string V_NAME, string V_FROM_DATE,
-            string V_TO_DATE, string V_FROM_HOUR, string V_TO_HOUR, string V_RULE_ADD,
-             string V_PRIORITY, string V_BALANCE_ID, string V_EXPIRE_DATE_ID, string V_STATUS, string V_NOTE, string V_USERS, string V_TYPE, string DISPLAY, string addType, string title, string isDefault, string isMyService)
-        {
-            return camUpdateByProcedure("BALANCE_PKG.HIDDEN_CAM_UPDATE", V_ID, V_CODE, V_NAME, V_FROM_DATE, V_TO_DATE, V_FROM_HOUR, V_TO_HOUR,
-                V_RULE_ADD, V_PRIORITY, V_BALANCE_ID, V_EXPIRE_DATE_ID, V_STATUS, V_NOTE, V_USERS, V_TYPE, DISPLAY, addType, title, isDefault, isMyService);
-        }
-
-        private static DataSet camUpdateByProcedure(string str, string V_ID, string V_CODE, string V_NAME, string V_FROM_DATE,
-            string V_TO_DATE, string V_FROM_HOUR, string V_TO_HOUR, string V_RULE_ADD,
-             string V_PRIORITY, string V_BALANCE_ID, string V_EXPIRE_DATE_ID, string V_STATUS, string V_NOTE, string V_USERS, string V_TYPE, string DISPLAY, string addType, string title, string isDefault, string isMyService)
-        {
-            OracleParameter[] parms;
-            parms = new OracleParameter[]
-                            {
-                                new OracleParameter("V_ID", OracleDbType.NVarchar2),
-
-                                new OracleParameter("V_CODE", OracleDbType.NVarchar2),
-                                new OracleParameter("V_NAME", OracleDbType.NVarchar2),
-                                new OracleParameter("V_FROM_DATE", OracleDbType.NVarchar2),
-
-                                new OracleParameter("V_TO_DATE", OracleDbType.NVarchar2),
-                                new OracleParameter("V_FROM_HOUR", OracleDbType.NVarchar2),
 
-                                new OracleParameter("V_TO_HOUR", OracleDbType.NVarchar2),
-                                new OracleParameter("V_RULE_ADD", OracleDbType.NVarchar2),
-
-                                new OracleParameter("V_PRIORITY", OracleDbType.NVarchar2),
-                                new OracleParameter("V_BALANCE_ID", OracleDbType.NVarchar2),
-                                new OracleParameter("V_EXPIRE_DATE_ID", OracleDbType.NVarchar2),
-                                new OracleParameter("V_STATUS", OracleDbType.NVarchar2),
-                                new OracleParameter("V_NOTE", OracleDbType.NVarchar2),
-
-
-                                new OracleParameter("V_USERS", OracleDbType.NVarchar2),
-                                new OracleParameter("V_TYPE", OracleDbType.NVarchar2),
-                                new OracleParameter("V_DISPLAY", OracleDbType.NVarchar2),
-                                new OracleParameter("V_ADD_TYPE", OracleDbType.NVarchar2),
-                                new OracleParameter("V_TITLE", OracleDbType.NVarchar2),
-                                new OracleParameter("V_DEFAULT", OracleDbType.NVarchar2),
-                                new OracleParameter("V_MYSERVICE", OracleDbType.NVarchar2),
-                                new OracleParameter("P_RESULT",OracleDbType.RefCursor,ParameterDirection.Output),
-            };
-            parms[0].Value = V_ID;
-            parms[1].Value = V_CODE;
-            parms[2].Value = V_NAME;
-            parms[3].Value = V_FROM_DATE;
-            parms[4].Value = V_TO_DATE;
-            parms[5].Value = V_FROM_HOUR;
-            parms[6].Value = V_TO_HOUR;
-            parms[7].Value = V_RULE_ADD;
-            parms[8].Value = V_PRIORITY;
-            parms[9].Value = V_BALANCE_ID;
-            parms[10].Value = V_EXPIRE_DATE_ID;
-            parms[11].Value = V_STATUS;
-            parms[12].Value = V_NOTE;
-            parms[13].Value = V_USERS;
-            parms[14].Value = V_TYPE;
-            parms[15].Value = DISPLAY;
-            parms[16].Value = addType;
-            parms[17].Value = title;
-            parms[18].Value = isDefault;
-            parms[19].Value = isMyService;
-
-            return DataAccess.getDataFromProcedure(str, "", parms);
-        }
 
 
 
@@ -1923,25 +1728,7 @@ namespace ResfullApi.Models.balance
             return DataAccess.getDataFromProcedure(str, "", parms);
         }
 
-        public static DataSet hiddenCamCopy(string id)
-        {
 
-            string str;
-            str = "";
-            str = "BALANCE_PKG.HIDDEN_CAM_COPY";
-            OracleParameter[] parms;
-            parms = new OracleParameter[]
-                            {
-
-                                new OracleParameter("v_id", OracleDbType.NVarchar2),
-
-                                new OracleParameter("P_RESULT",OracleDbType.RefCursor,ParameterDirection.Output),
-            };
-            parms[0].Value = id;
-
-
-            return DataAccess.getDataFromProcedure(str, "", parms);
-        }
 
 
         public static DataSet camBalGetList(string v_id, string v_users, string v_campaignId, string v_fromDate, string v_toDate

+ 1 - 78
ApiWeb/ApiProcessToken/Models/banlance/getListCommon.cs

@@ -1,4 +1,4 @@
-using ApiProcess.Models.balance;
+using ApiProcess.Models.balance;
 using CommonObj.common;
 using CommonObj.model;
 using ResfullApi.Models.balance;
@@ -111,84 +111,7 @@ namespace ApiProcessToken.Models.banlance
             return _result;
         }
 
-        public static List<campaignObj> getListHiddenCam(string id, string users, string name, string code, string fromDate, string toDate
-            , string order, string rowsOnPage, string seqPage, string status, out string _rowsOnPage, out string _seqPage, out string _totalPage, string isDefault, string isMyservice)
-        {
-            string v1, v2, v3;
-            _rowsOnPage = rowsOnPage;
-            _seqPage = seqPage;
-            _totalPage = "100";
-            List<campaignObj> _result = new List<campaignObj>();
-            try
-            {
-                DataSet ds_regist = balanceDataAccess.hiddenCamGetList(id, users, name, code, fromDate, toDate, order, rowsOnPage, seqPage, status, isDefault, isMyservice);
-                if (ds_regist != null & ds_regist.Tables[0].Rows.Count > 0)
-                {
-                    _rowsOnPage = ds_regist.Tables[0].Rows[0]["ROW_ON_PAGE"].ToString();
-                    _seqPage = ds_regist.Tables[0].Rows[0]["SEQ_PAGE"].ToString();
-                    _totalPage = ds_regist.Tables[0].Rows[0]["TOTAL_PAGE"].ToString();
-
-                    for (int j = 0; j < ds_regist.Tables[0].Rows.Count; j++)
-                    {
-                        campaignObj _obj = new campaignObj();
-
-                        _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.fromDate = ds_regist.Tables[0].Rows[j]["FROM_DATE"].ToString();
-                        _obj.toDate = ds_regist.Tables[0].Rows[j]["TO_DATE"].ToString();
-                        _obj.fromHour = ds_regist.Tables[0].Rows[j]["FROM_HOUR"].ToString();
-
-                        _obj.toHour = ds_regist.Tables[0].Rows[j]["TO_HOUR"].ToString();
-                        _obj.rule = ds_regist.Tables[0].Rows[j]["RULE_ADD"].ToString();
-
-                        _obj.priority = ds_regist.Tables[0].Rows[j]["PRIORITY"].ToString();
-                        _obj.balanceId = ds_regist.Tables[0].Rows[j]["BALANCE_ID"].ToString();
-                        _obj.expireDateId = ds_regist.Tables[0].Rows[j]["EXPIRE_DATE_ID"].ToString();
-                        _obj.status = ds_regist.Tables[0].Rows[j]["STATUS"].ToString();
-                        _obj.numberDisplay = ds_regist.Tables[0].Rows[j]["NUMBER_DISPLAY"].ToString();
-                        _obj.addType = ds_regist.Tables[0].Rows[j]["ADD_TYPE"].ToString();
-
-                        _obj.title = ds_regist.Tables[0].Rows[j]["TITLE"].ToString();
-                        _obj.isReload = ds_regist.Tables[0].Rows[j]["IS_RELOAD"].ToString();
-                        _obj.isDefault = ds_regist.Tables[0].Rows[j]["IS_DEFAULT"].ToString();
-                        _obj.isMyService = ds_regist.Tables[0].Rows[j]["IS_MYSERVICE"].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.listServiceMapCam = getListServiceOfCam("-1", users, _obj.id, fromDate
-                        , toDate, order, "100000", "1", "WEB",
-                        "EN", out v1, out v2, out v3);
-
-                        _obj.listBalanceMapCam = getListBalanceOfCam("-1", users, _obj.id, fromDate
-                        , toDate, order, "100000", "1", "WEB",
-                        "EN", out v1, out v2, out v3);
-
-                        _obj.listExpireMapCam = getListExpireOfCam("-1", users, _obj.id, fromDate
-                        , toDate, order, "100000", "1", "WEB",
-                        "EN", out v1, out v2, out v3);
 
-                        _obj.listShortCodeMapCam = getListShortCodeOfCam("-1", users, _obj.id, fromDate
-                        , toDate, order, "100000", "1", "WEB",
-                        "EN", out v1, out v2, out v3);
-
-                        _obj.listSubMapCam = getListSubOfCam("-1", users, _obj.id, fromDate
-                        , toDate, order, "100000", "1", "WEB",
-                        "EN", out v1, out v2, out v3);
-
-                        _result.Add(_obj);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-
-            }
-            return _result;
-        }
 
 
 

+ 17 - 82
SuperAdmin/SuperAdmin/Controllers/AdminController.cs

@@ -280,21 +280,11 @@ namespace SuperAdmin.Controllers
             {
                 return Redirect(GetParameter(UtilsController.Constant.SUB_DOMAIN) + "/Home/Login");
             }
-            PrepareCampaignManagementView(false);
+            PrepareCampaignManagementView();
             return View();
         }
 
-        public IActionResult HiddenCampaignManagement()
-        {
-            if (!CheckAuthToken())
-            {
-                return Redirect(GetParameter(UtilsController.Constant.SUB_DOMAIN) + "/Home/Login");
-            }
-            PrepareCampaignManagementView(true);
-            return View("CampaignManagement");
-        }
-
-        private void PrepareCampaignManagementView(bool isHiddenCampaign)
+        private void PrepareCampaignManagementView()
         {
             CriteriaSearchReq req = new CriteriaSearchReq();
             req.rowsOnPage = "1000000";
@@ -318,29 +308,23 @@ namespace SuperAdmin.Controllers
             HttpContext.Session.SetComplexData("listSubFile", res4.list);
             PreLoadService();
 
-            ViewBag.IsHiddenCampaign = isHiddenCampaign;
-            ViewBag.CampaignPageTitle = isHiddenCampaign ? "Hidden Campaign Management" : "Campaign Management";
-            ViewBag.CampaignBreadcrumb = isHiddenCampaign ? "Hidden Campaign Management" : "Campaign Management";
-            ViewBag.CampaignSearchUrl = isHiddenCampaign ? "/Admin/HiddenCampaignSearch" : "/Admin/CampaignSearch";
-            ViewBag.CampaignExportUrl = isHiddenCampaign ? "/Admin/HiddenCampaignExport" : "/Admin/CampaignExport";
-            ViewBag.CampaignLoadInfoUrl = isHiddenCampaign ? "/Admin/HiddenCampaignLoadInfo" : "/Admin/CampaignLoadInfo";
-            ViewBag.CampaignAddUpdateUrl = isHiddenCampaign ? "/Admin/HiddenCampaignAddUpdate" : "/Admin/CampaignAddUpdate";
-            ViewBag.CampaignCloneUrl = isHiddenCampaign ? "/Admin/HiddenCampaignClone" : "/Admin/CampaignClone";
-            ViewBag.CampaignChangeStatusUrl = isHiddenCampaign ? "/Admin/HiddenCampaignChangeStatus" : "/Admin/ChangeStatus";
-            ViewBag.CampaignExportFileName = isHiddenCampaign ? "hidden_campaigns.xlsx" : "campaigns.xlsx";
+            ViewBag.CampaignPageTitle = "Campaign Management";
+            ViewBag.CampaignBreadcrumb = "Campaign Management";
+            ViewBag.CampaignSearchUrl = "/Admin/CampaignSearch";
+            ViewBag.CampaignExportUrl = "/Admin/CampaignExport";
+            ViewBag.CampaignLoadInfoUrl = "/Admin/CampaignLoadInfo";
+            ViewBag.CampaignAddUpdateUrl = "/Admin/CampaignAddUpdate";
+            ViewBag.CampaignCloneUrl = "/Admin/CampaignClone";
+            ViewBag.CampaignChangeStatusUrl = "/Admin/ChangeStatus";
+            ViewBag.CampaignExportFileName = "campaigns.xlsx";
         }
 
         public IActionResult CampaignSearch(CampaignGetListReq req)
         {
-            return CampaignSearchByWs(req, CommonUtils.WsType.CamGetList, false);
+            return CampaignSearchByWs(req, CommonUtils.WsType.CamGetList);
         }
 
-        public IActionResult HiddenCampaignSearch(CampaignGetListReq req)
-        {
-            return CampaignSearchByWs(req, CommonUtils.WsType.HiddenCamGetList, true);
-        }
-
-        private IActionResult CampaignSearchByWs(CampaignGetListReq req, string wsType, bool isHiddenCampaign)
+        private IActionResult CampaignSearchByWs(CampaignGetListReq req, string wsType)
         {
             if (!CheckAuthToken())
             {
@@ -350,23 +334,12 @@ namespace SuperAdmin.Controllers
                     content = "Login first"
                 });
             }
-            //string account = HttpContext.Session.GetString("account");
-            //req.usersName = account;
             req.rowsOnPage = "1000000";
             req.seqPage = "1";
             req.order = "desc";
-            //req.type = "1"; // already result
 
             String url = GetParameter(wsType);
             CampaignGetListRes res = CampaignGetListRes.Parse(SendPost(req, url));
-            //HttpContext.Session.SetComplexData("ExportGetListRes", res);
-            //return Json(new
-            //{
-            //    error = res.responseCode,
-            //    content = res.responseMessage,
-            //    data = res.list
-            //});
-            ViewBag.IsHiddenCampaign = isHiddenCampaign;
             return PartialView("../Partial/_ListCampaign", res.list);
         }
 
@@ -376,11 +349,7 @@ namespace SuperAdmin.Controllers
             return CampaignExportByWs(req, CommonUtils.WsType.CamGetList, "campaigns.xlsx");
         }
 
-        [HttpPost]
-        public IActionResult HiddenCampaignExport(CampaignGetListReq req)
-        {
-            return CampaignExportByWs(req, CommonUtils.WsType.HiddenCamGetList, "hidden_campaigns.xlsx");
-        }
+
 
         private IActionResult CampaignExportByWs(CampaignGetListReq req, string wsType, string fileName)
         {
@@ -475,11 +444,7 @@ namespace SuperAdmin.Controllers
             return CampaignCloneByWs(request, CommonUtils.WsType.camCopy);
         }
 
-        [HttpPost]
-        public JsonResult HiddenCampaignClone(CampaignCopyReq request)
-        {
-            return CampaignCloneByWs(request, CommonUtils.WsType.hiddenCamCopy);
-        }
+
 
         private JsonResult CampaignCloneByWs(CampaignCopyReq request, string wsType)
         {
@@ -510,11 +475,7 @@ namespace SuperAdmin.Controllers
             return CampaignLoadInfoByWs(request, CommonUtils.WsType.CamGetList);
         }
 
-        [HttpPost]
-        public IActionResult HiddenCampaignLoadInfo(CampaignGetListReq request)
-        {
-            return CampaignLoadInfoByWs(request, CommonUtils.WsType.HiddenCamGetList);
-        }
+
 
         private IActionResult CampaignLoadInfoByWs(CampaignGetListReq request, string wsType)
         {
@@ -552,11 +513,7 @@ namespace SuperAdmin.Controllers
             return CampaignAddUpdateByWs(campAddUpdateObj, CommonUtils.WsType.CamGetList, CommonUtils.WsType.CamInsert, CommonUtils.WsType.CamUpdate);
         }
 
-        [HttpPost]
-        public JsonResult HiddenCampaignAddUpdate(CampaignAddUpdateObj campAddUpdateObj)
-        {
-            return CampaignAddUpdateByWs(campAddUpdateObj, CommonUtils.WsType.HiddenCamGetList, CommonUtils.WsType.HiddenCamInsert, CommonUtils.WsType.HiddenCamUpdate);
-        }
+
 
         private JsonResult CampaignAddUpdateByWs(CampaignAddUpdateObj campAddUpdateObj, string getListWsType, string insertWsType, string updateWsType)
         {
@@ -1261,29 +1218,7 @@ namespace SuperAdmin.Controllers
             });
         }
 
-        [HttpPost]
-        public JsonResult HiddenCampaignChangeStatus(ChangeStatusReq request)
-        {
-            if (!CheckAuthToken())
-            {
-                return Json(new
-                {
-                    error = "-1",
-                    content = "Login first"
-                });
-            }
-            string account = HttpContext.Session.GetString("account");
-            request.users = account;
-            request.type = CommonUtils.ActionType.Campaign;
-            string url = GetParameter(CommonUtils.WsType.hiddenChangeStatus);
-            var res = CommonRes.Parse(SendPost(request, url));
 
-            return Json(new
-            {
-                error = res.responseCode,
-                content = res.responseMessage
-            });
-        }
 
         [HttpPost]
         public IActionResult ServiceExport(ServiceGetListReq req)

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -238,11 +238,6 @@ namespace SuperAdmin.Source
             public const String CamUpdate = "wsCamUpdate";
             public const String CamInsert = "wsCamInsert";
             public const String camCopy = "camCopy";
-            public const String HiddenCamGetList = "wsHiddenCamGetList";
-            public const String HiddenCamUpdate = "wsHiddenCamUpdate";
-            public const String HiddenCamInsert = "wsHiddenCamInsert";
-            public const String hiddenCamCopy = "hiddenCamCopy";
-            public const String hiddenChangeStatus = "wsHiddenChangeStatus";
             public const String CamSvGetList = "wsCamSvGetList";
             public const String CamAddInsert = "wsCamAddInsert";
             public const String CamSvRemove = "wsCamSvRemove";

+ 1 - 32
SuperAdmin/SuperAdmin/Views/Admin/CampaignManagement.cshtml

@@ -10,7 +10,6 @@
 
 @model SearchMsisdnRes
 @{
-    bool isHiddenCampaign = ViewBag.IsHiddenCampaign == true;
     string campaignPageTitle = ViewBag.CampaignPageTitle ?? "Campaign Management";
     string campaignBreadcrumb = ViewBag.CampaignBreadcrumb ?? "Campaign Management";
     string campaignSearchUrl = ViewBag.CampaignSearchUrl ?? "/Admin/CampaignSearch";
@@ -1203,37 +1202,7 @@
             });
         }
 
-        @if (isHiddenCampaign)
-        {
-            <text>
-        function changeStatus(id, type, status) {
-            console.log("changeHiddenCampaignStatus " + id + " to " + status);
-            $.ajax({
-                url: urlConfig('@campaignChangeStatusUrl'),
-                type: "POST",
-                data: {
-                    id: id,
-                    type: type,
-                    status: status
-                },
-                success: function (result) {
-                    console.log(result);
-                    if (result.error == '0') {
-                        Swal.fire("Success!", result.content, "success").
-                            then((result) => {
-                                search();
-                            });
-                    } else {
-                        Swal.fire("Failed!", result.content, "error");
-                    }
-                },
-                error: function (err) {
-                    console.log(err);
-                }
-            });
-        }
-            </text>
-        }
+
 
         //function updateGridDataDetail(val) {
         //    console.log(val);

+ 1 - 10
SuperAdmin/SuperAdmin/Views/Partial/_Menu.cshtml

@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Http;
+@using Microsoft.AspNetCore.Http;
 @using SuperAdmin.Controllers;
 @using SuperAdmin.Models.Object;
 @using SuperCms.Extensions;
@@ -48,15 +48,6 @@
                 </a>
             </li>
         }
-        if (BaseController.useVsa == "0" || listMenu.Contains("/Admin/HiddenCampaignManagement"))
-        {
-            <li class=" nav-item">
-                <a class="nav-link" href="@ViewBag.MyConfig.MyValue/Admin/HiddenCampaignManagement">
-                    <i class="icon-eyeglasses"></i>
-                    <span class="menu-title">Hidden Campaigns</span>
-                </a>
-            </li>
-        }
         if (BaseController.useVsa == "0" || listMenu.Contains("/Admin/CampaignScheduler"))
         {
             <li class=" nav-item">

+ 0 - 5
SuperAdmin/SuperAdmin/appsettings.json

@@ -18,11 +18,6 @@
   "wsCamGetList": "http://127.0.0.1:8989/api/balance/camGetList/data",
   "wsCamUpdate": "http://127.0.0.1:8989/api/balance/camUpdate/data",
   "wsCamInsert": "http://127.0.0.1:8989/api/balance/camInsert/data",
-  "wsHiddenCamGetList": "http://127.0.0.1:8989/api/balance/hiddenCamGetList/data",
-  "wsHiddenCamUpdate": "http://127.0.0.1:8989/api/balance/hiddenCamUpdate/data",
-  "wsHiddenCamInsert": "http://127.0.0.1:8989/api/balance/hiddenCamInsert/data",
-  "hiddenCamCopy": "http://127.0.0.1:8989/api/balance/hiddenCamCopy/data",
-  "wsHiddenChangeStatus": "http://127.0.0.1:8989/api/balance/hiddenChangeStatus/data",
   "wsTransferSearch": " http://127.0.0.1:8989/api/balance/getListConvertByUser/data",
   "wsMsisdnExport": " http://127.0.0.1:8989/api/balance/rpSearchDetailTicketUniqueMsisdn/data",
   "urlTermresult": " http://127.0.0.1:8989/api/luckyGame/getResultOfTerm/data",