监控管理后台

src/main/java/com/izouma/wenlvju/domain/ExamRoom.java

@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Entity;
 
@@ -15,6 +16,7 @@ import javax.persistence.Entity;
 @Builder
 @Entity
 @ApiModel(value = "考场")
+@Where(clause = "del = 0")
 public class ExamRoom extends BaseEntity {
     private Long organizationId;
 

src/main/java/com/izouma/wenlvju/domain/Video.java → src/main/java/com/izouma/wenlvju/domain/RecordExamRoom.java

@@ -1,7 +1,6 @@
 package com.izouma.wenlvju.domain;
 
 
-import com.izouma.wenlvju.converter.LongArrayConverter;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -14,7 +13,7 @@ import javax.persistence.Entity;
 @NoArgsConstructor
 @Builder
 @Entity
-public class Video extends BaseEntity {
+public class RecordExamRoom extends BaseEntity {
     private Long recordId;
 
     private Long examRoomId;

src/main/java/com/izouma/wenlvju/repo/RecordExamRoomRepo.java

@@ -0,0 +1,22 @@
+package com.izouma.wenlvju.repo;
+
+import com.izouma.wenlvju.domain.RecordExamRoom;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+public interface RecordExamRoomRepo extends JpaRepository<RecordExamRoom, Long>, JpaSpecificationExecutor<RecordExamRoom> {
+    @Query("update RecordExamRoom t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    List<RecordExamRoom> findAllByRecordId(Long recordId);
+
+    @Query("select id from RecordExamRoom where del = false and recordId = ?1")
+    List<Long> findIdByRecordId(Long recordId);
+}

src/main/java/com/izouma/wenlvju/service/ExamRoomService.java

@@ -1,35 +1,76 @@
 package com.izouma.wenlvju.service;
 
+import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.kevinsawicki.http.HttpRequest;
 import com.izouma.wenlvju.domain.ExamRoom;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.ExamRoomRepo;
+import com.izouma.wenlvju.repo.RecordExamRoomRepo;
 import com.izouma.wenlvju.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
+
 @Slf4j
 @Service
 @AllArgsConstructor
 public class ExamRoomService {
 
-    private final ExamRoomRepo      examRoomRepo;
-    private final EzvizTokenService ezvizTokenService;
+    private final ExamRoomRepo       examRoomRepo;
+    private final EzvizTokenService  ezvizTokenService;
+    private final RecordExamRoomRepo recordExamRoomRepo;
 
     public Page<ExamRoom> all(PageQuery pageQuery) {
         return examRoomRepo.findAll(JpaUtils.toSpecification(pageQuery, ExamRoom.class), JpaUtils.toPageRequest(pageQuery));
     }
 
-    public void addDevice(ExamRoom examRoom) {
+    /*
+    查看设备列表
+     */
+    public List<String> showDevice() {
+        String uri = "https://open.ys7.com/api/lapp/device/list";
+        String accessToken = ezvizTokenService.getToken();
+        String send = "accessToken=" + accessToken + "&pageStart=0&pageSize=10";
+        log.info("萤石查看设备--->" + send);
+
+        String body = HttpRequest.post(uri).send(send).body();
+        log.info("萤石查看设备返回--->" + body);
+
+        JSONObject json = JSONObject.parseObject(body);
+        if (!"200".equals(json.getString("code"))) {
+            throw new BusinessException(json.getString("msg"));
+        }
+
+        JSONArray data = JSONObject.parseArray(json.getString("data"));
+        List<String> devices = new ArrayList<>();
+        for (int i = 0; i < data.size(); i++) {
+            JSONObject jsonObject = data.getJSONObject(i);
+            String name = jsonObject.getString("deviceSerial");
+            devices.add(name);
+        }
+        return devices;
+    }
+
+    /*
+    添加设备
+     */
+    public void addDevice(String deviceSerial, String validateCode) {
+        List<String> devices = this.showDevice();
+        if (devices.contains(deviceSerial)) {
+            return;
+        }
+
         String uri = "https://open.ys7.com/api/lapp/device/add";
         String accessToken = ezvizTokenService.getToken();
-        String deviceSerial = examRoom.getDeviceSerial();
-        String validateCode = examRoom.getValidateCode();
         String send = "accessToken=" + accessToken + "&deviceSerial=" + deviceSerial + "&validateCode=" + validateCode;
         log.info("萤石添加设备--->" + send);
 
@@ -37,16 +78,18 @@ public class ExamRoomService {
         log.info("萤石添加设备返回--->" + body);
 
         JSONObject json = JSONObject.parseObject(body);
-        if (!"200".equals(json.getString("code"))){
+        if (!"200".equals(json.getString("code"))) {
             throw new BusinessException(json.getString("msg"));
         }
     }
 
-    public void delDevice(ExamRoom examRoom) {
+    /*
+    删除设备
+     */
+    public void delDevice(String deviceSerial) {
         String uri = "https://open.ys7.com/api/lapp/device/delete";
 
         String accessToken = ezvizTokenService.getToken();
-        String deviceSerial = examRoom.getDeviceSerial();
 
         String send = "accessToken=" + accessToken + "&deviceSerial=" + deviceSerial;
         log.info("萤石删除设备--->" + send);
@@ -55,8 +98,65 @@ public class ExamRoomService {
         log.info("萤石删除设备返回--->" + body);
 
         JSONObject json = JSONObject.parseObject(body);
-        if (!"200".equals(json.getString("code"))){
+        if (!"200".equals(json.getString("code"))) {
             throw new BusinessException(json.getString("msg"));
         }
     }
+
+    /*
+    开启设备加密
+     */
+    public void encryptOn(String deviceSerial) {
+        String uri = "https://open.ys7.com/api/lapp/device/encrypt/on";
+
+        String accessToken = ezvizTokenService.getToken();
+
+        String send = "accessToken=" + accessToken + "&deviceSerial=" + deviceSerial;
+        log.info("萤石开启设备加密--->" + send);
+
+        String body = HttpRequest.post(uri).send(send).body();
+        log.info("萤石开启设备加密返回--->" + body);
+
+        JSONObject json = JSONObject.parseObject(body);
+        if (!"200".equals(json.getString("code"))) {
+            throw new BusinessException(json.getString("msg"));
+        }
+    }
+
+
+    /*
+    关闭设备加密
+     */
+    public void encryptOff(String deviceSerial, String validateCode) {
+
+        String uri = "https://open.ys7.com/api/lapp/device/encrypt/off";
+        String accessToken = ezvizTokenService.getToken();
+        String send = "accessToken=" + accessToken + "&deviceSerial=" + deviceSerial + "&validateCode=" + validateCode;
+        log.info("萤石关闭设备加密--->" + send);
+
+        String body = HttpRequest.post(uri).send(send).body();
+        log.info("萤石关闭设备加密返回--->" + body);
+
+        JSONObject json = JSONObject.parseObject(body);
+        if (!"200".equals(json.getString("code"))) {
+            throw new BusinessException(json.getString("msg"));
+        }
+    }
+
+    /*
+    按recordId查找考场
+     */
+    public Page<ExamRoom> byRecord(Long recordId, PageQuery pageQuery) {
+        List<Long> ids = recordExamRoomRepo.findIdByRecordId(recordId);
+        if (CollUtil.isEmpty(ids)) {
+            return new PageImpl<>(new ArrayList<>(), JpaUtils.toPageRequest(pageQuery), 0);
+        }
+        examRoomRepo.findAll((root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> and = JpaUtils.toPredicates(pageQuery, ExamRoom.class, root, criteriaQuery, criteriaBuilder);
+            and.add(root.get("id").in(ids));
+            JpaUtils.toSpecification(pageQuery, ExamRoom.class);
+            return null;
+        });
+        return null;
+    }
 }

src/main/java/com/izouma/wenlvju/service/RecordExamRoomService.java

@@ -0,0 +1,20 @@
+package com.izouma.wenlvju.service;
+
+import com.izouma.wenlvju.domain.RecordExamRoom;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.repo.RecordExamRoomRepo;
+import com.izouma.wenlvju.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class RecordExamRoomService {
+
+    private RecordExamRoomRepo recordExamRoomRepo;
+
+    public Page<RecordExamRoom> all(PageQuery pageQuery) {
+        return recordExamRoomRepo.findAll(JpaUtils.toSpecification(pageQuery, RecordExamRoom.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/wenlvju/web/ExamRoomController.java

@@ -1,35 +1,53 @@
 package com.izouma.wenlvju.web;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.izouma.wenlvju.domain.ExamRoom;
-import com.izouma.wenlvju.service.ExamRoomService;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.ExamRoomRepo;
+import com.izouma.wenlvju.service.ExamRoomService;
+import com.izouma.wenlvju.utils.JpaUtils;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.web.bind.annotation.*;
 
+import javax.persistence.criteria.Predicate;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
 @RequestMapping("/examRoom")
 @AllArgsConstructor
 public class ExamRoomController extends BaseController {
-    private ExamRoomService examRoomService;
-    private ExamRoomRepo examRoomRepo;
+    private final ExamRoomService    examRoomService;
+    private final ExamRoomRepo       examRoomRepo;
+
+
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public ExamRoom save(@RequestBody ExamRoom record) {
+        String deviceSerial = record.getDeviceSerial();
+        String validateCode = record.getValidateCode();
         if (record.getId() != null) {
             ExamRoom orig = examRoomRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            if (StrUtil.isNotBlank(deviceSerial) && StrUtil.isNotBlank(validateCode) && !deviceSerial.equals(orig.getDeviceSerial())) {
+                // 添加设备
+                examRoomService.addDevice(deviceSerial, validateCode);
+            }
             ObjUtils.merge(orig, record);
             return examRoomRepo.save(orig);
         }
+        if (StrUtil.isNotBlank(deviceSerial) && StrUtil.isNotBlank(validateCode)) {
+            // 添加设备
+            examRoomService.addDevice(deviceSerial, validateCode);
+        }
         return examRoomRepo.save(record);
     }
 
@@ -47,6 +65,9 @@ public class ExamRoomController extends BaseController {
 
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
+//        ExamRoom room = examRoomRepo.findById(id).orElseThrow(new BusinessException("无考场"));
+//        // 删除设备
+//        examRoomService.delDevice(room.getDeviceSerial());
         examRoomRepo.softDelete(id);
     }
 
@@ -56,5 +77,10 @@ public class ExamRoomController extends BaseController {
         List<ExamRoom> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    @PostMapping("/byRecord")
+    public Page<ExamRoom> byRecord(PageQuery pageQuery, Long recordId) {
+        return null;
+    }
 }
 

src/main/java/com/izouma/wenlvju/web/EzvizTokenController.java

@@ -1,4 +1,5 @@
 package com.izouma.wenlvju.web;
+
 import com.izouma.wenlvju.domain.EzvizToken;
 import com.izouma.wenlvju.service.EzvizTokenService;
 import com.izouma.wenlvju.dto.PageQuery;
@@ -6,6 +7,7 @@ import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.EzvizTokenRepo;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -56,5 +58,11 @@ public class EzvizTokenController extends BaseController {
         List<EzvizToken> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    @GetMapping("/getToken")
+    @ApiOperation("获取token")
+    public String getToken() {
+        return ezvizTokenService.getToken();
+    }
 }
 

src/main/java/com/izouma/wenlvju/web/RecordExamRoomController.java

@@ -0,0 +1,88 @@
+package com.izouma.wenlvju.web;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import com.izouma.wenlvju.converter.LongArrayConverter;
+import com.izouma.wenlvju.domain.RecordExamRoom;
+import com.izouma.wenlvju.repo.ExamRoomRepo;
+import com.izouma.wenlvju.service.RecordExamRoomService;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.RecordExamRoomRepo;
+import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.utils.excel.ExcelUtils;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/recordExamRoom")
+@AllArgsConstructor
+public class RecordExamRoomController extends BaseController {
+    private final RecordExamRoomService recordExamRoomService;
+    private final RecordExamRoomRepo    recordExamRoomRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public RecordExamRoom save(@RequestBody RecordExamRoom record) {
+        if (record.getId() != null) {
+            RecordExamRoom orig = recordExamRoomRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return recordExamRoomRepo.save(orig);
+        }
+        return recordExamRoomRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<RecordExamRoom> all(@RequestBody PageQuery pageQuery) {
+        return recordExamRoomService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public RecordExamRoom get(@PathVariable Long id) {
+        return recordExamRoomRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        recordExamRoomRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<RecordExamRoom> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PostMapping("/add")
+    @ApiOperation("添加考场")
+    public void addRooms(@RequestParam Long recordId, @RequestParam String addRooms) {
+        if (StrUtil.isEmpty(addRooms)) {
+            return;
+        }
+        List<Long> roomIds = Convert.toList(Long.class, addRooms);
+        List<Long> ids = recordExamRoomRepo.findIdByRecordId(recordId);
+
+        roomIds.forEach(id -> {
+            if (!ids.contains(id)) {
+                recordExamRoomRepo.save(RecordExamRoom.builder()
+                        .recordId(recordId)
+                        .examRoomId(id)
+                        .build());
+            }
+        });
+
+    }
+}
+

src/main/resources/genjson/RecordExamRoom.json

@@ -0,0 +1 @@
+{"tableName":"RecordExamRoom","className":"RecordExamRoom","remark":"备案考场","genTable":true,"genClass":true,"genList":false,"genForm":false,"genRouter":false,"javaPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/java/com/izouma/wenlvju","viewPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"recordId","modelName":"recordId","remark":"recordId","showInList":true,"showInForm":true,"formType":"number"},{"name":"examRoomId","modelName":"examRoomId","remark":"examRoomId","showInList":true,"showInForm":true,"formType":"number"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.RecordExamRoom"}

src/main/vue/src/components/EZUIKitJs.vue

@@ -9,37 +9,48 @@ import EZUIKit from 'ezuikit-js';
 
 export default {
     name: 'HelloWorld',
-    props: {
-        msg: String
+    data() {
+        return {
+            token: '',
+            device: ''
+        };
     },
     mounted: () => {
-        console.group('mounted 组件挂载完毕状态===============》');
-        var player = new EZUIKit.EZUIKitPlayer({
-            autoplay: false,
-            id: 'video-container',
-            accessToken: 'at.bgdp2ewu1btz9gl47vco9rckdexx5p32-8oic3wp6h3-0manyiu-oc0vsrvpy',
-            url: 'ezopen://open.ys7.com/F75663984/1.live',
-            template: 'security', // simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版；
-            // 视频上方头部控件
-            // header: ['capturePicture', 'save', 'zoom'], // 如果templete参数不为simple,该字段将被覆盖
-            // plugin: ['talk'], // 加载插件，talk-对讲
-            // 视频下方底部控件
-            // footer: ['talk', 'broadcast', 'hd', 'fullScreen'], // 如果template参数不为simple,该字段将被覆盖
-            // audio: 0, // 是否默认开启声音 0 - 关闭 1 - 开启
-            // openSoundCallBack: data => console.log('开启声音回调', data),
-            // closeSoundCallBack: data => console.log('关闭声音回调', data),
-            // startSaveCallBack: data => console.log('开始录像回调', data),
-            // stopSaveCallBack: data => console.log('录像回调', data),
-            // capturePictureCallBack: data => console.log('截图成功回调', data),
-            // fullScreenCallBack: data => console.log('全屏回调', data),
-            // getOSDTimeCallBack: data => console.log('获取OSDTime回调', data),
-            width: 500,
-            height: 330
-        });
-        console.log('player', player);
         // setTimeout(()=>{
         //   player.stop(); // 方法调用示例，10秒后关闭视频
         // },10000)
+    },
+    methods: {
+        init(form) {
+            this.token = form.accessToken;
+            this.device = form.deviceSerial;
+
+            var player = new EZUIKit.EZUIKitPlayer({
+                autoplay: false,
+                id: 'video-container',
+                accessToken: this.token,
+                url: 'ezopen://open.ys7.com/' + this.device + '/1.live',
+                template: 'security', // simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版；
+                // 视频上方头部控件
+                // header: ['capturePicture', 'save', 'zoom'], // 如果templete参数不为simple,该字段将被覆盖
+                // plugin: ['talk'], // 加载插件，talk-对讲
+                // 视频下方底部控件
+                // footer: ['talk', 'broadcast', 'hd', 'fullScreen'], // 如果template参数不为simple,该字段将被覆盖
+                // audio: 0, // 是否默认开启声音 0 - 关闭 1 - 开启
+                // openSoundCallBack: data => console.log('开启声音回调', data),
+                // closeSoundCallBack: data => console.log('关闭声音回调', data),
+                // startSaveCallBack: data => console.log('开始录像回调', data),
+                // stopSaveCallBack: data => console.log('录像回调', data),
+                // capturePictureCallBack: data => console.log('截图成功回调', data),
+                // fullScreenCallBack: data => console.log('全屏回调', data),
+                // getOSDTimeCallBack: data => console.log('获取OSDTime回调', data),
+                width: 500,
+                height: 330
+            });
+            console.group('mounted 组件挂载完毕状态===============》');
+
+            console.log('player', player);
+        }
     }
 };
 </script>

src/main/vue/src/router.js

@@ -520,6 +520,15 @@ const router = new Router({
                         title: '考场管理'
                     }
                 },
+                {
+                    path: '/recordRoomList',
+                    name: 'RecordRoomList',
+                    component: () =>
+                        import(/* webpackChunkName: "recordRoomList" */ '@/views/record/RecordRoomList.vue'),
+                    meta: {
+                        title: '考场管理'
+                    }
+                },
                 {
                     path: '/recordSpecialtyEdit',
                     name: 'RecordSpecialtyEdit',

src/main/vue/src/views/ExamRoomList.vue

@@ -31,7 +31,7 @@
             <el-table-column prop="address" label="地址"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="{ row }">
-                    <el-button @click="editRow(row)" type="success" size="mini" plain>监控</el-button>
+                    <el-button @click="monitor(row)" type="success" size="mini" plain>监控</el-button>
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
@@ -58,11 +58,15 @@
             >
             </el-pagination>
         </div>
+        <el-dialog title="监控" :visible.sync="dialogVisible" width="600px" center>
+            <EZUIKitJs ref="EZUIKitJs"></EZUIKitJs>
+        </el-dialog>
     </div>
 </template>
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
+import EZUIKitJs from '../components/EZUIKitJs.vue';
 
 export default {
     name: 'ExamRoomList',
@@ -72,7 +76,12 @@ export default {
             multipleMode: false,
             search: '',
             url: '/examRoom/all',
-            downloading: false
+            downloading: false,
+            dialogVisible: false,
+            form: {
+                accessToken: '',
+                deviceSerial: ''
+            }
         };
     },
     computed: {
@@ -153,7 +162,24 @@ export default {
                         this.$message.error(e.error);
                     }
                 });
+        },
+        monitor(row) {
+            this.dialogVisible = true;
+            this.form.deviceSerial = row.deviceSerial;
+            this.$http
+                .get('ezvizToken/getToken')
+                .then(res => {
+                    this.form.accessToken = res;
+                    this.$refs.EZUIKitJs.init(this.form);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
         }
+    },
+    components: {
+        EZUIKitJs
     }
 };
 </script>

src/main/vue/src/views/record/RecordOrganizationList.vue

@@ -36,9 +36,11 @@
             <el-table-column prop="district" label="考级地点"> </el-table-column>
             <el-table-column prop="recordTime" label="备案时间"> </el-table-column>
             <el-table-column prop="status" label="状态" :formatter="statusFormatter" width="50"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="80">
+            <el-table-column label="操作" align="center" fixed="right" min-width="140">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
+                    <el-button @click="openRoom(row)" type="warning" size="mini" plain>考场</el-button>
+                    <!-- <el-button @click="openDialog(row)" type="success" size="mini" plain>添加考场</el-button> -->
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
             </el-table-column>
@@ -64,6 +66,20 @@
             >
             </el-pagination>
         </div>
+        <el-dialog title="添加考场" :visible.sync="dialogVisible" width="600px" center>
+            <el-select
+                v-model="form.addRooms"
+                clearable
+                multiple
+                style="width: 400px; margin-left: 80px"
+                placeholder="请选择考场"
+            >
+                <el-option v-for="item in rooms" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+            <div style="margin: 20px 0 0 422px">
+                <el-button type="primary" @click="saveRoom">确认</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -71,7 +87,7 @@ import pageableTable from '@/mixins/pageableTable';
 import { mapState } from 'vuex';
 
 export default {
-    name: 'RecordList',
+    name: 'RecordOrganizationList',
     mixins: [pageableTable],
     created() {
         this.$http
@@ -83,6 +99,22 @@ export default {
                 console.log(e);
                 this.$message.error(e.error);
             });
+        this.$http
+            .post('/examRoom/all', { size: 100, query: { organizationId: this.organization.id } }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.rooms.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
     },
     data() {
         return {
@@ -100,7 +132,13 @@ export default {
             recordDateRange: '',
             agency: '',
             organizer: '',
-            dateRange: ''
+            dateRange: '',
+            rooms: [],
+            dialogVisible: false,
+            form: {
+                id: '',
+                addRooms: []
+            }
         };
     },
     computed: {
@@ -156,6 +194,14 @@ export default {
                 }
             });
         },
+        openRoom(row) {
+            this.$router.push({
+                path: '/recordRoomList',
+                query: {
+                    id: row.id
+                }
+            });
+        },
         download() {
             this.downloading = true;
             this.$axios
@@ -224,6 +270,16 @@ export default {
                     console.log(e);
                     this.$message.error(e.error);
                 });
+        },
+        openDialog(row) {
+            this.dialogVisible = true;
+            this.form.id = row.id;
+        },
+        saveRoom() {
+            console.log(this.form);
+            this.dialogVisible = false;
+            // this.form.id = '';
+            // this.form.addRooms = [];
         }
     }
 };

src/main/vue/src/views/record/RecordRoomList.vue

@@ -0,0 +1,240 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索</el-button>
+            <el-button @click="openDialog" type="primary" icon="el-icon-plus" class="filter-item">添加</el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"></el-table-column>
+            <el-table-column prop="id" label="ID" width="100"></el-table-column>
+            <el-table-column prop="name" label="考场名称"></el-table-column>
+            <el-table-column prop="address" label="地址"></el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="monitor(row)" type="success" size="mini" plain>监控</el-button>
+                    <!-- <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button> -->
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>-->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            ></el-pagination>
+        </div>
+        <el-dialog title="监控" :visible.sync="dialogVisible" width="600px" center>
+            <EZUIKitJs ref="EZUIKitJs"></EZUIKitJs>
+        </el-dialog>
+        <el-dialog title="添加考场" :visible.sync="dialogRoom" width="600px" center>
+            <el-select
+                v-model="formRoom.addRooms"
+                clearable
+                multiple
+                style="width: 400px; margin-left: 80px"
+                placeholder="请选择考场"
+            >
+                <el-option v-for="item in rooms" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+            <div style="margin: 20px 0 0 422px">
+                <el-button type="primary" @click="saveRoom">确认</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+import EZUIKitJs from '../../components/EZUIKitJs.vue';
+
+export default {
+    name: 'RecordRoomList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/examRoom/all',
+            downloading: false,
+            dialogVisible: false,
+            form: {
+                accessToken: '',
+                deviceSerial: ''
+            },
+            dialogRoom: false,
+            rooms: [],
+            formRoom: {
+                id: '',
+                addRooms: []
+            }
+        };
+    },
+    created() {
+        if (this.$route.query.id) {
+            this.formRoom.id = Number(this.$route.query.id);
+        }
+        this.$http
+            .post('/examRoom/all', { size: 100, query: { organizationId: this.organization.id } }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.rooms.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        },
+        ...mapState(['organization'])
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/examRoomEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/examRoomEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/examRoom/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/examRoom/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        monitor(row) {
+            this.dialogVisible = true;
+            this.form.deviceSerial = row.deviceSerial;
+            this.$http
+                .get('ezvizToken/getToken')
+                .then(res => {
+                    this.form.accessToken = res;
+                    this.$refs.EZUIKitJs.init(this.form);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        },
+        openDialog() {
+            this.dialogRoom = true;
+        },
+        saveRoom() {
+            console.log(this.formRoom);
+
+            this.$http
+                .post('/recordExamRoom/add', {
+                    recordId: this.formRoom.id,
+                    addRooms: this.formRoom.addRooms.toString()
+                })
+                .then(res => {
+                    this.$message.success('添加成功');
+                    this.getData();
+                    this.dialogRoom = false;
+                    this.formRoom.id = '';
+                    this.formRoom.addRooms = [];
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    components: {
+        EZUIKitJs
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/test/java/com/izouma/wenlvju/service/ExamRoomServiceTest.java

@@ -16,8 +16,25 @@ public class ExamRoomServiceTest extends ApplicationTests {
 
     @Test
     public void addDevice() {
-        ExamRoom examRoom = examRoomRepo.findById(874L).orElse(null);
-        examRoomService.addDevice(examRoom);
+        ExamRoom examRoom = examRoomRepo.findById(874L).orElseThrow(null);
+        examRoomService.addDevice(examRoom.getDeviceSerial(), examRoom.getValidateCode());
 
     }
+
+    @Test
+    public void show() {
+        examRoomService.showDevice();
+    }
+
+    @Test
+    public void on() {
+//        ExamRoom examRoom = examRoomRepo.findById(874L).orElseThrow(null);
+        examRoomService.encryptOn("F75663984");
+    }
+
+    @Test
+    public void off() {
+        ExamRoom examRoom = examRoomRepo.findById(874L).orElseThrow(null);
+        examRoomService.encryptOff(examRoom.getDeviceSerial(), examRoom.getValidateCode());
+    }
 }

src/test/java/com/izouma/wenlvju/service/EzvizTokenServiceTest.java

@@ -2,6 +2,7 @@ package com.izouma.wenlvju.service;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.izouma.wenlvju.ApplicationTests;
 import org.junit.Test;
@@ -29,13 +30,25 @@ public class EzvizTokenServiceTest extends ApplicationTests {
 
     @Test
     public void test1() {
-        String str = "{\"msg\":\"操作成功!\",\"code\":\"200\",\"data\":{\"accessToken\":\"at.4jrsvi0u34xzz9rs8mz3uj04bzn489q6-230iyqmr9e-0yn79qd-7ezu9nfog\",\"expireTime\":1624525723010}}";
-
+//        String str = "{\"msg\":\"操作成功!\",\"code\":\"200\",\"data\":{\"accessToken\":\"at.4jrsvi0u34xzz9rs8mz3uj04bzn489q6-230iyqmr9e-0yn79qd-7ezu9nfog\",\"expireTime\":1624525723010}}";
+//
+//        JSONObject json = JSONObject.parseObject(str);
+//        String code = json.getString("code");
+//        System.out.println(code);
+//        JSONObject data = json.getJSONObject("data");
+//        System.out.println(data.getString("accessToken"));
+//        System.out.println(data.getLong("expireTime"));
+
+        String str = "{\"msg\":\"操作成功!\",\"code\":\"200\",\"data\":[{\"id\":\"00da84fe3e2043389be46ab4c3fd133eF75663984\",\"deviceSerial\":\"F75663984\",\"deviceName\":\"C6C(F75663984)\",\"deviceType\":\"CS-C6C-3H3WFRV\",\"status\":1,\"defence\":0,\"deviceVersion\":\"V5.3.4 build 201107\",\"addTime\":1621311282892,\"updateTime\":1622603978000,\"parentCategory\":\"IPC\"}],\"page\":{\"total\":1,\"size\":10,\"page\":0}}";
         JSONObject json = JSONObject.parseObject(str);
-        String code = json.getString("code");
-        System.out.println(code);
-        JSONObject data = json.getJSONObject("data");
-        System.out.println(data.getString("accessToken"));
-        System.out.println(data.getLong("expireTime"));
+//        String code = json.getString("code");
+//        System.out.println(code);
+        JSONArray data = JSONObject.parseArray(json.getString("data"));
+        System.out.println(data);
+        for (int i = 0; i < data.size(); i++) {
+            JSONObject jsonObject = data.getJSONObject(i);
+            String name = jsonObject.getString("deviceSerial");
+            System.out.println(name);
+        }
     }
 }