添加设备上线下线通知

smart-office-manager-ui/admin/src/assets/mixins/table.js

@@ -14,6 +14,9 @@ export default {
   },
   watch: {
     '$route'(route) {
+      if(route.path=='/device/electron/list'||route.path=='/device/meet/list'){
+        this.changePath("device")
+      }
       this.query = Object.assign({}, this.query, route.query);
       this.getData();
     }

smart-office-manager-ui/admin/src/components/Pagination.vue

-// 列表-分页 
+// 列表-分页
 
 <template>
   <div class="pagination-wapper flex">
@@ -28,7 +28,6 @@ export default {
   },
   watch: {
     '$route'(route) {
-
       this.initPage(route.query);
     }
   },
@@ -42,7 +41,13 @@ export default {
       this.currSize = parseInt(query['size']) || this.prePageResult;
     },
     changeHash(key, val) {
+      console.log("$route:",this.$route)
       let {path, query} = this.$route;
+      console.log("path",path)
+
+      // if(path=="/device/meet/list"||path=="/device/electron/list"){
+      //   path="/device/list"
+      // }
       this.$router.push({
         path: path,
         query: Object.assign({}, query, {[`${key}`]: val})

smart-office-manager-ui/admin/src/views/device/electron/list.vue

@@ -77,6 +77,7 @@
         created() {
           console.log("route",this.$route)
           this.changePath("/device")
+          console.log("this.pageInfo.list000",this.pageInfo.list)
           this.query = Object.assign({}, this.query, {productCode:"dzmp"});
         },
         methods: {

smart-office-manager-ui/admin/src/views/device/meet/list.vue

@@ -75,7 +75,7 @@
 },
         mixins: [table],
         created() {
-          console.log("route",this.$route)
+          console.log("route111",this.$route)
           this.changePath("/device")
           this.query = Object.assign({}, this.query, {productCode:"hysdzmp"});
         },

smart-office-manager/src/main/java/com/mortals/xhx/base/system/oper/service/impl/OperLogServiceImpl.java

@@ -89,13 +89,14 @@ public class OperLogServiceImpl extends AbstractCRUDServiceImpl<OperLogDao,OperL
                 break;
             case DELETE:
                 formatterLogContent(operLogEntity, content, id, operType);
+            case SEARCH:
+                formatterLogContent(operLogEntity, content, id, operType);
                 break;
             default:
                 operLogEntity.setOperType(OperTypeEnum.UPDATE.getValue());
                 operLogEntity.setContent(StringUtils.isBlank(id) ? content : content + "id:" + id);
                 break;
         }
-
         super.save(operLogEntity, null);
     }
 

smart-office-manager/src/main/java/com/mortals/xhx/common/code/OperTypeEnum.java

@@ -11,6 +11,7 @@ public enum OperTypeEnum {
     SAVE(0,"添加"),
     UPDATE(1,"更新"),
     DELETE(2,"删除"),
+    SEARCH(3,"查询"),
     OTHER(-1,"其它");
 
     private int value;

smart-office-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

@@ -64,13 +64,11 @@ client.global.set("Device_id", JSON.parse(response.body).data.id);
 %}
 
 ###设备管理查看
-GET {{baseUrl}}/device/info?id={{Device_id}}
-Authorization: {{authToken}}
+GET {{baseUrl}}/device/info?id=17
 Accept: application/json
 
 ###设备管理编辑
-GET {{baseUrl}}/device/edit?id={{Device_id}}
-Authorization: {{authToken}}
+GET {{baseUrl}}/device/edit?id=17
 Accept: application/json
 
 

smart-office-manager/src/test/java/com/mortals/httpclient/metting/MettingRecordController.http

@@ -19,8 +19,7 @@ Content-Type: application/json
 
 {
     "page":1,
-    "size":-1,
-    "deviceCode":"11-22-33-44"
+    "size":-1
 }
 
 
@@ -30,16 +29,16 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "meetName":"he54lk",
-        "meetDate":"1684684800000",
-        "meetTimeStart":"1684684800000",
-        "meetTimeEnd":"1684684800000",
+        "meetName":"he54lk1",
+        "meetDate":"2023-06-02 15:30:00",
+        "meetTimeStart":"2023-06-02 15:30:00",
+        "meetTimeEnd":"2023-06-02 15:30:00",
         "roomId":101,
         "roomName":"7o0iut",
         "meetDeptName":"k6be71",
         "meetStatus":0,
         "finishMethod":0,
-        "remark":"lk9hlk",
+        "remark":"lk9hlk"
 }
 
 > {%
@@ -47,9 +46,7 @@ client.global.set("MettingRecord_id", JSON.parse(response.body).data.id);
 %}
 
 ###会议记录查看
-GET {{baseUrl}}/metting/record/info?id={{MettingRecord_id}}
-Authorization: {{authToken}}
-Accept: application/json
+GET {{baseUrl}}/metting/record/info?id=12
 
 ###会议记录编辑
 GET {{baseUrl}}/metting/record/edit?id={{MettingRecord_id}}
@@ -58,7 +55,7 @@ Accept: application/json
 
 
 ###会议记录删除
-GET {{baseUrl}}/metting/record/delete?id={{MettingRecord_id}}
+GET {{baseUrl}}/metting/record/delete?id=12
 Authorization: {{authToken}}
 Accept: application/json
 

smart-office-manager/src/test/java/com/mortals/httpclient/system.http

+POST http://192.168.0.252:18001/sm/file/commonupload
+Content-Type: multipart/form-data; boundary=WebAppBoundary
+
+--WebAppBoundary
+Content-Disposition: form-data; name="file"; filename="file.txt"
+
+< F://user.xlsx
+--WebAppBoundary--
+
+###
 
 ###登录
 POST {{baseUrl}}/login/login