物联网1.0

db/module.sql

@@ -166,12 +166,15 @@ CREATE TABLE mortals_xhx_alarm_config(
     `alarmLevel` tinyint(2) NOT NULL    COMMENT '告警级别,(0.危险，1.次要，2.一般)',
     `alarmPusW1ay` tinyint(2) NOT NULL    COMMENT '推送方式,(0.不推送，1.短信)',
     `isUse` tinyint(2) NOT NULL    COMMENT '是否启用(0.不启动，1.启动)',
+    `remark` varchar(2048)     COMMENT '备注',
     `createTime` datetime NOT NULL    COMMENT '创建时间',
     `updateUserId` bigint(20)     COMMENT '更新用户',
     `updateTime` datetime     COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备告警配置';
 
+
+
 -- ----------------------------
 -- 短信发送记录表
 -- ----------------------------

device-manager-ui/admin/src/assets/mixins/formdialog.js

@@ -23,6 +23,14 @@ export default {
       this.$router.go(-1);
     },
 
+      // 开启、关闭
+      changePath(path) {
+        this.pageInfo.list = path + "/list";
+        this.pageInfo.del = path + "/delete";
+        this.pageInfo.add = path + "/add";
+        this.pageInfo.edit = path + "/edit";
+        this.pageInfo.view = path + "/view";
+      },
     
     // 默认拉取数据
     getData() {

device-manager-ui/admin/src/assets/mixins/table.js

@@ -15,7 +15,6 @@ export default {
   watch: {
     '$route'(route) {
       // this.query = Object.assign({}, this.query, route.query);
-
       this.getData();
     }
   },
@@ -24,6 +23,17 @@ export default {
     clearTimeout(this.loadingTimer);
   },
   methods: {
+    test(){
+      console.log("test")
+    },
+      // 开启、关闭
+      changePath(path) {
+        this.pageInfo.list = path + "/list";
+        this.pageInfo.del = path + "/delete";
+        this.pageInfo.add = path + "/add";
+        this.pageInfo.edit = path + "/edit";
+        this.pageInfo.view = path + "/view";
+      },
     beforeFecth() {
       return Promise.resolve();
     },
@@ -242,7 +252,7 @@ export default {
         return this.$message.warning('请选中一条记录');
       }
 
-      this.$get(this.pageInfo.del, {id: id})
+      this.$get(this.pageInfo.del, { id: id })
         .then(res => {
           this.$message.success(res.msg)
           // 更新数据
@@ -299,13 +309,13 @@ export default {
     open() {
 
     },
+
   },
   computed: {
     tableConfig() {
       return Object.assign({}, this.defaultConfig, this.config)
     },
     pageInfo() {
-      console.log(3333333+this.$route.path)
       const urls = { // 操作所需的url地址，和url同路径
         list: this.$route.path,
         edit: this.$route.path.replace('/list', '/edit'),

device-manager-ui/admin/src/components/Table.vue

@@ -111,6 +111,7 @@
       <slot name="table-search-left"></slot>
       <SearchForm
         :search="config.search"
+         v-if="isShowButton('notSearch')"
         :table="data"
         :downloadUrl="config.downloadUrl"
         :areaSelect="config.areaSelect"
@@ -190,7 +191,7 @@
       class="table-foot"
       v-if="!isShowButton('notPagination') ? false : data.pageInfo.totalResult"
     >
-      <Pagination
+      <Pagination style="float:left"
         :total="data.pageInfo.totalResult"
         :prePageResult="data.pageInfo.prePageResult"
       />

device-manager-ui/admin/src/views/alarm/config/list.vue

@@ -3,17 +3,19 @@
         <LayoutTable :data="tableData" :config="tableConfig">
                     </LayoutTable>
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <!-- <dialog-show ref="dialogform" @ok="getData" /> -->
+
+            <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+   import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "AlarmConfig",
-        components: {dialogShow },
+        components: {drawerShow },
         mixins: [table],
         created() {
         },
@@ -21,7 +23,9 @@
 
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                //this.$refs.dialogform.add(row);
+
+                 this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {

device-manager-ui/admin/src/views/device/alarm/info/list.vue

@@ -32,13 +32,13 @@ export default {
 
     console.log("pageInfo--before",this.pageInfo)
 
-   // this.changePath("/device/alarm/info")
+    this.changePath("/device/alarm/info")
 
-    this.pageInfo.list = "/device/alarm/info/list";
-    this.pageInfo.del = "/device/alarm/info/delete";
-    this.pageInfo.add = "/device/alarm/info/add";
-    this.pageInfo.edit = "/device/alarm/info/edit";
-    this.pageInfo.view = "/device/alarm/info/view";
+    // this.pageInfo.list = "/device/alarm/info/list";
+    // this.pageInfo.del = "/device/alarm/info/delete";
+    // this.pageInfo.add = "/device/alarm/info/add";
+    // this.pageInfo.edit = "/device/alarm/info/edit";
+    // this.pageInfo.view = "/device/alarm/info/view";
 
      console.log("pageInfo",this.pageInfo)
 

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

@@ -34,7 +34,7 @@
 import form from "@/assets/mixins/formdialog";
 import viewShow from "./view";
 import alarmList from "./alarm/info/list";
-import moduleList from "./module/list";
+import moduleList from "./module/use/list";
 import ImageUpload from "@/components/ImageUpload";
 export default {
   mixins: [form],

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

@@ -31,23 +31,26 @@
         :disabled="isExport"
         >导出</el-button
       >
-      <el-tag slot="table-body-head" style="margin: 5px" type="success"
-        >当前在线设备总计：{{ tableData.onlineCount }}个</el-tag
+      <el-tag slot="table-head-left2" size="mini" style="margin-left: 20px" 
+        >设备总数：{{ tableData.totalCount }}台</el-tag
       >
 
-      <el-tag slot="table-body-head" style="margin: 5px" type="danger"
-        >当前离线设备总计：{{ tableData.offlineCount }}个</el-tag
+      <el-tag slot="table-head-left2" size="mini" style="margin: 5px" type="success"
+        >在线：{{ tableData.onlineCount }}台</el-tag
       >
 
-      <el-tag
-        v-for="($label, $value) in tableData.offlineDeviceType"
-        :key="$value"
-        :label="$value"
-        slot="table-body-head"
-        style="margin: 5px"
-        type="danger"
-        >{{ $value }}离线设备：{{ $label }}个</el-tag
+      <el-tag slot="table-head-left2" size="mini" style="margin: 5px" type="danger"
+        >离线：{{ tableData.offlineCount }}台</el-tag
       >
+
+       <el-tag slot="table-head-left2" size="mini" style="margin: 5px" type="danger"
+        >停用：{{ tableData.stopCount }}台</el-tag
+      >
+
+       <el-tag slot="table-head-left2" size="mini" style="margin: 5px" type="danger"
+        >未激活：{{ tableData.unActiveCount }}台</el-tag
+      >
+
     </LayoutTable>
 
     <!-- 设备导入对话框 -->
@@ -268,29 +271,29 @@ export default {
       config: {
         getsocketData: null,
         search: [
-          {
-            name: "deviceNum",
-            type: "text",
-            label: "设备编号",
-          },
+          // {
+          //   name: "deviceNum",
+          //   type: "text",
+          //   label: "设备编号",
+          // },
           {
             name: "deviceStatus",
             type: "select",
             label: "状态",
           },
 
-          {
-            name: "porductId",
-            type: "select",
-            label: "产品类型",
-          },
+          // {
+          //   name: "porductId",
+          //   type: "select",
+          //   label: "产品类型",
+          // },
         ],
         columns: [
           { type: "selection", width: 60 },
 
           { label: "设备名称", prop: "deviceName" },
 
-          { label: "设备类型", prop: "porductId", formatter: this.formatter },
+          { label: "设备类型", prop: "productId", formatter: this.formatter },
 
           { label: "设备编码", prop: "deviceCode" },
 

device-manager-ui/admin/src/views/device/module/use/list.vue

 <template>
   <div class="page">
-        <LayoutTable :data="tableData" :config="tableConfig">
+    <LayoutTable
+      :data="tableData"
+      notAdd
+      notDel
+      notSearch
+      :config="tableConfig"
+    >
     </LayoutTable>
 
     <dialog-show ref="dialogform" @ok="getData" />
@@ -8,17 +14,42 @@
 </template>
 
 <script>
-    /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
-    import table from "@/assets/mixins/table";
-    export default {
+/** 表单弹出框模式需引入 */
+import dialogShow from "./dialogshow";
+import table from "@/assets/mixins/table";
+export default {
   name: "DeviceModuleUse",
-        components: {dialogShow },
+  props: {
+    queryIn: {
+      type: Object,
+      default: null,
+    },
+  },
+  components: { dialogShow },
   mixins: [table],
   created() {
+    console.log("queryIn:", this.queryIn);
+
+    //this.config.addQuery = { deviceId, deviceType };
+
+    if (this.queryIn.deviceId) {
+      this.query = {};
+      this.query["deviceId"] = this.queryIn.deviceId;
+    }
+
+    console.log("pageInfo--before", this.pageInfo);
+
+    // this.changePath("/device/alarm/info")
+
+    this.pageInfo.list = "/device/module/use/list";
+    this.pageInfo.del = "/device/module/use/delete";
+    this.pageInfo.add = "/device/module/use/add";
+    this.pageInfo.edit = "/device/module/use/edit";
+    this.pageInfo.view = "/device/module/use/view";
+
+    console.log("pageInfo", this.pageInfo);
   },
   methods: {
-
     /** 重写新增方法 */
     toAdd(row) {
       this.$refs.dialogform.add(row);
@@ -26,33 +57,33 @@
     /** 重写编辑方法 */
     toEdit(row) {
       this.$refs.dialogform.edit(row);
-
     },
     /** 重写查看方法 */
     // toView(row) {
     //     this.$refs.dialogform.view(row);
     // },
-
   },
   data() {
     return {
       config: {
-                    search: [
-                    ],
+        search: [],
         columns: [
-                        {type: "selection", width: 60},
+          { label: "模块名称", prop: "moduleName" },
+
+        //   { label: "模块消息编码", prop: "moduleMsgCode" },
+
           {
-                            label: "操作",
-                            width: 240,
-                            formatter: row => {
-                                return (
-                                    <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
-                            );
-                            }
-                        }
-                    ]
-                }
-            };
-        }
+            label: "设备名称",
+            prop: "deviceId",
+            formatter: this.formatterString,
+          },
+
+          { label: "产品名称", prop: "platformAndProductName" },
+
+          { label: "调用次数", prop: "useNum" },
+        ],
+      },
     };
+  },
+};
 </script>
\ No newline at end of file

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

@@ -148,7 +148,9 @@
         label-class-name="labelClass"
         content-class-name="contentClass"
       >
-        {{ form.devicePhotoPath }}
+
+      <ImageUpload v-model="form.devicePhotoPath" prePath="/file/preview" />
+     
       </el-descriptions-item>
 
       <el-descriptions-item

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -145,6 +145,7 @@ public class DeviceApiController {
             ServerInfo serverInfo = new ServerInfo();
             serverInfo.setHomeUrl(platformEntity.getHomeUrl());
             serverInfo.setServerUrl(platformEntity.getSendUrl());
+            registerResp.setServiceInfo(serverInfo);
 
             String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR);
             deviceResp.setContent(content);

device-manager/src/main/java/com/mortals/xhx/module/alarm/model/AlarmConfigEntity.java

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.alarm.model.vo.AlarmConfigVo;
 /**
-* 设备告警配置实体对象
-*
-* @author zxfei
-* @date 2022-07-01
-*/
+ * 设备告警配置实体对象
+ *
+ * @author zxfei
+ * @date 2022-07-04
+ */
 
 public class AlarmConfigEntity extends AlarmConfigVo {
     private static final long serialVersionUID = 1L;
@@ -36,6 +36,10 @@ public class AlarmConfigEntity extends AlarmConfigVo {
      * 是否启用(0.不启动，1.启动)
      */
     private Integer isUse;
+    /**
+     * 备注
+     */
+    private String remark;
 
 
 
@@ -110,6 +114,20 @@ public class AlarmConfigEntity extends AlarmConfigVo {
     public void setIsUse(Integer isUse){
         this.isUse = isUse;
     }
+    /**
+     * 获取 备注
+     * @return String
+     */
+    public String getRemark(){
+        return remark;
+    }
+    /**
+     * 设置 备注
+     * @param remark
+     */
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
 
 
 
@@ -137,6 +155,7 @@ public class AlarmConfigEntity extends AlarmConfigVo {
         sb.append(",alarmLevel:").append(getAlarmLevel());
         sb.append(",alarmPusW1ay:").append(getAlarmPusW1ay());
         sb.append(",isUse:").append(getIsUse());
+        sb.append(",remark:").append(getRemark());
         return sb.toString();
     }
 
@@ -151,5 +170,7 @@ public class AlarmConfigEntity extends AlarmConfigVo {
         this.alarmPusW1ay = 0;
 
         this.isUse = null;
+
+        this.remark = "";
     }
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/alarm/model/AlarmConfigQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.alarm.model;
 import java.util.List;
 import com.mortals.xhx.module.alarm.model.AlarmConfigEntity;
 /**
-* 设备告警配置查询对象
-*
-* @author zxfei
-* @date 2022-07-01
-*/
+ * 设备告警配置查询对象
+ *
+ * @author zxfei
+ * @date 2022-07-04
+ */
 public class AlarmConfigQuery extends AlarmConfigEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -81,6 +81,9 @@ public class AlarmConfigQuery extends AlarmConfigEntity {
     /** 是否启用(0.不启动，1.启动)列表 */
     private List <Integer> isUseList;
 
+    /** 备注 */
+    private List<String> remarkList;
+
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -497,6 +500,21 @@ public class AlarmConfigQuery extends AlarmConfigEntity {
         this.isUseList = isUseList;
     }
 
+    /**
+     * 获取 备注
+     * @return remarkList
+     */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+     * 设置 备注
+     * @param remarkList
+     */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -896,6 +914,25 @@ public class AlarmConfigQuery extends AlarmConfigEntity {
     }
 
 
+    /**
+     * 设置 备注
+     * @param remark
+     */
+    public AlarmConfigQuery remark(String remark){
+        setRemark(remark);
+        return this;
+    }
+
+    /**
+     * 设置 备注
+     * @param remarkList
+     */
+    public AlarmConfigQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+        return this;
+    }
+
+
     /**
      * 设置  更新用户
      * @param updateUserId

device-manager/src/main/java/com/mortals/xhx/module/alarm/web/AlarmConfigController.java

@@ -5,11 +5,15 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.alarm.model.AlarmConfigEntity;
 import com.mortals.xhx.module.alarm.service.AlarmConfigService;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.product.service.ProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
 *
 * 设备告警配置
@@ -23,6 +27,8 @@ public class AlarmConfigController extends BaseCRUDJsonBodyMappingController<Ala
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private ProductService productService;
 
     public AlarmConfigController(){
         super.setModuleDesc( "设备告警配置");
@@ -34,6 +40,9 @@ public class AlarmConfigController extends BaseCRUDJsonBodyMappingController<Ala
         this.addDict(model, "alarmLevel", paramService.getParamBySecondOrganize("AlarmConfig","alarmLevel"));
         this.addDict(model, "alarmPusW1ay", paramService.getParamBySecondOrganize("AlarmConfig","alarmPusW1ay"));
         this.addDict(model, "isUse", paramService.getParamBySecondOrganize("AlarmConfig","isUse"));
+
+        this.addDict(model, "productId", productService.find(new ProductEntity()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getProductName())));
+
         super.init(model, context);
     }
 

device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceModuleUseVo.java

 package com.mortals.xhx.module.device.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
 /**
@@ -9,6 +11,11 @@ import java.util.List;
 * @author zxfei
 * @date 2022-07-02
 */
+@Data
 public class DeviceModuleUseVo extends BaseEntityLong {
 
+    /**
+     * 平台与产品名称
+     */
+    private String platformAndProductName;
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.device.service.impl;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.platform.model.PlatformEntity;
+import com.mortals.xhx.module.platform.service.PlatformService;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.product.service.ProductService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.module.device.dao.DeviceModuleDao;
 import com.mortals.xhx.module.device.model.DeviceModuleEntity;
 import com.mortals.xhx.module.device.service.DeviceModuleService;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+
 /**
-* DeviceModuleService
-* 设备模块信息 service实现
-*
-* @author zxfei
-* @date 2022-07-02
-*/
+ * DeviceModuleService
+ * 设备模块信息 service实现
+ *
+ * @author zxfei
+ * @date 2022-07-02
+ */
 @Service("deviceModuleService")
 public class DeviceModuleServiceImpl extends AbstractCRUDServiceImpl<DeviceModuleDao, DeviceModuleEntity, Long> implements DeviceModuleService {
 
+
+
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.device.service.impl;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.platform.model.PlatformEntity;
+import com.mortals.xhx.module.platform.service.PlatformService;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.product.service.ProductService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.module.device.dao.DeviceModuleUseDao;
 import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
 import com.mortals.xhx.module.device.service.DeviceModuleUseService;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+
 /**
-* DeviceModuleUseService
-* 设备模块使用频率 service实现
-*
-* @author zxfei
-* @date 2022-07-02
-*/
+ * DeviceModuleUseService
+ * 设备模块使用频率 service实现
+ *
+ * @author zxfei
+ * @date 2022-07-02
+ */
 @Service("deviceModuleUseService")
 public class DeviceModuleUseServiceImpl extends AbstractCRUDServiceImpl<DeviceModuleUseDao, DeviceModuleUseEntity, Long> implements DeviceModuleUseService {
 
+    @Autowired
+    private PlatformService platformService;
+    @Autowired
+    private ProductService productService;
+    @Autowired
+    private DeviceService deviceService;
+
+    @Override
+    protected void findAfter(DeviceModuleUseEntity params, PageInfo pageInfo, Context context, List<DeviceModuleUseEntity> list) throws AppException {
+        list.stream().forEach(item -> {
+            DeviceEntity deviceEntity = deviceService.getExtCache(item.getDeviceId().toString());
+            if (!ObjectUtils.isEmpty(deviceEntity)) {
+                PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
+                ProductEntity productEntity = productService.get(deviceEntity.getProductId());
+                if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
+                    item.setPlatformAndProductName(platformEntity.getPlatformName() + "/" + productEntity.getProductName());
+                }
+            }
+        });
+        super.findAfter(params, pageInfo, context, list);
+    }
 }
\ No newline at end of file

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

@@ -240,8 +240,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         Arrays.asList(ids).stream().forEach(id -> {
             DeviceEntity deviceEntity = this.get(id, context);
             if (!ObjectUtils.isEmpty(deviceEntity)) {
-
-
                 TbQueueCallback callback = new TbQueueCallback() {
                     @Override
                     public void onSuccess(TbQueueMsgMetadata metadata) {
@@ -293,4 +291,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
 
         super.saveBefore(entity, context);
     }
+
+
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -11,6 +11,8 @@ import com.mortals.xhx.base.system.message.MessageService;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.busiz.rsp.ApiResp;
 import com.mortals.xhx.common.code.ApiRespCodeEnum;
+import com.mortals.xhx.common.code.DeviceStatusEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders;
 import com.mortals.xhx.common.model.MessageHeader;
@@ -30,6 +32,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -171,4 +174,20 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         return jsonObject.toJSONString();
     }
 
+
+    @Override
+    protected int doListAfter(DeviceEntity query, Map<String, Object> model, Context context) throws AppException {
+        //统计当前站点设备情况
+        if (!ObjectUtils.isEmpty(query.getSiteId())) {
+            List<DeviceEntity> deviceEntityList = this.service.find(query, context);
+            if (!ObjectUtils.isEmpty(deviceEntityList)) {
+                model.put("totalCount", deviceEntityList.size());
+                model.put("onlineCount", deviceEntityList.stream().filter(f -> f.getDeviceStatus() == DeviceStatusEnum.在线.getValue()).count());
+                model.put("offlineCount", deviceEntityList.stream().filter(f -> f.getDeviceStatus() == DeviceStatusEnum.离线.getValue()).count());
+                model.put("stopCount", deviceEntityList.stream().filter(f -> f.getDeviceStatus() != DeviceStatusEnum.未激活.getValue() && f.getEnabled() == YesNoEnum.NO.getValue()).count());
+                model.put("unActiveCount", deviceEntityList.stream().filter(f -> f.getDeviceStatus() == DeviceStatusEnum.未激活.getValue()).count());
+            }
+        }
+        return super.doListAfter(query, model, context);
+    }
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleUseController.java

 package com.mortals.xhx.module.device.web;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.device.model.DeviceQuery;
+import com.mortals.xhx.module.device.service.DeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -35,6 +37,8 @@ public class DeviceModuleUseController extends BaseCRUDJsonBodyMappingController
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private DeviceService deviceService;
 
     public DeviceModuleUseController(){
         super.setModuleDesc( "设备模块使用频率");
@@ -42,6 +46,7 @@ public class DeviceModuleUseController extends BaseCRUDJsonBodyMappingController
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "deviceId", deviceService.find(new DeviceQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeviceName())));
         super.init(model, context);
     }
 

device-manager/src/main/resources/sqlmap/module/alarm/AlarmConfigMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.alarm.dao.ibatis.AlarmConfigDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -11,6 +11,7 @@
         <result property="alarmLevel" column="alarmLevel" />
         <result property="alarmPusW1ay" column="alarmPusW1ay" />
         <result property="isUse" column="isUse" />
+        <result property="remark" column="remark" />
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
@@ -39,6 +40,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isUse') or colPickMode == 1 and data.containsKey('isUse')))">
                 a.isUse,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                a.remark,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
                 a.createTime,
             </if>
@@ -53,18 +57,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AlarmConfigEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_alarm_config
-        (productId,alarmType,alarmLevel,alarmPusW1ay,isUse,createTime,updateUserId,updateTime)
+        (productId,alarmType,alarmLevel,alarmPusW1ay,isUse,remark,createTime,updateUserId,updateTime)
         VALUES
-        (#{productId},#{alarmType},#{alarmLevel},#{alarmPusW1ay},#{isUse},#{createTime},#{updateUserId},#{updateTime})
+        (#{productId},#{alarmType},#{alarmLevel},#{alarmPusW1ay},#{isUse},#{remark},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_alarm_config
-        (productId,alarmType,alarmLevel,alarmPusW1ay,isUse,createTime,updateUserId,updateTime)
+        (productId,alarmType,alarmLevel,alarmPusW1ay,isUse,remark,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.productId},#{item.alarmType},#{item.alarmLevel},#{item.alarmPusW1ay},#{item.isUse},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.productId},#{item.alarmType},#{item.alarmLevel},#{item.alarmPusW1ay},#{item.isUse},#{item.remark},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -104,6 +108,9 @@
             <if test="(colPickMode==0 and data.containsKey('isUseIncrement')) or (colPickMode==1 and !data.containsKey('isUseIncrement'))">
                 a.isUse=ifnull(a.isUse,0) + #{data.isUseIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+                a.remark=#{data.remark},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
                 a.createTime=#{data.createTime},
             </if>
@@ -188,6 +195,13 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="remark=(case" suffix="ELSE remark end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                        when a.id=#{item.id} then #{item.remark}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="createTime=(case" suffix="ELSE createTime end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
@@ -442,6 +456,21 @@
         </if>
 
 
+        <if test="conditionParamRef.containsKey('remark')">
+            <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
+            </if>
+            <if test="conditionParamRef.remark == null">
+                ${_conditionType_} a.remark is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('remarkList')">
+            ${_conditionType_} a.remark in
+            <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="conditionParamRef.containsKey('createTime')">
             <if test="conditionParamRef.createTime != null ">
                 ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
@@ -535,6 +564,11 @@
                     <if test='orderCol.isUse != null and "DESC".equalsIgnoreCase(orderCol.isUse)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('remark')">
+                    a.remark
+                    <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('createTime')">
                     a.createTime
                     <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>