事件详情方法

event-ui/src/views/event/eventProcess/index.vue

@@ -56,7 +56,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">详情</el-button>
           <el-button size="mini" type="text" icon="el-icon-document">事件日志</el-button>
         </template>
       </el-table-column>
@@ -128,6 +128,40 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询数据详情 */
+    handleDetail(row) {
+      this.findView = true;
+      this.reset();
+      this.srcList=[]
+      this.detailSee = true
+      const id = row.id || this.ids
+      getEventcatalogue(id).then(response => {
+        this.form = response.data;
+        const list = response.data.attach;
+        if(list.length == 0){
+          this.detailSee = false;
+        }
+        for (let i = 0; i < list.length; i++) {
+          this.$set(list[i], "url", list[i].attachPath)
+        }
+        list.forEach(e => {
+          if (e.fileType == 'video') {
+            this.filevedioList.push(e);
+          } else {
+            this.fileList.push(e);
+          }
+        })
+        this.form.attachId = this.fileList;
+        this.srcList=this.form.attachId.map(a=>a.url)
+        this.detailflValue()
+        listSJfl({parentId: 0}).then(response => {
+          this.eventTypeList = response.data;
+        });
+        this.openSee = true;
+        this.submit = false;
+        this.title = "事件详情";
+      });
+    },
     /** 获取事件类型数据源 */
     getEventTypeTree() {
       getEventTypeTree().then(response => {

src/main/java/com/sooka/sponest/event/eventProcess/controller/EventProcessController.java

@@ -36,6 +36,8 @@ public class EventProcessController extends BaseController {
     @Resource
     private EventLogService eventLogService;
 
+    //******************************************综合查询块**************************************************/
+
     /**
      * 事件中心 - 综合查询
      * @author limeng
@@ -47,6 +49,15 @@ public class EventProcessController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 事件中心 - 综合查询 - 详情
+     * @author limeng
+     * */
+    @GetMapping("/getCompositeEventDetail")
+    public EventInfoBO getCompositeEventDetail(EventInfo eventInfo) {
+        return null;
+    }
+
     //******************************************待确认事件块**************************************************/
 
     /**
@@ -64,12 +75,12 @@ public class EventProcessController extends BaseController {
     /**
      * 查询待确认事件详情
      *
-     * @param id 事件信息主键
+     * @param eventInfo 事件信息
      * @author limeng
      */
-    @GetMapping("/getUnconfirmedEventDetailById/{id}")
-    public AjaxResult getUnconfirmedEventDetailById(@PathVariable("id") String id) {
-        EventInfo unconfirmedEventDetailById = eventProcessService.getUnconfirmedEventDetailById(id);
+    @GetMapping("/getUnconfirmedEventDetail")
+    public AjaxResult getUnconfirmedEventDetail(EventInfo eventInfo) {
+        EventInfo unconfirmedEventDetailById = eventProcessService.getUnconfirmedEventDetail(eventInfo);
         if (null == unconfirmedEventDetailById) {
             return AjaxResult.error("查询异常!");
         }
@@ -93,12 +104,12 @@ public class EventProcessController extends BaseController {
     /**
      * 查询已确认事件详情
      *
-     * @param id 事件信息主键
+     * @param eventInfo 事件信息
      * @author limeng
      */
-    @GetMapping("/getProcessEventDetailById/{id}")
-    public AjaxResult getProcessEventDetailById(@PathVariable("id") String id) {
-        EventInfo unconfirmedEventDetailById = eventProcessService.getProcessEventDetailById(id);
+    @GetMapping("/getProcessEventDetail")
+    public AjaxResult getProcessEventDetail(EventInfo eventInfo) {
+        EventInfo unconfirmedEventDetailById = eventProcessService.getProcessEventDetail(eventInfo);
         if (null == unconfirmedEventDetailById) {
             return AjaxResult.error("查询异常!");
         }
@@ -123,12 +134,12 @@ public class EventProcessController extends BaseController {
     /**
      * 查询无异常事件详情
      *
-     * @param id 事件信息主键
+     * @param eventInfo 事件信息主键
      * @author limeng
      */
-    @GetMapping("/getUsualEventDetailById/{id}")
-    public AjaxResult getUsualEventDetailById(@PathVariable("id") String id) {
-        EventInfo unconfirmedEventDetailById = eventProcessService.getUsualEventDetailById(id);
+    @GetMapping("/getUsualEventDetail")
+    public AjaxResult getUsualEventDetailById(EventInfo eventInfo) {
+        EventInfo unconfirmedEventDetailById = eventProcessService.getUsualEventDetail(eventInfo);
         if (null == unconfirmedEventDetailById) {
             return AjaxResult.error("查询异常!");
         }

src/main/java/com/sooka/sponest/event/eventProcess/mapper/EventProcessMapper.java

@@ -15,15 +15,21 @@ public interface EventProcessMapper {
 
     List<EventInfoBO> selectUnConfirmedList(EventInfo eventInfo);
 
-    EventInfo getUnconfirmedEventDetailById(EventInfo eventInfo);
+    /**
+     * 事件中心 - 综合查询 - 详情
+     * @author limeng
+     * */
+    EventInfoBO getCompositeEventDetail(EventInfo eventInfo);
+
+    EventInfo getUnconfirmedEventDetail(EventInfo eventInfo);
 
     List<EventInfoBO> selectEventProcessList(EventInfo eventInfo);
 
-    EventInfo getProcessEventDetailById(EventInfo eventInfo);
+    EventInfo getProcessEventDetail(EventInfo eventInfo);
 
     List<EventInfoBO> selectUsualList(EventInfo eventInfo);
 
-    EventInfo getUsualEventDetailById(EventInfo eventInfo);
+    EventInfo getUsualEventDetail(EventInfo eventInfo);
 
     void insertEventProcess(EventInfo eventInfo);
 

src/main/java/com/sooka/sponest/event/eventProcess/service/EventProcessService.java

@@ -18,6 +18,12 @@ public interface EventProcessService {
     List<EventInfoBO> selectCompositeEventList(EventInfo eventInfo);
 
     /**
+     * 事件中心 - 综合查询 - 详情
+     * @author limeng
+     * */
+    EventInfoBO getCompositeEventDetail(EventInfo eventInfo);
+
+    /**
      * 插入大华 XC5300 类型事件
      *
      * @param daHuaOtherEventVO 事件类型
@@ -35,15 +41,15 @@ public interface EventProcessService {
     List<EventInfoBO> selectUnConfirmedList(EventInfo eventInfo);
 
 
-    EventInfo getUnconfirmedEventDetailById(String id);
+    EventInfo getUnconfirmedEventDetail(EventInfo eventInfo);
 
     List<EventInfoBO> selectEventProcessList(EventInfo eventInfo);
 
-    EventInfo getProcessEventDetailById(String id);
+    EventInfo getProcessEventDetail(EventInfo eventInfo);
 
     List<EventInfoBO> selectUsualList(EventInfo eventInfo);
 
-    EventInfo getUsualEventDetailById(String id);
+    EventInfo getUsualEventDetail(EventInfo eventInfo);
 
     AjaxResult confirm(EventInfo eventInfo);
 

src/main/java/com/sooka/sponest/event/eventProcess/service/impl/EventProcessServiceImpl.java

@@ -101,6 +101,25 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         }
     }
 
+    /**
+     * 事件中心 - 综合查询 - 详情
+     * @author limeng
+     * */
+    @Override
+    public EventInfoBO getCompositeEventDetail(EventInfo eventInfo) {
+//        // 入参校验
+//        if (eventInfo == null || eventInfo.getEventId() == null || eventInfo.getEventStatus() == null)
+//            return new EventInfoBO();
+//        if (eventInfo.getEventStatus().equals(EVENT_STATUS_1)) { // 上报
+//            return eventProcessMapper.getUnconfirmedEventDetail(eventInfo);
+//        } else if (eventInfo.getEventStatus().equals(EVENT_STATUS_98) || eventInfo.getEventStatus().equals(EVENT_STATUS_99)) { // 误报 重复
+//            return eventProcessMapper.getUsualEventDetail(eventInfo);
+//        } else { // 确认 签收 办结 审核通过 归档
+//            return eventProcessMapper.getProcessEventDetail(eventInfo);
+//        }
+        return null;
+    }
+
     @Override
     public void insertDaHuaOtherEvent(DaHuaOtherEventVO daHuaOtherEventVO) {
         try {
@@ -273,8 +292,8 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
     }
 
     @Override
-    public EventInfo getUnconfirmedEventDetailById(String id) {
-        EventInfo unconfirmedEventDetailById = eventProcessMapper.getUnconfirmedEventDetailById(new EventInfo(id));
+    public EventInfo getUnconfirmedEventDetail(EventInfo eventInfo) {
+        EventInfo unconfirmedEventDetailById = eventProcessMapper.getUnconfirmedEventDetail(eventInfo);
         detailSetPath(unconfirmedEventDetailById.getEventLogList());
         return unconfirmedEventDetailById;
     }
@@ -289,8 +308,8 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
     }
 
     @Override
-    public EventInfo getProcessEventDetailById(String id) {
-        EventInfo confirmedEventDetailById = eventProcessMapper.getProcessEventDetailById(new EventInfo(id));
+    public EventInfo getProcessEventDetail(EventInfo eventInfo) {
+        EventInfo confirmedEventDetailById = eventProcessMapper.getProcessEventDetail(eventInfo);
         detailSetPath(confirmedEventDetailById.getEventLogList());
         return confirmedEventDetailById;
     }
@@ -305,8 +324,8 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
     }
 
     @Override
-    public EventInfo getUsualEventDetailById(String id) {
-        EventInfo usualEventDetailById = eventProcessMapper.getUsualEventDetailById(new EventInfo(id));
+    public EventInfo getUsualEventDetail(EventInfo eventInfo) {
+        EventInfo usualEventDetailById = eventProcessMapper.getUsualEventDetail(eventInfo);
         detailSetPath(usualEventDetailById.getEventLogList());
         return usualEventDetailById;
     }
@@ -462,7 +481,7 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
                 }
 
                 eventInfo.setEventStatus(EVENT_STATUS_2);
-                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetailById(eventInfo);
+                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetail(eventInfo);
                 if (null == processEventDetailById) {
                     return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
@@ -504,7 +523,7 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
                 }
 
                 eventInfo.setEventStatus(EVENT_STATUS_3);
-                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetailById(eventInfo);
+                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetail(eventInfo);
                 if (null == processEventDetailById) {
                     return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
@@ -543,7 +562,7 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
                 }
 
                 eventInfo.setEventStatus(EVENT_STATUS_4);
-                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetailById(eventInfo);
+                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetail(eventInfo);
                 if (null == processEventDetailById) {
                     return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
@@ -584,7 +603,7 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
                 }
 
                 eventInfo.setEventStatus(EVENT_STATUS_5);
-                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetailById(eventInfo);
+                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetail(eventInfo);
                 if (null == processEventDetailById) {
                     return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
@@ -620,7 +639,7 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
             }
 
 
-            EventInfo processEventDetail = eventProcessMapper.getProcessEventDetailById(eventInfo);
+            EventInfo processEventDetail = eventProcessMapper.getProcessEventDetail(eventInfo);
             if (null == processEventDetail || (!EVENT_STATUS_2.equals(processEventDetail.getEventStatus()) && !EVENT_STATUS_3.equals(processEventDetail.getEventStatus()))) {
                 return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
             }

src/main/resources/mapper/event/eventProcess/EventProcessMapper.xml

@@ -362,10 +362,11 @@
         order by a.create_time desc
     </select>
 
-    <select id="getUnconfirmedEventDetailById" parameterType="string" resultMap="EventDetailResult">
-        SELECT *
-        FROM event_unconfirmed
-        WHERE event_id = #{eventId}
+    <select id="getUnconfirmedEventDetail" resultMap="EventDetailResult">
+        SELECT * FROM event_unconfirmed
+        <where>
+            <include refid="selectEventListWhere"/>
+        </where>
     </select>
 
     <select id="selectEventProcessList" parameterType="EventInfo" resultMap="EventInfoProcessResult">
@@ -379,7 +380,7 @@
         order by a.create_time desc
     </select>
 
-    <select id="getProcessEventDetailById" resultMap="EventDetailProcessResult">
+    <select id="getProcessEventDetail" resultMap="EventDetailProcessResult">
         SELECT * FROM event_process
         <where>
             <include refid="selectEventListWhere"/>
@@ -397,10 +398,11 @@
         order by a.create_time desc
     </select>
 
-    <select id="getUsualEventDetailById" resultMap="EventDetailProcessResult">
-        SELECT *
-        FROM event_usual
-        WHERE event_id = #{eventId}
+    <select id="getUsualEventDetail" resultMap="EventDetailProcessResult">
+        SELECT * FROM event_usual
+        <where>
+            <include refid="selectEventListWhere"/>
+        </where>
     </select>