Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowHallVo.java

 package com.mortals.xhx.module.window.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.window.model.WindowHallEntity;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import lombok.Data;
+
 /**
-* 大厅窗口视图对象
-*
-* @author zxfei
-* @date 2023-04-25
-*/
+ * 大厅窗口视图对象
+ *
+ * @author zxfei
+ * @date 2023-04-25
+ */
 @Data
 public class WindowHallVo extends BaseEntityLong {
 
 
+    private String fromnum;
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowHallServiceImpl.java

 package com.mortals.xhx.module.window.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.module.window.model.WindowEntity;
+import com.mortals.xhx.module.window.model.WindowQuery;
+import com.mortals.xhx.module.window.service.WindowService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -6,14 +13,44 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.window.dao.WindowHallDao;
 import com.mortals.xhx.module.window.model.WindowHallEntity;
 import com.mortals.xhx.module.window.service.WindowHallService;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
-* WindowHallService
-* 大厅窗口 service实现
-*
-* @author zxfei
-* @date 2023-04-25
-*/
+ * WindowHallService
+ * 大厅窗口 service实现
+ *
+ * @author zxfei
+ * @date 2023-04-25
+ */
 @Service("windowHallService")
 public class WindowHallServiceImpl extends AbstractCRUDServiceImpl<WindowHallDao, WindowHallEntity, Long> implements WindowHallService {
 
+    @Autowired
+    private WindowService windowService;
+
+    /**
+     * @param params
+     * @param pageInfo
+     * @param context
+     * @param list
+     * @throws AppException
+     */
+    @Override
+    protected void findAfter(WindowHallEntity params, PageInfo pageInfo, Context context, List<WindowHallEntity> list) throws AppException {
+        super.findAfter(params, pageInfo, context, list);
+        List<Long> collect = list.stream().map(i -> i.getWindowId()).distinct().collect(Collectors.toList());
+        if (!ObjectUtils.isEmpty(collect)) {
+            WindowQuery windowQuery = new WindowQuery();
+            windowQuery.setIdList(collect);
+            Map<Long, WindowEntity> collectWin = windowService.find(windowQuery).stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
+            list.forEach(item -> {
+                WindowEntity windowEntity = collectWin.get(item.getWindowId());
+                item.setFromnum(windowEntity == null ? "" : windowEntity.getFromnum());
+            });
+        }
+    }
 }
\ No newline at end of file

portal-manager-ui/admin/src/api/dataAdmin.js

@@ -185,3 +185,9 @@ export function getCountImpossible(params) {
 export function getImpossibleInfo(params) {
   return http.get(`${BASEURL}/admin/impossible/impossibleInfo`, params);
 }
+/**
+ * AI效能监察异常行为数据报表
+ */
+export function getKqalert(params) {
+  return http.get(`${BASEURL}/admin/kqalert/list`, params);
+}
\ No newline at end of file

portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/reportForm.vue

@@ -14,12 +14,12 @@
         />
         <a-input
           allowClear
-          v-model="searchName"
+          v-model="Query.workman_name"
           placeholder="请输入工作人员姓名查询 "
         >
           <a-icon slot="prefix" type="search" />
         </a-input>
-        <a-select default-value="001">
+        <a-select default-value="001" placeholder="请选择窗口">
           <!-- <a-select-option
             v-for="(item, index) of selectOptions"
             :key="index"
@@ -31,24 +31,22 @@
           <a-select-option value="001"> 窗口001 </a-select-option>
           <a-select-option value="002"> 窗口002 </a-select-option>
         </a-select>
-        <a-select default-value="001">
-          <!-- <a-select-option
-            v-for="(item, index) of selectOptions"
-            :key="index"
-            :value="item.value"
+        <a-select v-model="Query.warn_alert" placeholder="请选择类型">
+          <a-select-option value=""> 全部 </a-select-option>
+          <a-select-option
+            v-for="(item,i) in warn_alert"
+            :key="i"
+            :value="i"
           >
-            {{ item.label }}
-          </a-select-option> -->
-
-          <a-select-option value="001"> 类型001 </a-select-option>
-          <a-select-option value="002"> 类型002 </a-select-option>
+            {{ item }}
+          </a-select-option>
         </a-select>
 
         <a-range-picker
           format="YYYY年MM月DD日"
           class="range_picker_style"
           @change="rangePickerChange"
-          v-model="BegindAndEndTime"
+          v-model="Query.time"
         >
         </a-range-picker>
 
@@ -71,7 +69,7 @@
         :columns="tableHeaders"
         :dataSource="tableSourceData"
       >
-        <template slot="operation" slot-scope="text, record, index">
+        <template slot="operation" slot-scope="text, record">
           <a-button type="link" @click="openDetails"
             >查看详情{{ record.id }}</a-button
           >
@@ -83,17 +81,33 @@
 
 <script>
 import table from "@/mixins/table";
+import {getKqalert} from "@/api/dataAdmin"
+const warn_alert = {
+  1:'离岗',
+  2:'离开',
+  4:'玩手机',
+  5:'扶头',
+  6:'趴桌',
+}
 export default {
   mixins: [table],
   name: "PortalAdminVueReportForm",
   data() {
     return {
+      warn_alert,
+      Query:{
+        have_process:"",//只看未处理 0
+        warn_alert:"",//1离岗，2离开 4:玩手机 5:扶头 6:趴桌
+        window_id:"",//窗口ID
+        workman_name:"",//工作人员姓名
+        time:[],//时间段
+      },//查询条件
       checkboxVALUE: [],
       BegindAndEndTime: [],
       checkboxOptions: [
         {
           label: "只看未处理",
-          value: "ID001",
+          value: "0",
         },
       ],
       tableHeaders: [
@@ -107,48 +121,48 @@ export default {
         },
         {
             title: "报警类型",
-          align: "center",
-          dataIndex: "报警类型",
+            dataIndex: "warn_alert",
+            customRender:(text, record)=>text?text:'--'
         },
         {
             title: "发生窗口",
-          align: "center",
-          dataIndex: "发生窗口",
+            dataIndex: "window_name",
+            customRender:(text, record)=>text?text:'--'
         },
         {
             title: "工作人员",
-          align: "center",
-          dataIndex: "工作人员",
+            dataIndex: "workman_name",
+            customRender:(text, record)=>text?text:'--'
         },
         {
             title: "所属部门",
-          align: "center",
-          dataIndex: "所属部门",
+            dataIndex: "section_name",
+            customRender:(text, record)=>text?text:'--'
         },
         {
             title: "手机号",
-          align: "center",
-          dataIndex: "手机号",
+            dataIndex: "workman_phone",
+            customRender:(text, record)=>text?text:'--'
         },
         {
             title: "发生时间",
-          align: "center",
-          dataIndex: "发生时间",
+            dataIndex: "out_time",
+            customRender:(text, record)=>text?text:'--'
         },
         {
             title: "时长",
-          align: "center",
-          dataIndex: "时长",
+            dataIndex: "duration",
+            customRender:(text, record)=>text?text:'--'
         },
         {
             title: "是否准确",
-          align: "center",
-          dataIndex: "是否准确",
+            dataIndex: "isaccuracy",
+            customRender:(text, record)=>text?text:'--'
         },
         {
             title: "是否处理",
-          align: "center",
-          dataIndex: "是否处理",
+            dataIndex: "have_process_name",
+            customRender:(text, record)=>text?text:'--'
         },
         {
           title: "操作",
@@ -165,23 +179,21 @@ export default {
   },
   components: {},
   mounted() {
+    this.onGetKqalert()
     this.setMoment();
-    for (let key = 0; key < 20; key++) {
-      this.tableSourceData.push({
-        id: `00${key + 1}`,
-        报警类型: `离岗${key + 1}`,
-        发生窗口: `001号窗口${key + 1}`,
-        工作人员: `刘德华${key + 1}`,
-        所属部门: `网络理政办${key + 1}`,
-        手机号: `13080888888${key + 1}`,
-        发生时间: `2022-07-03 18:00:00${key + 1}`,
-        时长: `15分32秒${key + 1}`,
-        是否准确: `准确${key + 1}`,
-        是否处理: `未处理${key + 1}`,
-      });
-    }
   },
   methods: {
+    // 报表接口
+    onGetKqalert(){
+      getKqalert(this.Query).then(res=>{
+        const {code,data} = res
+        if(code == 1){
+          this.tableSourceData = data.data
+          this.tablePagination.total = data.total
+        }
+        console.log(res)
+      })
+    },
     openDetails() {
       console.log("跳转网页");
     },
@@ -189,8 +201,11 @@ export default {
       console.log(val);
     },
     checkboxonChange(val) {
-      console.log(val);
-      console.log(this.checkboxVALUE);
+      if(val.length == 0){
+        this.Query.have_process = ""
+      }else{
+        this.Query.have_process = "0"
+      }
     },
     QueueState(type) {
       switch (type) {