From 03bd97d3c592dae70d96af3474fc2ccc3c6ebdbf Mon Sep 17 00:00:00 2001 From: 15689705887 <396341246@qq.com> Date: Fri, 27 Sep 2024 14:38:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E7=99=BB=E8=AE=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=81=E4=BA=BA=E5=91=98=E6=8A=A5=E8=AD=A6=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RoadFlow.Platform/WorkFlowTask.cs | 62 +++---- Code/ClassLib/ZHYQ/BLL/OA/TBL_VISITOR_REG.cs | 17 +- .../ZHYQ/OracleDAL/OA/TBL_ALARMDATA.cs | 2 +- .../OA/VisitorReg/AppOrgTree.html | 130 ++++++++++++++ .../OA/VisitorReg/VisitorRegApp.html | 170 ++++++++++++++++++ .../ashx/AppHandler.ashx.cs | 96 ++++++++++ .../ashx/MenuHandler.ashx.cs | 28 +-- .../ashx/VisitorRegHandler.ashx.cs | 62 +++++++ 8 files changed, 517 insertions(+), 50 deletions(-) create mode 100644 Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/AppOrgTree.html create mode 100644 Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/VisitorRegApp.html diff --git a/Code/ClassLib/RoadFlow/RoadFlow.Platform/WorkFlowTask.cs b/Code/ClassLib/RoadFlow/RoadFlow.Platform/WorkFlowTask.cs index e340629..2210d63 100644 --- a/Code/ClassLib/RoadFlow/RoadFlow.Platform/WorkFlowTask.cs +++ b/Code/ClassLib/RoadFlow/RoadFlow.Platform/WorkFlowTask.cs @@ -717,40 +717,40 @@ namespace RoadFlow.Platform var tempTasks = createTempTasks(executeModel, currentTask); List nextStepName = new List(); //FangYar.FYMQTT.MQTT mq = new FangYar.FYMQTT.MQTT(); - //FangYar.FYMQTT.MessagePush mp = new FangYar.FYMQTT.MessagePush(); + FangYar.FYMQTT.MessagePush mp = new FangYar.FYMQTT.MessagePush(); foreach (var nstep in tempTasks) { - //var title = nstep.Title + "待审批，请及时查看"; - ////mq.messagePublished2(title, "", usercode); - //try - //{ - // //人员详细信息 - // FangYar.BLL.TBL.SysEmpBLL empBll = new FangYar.BLL.TBL.SysEmpBLL(); - // FangYar.Model.TBL.TBL_SYS_EMP_Model empModel = empBll.GetModelByUID(nstep.SenderID); - - // //消息通知记录入库操作 - // FangYar.Model.TBL.TBL_MESSAGE_LOG tbl_message_log = new FangYar.Model.TBL.TBL_MESSAGE_LOG(); - // tbl_message_log.ID = Guid.NewGuid().ToString("N"); - // tbl_message_log.TITLE = "待办审批"; - // tbl_message_log.CONTENT = title; - // tbl_message_log.SENDID = nstep.SenderID; - // tbl_message_log.SENDNAME = nstep.SenderName; - // tbl_message_log.SENDTIME = DateTime.Now.ToString("G"); - // tbl_message_log.TYPE = message_log_type; - // tbl_message_log.URL = "/pages/team/dspxnew/dspxlist"; - // tbl_message_log.PARAM = ""; - // tbl_message_log.RECEIVEID = nstep.ReceiveID; - // tbl_message_log.RECEIVENAME = nstep.ReceiveName; - // tbl_message_log.OPENTIME = ""; - // tbl_message_log.STATE = "0"; //未读 - // tbl_message_log.ORG_ID = empModel.ORG_ID; //机构ID - // FangYar.FYMQTT.MessageLog ml = new FangYar.FYMQTT.MessageLog(); - // ml.MessageLogAdd(tbl_message_log); - - // mp.AloneMsgPush(nstep.ReceiveID, "待办审批", title, tbl_message_log.ID); + var title = nstep.Title + "待审批，请及时查看"; + //mq.messagePublished2(title, "", usercode); + try + { + //人员详细信息 + FangYar.BLL.TBL.SysEmpBLL empBll = new FangYar.BLL.TBL.SysEmpBLL(); + FangYar.Model.TBL.TBL_SYS_EMP_Model empModel = empBll.GetModelByUID(nstep.SenderID); + + //消息通知记录入库操作 + FangYar.Model.TBL.TBL_MESSAGE_LOG tbl_message_log = new FangYar.Model.TBL.TBL_MESSAGE_LOG(); + tbl_message_log.ID = Guid.NewGuid().ToString("N"); + tbl_message_log.TITLE = "待办审批"; + tbl_message_log.CONTENT = title; + tbl_message_log.SENDID = nstep.SenderID; + tbl_message_log.SENDNAME = nstep.SenderName; + tbl_message_log.SENDTIME = DateTime.Now.ToString("G"); + tbl_message_log.TYPE = message_log_type; + tbl_message_log.URL = "/pages/team/dspxnew/dspxlist"; + tbl_message_log.PARAM = ""; + tbl_message_log.RECEIVEID = nstep.ReceiveID; + tbl_message_log.RECEIVENAME = nstep.ReceiveName; + tbl_message_log.OPENTIME = ""; + tbl_message_log.STATE = "0"; //未读 + tbl_message_log.ORG_ID = empModel.ORG_ID; //机构ID + FangYar.FYMQTT.MessageLog ml = new FangYar.FYMQTT.MessageLog(); + ml.MessageLogAdd(tbl_message_log); + + mp.AloneMsgPush(nstep.ReceiveID, "待办审批", title, tbl_message_log.ID); - //} - //catch (Exception ex) { } + } + catch (Exception ex) { } nextStepName.Add(nstep.StepName); } nextTasks.AddRange(tempTasks); diff --git a/Code/ClassLib/ZHYQ/BLL/OA/TBL_VISITOR_REG.cs b/Code/ClassLib/ZHYQ/BLL/OA/TBL_VISITOR_REG.cs index 8be89bd..2b2b575 100644 --- a/Code/ClassLib/ZHYQ/BLL/OA/TBL_VISITOR_REG.cs +++ b/Code/ClassLib/ZHYQ/BLL/OA/TBL_VISITOR_REG.cs @@ -75,10 +75,19 @@ namespace FangYar.BLL.OA return flag; } - /// - /// 更新一条数据 - /// - public bool Update(FangYar.Model.OA.TBL_VISITOR_REG model) + /// + /// 增加一条数据 + /// + public bool Add2(FangYar.Model.OA.TBL_VISITOR_REG model) + { + model.REGISTERTIME = DateTime.Now.ToString(); + return dal.Add(model); + } + + /// + /// 更新一条数据 + /// + public bool Update(FangYar.Model.OA.TBL_VISITOR_REG model) { return dal.Update(model); } diff --git a/Code/ClassLib/ZHYQ/OracleDAL/OA/TBL_ALARMDATA.cs b/Code/ClassLib/ZHYQ/OracleDAL/OA/TBL_ALARMDATA.cs index fb194dd..edb5e4f 100644 --- a/Code/ClassLib/ZHYQ/OracleDAL/OA/TBL_ALARMDATA.cs +++ b/Code/ClassLib/ZHYQ/OracleDAL/OA/TBL_ALARMDATA.cs @@ -510,7 +510,7 @@ namespace FangYar.OracleDAL public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex) { StringBuilder strSql = new StringBuilder(); - strSql.Append("SELECT ID,DVC_ID,ORG_ID,TYPE,TIME,ADDR,PICSRC,VALUE,ALARM_TYPE,replace(ALARM_DES,'非法外出','违规外出') ALARM_DES,EMP_ID,USERS_UID,CAR_ID,CAR_NUM,LEAVE_ID,CARAPPLY_ID,EXTENDCODE1,EXTENDCODE2,EXTENDCODE3,EXTENDCODE4,EXTENDCODE5,EXTENDCODE6,CHANNEL,CHANNELTYPE,CUSTOMINFO,DEVSERIAL,ALARMID,ALARMTYPE,CHANNELNAME,org_name,emp_name from (select j.*, k.org_name,m.emp_name from tbl_alarmdata j left join fire_org k on j.org_id = k.org_id left join TBL_SYS_EMP m on m.IS_ADMIN='0' and j.EMP_ID = m.id) T "); + strSql.Append("SELECT ID,DVC_ID,ORG_ID,TYPE,TIME,ADDR,PICSRC,VALUE,ALARM_TYPE,replace(ALARM_DES,'非法外出','违规外出') ALARM_DES,EMP_ID,USERS_UID,CAR_ID,CAR_NUM,LEAVE_ID,CARAPPLY_ID,EXTENDCODE1,EXTENDCODE2,EXTENDCODE3,EXTENDCODE4,EXTENDCODE5,EXTENDCODE6,CHANNEL,CHANNELTYPE,CUSTOMINFO,DEVSERIAL,ALARMID,ALARMTYPE,CHANNELNAME,org_name,emp_name,STATE,OPINION from (select j.*, k.org_name,m.emp_name from tbl_alarmdata j left join fire_org k on j.org_id = k.org_id left join TBL_SYS_EMP m on m.IS_ADMIN='0' and j.EMP_ID = m.id) T "); if (!string.IsNullOrEmpty(strWhere.Trim())) { strSql.Append(" WHERE " + strWhere); diff --git a/Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/AppOrgTree.html b/Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/AppOrgTree.html new file mode 100644 index 0000000..f1d5152 --- /dev/null +++ b/Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/AppOrgTree.html @@ -0,0 +1,130 @@ + + + + + 系统中心--科宁权限资源管理系统 + + + + + + + + + + + + + + + +
+
    +
+ + + + + + + diff --git a/Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/VisitorRegApp.html b/Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/VisitorRegApp.html new file mode 100644 index 0000000..381fc92 --- /dev/null +++ b/Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/VisitorRegApp.html @@ -0,0 +1,170 @@ + + + + + 访客登记单 + + + + + + + + + + + + + +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ 提交 +
+
+ + + + diff --git a/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/AppHandler.ashx.cs b/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/AppHandler.ashx.cs index 4ca409d..fd2ba70 100644 --- a/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/AppHandler.ashx.cs +++ b/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/AppHandler.ashx.cs @@ -101,6 +101,12 @@ namespace FangYar.WebUI.ashx case "AppGetAlarmEmpListByOrgId": returnstr = AppGetAlarmEmpListByOrgId(context); break; + case "AppGetAlarmEmpListByOrgIdApprovalState": + returnstr = AppGetAlarmEmpListByOrgIdApprovalState(context); + break; + case "AppUpdateAlarmEmpStateByOrgId": + returnstr = AppUpdateAlarmEmpStateByOrgId(context); + break; case "AppGetAlarmCarListByOrgId": returnstr = AppGetAlarmCarListByOrgId(context); break; @@ -2354,6 +2360,96 @@ namespace FangYar.WebUI.ashx BLL.SysOperationLogHelp.AddSysOperationLog(context, Common.EnumOperationLogType.Query, "APP操作请求", "人员报警列表查询"); return returnstr; } + + //人员报警列表查询（待审批） + private string AppGetAlarmEmpListByOrgIdApprovalState(HttpContext context) + { + string returnstr = ""; + try + { + FangYar.BLL.TBL_ALARMDATA alarmBll = new FangYar.BLL.TBL_ALARMDATA(); + + string OrgId = context.Request.Params["orgId"]; + string sTime = context.Request.Params["sTime"]; + string eTime = context.Request.Params["eTime"]; + string type = context.Request.Params["type"]; + string page = context.Request.Params["page"]; + string limit = context.Request.Params["limit"]; + int pageIndex = 1; + int pageSize = 10; + if (!string.IsNullOrEmpty(page)) { pageIndex = int.Parse(page); } + if (!string.IsNullOrEmpty(limit)) { pageSize = int.Parse(limit); } + string where = " ALARM_TYPE='1' and state = '0' "; + if (!string.IsNullOrEmpty(OrgId)) + { + where += " and (ORG_ID ='" + OrgId + "' or ORG_ID in (select o.org_id from fire_org o where o.pid = '" + OrgId + "') )"; + } + if (!string.IsNullOrEmpty(sTime)) + { + where += " and TIME >= date_format('" + sTime + "','%Y-%m-%d')"; + } + if (!string.IsNullOrEmpty(eTime)) + { + where += " and TIME <= date_format('" + eTime + "','%Y-%m-%d')"; + } + if (!string.IsNullOrEmpty(type)) + { + where += " and EXTENDCODE1 = '" + type + "'"; + } + returnstr = "{\"code\":0,\"msg\":\"\","; + int count = alarmBll.GetRecordCount(where); + returnstr += "\"count\":" + count + ",\"data\":"; + if (count == 0) + { + returnstr += "[]"; + } + else + { + DataTable dt = alarmBll.GetListByPage(where, " TIME desc ", (pageIndex - 1) * pageSize, pageSize).Tables[0]; + returnstr += FangYar.Common.JsonHelper.ToJson(dt); + } + returnstr += "}"; + } + catch (Exception e) + { + returnstr = "{\"code\":-1,\"msg\":\"error\",\"count\":0,\"data\":[]}"; + // 记录操作日志 + BLL.SysOperationLogHelp.AddSysOperationLog(context, Common.EnumOperationLogType.Error, "APP操作请求", "人员报警列表查询异常：" + e); + } + // 记录操作日志 + BLL.SysOperationLogHelp.AddSysOperationLog(context, Common.EnumOperationLogType.Query, "APP操作请求", "人员报警列表查询"); + return returnstr; + } + + //审批人员报警 + private string AppUpdateAlarmEmpStateByOrgId(HttpContext context) + { + string returnstr = "", msg = "审批失败！"; + int code = 0; + try + { + string id = context.Request.Params["id"]; + string OPINION = context.Request.Params["OPINION"]; + + string sql = " update tbl_alarmdata set state='1',OPINION='"+ OPINION + "' where id='" + id + "' "; + var n1 = FangYar.Common.MySqlHelper.Execute(sql); + if (n1 > 0) + { + msg = "审批成功！"; + code = 1; + } + else + { + msg = "审批失败！"; + } + } + catch(Exception e) + { + + } + returnstr = "{\"code\":" + code + ",\"msg\":\"" + msg + "\"}"; + return returnstr; + } #endregion #region 车辆报警列表查询 diff --git a/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/MenuHandler.ashx.cs b/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/MenuHandler.ashx.cs index 9791143..1d5a443 100644 --- a/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/MenuHandler.ashx.cs +++ b/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/MenuHandler.ashx.cs @@ -613,20 +613,20 @@ namespace FangYar.WebUI.ashx model.OpenMode = int.Parse(dr["OPENMODE"].ToString()); } } - if (dr.Table.Columns.Contains("WIDTH")) - { - if (dr["WIDTH"] != null && dr["WIDTH"].ToString() != "") - { - model.Width = int.Parse(dr["WIDTH"].ToString()); - } - } - if (dr.Table.Columns.Contains("HEIGHT")) - { - if (dr["HEIGHT"] != null && dr["HEIGHT"].ToString() != "") - { - model.Height = int.Parse(dr["HEIGHT"].ToString()); - } - } + //if (dr.Table.Columns.Contains("WIDTH")) + //{ + // if (dr["WIDTH"] != null && dr["WIDTH"].ToString() != "") + // { + // model.Width = int.Parse(dr["WIDTH"].ToString()); + // } + //} + //if (dr.Table.Columns.Contains("HEIGHT")) + //{ + // if (dr["HEIGHT"] != null && dr["HEIGHT"].ToString() != "") + // { + // model.Height = int.Parse(dr["HEIGHT"].ToString()); + // } + //} model.Params = dr["PARAMS"] + ""; model.Manager = dr["MANAGER"] + ""; model.Note = dr["NOTE"] + ""; diff --git a/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/VisitorRegHandler.ashx.cs b/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/VisitorRegHandler.ashx.cs index 133c4db..6852cfe 100644 --- a/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/VisitorRegHandler.ashx.cs +++ b/Code/智慧营区/DOCManageAPP（阿克苏）/ashx/VisitorRegHandler.ashx.cs @@ -43,6 +43,9 @@ namespace FangYar.WebUI.ashx case "add": returnstr = visRegAdd(context); break; + case "add2": + returnstr = visRegAdd2(context); + break; case "edit": returnstr = visRegEdit(context); break; @@ -285,6 +288,65 @@ namespace FangYar.WebUI.ashx return returnstr; } + + //添加访客登记 + private string visRegAdd2(HttpContext context) + { + string returnstr = ""; + int code = -1; + string msg = ""; + try + { + string ID = Guid.NewGuid().ToString("N"); + string NAME = context.Request.Params["NAME"]; + string CARID = context.Request.Params["CARID"]; + string BELONGINGS = context.Request.Params["BELONGINGS"]; + string ABOUTTIME = context.Request.Params["ABOUTTIME"]; + string REASON = context.Request.Params["REASON"]; + string VED_ID = context.Request.Params["VED_ID"]; + string VED_MAN = context.Request.Params["VED_MAN"]; + string ORG_ID = context.Request.Params["ORG_ID"]; + + //访客登记表 + FangYar.Model.OA.TBL_VISITOR_REG model = new Model.OA.TBL_VISITOR_REG(); + model.ID = ID; + model.NAME = NAME; + model.CARID = CARID; + model.BELONGINGS = BELONGINGS; + model.REASON = REASON; + if (string.IsNullOrEmpty(ABOUTTIME)) + { + model.ABOUTTIME = 1; + } + else + { + model.ABOUTTIME = decimal.Parse(ABOUTTIME); + } + model.VED_ID = VED_ID; + model.VED_MAN = VED_MAN; + model.ORG_ID = ORG_ID; + model.STATE = "0"; + + if (bll.Add2(model)) + { + msg = "添加成功！"; + code = 1; + } + else { msg = "添加失败！"; } + } + catch (Exception e) + { + msg = "添加失败"; + // 记录操作日志 + BLL.SysOperationLogHelp.AddSysOperationLog(context, Common.EnumOperationLogType.Error, "访客登记操作请求", "添加访客登记异常：" + e); + } + returnstr = "{\"msg\":\"" + msg + "\",\"code\":" + code + "}"; + // 记录操作日志 + BLL.SysOperationLogHelp.AddSysOperationLog(context, Common.EnumOperationLogType.Add, "访客登记操作请求", "添加访客登记"); + return returnstr; + } + + //访客登记审批 private string visRegEdit(HttpContext context) {