添加智慧办公回调信息

device-manager-ui/admin/src/views/login/login.vue

@@ -19,7 +19,7 @@
         </el-form-item>
         <el-form-item size="large">
           <el-button
-            type="primary" class="addclass" 
+            type="primary" class="addclass"
             native-type="submit"
             :loading="loading"
             @click="onSubmit"
@@ -41,16 +41,7 @@ import { createSocket } from "@/assets/utils/websocket";
 export default {
   name: "login",
   created() {
-    // let obj = {};
-    // obj.lng = 104.21;
-    // obj.lat = 30.56;
-    // obj.address = "测试站点";
-    // obj.siteId = 2;
-    // this.originData.push(obj);
-    // this.$nextTick(() => {
-    //   this.$refs.map1.refresh(this.originData);
-    // });
-    // window.location.href=process.env.VUE_APP_PORTAL_URL=='undefined'?'http://192.168.0.98:11072':process.env.VUE_APP_PORTAL_URL
+
   },
   methods: {
     login() {

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -104,7 +104,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
     private SiteService siteService;
 
 
-
     public void refresh() {
         log.info("开始初始化系统参数...");
         try {
@@ -759,11 +758,13 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         //判断当前站点与修改的站点不一致时候 更新设备站点关联信息
         if (!ObjectUtils.isEmpty(entity.getId())) {
             DeviceEntity temp = this.get(entity.getId(), null);
-            if (!entity.getSiteId().equals(temp.getSiteId())) {
-                updateDeviceEntityBySite(entity);
-            } else {
-                if (ObjectUtils.isEmpty(entity.getSiteCode()) || ObjectUtils.isEmpty(entity.getSiteName())) {
+            if (!ObjectUtils.isEmpty(entity.getSiteId())) {
+                if (!entity.getSiteId().equals(temp.getSiteId())) {
                     updateDeviceEntityBySite(entity);
+                } else {
+                    if (ObjectUtils.isEmpty(entity.getSiteCode()) || ObjectUtils.isEmpty(entity.getSiteName())) {
+                        updateDeviceEntityBySite(entity);
+                    }
                 }
             }
         }

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

@@ -65,6 +65,15 @@ Content-Type: application/json
   "siteId": 1
 }
 
+###设备告警统计查看
+POST {{baseUrl}}/device/alarm/info/statlist
+Accept: application/json
+Content-Type: application/json
+
+{
+  "siteId": 1
+}
+
 
 ###设备编辑
 GET {{baseUrl}}/device/edit?id={{Device_id}}