Skip to content

D
device-platform
Commit 5761b10c authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改设备管理

parent 0f289e4a
Show whitespace changes
Inline Side-by-side
Showing with 2129 additions and 1576 deletions
db/module.sql
View file @ 5761b10c
...@@ -16,6 +16,7 @@ CREATE TABLE mortals_stp_device( ...@@ -16,6 +16,7 @@ CREATE TABLE mortals_stp_device(
`deviceFirmname` varchar(20) COMMENT '设备生产厂商名称', `deviceFirmname` varchar(20) COMMENT '设备生产厂商名称',
`deviceOnlineStatus` tinyint(2) NOT NULL COMMENT '在线状态 (0.离线，1.在线)', `deviceOnlineStatus` tinyint(2) NOT NULL COMMENT '在线状态 (0.离线，1.在线)',
`status` tinyint(2) NOT NULL COMMENT '启用状态 (0.停止，1.启用)', `status` tinyint(2) NOT NULL COMMENT '启用状态 (0.停止，1.启用)',
`deviceSource` tinyint(2) NOT NULL COMMENT '设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)',
`deviceRemark` varchar(256) COMMENT '备注', `deviceRemark` varchar(256) COMMENT '备注',
`onlineTime` datetime COMMENT '最近上线时间', `onlineTime` datetime COMMENT '最近上线时间',
`offlineTime` datetime COMMENT '最近离线时间', `offlineTime` datetime COMMENT '最近离线时间',
...@@ -25,6 +26,7 @@ CREATE TABLE mortals_stp_device( ...@@ -25,6 +26,7 @@ CREATE TABLE mortals_stp_device(
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备';
-- ---------------------------- -- ----------------------------
-- 设备生产厂商表 -- 设备生产厂商表
-- ---------------------------- -- ----------------------------
......
device-manager-ui/admin/src/router.js
View file @ 5761b10c
...@@ -31,9 +31,7 @@ const router = new Router({ ...@@ -31,9 +31,7 @@ const router = new Router({
builder('site/list', 'system/site/index'),//站点 builder('site/list', 'system/site/index'),//站点
...restBuilder('device', 'device'),// ...restBuilder('device', 'device'),//
...restBuilder('device/log', 'device/log'),// ...restBuilder('device/log', 'device/log'),//
...restBuilder('firm', 'firm'),// ...restBuilder('firm', 'firm'),//
//以下为基础路由配置 //以下为基础路由配置
......
device-manager-ui/admin/src/views/device/dialogshow.vue
View file @ 5761b10c
...@@ -3,15 +3,37 @@ ...@@ -3,15 +3,37 @@
<el-dialog :title="title" :visible.sync="open" width="80%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field :span="20" label="设备名称" prop="deviceName" v-model="form.deviceName" placeholder="请输入设备名称"/> <Field
<Field :span="20" label="设备编码" prop="deviceCode" v-model="form.deviceCode" type="textarea" placeholder="请输入设备编码"/> :span="20"
<Field :span="20" label="设备类型" prop="deviceType" v-model="form.deviceType" type="select" :enumData="dict.deviceType" placeholder="请选择设备类型"/> label="设备名称"
<Field :span="20" label="设备的MAC地址" prop="deviceMac" v-model="form.deviceMac" placeholder="请输入设备的MAC地址"/> prop="deviceName"
<Field :span="20" label="中心设备编码" v-model="form.centernum" placeholder="请输入中心设备编码"/> v-model="form.deviceName"
placeholder="请输入设备名称"
/>
<Field
:span="20"
label="设备编码"
prop="deviceCode"
v-model="form.deviceCode"
placeholder="请输入设备编码"
/>
<Field
:span="20"
label="设备的MAC地址"
prop="deviceMac"
v-model="form.deviceMac"
placeholder="请输入设备的MAC地址"
/>
<Field
:span="20"
label="设备类型"
prop="deviceType"
v-model="form.deviceType"
type="select"
:enumData="dict.deviceType"
placeholder="请选择设备类型"
/>
<Field :span="20" disabled label="设备访问ip" v-model="form.ip" />
<Field :span="20" disabled label="端口" v-model="form.port" />
<Field :span="20" disabled label="站点编号" v-model="form.siteNum" />
<Field <Field
:span="20" :span="20"
label="设备生产商：" label="设备生产商："
...@@ -21,29 +43,55 @@ ...@@ -21,29 +43,55 @@
type="select" type="select"
:enumData="dict.deviceFirmId" :enumData="dict.deviceFirmId"
/> />
<Field :span="20" label="备注" prop="deviceRemark" v-model="form.deviceRemark" type="textarea" placeholder="请输入备注"/> <Field
:span="20"
label="备注"
<Field :span="20" label="启用状态 " prop="status" v-model="form.status" type="radio" :enumData="dict.status" placeholder="请选择启用状态 "/> prop="deviceRemark"
v-model="form.deviceRemark"
type="textarea"
placeholder="请输入备注"
/>
<Field
:span="20"
label="启用状态 "
prop="status"
v-model="form.status"
type="radio"
:enumData="dict.status"
placeholder="请选择启用状态 "
/>
<Field
:span="20"
label="设备来源 "
prop="deviceSource"
v-model="form.deviceSource"
type="radio"
:enumData="dict.deviceSource"
placeholder="请选择设备来源"
/>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button> <el-button
type="primary"
v-if="pageInfo.type !== 'view'"
@click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
export default { export default {
mixins: [form], mixins: [form],
components: { components: {
dialogShow , dialogShow,
}, },
data() { data() {
return { return {
...@@ -53,60 +101,52 @@ ...@@ -53,60 +101,52 @@
title: "设备", title: "设备",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
toString:[ toString: ["deviceType", "deviceOnlineStatus", "status", "deviceFirmId"],
"deviceType",
"deviceOnlineStatus",
"status",
"deviceFirmId"
],
// 表单校验 // 表单校验
rules: { rules: {
deviceName: [ deviceName: [
{required: true,message: "请输入设备名称", trigger: "blur" }, { required: true, message: "请输入设备名称", trigger: "blur" },
{max: 20,message: "最多只能录入20个字符",trigger: "blur",}, { max: 20, message: "最多只能录入20个字符", trigger: "blur" },
], ],
deviceType: [ deviceType: [
{required: true,message: "请输入设备类型", trigger: "blur" }, { required: true, message: "请输入设备类型", trigger: "blur" },
], ],
deviceOnlineStatus: [ deviceOnlineStatus: [
{required: true,message: "请输入在线状态 ", trigger: "blur" }, { required: true, message: "请输入在线状态 ", trigger: "blur" },
], ],
status: [ status: [
{required: true,message: "请输入启用状态 ", trigger: "blur" }, { required: true, message: "请输入启用状态 ", trigger: "blur" },
],
createTime: [
{required: true,message: "请选择创建时间" },
], ],
} },
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.editUrl;; this.urls.currUrl = this.pageInfo.editUrl;
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type = "edit";
this.title = "修改设备"; this.title = "修改设备";
}, },
/** 新增 */ /** 新增 */
add(row) { add(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = this.pageInfo.addUrl; this.urls.currUrl = this.pageInfo.addUrl;
this.getData(); this.getData();
this.pageInfo.type="add" this.pageInfo.type = "add";
this.title = "新增设备"; this.title = "新增设备";
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.viewUrl;; this.urls.currUrl = this.pageInfo.viewUrl;
this.getData(); this.getData();
this.pageInfo.type="view" this.pageInfo.type = "view";
this.title = "设备详细"; this.title = "设备详细";
}, },
/**取消按钮 */ /**取消按钮 */
...@@ -126,21 +166,21 @@ ...@@ -126,21 +166,21 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
deviceName : "", deviceName: "",
deviceCode : "", deviceCode: "",
deviceType : 1, deviceType: 1,
deviceMac : "", deviceMac: "",
ip : "", ip: "",
centernum : "", centernum: "",
port : "", port: "",
siteNum : "", siteNum: "",
deviceFirmId : null, deviceFirmId: null,
deviceFirmname : "", deviceFirmname: "",
deviceOnlineStatus : 0, deviceOnlineStatus: 0,
status : 0, status: 0,
deviceRemark : "", deviceRemark: "",
onlineTime : null, onlineTime: null,
offlineTime : null, offlineTime: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -150,5 +190,5 @@ ...@@ -150,5 +190,5 @@
} }
}, },
}, },
}; };
</script> </script>
device-manager-ui/admin/src/views/login/authentication.vue
View file @ 5761b10c
...@@ -34,12 +34,12 @@ export default { ...@@ -34,12 +34,12 @@ export default {
}, },
loginFail(error) { loginFail(error) {
this.$message.error(error.message || '请登录'); this.$message.error(error.message || '请登录');
this.$router.replace({ // this.$router.replace({
path: '/login', // path: '/login',
query: { // query: {
redirect: this.redirect, // redirect: this.redirect,
} // }
}); // });
}, },
getUrlKey (name) { getUrlKey (name) {
......
device-manager/src/main/java/com/mortals/xhx/busiz/req/DeviceReq.java
View file @ 5761b10c
...@@ -10,19 +10,38 @@ import java.io.Serializable; ...@@ -10,19 +10,38 @@ import java.io.Serializable;
@Data @Data
public class DeviceReq implements Serializable { public class DeviceReq implements Serializable {
/**
* 行为
*/
private String action; private String action;
/**
* 设备编码 唯一
*/
private String devicenum; private String devicenum;
/**
* ip地址
*/
private String ip; private String ip;
/**
* 站点编码
*/
private String sitenum; private String sitenum;
/**
* 上传类型
*/
private Integer type; private Integer type;
/**
* 端口
*/
private String port; private String port;
/**
* 中心编码
*/
private String centernum; private String centernum;
......
device-manager/src/main/java/com/mortals/xhx/busiz/rsp/DeviceResp.java 0 → 100644
View file @ 5761b10c
package com.mortals.xhx.busiz.rsp;
import lombok.Data;
import java.io.Serializable;
@Data
public class DeviceResp implements Serializable {
/**
* 在线状态(0在线 1离线）
*/
private String isOnLine;
}
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @ 5761b10c
...@@ -9,11 +9,14 @@ import com.mortals.xhx.busiz.req.DeviceReq; ...@@ -9,11 +9,14 @@ import com.mortals.xhx.busiz.req.DeviceReq;
import com.mortals.xhx.busiz.rsp.ApiResp; import com.mortals.xhx.busiz.rsp.ApiResp;
import com.mortals.xhx.common.code.ApiRespCodeEnum; import com.mortals.xhx.common.code.ApiRespCodeEnum;
import com.mortals.xhx.common.code.DeviceOnlineStatusEnum; import com.mortals.xhx.common.code.DeviceOnlineStatusEnum;
import com.mortals.xhx.common.utils.SendTaskThreadPool;
import com.mortals.xhx.common.utils.UploadTask;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.model.DeviceLogEntity; import com.mortals.xhx.module.device.model.DeviceLogEntity;
import com.mortals.xhx.module.device.service.DeviceLogService; import com.mortals.xhx.module.device.service.DeviceLogService;
import com.mortals.xhx.module.device.service.DeviceService; import com.mortals.xhx.module.device.service.DeviceService;
import lombok.extern.apachecommons.CommonsLog; import lombok.extern.apachecommons.CommonsLog;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -29,15 +32,15 @@ import java.util.Date; ...@@ -29,15 +32,15 @@ import java.util.Date;
* @date: 2021/8/24 20:28 * @date: 2021/8/24 20:28
*/ */
@RestController @RestController
@CommonsLog @Slf4j
@RequestMapping("/api/device") @RequestMapping("/api/device")
public class DeviceApiController { public class DeviceApiController {
@Autowired @Autowired
private DeviceLogService deviceLogService; private DeviceLogService deviceLogService;
@Autowired @Autowired
private DeviceService deviceService; private DeviceService deviceService;
@Autowired
private SendTaskThreadPool sendTaskThreadPool;
/** /**
* 设备数据上报 * 设备数据上报
...@@ -47,73 +50,13 @@ public class DeviceApiController { ...@@ -47,73 +50,13 @@ public class DeviceApiController {
*/ */
@PostMapping("upload") @PostMapping("upload")
public String upload(DeviceReq req) { public String upload(DeviceReq req) {
log.info("【设备数据上报】【请求体】--> " + JSONObject.toJSONString(req)); log.debug("【设备数据上报】【请求体】--> " + JSONObject.toJSONString(req));
ApiResp rsp = new ApiResp<>(); ApiResp rsp = new ApiResp<>();
rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel()); rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue()); rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
try { UploadTask uploadTask = new UploadTask(req, deviceLogService, deviceService);
//根据设备编码查询设备 sendTaskThreadPool.execute(uploadTask);
DeviceEntity deviceEntity = deviceService.getExtCache(req.getDevicenum()); log.debug("响应【设备数据上报】【响应体】--> " + JSONObject.toJSONString(rsp));
boolean bool = false;
if (!ObjectUtils.isEmpty(deviceEntity)) {
if (deviceEntity.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.离线.getValue()) {
bool = true;
}
deviceEntity.setOnlineTime(new Date());
deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
deviceEntity.setIp(req.getIp());
deviceEntity.setPort(req.getPort());
deviceEntity.setSiteNum(req.getSitenum());
deviceEntity.setCenternum(req.getCenternum());
deviceService.update(deviceEntity);
DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
deviceLogEntity.initAttrValue();
deviceLogEntity.setDeviceId(deviceEntity.getId());
deviceLogEntity.setDeviceName(deviceEntity.getDeviceName());
deviceLogEntity.setDeviceNum(deviceEntity.getDeviceCode());
deviceLogEntity.setContent(JSONObject.toJSONString(req));
deviceLogEntity.setCreateTime(new Date());
deviceLogService.save(deviceLogEntity);
if (bool) {
WebSocketUtil.broadcast(SendToAllRequest.TYPE, new SendToAllRequest().setContent(JSON.toJSONString(deviceEntity)));
}
} else {
//新增设备
deviceEntity = new DeviceEntity();
deviceEntity.initAttrValue();
deviceEntity.setDeviceCode(req.getDevicenum());
deviceEntity.setOnlineTime(new Date());
deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
deviceEntity.setIp(req.getIp());
deviceEntity.setPort(req.getPort());
deviceEntity.setSiteNum(req.getSitenum());
deviceEntity.setCenternum(req.getCenternum());
deviceEntity.setCreateUserId(1L);
deviceEntity.setCreateTime(new Date());
deviceService.save(deviceEntity);
DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
deviceLogEntity.initAttrValue();
deviceLogEntity.setDeviceId(deviceEntity.getId());
deviceLogEntity.setDeviceName(deviceEntity.getDeviceName());
deviceLogEntity.setDeviceNum(deviceEntity.getDeviceCode());
deviceLogEntity.setContent(JSONObject.toJSONString(req));
deviceLogEntity.setCreateTime(new Date());
deviceLogService.save(deviceLogEntity);
WebSocketUtil.broadcast(SendToAllRequest.TYPE, new SendToAllRequest().setContent(JSON.toJSONString(deviceEntity)));
}
} catch (Exception e) {
log.error("接收数据失败", e);
rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
rsp.setMsg(e.getMessage());
return JSON.toJSONString(rsp);
}
log.info("响应【设备数据上报】【响应体】--> " + JSONObject.toJSONString(rsp));
return JSON.toJSONString(rsp); return JSON.toJSONString(rsp);
} }
......
device-manager/src/main/java/com/mortals/xhx/common/code/DeviceSourceEnum.java 0 → 100644
View file @ 5761b10c
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)枚举类
*
* @author zxfei
*/
public enum DeviceSourceEnum {
大厅(0, "大厅"),
其它(1, "其它");
private Integer value;
private String desc;
DeviceSourceEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static DeviceSourceEnum getByValue(Integer value) {
for (DeviceSourceEnum deviceSourceEnum : DeviceSourceEnum.values()) {
if (deviceSourceEnum.getValue() == value) {
return deviceSourceEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (DeviceSourceEnum item : DeviceSourceEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/common/key/ParamKey.java
View file @ 5761b10c
...@@ -28,4 +28,10 @@ public class ParamKey { ...@@ -28,4 +28,10 @@ public class ParamKey {
*/ */
public static String SYS_PARAM_USER_URL = "user_url"; public static String SYS_PARAM_USER_URL = "user_url";
/**
* 设备状态查询url
*/
public static String SYS_PARAM_SEND_QUERY_URL = "send_query_url";
} }
device-manager/src/main/java/com/mortals/xhx/common/utils/SendTask.java 0 → 100644
View file @ 5761b10c
package com.mortals.xhx.common.utils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.mortals.framework.util.HttpUtil;
import com.mortals.xhx.busiz.rsp.ApiResp;
import com.mortals.xhx.busiz.rsp.DeviceResp;
import com.mortals.xhx.common.code.DeviceOnlineStatusEnum;
import com.mortals.xhx.daemon.task.CustomerInfo;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.mortals.framework.util.HttpUtil.HEADER_CONTENT_TYPE;
/**
* 发送任务
*
* @author: zxfei
* @date: 2022/4/28 10:56
* @description:
**/
@Slf4j
@AllArgsConstructor
public class SendTask implements Runnable {
private String sendUrl;
private Long deviceId;
private String content;
private DeviceService deviceService;
@Override
public void run() {
try {
Map<String, String> headers = new HashMap<>();
DeviceEntity deviceEntity = new DeviceEntity();
deviceEntity.setId(deviceId);
headers.put(HEADER_CONTENT_TYPE, "application/json");
String resp = HttpUtil.doPost(sendUrl, headers, content);
ApiResp<DeviceResp> apiResp = JSON.parseObject(resp, new TypeReference<ApiResp<DeviceResp>>(){});
if (apiResp.getCode() == 0) {
if (apiResp.getData().getIsOnLine() == "0") {
deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
deviceEntity.setOnlineTime(new Date());
} else if (apiResp.getData().getIsOnLine() == "1") {
deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.离线.getValue());
deviceEntity.setOfflineTime(new Date());
} else {
deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
deviceEntity.setOnlineTime(new Date());
}
deviceService.update(deviceEntity);
}
log.debug("http resp:{}", resp);
} catch (Exception e) {
log.error("发送异常：" + e);
}
}
}
device-manager/src/main/java/com/mortals/xhx/common/utils/SendTaskThreadPool.java 0 → 100644
View file @ 5761b10c
package com.mortals.xhx.common.utils;
import org.springframework.stereotype.Component;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;
/**
* 发送任务线程池
*
* @author: zxfei
* @date: 2022/4/28 10:52
*/
@Component
public class SendTaskThreadPool {
/**
* 线程池
*/
private ThreadPoolExecutor threadPool;
private int poolSize;
private volatile boolean isInit = false;
private Object lock = new Object();
public void init(Integer threadNum) {
if (poolSize < 0) {
throw new IllegalArgumentException();
}
if (poolSize < Runtime.getRuntime().availableProcessors()) {
poolSize = Runtime.getRuntime().availableProcessors() + 1;
}
if (!isInit) {
synchronized (lock) {
if (!isInit) {
threadPool = (ThreadPoolExecutor) Executors.newFixedThreadPool(threadNum);
isInit = true;
}
}
}
}
public void execute(Runnable command) {
threadPool.execute(command);
}
public void setPoolSize(int poolSize) {
threadPool.setCorePoolSize(poolSize);
threadPool.setMaximumPoolSize(poolSize);
}
public void incrementPoolSize(int delta) {
setPoolSize(threadPool.getCorePoolSize() + delta);
}
public synchronized void close() {
if (threadPool != null) {
threadPool.shutdown();
threadPool = null;
isInit = false;
}
}
}
device-manager/src/main/java/com/mortals/xhx/common/utils/UploadTask.java 0 → 100644
View file @ 5761b10c
package com.mortals.xhx.common.utils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.mortals.framework.util.HttpUtil;
import com.mortals.xhx.base.framework.ws.message.SendToAllRequest;
import com.mortals.xhx.base.framework.ws.util.WebSocketUtil;
import com.mortals.xhx.busiz.req.DeviceReq;
import com.mortals.xhx.busiz.rsp.ApiResp;
import com.mortals.xhx.busiz.rsp.DeviceResp;
import com.mortals.xhx.common.code.DeviceOnlineStatusEnum;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.model.DeviceLogEntity;
import com.mortals.xhx.module.device.service.DeviceLogService;
import com.mortals.xhx.module.device.service.DeviceService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import static com.mortals.framework.util.HttpUtil.HEADER_CONTENT_TYPE;
/**
* 上报任务
*
* @author: zxfei
* @date: 2022/4/28 10:56
* @description:
**/
@Slf4j
@AllArgsConstructor
public class UploadTask implements Runnable {
private DeviceReq req;
private DeviceLogService deviceLogService;
private DeviceService deviceService;
@Override
public void run() {
try {
DeviceEntity deviceEntity = deviceService.getExtCache(req.getDevicenum());
boolean bool = false;
if (!ObjectUtils.isEmpty(deviceEntity)) {
if (deviceEntity.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.离线.getValue()) {
bool = true;
}
deviceEntity.setOnlineTime(new Date());
deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
deviceEntity.setIp(req.getIp());
deviceEntity.setPort(req.getPort());
deviceEntity.setSiteNum(req.getSitenum());
deviceEntity.setCenternum(req.getCenternum());
deviceService.update(deviceEntity);
DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
deviceLogEntity.initAttrValue();
deviceLogEntity.setDeviceId(deviceEntity.getId());
deviceLogEntity.setDeviceName(deviceEntity.getDeviceName());
deviceLogEntity.setDeviceNum(deviceEntity.getDeviceCode());
deviceLogEntity.setContent(JSONObject.toJSONString(req));
deviceLogEntity.setCreateTime(new Date());
deviceLogService.save(deviceLogEntity);
if (bool) {
WebSocketUtil.broadcast(SendToAllRequest.TYPE, new SendToAllRequest().setContent(JSON.toJSONString(deviceEntity)));
}
} else {
//新增设备
deviceEntity = new DeviceEntity();
deviceEntity.initAttrValue();
deviceEntity.setDeviceCode(req.getDevicenum());
deviceEntity.setOnlineTime(new Date());
deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
deviceEntity.setIp(req.getIp());
deviceEntity.setPort(req.getPort());
deviceEntity.setSiteNum(req.getSitenum());
deviceEntity.setCenternum(req.getCenternum());
deviceEntity.setCreateUserId(1L);
deviceEntity.setCreateTime(new Date());
deviceService.save(deviceEntity);
DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
deviceLogEntity.initAttrValue();
deviceLogEntity.setDeviceId(deviceEntity.getId());
deviceLogEntity.setDeviceName(deviceEntity.getDeviceName());
deviceLogEntity.setDeviceNum(deviceEntity.getDeviceCode());
deviceLogEntity.setContent(JSONObject.toJSONString(req));
deviceLogEntity.setCreateTime(new Date());
deviceLogService.save(deviceLogEntity);
WebSocketUtil.broadcast(SendToAllRequest.TYPE, new SendToAllRequest().setContent(JSON.toJSONString(deviceEntity)));
}
} catch (Exception e) {
log.error("异常：" ,e);
}
}
}
device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartService.java
View file @ 5761b10c
package com.mortals.xhx.daemon.applicationservice; package com.mortals.xhx.daemon.applicationservice;
import org.apache.commons.logging.Log; import com.mortals.framework.springcloud.service.IApplicationService;
import org.apache.commons.logging.LogFactory; import com.mortals.xhx.common.utils.SendTaskThreadPool;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.mortals.framework.springcloud.service.IApplicationService;
/**
* 应用级服务，在应用启动、停止过程中调用
*
* 缺陷：类加载完成后就调用，会由于某些组件还未初始化而导致服务异常，
* 比如Kafka的连接以及订阅初始化比较靠后，在服务启动过程中就调用操作kafka相关API，将导致失败
* 比如开启Socket监听端口，可能端口都接收到连接请求了，但数据库连接还未初始化完成，导致请求处理失败
* 比如定时任务，任务执行时，相关缓存还未初始化，导致处理失败
*
* 应用场景：
* 1、无依赖其它模块或框架的数据初始化等操作
* @author GM
* @date 2020年7月15日
*/
@Component @Component
@Slf4j
public class DemoStartService implements IApplicationService { public class DemoStartService implements IApplicationService {
@Autowired
private static Log logger = LogFactory.getLog(DemoStartService.class); private SendTaskThreadPool sendTaskThreadPool;
@Override @Override
public void start() { public void start() {
logger.info("开始服务..[配置已加载完成，但部分框架还未初始化，比如：Kafka]"); int coreThreadNum = Runtime.getRuntime().availableProcessors();
sendTaskThreadPool.init(coreThreadNum*2);
log.info("开始服务..[配置已加载完成，但部分框架还未初始化，比如：Kafka]");
} }
@Override @Override
public void stop() { public void stop() {
logger.info("停止服务.."); log.info("停止服务..");
} }
} }
device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceStatTaskImpl.java
View file @ 5761b10c
package com.mortals.xhx.daemon.task; package com.mortals.xhx.daemon.task;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.ap.GlobalSysInfo; import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ITask; import com.mortals.framework.service.ITask;
...@@ -10,7 +11,10 @@ import com.mortals.xhx.base.framework.ws.message.SendToAllRequest; ...@@ -10,7 +11,10 @@ import com.mortals.xhx.base.framework.ws.message.SendToAllRequest;
import com.mortals.xhx.base.framework.ws.message.UserJoinNoticeRequest; import com.mortals.xhx.base.framework.ws.message.UserJoinNoticeRequest;
import com.mortals.xhx.base.framework.ws.util.WebSocketUtil; import com.mortals.xhx.base.framework.ws.util.WebSocketUtil;
import com.mortals.xhx.common.code.DeviceOnlineStatusEnum; import com.mortals.xhx.common.code.DeviceOnlineStatusEnum;
import com.mortals.xhx.common.code.DeviceSourceEnum;
import com.mortals.xhx.common.key.ParamKey; import com.mortals.xhx.common.key.ParamKey;
import com.mortals.xhx.common.utils.SendTask;
import com.mortals.xhx.common.utils.SendTaskThreadPool;
import com.mortals.xhx.module.device.model.DeviceLogEntity; import com.mortals.xhx.module.device.model.DeviceLogEntity;
import com.mortals.xhx.module.device.model.DeviceLogQuery; import com.mortals.xhx.module.device.model.DeviceLogQuery;
import com.mortals.xhx.module.device.service.DeviceLogService; import com.mortals.xhx.module.device.service.DeviceLogService;
...@@ -38,12 +42,15 @@ public class DeviceStatTaskImpl implements ITaskExcuteService { ...@@ -38,12 +42,15 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
@Autowired @Autowired
private DeviceLogService deviceLogService; private DeviceLogService deviceLogService;
@Autowired
private SendTaskThreadPool sendTaskThreadPool;
@Override @Override
public void excuteTask(ITask task) throws AppException { public void excuteTask(ITask task) throws AppException {
log.debug("设备状态统计，开始执行"); log.debug("设备状态统计，开始执行");
doDeviceUpOrDown(); doDeviceUpOrDown();
doDeviceLogDel(); doDeviceLogDel();
doDeviceQuery();
log.debug("设备状态统计，结束执行"); log.debug("设备状态统计，结束执行");
} }
...@@ -56,6 +63,7 @@ public class DeviceStatTaskImpl implements ITaskExcuteService { ...@@ -56,6 +63,7 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
try { try {
//获取所有设备，针对每个设备查询最近指定秒的日志，如果没有则更新下线 //获取所有设备，针对每个设备查询最近指定秒的日志，如果没有则更新下线
deviceService.getCacheList().stream() deviceService.getCacheList().stream()
.filter(f -> f.getDeviceSource() == DeviceSourceEnum.大厅.getValue())
.filter(f -> f.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.在线.getValue()) .filter(f -> f.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.在线.getValue())
.peek(device -> { .peek(device -> {
DeviceLogQuery query = new DeviceLogQuery(); DeviceLogQuery query = new DeviceLogQuery();
...@@ -68,14 +76,14 @@ public class DeviceStatTaskImpl implements ITaskExcuteService { ...@@ -68,14 +76,14 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
device.setDeviceOnlineStatus(DeviceOnlineStatusEnum.离线.getValue()); device.setDeviceOnlineStatus(DeviceOnlineStatusEnum.离线.getValue());
deviceService.update(device); deviceService.update(device);
WebSocketUtil.broadcast(SendToAllRequest.TYPE,new SendToAllRequest().setContent(JSON.toJSONString(device))); WebSocketUtil.broadcast(SendToAllRequest.TYPE, new SendToAllRequest().setContent(JSON.toJSONString(device)));
} }
}).count(); }).count();
} catch (Exception e) { } catch (Exception e) {
log.error("更新设备状态任务异常，结束执行", e); log.error("更新设备状态任务异常，结束执行", e);
} }
log.info("更新设备状态任务，结束执行"); log.debug("更新设备状态任务，结束执行");
} }
...@@ -95,7 +103,29 @@ public class DeviceStatTaskImpl implements ITaskExcuteService { ...@@ -95,7 +103,29 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
} catch (Exception e) { } catch (Exception e) {
log.error("设备日志删除任务异常，结束执行", e); log.error("设备日志删除任务异常，结束执行", e);
} }
log.info("设备日志删除任务，结束执行"); log.debug("设备日志删除任务，结束执行");
}
/**
* 定时查询更新其它设备状态
*/
private void doDeviceQuery() {
try {
deviceService.getCacheList().parallelStream()
.filter(f -> f.getDeviceSource() == DeviceSourceEnum.其它.getValue())
.peek(device -> {
String sendUrl = GlobalSysInfo.getParamValue(ParamKey.SYS_PARAM_SEND_QUERY_URL,"http://127.0.0.1:18211/m/test/equipStateQuery");
JSONObject jsonObject = new JSONObject();
jsonObject.put("macAddress",device.getDeviceMac());
SendTask sendTask = new SendTask(sendUrl, device.getId(), jsonObject.toJSONString(), deviceService);
sendTaskThreadPool.execute(sendTask);
}).count();
} catch (Exception e) {
log.error("查询设备状态任务异常，结束执行", e);
}
log.debug("查询设备状态任务，结束执行");
} }
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
View file @ 5761b10c
...@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.vo.DeviceVo; import com.mortals.xhx.module.device.model.vo.DeviceVo;
/** /**
* 设备实体对象 * 设备实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-03-09 * @date 2022-05-06
*/ */
public class DeviceEntity extends DeviceVo { public class DeviceEntity extends DeviceVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -67,6 +67,10 @@ public class DeviceEntity extends DeviceVo { ...@@ -67,6 +67,10 @@ public class DeviceEntity extends DeviceVo {
* 启用状态 (0.停止，1.启用) * 启用状态 (0.停止，1.启用)
*/ */
private Integer status; private Integer status;
/**
* 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
*/
private Integer deviceSource;
/** /**
* 备注 * 备注
*/ */
...@@ -251,6 +255,20 @@ public class DeviceEntity extends DeviceVo { ...@@ -251,6 +255,20 @@ public class DeviceEntity extends DeviceVo {
public void setStatus(Integer status){ public void setStatus(Integer status){
this.status = status; this.status = status;
} }
/**
* 获取 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @return Integer
*/
public Integer getDeviceSource(){
return deviceSource;
}
/**
* 设置 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @param deviceSource
*/
public void setDeviceSource(Integer deviceSource){
this.deviceSource = deviceSource;
}
/** /**
* 获取 备注 * 获取 备注
* @return String * @return String
...@@ -327,6 +345,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -327,6 +345,7 @@ public class DeviceEntity extends DeviceVo {
sb.append(",deviceFirmname:").append(getDeviceFirmname()); sb.append(",deviceFirmname:").append(getDeviceFirmname());
sb.append(",deviceOnlineStatus:").append(getDeviceOnlineStatus()); sb.append(",deviceOnlineStatus:").append(getDeviceOnlineStatus());
sb.append(",status:").append(getStatus()); sb.append(",status:").append(getStatus());
sb.append(",deviceSource:").append(getDeviceSource());
sb.append(",deviceRemark:").append(getDeviceRemark()); sb.append(",deviceRemark:").append(getDeviceRemark());
sb.append(",onlineTime:").append(getOnlineTime()); sb.append(",onlineTime:").append(getOnlineTime());
sb.append(",offlineTime:").append(getOfflineTime()); sb.append(",offlineTime:").append(getOfflineTime());
...@@ -359,6 +378,8 @@ public class DeviceEntity extends DeviceVo { ...@@ -359,6 +378,8 @@ public class DeviceEntity extends DeviceVo {
this.status = 0; this.status = 0;
this.deviceSource = 0;
this.deviceRemark = ""; this.deviceRemark = "";
this.onlineTime = null; this.onlineTime = null;
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
View file @ 5761b10c
...@@ -4,11 +4,11 @@ import java.util.Date; ...@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
/** /**
* 设备查询对象 * 设备查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-03-09 * @date 2022-05-06
*/ */
public class DeviceQuery extends DeviceEntity { public class DeviceQuery extends DeviceEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -94,6 +94,18 @@ public class DeviceQuery extends DeviceEntity { ...@@ -94,6 +94,18 @@ public class DeviceQuery extends DeviceEntity {
/** 启用状态 (0.停止，1.启用)列表 */ /** 启用状态 (0.停止，1.启用)列表 */
private List <Integer> statusList; private List <Integer> statusList;
/** 开始 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它) */
private Integer deviceSourceStart;
/** 结束 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它) */
private Integer deviceSourceEnd;
/** 增加 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它) */
private Integer deviceSourceIncrement;
/** 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)列表 */
private List <Integer> deviceSourceList;
/** 备注 */ /** 备注 */
private List<String> deviceRemarkList; private List<String> deviceRemarkList;
...@@ -593,6 +605,70 @@ public class DeviceQuery extends DeviceEntity { ...@@ -593,6 +605,70 @@ public class DeviceQuery extends DeviceEntity {
this.statusList = statusList; this.statusList = statusList;
} }
/**
* 获取 开始 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @return deviceSourceStart
*/
public Integer getDeviceSourceStart(){
return this.deviceSourceStart;
}
/**
* 设置 开始 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @param deviceSourceStart
*/
public void setDeviceSourceStart(Integer deviceSourceStart){
this.deviceSourceStart = deviceSourceStart;
}
/**
* 获取 结束 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @return $deviceSourceEnd
*/
public Integer getDeviceSourceEnd(){
return this.deviceSourceEnd;
}
/**
* 设置 结束 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @param deviceSourceEnd
*/
public void setDeviceSourceEnd(Integer deviceSourceEnd){
this.deviceSourceEnd = deviceSourceEnd;
}
/**
* 获取 增加 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @return deviceSourceIncrement
*/
public Integer getDeviceSourceIncrement(){
return this.deviceSourceIncrement;
}
/**
* 设置 增加 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @param deviceSourceIncrement
*/
public void setDeviceSourceIncrement(Integer deviceSourceIncrement){
this.deviceSourceIncrement = deviceSourceIncrement;
}
/**
* 获取 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @return deviceSourceList
*/
public List<Integer> getDeviceSourceList(){
return this.deviceSourceList;
}
/**
* 设置 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @param deviceSourceList
*/
public void setDeviceSourceList(List<Integer> deviceSourceList){
this.deviceSourceList = deviceSourceList;
}
/** /**
* 获取 备注 * 获取 备注
* @return deviceRemarkList * @return deviceRemarkList
...@@ -1241,6 +1317,51 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1241,6 +1317,51 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @param deviceSource
*/
public DeviceQuery deviceSource(Integer deviceSource){
setDeviceSource(deviceSource);
return this;
}
/**
* 设置 开始 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @param deviceSourceStart
*/
public DeviceQuery deviceSourceStart(Integer deviceSourceStart){
this.deviceSourceStart = deviceSourceStart;
return this;
}
/**
* 设置 结束 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @param deviceSourceEnd
*/
public DeviceQuery deviceSourceEnd(Integer deviceSourceEnd){
this.deviceSourceEnd = deviceSourceEnd;
return this;
}
/**
* 设置 增加 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @param deviceSourceIncrement
*/
public DeviceQuery deviceSourceIncrement(Integer deviceSourceIncrement){
this.deviceSourceIncrement = deviceSourceIncrement;
return this;
}
/**
* 设置 设备来源，为其它时候上线下线通过查询(0.大厅，1.其它)
* @param deviceSourceList
*/
public DeviceQuery deviceSourceList(List<Integer> deviceSourceList){
this.deviceSourceList = deviceSourceList;
return this;
}
/** /**
* 设置 备注 * 设置 备注
......
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
View file @ 5761b10c
package com.mortals.xhx.module.device.service.impl; package com.mortals.xhx.module.device.service.impl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
import com.mortals.xhx.module.device.dao.DeviceDao; import com.mortals.xhx.module.device.dao.DeviceDao;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService; import com.mortals.xhx.module.device.service.DeviceService;
import org.springframework.util.ObjectUtils;
/** /**
* DeviceService * DeviceService
* 设备 service实现 * 设备 service实现
...@@ -19,4 +23,13 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D ...@@ -19,4 +23,13 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
protected String getExtKey(DeviceEntity data) { protected String getExtKey(DeviceEntity data) {
return data.getDeviceCode(); return data.getDeviceCode();
} }
@Override
protected void saveBefore(DeviceEntity entity, Context context) throws AppException {
if(ObjectUtils.isEmpty(entity.getDeviceCode())){
entity.setDeviceCode(entity.getDeviceMac());
}
super.saveBefore(entity, context);
}
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @ 5761b10c
...@@ -69,9 +69,8 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic ...@@ -69,9 +69,8 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
this.addDict(model, "deviceOnlineStatus", paramService.getParamBySecondOrganize("Device", "deviceOnlineStatus")); this.addDict(model, "deviceOnlineStatus", paramService.getParamBySecondOrganize("Device", "deviceOnlineStatus"));
this.addDict(model, "status", paramService.getParamBySecondOrganize("Device", "status")); this.addDict(model, "status", paramService.getParamBySecondOrganize("Device", "status"));
this.addDict(model, "deviceFirmId", firmService.find(new FirmQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getFirmName()))); this.addDict(model, "deviceFirmId", firmService.find(new FirmQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getFirmName())));
this.addDict(model, "deviceSource", paramService.getParamBySecondOrganize("Device","deviceSource"));
Map<Boolean, Long> collect = this.service.find(new DeviceQuery()).stream().collect(Collectors.partitioningBy(item -> (item.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.在线.getValue()), Collectors.counting())); Map<Boolean, Long> collect = this.service.find(new DeviceQuery()).stream().collect(Collectors.partitioningBy(item -> (item.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.在线.getValue()), Collectors.counting()));
model.put("onlineCount", collect.get(true)); model.put("onlineCount", collect.get(true));
model.put("offlineCount", collect.get(false)); model.put("offlineCount", collect.get(false));
super.init(request, response, form, model, context); super.init(request, response, form, model, context);
......
device-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml
View file @ 5761b10c
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceDaoImpl"> <mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<result property="deviceFirmname" column="deviceFirmname" /> <result property="deviceFirmname" column="deviceFirmname" />
<result property="deviceOnlineStatus" column="deviceOnlineStatus" /> <result property="deviceOnlineStatus" column="deviceOnlineStatus" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="deviceSource" column="deviceSource" />
<result property="deviceRemark" column="deviceRemark" /> <result property="deviceRemark" column="deviceRemark" />
<result property="onlineTime" column="onlineTime" /> <result property="onlineTime" column="onlineTime" />
<result property="offlineTime" column="offlineTime" /> <result property="offlineTime" column="offlineTime" />
...@@ -33,82 +34,85 @@ ...@@ -33,82 +34,85 @@
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id as id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
a.deviceName as deviceName, a.deviceName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
a.deviceCode as deviceCode, a.deviceCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceType') or colPickMode == 1 and data.containsKey('deviceType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceType') or colPickMode == 1 and data.containsKey('deviceType')))">
a.deviceType as deviceType, a.deviceType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceMac') or colPickMode == 1 and data.containsKey('deviceMac')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceMac') or colPickMode == 1 and data.containsKey('deviceMac')))">
a.deviceMac as deviceMac, a.deviceMac,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ip') or colPickMode == 1 and data.containsKey('ip')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ip') or colPickMode == 1 and data.containsKey('ip')))">
a.ip as ip, a.ip,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('centernum') or colPickMode == 1 and data.containsKey('centernum')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('centernum') or colPickMode == 1 and data.containsKey('centernum')))">
a.centernum as centernum, a.centernum,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('port') or colPickMode == 1 and data.containsKey('port')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('port') or colPickMode == 1 and data.containsKey('port')))">
a.port as port, a.port,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteNum') or colPickMode == 1 and data.containsKey('siteNum')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteNum') or colPickMode == 1 and data.containsKey('siteNum')))">
a.siteNum as siteNum, a.siteNum,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmId') or colPickMode == 1 and data.containsKey('deviceFirmId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmId') or colPickMode == 1 and data.containsKey('deviceFirmId')))">
a.deviceFirmId as deviceFirmId, a.deviceFirmId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmname') or colPickMode == 1 and data.containsKey('deviceFirmname')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmname') or colPickMode == 1 and data.containsKey('deviceFirmname')))">
a.deviceFirmname as deviceFirmname, a.deviceFirmname,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceOnlineStatus') or colPickMode == 1 and data.containsKey('deviceOnlineStatus')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceOnlineStatus') or colPickMode == 1 and data.containsKey('deviceOnlineStatus')))">
a.deviceOnlineStatus as deviceOnlineStatus, a.deviceOnlineStatus,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status as status, a.status,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceSource') or colPickMode == 1 and data.containsKey('deviceSource')))">
a.deviceSource,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceRemark') or colPickMode == 1 and data.containsKey('deviceRemark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceRemark') or colPickMode == 1 and data.containsKey('deviceRemark')))">
a.deviceRemark as deviceRemark, a.deviceRemark,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineTime') or colPickMode == 1 and data.containsKey('onlineTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineTime') or colPickMode == 1 and data.containsKey('onlineTime')))">
a.onlineTime as onlineTime, a.onlineTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('offlineTime') or colPickMode == 1 and data.containsKey('offlineTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('offlineTime') or colPickMode == 1 and data.containsKey('offlineTime')))">
a.offlineTime as offlineTime, a.offlineTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId as createUserId, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime as createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId as updateUserId, a.updateUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime as updateTime, a.updateTime,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_stp_device insert into mortals_stp_device
(deviceName,deviceCode,deviceType,deviceMac,ip,centernum,port,siteNum,deviceFirmId,deviceFirmname,deviceOnlineStatus,status,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime) (deviceName,deviceCode,deviceType,deviceMac,ip,centernum,port,siteNum,deviceFirmId,deviceFirmname,deviceOnlineStatus,status,deviceSource,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{deviceName},#{deviceCode},#{deviceType},#{deviceMac},#{ip},#{centernum},#{port},#{siteNum},#{deviceFirmId},#{deviceFirmname},#{deviceOnlineStatus},#{status},#{deviceRemark},#{onlineTime},#{offlineTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{deviceName},#{deviceCode},#{deviceType},#{deviceMac},#{ip},#{centernum},#{port},#{siteNum},#{deviceFirmId},#{deviceFirmname},#{deviceOnlineStatus},#{status},#{deviceSource},#{deviceRemark},#{onlineTime},#{offlineTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_stp_device insert into mortals_stp_device
(deviceName,deviceCode,deviceType,deviceMac,ip,centernum,port,siteNum,deviceFirmId,deviceFirmname,deviceOnlineStatus,status,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime) (deviceName,deviceCode,deviceType,deviceMac,ip,centernum,port,siteNum,deviceFirmId,deviceFirmname,deviceOnlineStatus,status,deviceSource,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.deviceName},#{item.deviceCode},#{item.deviceType},#{item.deviceMac},#{item.ip},#{item.centernum},#{item.port},#{item.siteNum},#{item.deviceFirmId},#{item.deviceFirmname},#{item.deviceOnlineStatus},#{item.status},#{item.deviceRemark},#{item.onlineTime},#{item.offlineTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.deviceName},#{item.deviceCode},#{item.deviceType},#{item.deviceMac},#{item.ip},#{item.centernum},#{item.port},#{item.siteNum},#{item.deviceFirmId},#{item.deviceFirmname},#{item.deviceOnlineStatus},#{item.status},#{item.deviceSource},#{item.deviceRemark},#{item.onlineTime},#{item.offlineTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -166,6 +170,12 @@ ...@@ -166,6 +170,12 @@
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))"> <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement}, a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deviceSource')) or (colPickMode==1 and !data.containsKey('deviceSource'))">
a.deviceSource=#{data.deviceSource},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceSourceIncrement')) or (colPickMode==1 and !data.containsKey('deviceSourceIncrement'))">
a.deviceSource=ifnull(a.deviceSource,0) + #{data.deviceSourceIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceRemark')) or (colPickMode==1 and !data.containsKey('deviceRemark'))"> <if test="(colPickMode==0 and data.containsKey('deviceRemark')) or (colPickMode==1 and !data.containsKey('deviceRemark'))">
a.deviceRemark=#{data.deviceRemark}, a.deviceRemark=#{data.deviceRemark},
</if> </if>
...@@ -309,6 +319,18 @@ ...@@ -309,6 +319,18 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceSource=(case" suffix="ELSE deviceSource end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('deviceSource')) or (colPickMode==1 and !item.containsKey('deviceSource'))">
when a.id=#{item.id} then #{item.deviceSource}
</when>
<when test="(colPickMode==0 and item.containsKey('deviceSourceIncrement')) or (colPickMode==1 and !item.containsKey('deviceSourceIncrement'))">
when a.id=#{item.id} then ifnull(a.deviceSource,0) + #{item.deviceSourceIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="deviceRemark=(case" suffix="ELSE deviceRemark end),"> <trim prefix="deviceRemark=(case" suffix="ELSE deviceRemark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceRemark')) or (colPickMode==1 and !item.containsKey('deviceRemark'))"> <if test="(colPickMode==0 and item.containsKey('deviceRemark')) or (colPickMode==1 and !item.containsKey('deviceRemark'))">
...@@ -694,6 +716,27 @@ ...@@ -694,6 +716,27 @@
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd} ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if> </if>
<if test="conditionParamRef.containsKey('deviceSource')">
<if test="conditionParamRef.deviceSource != null ">
${_conditionType_} a.deviceSource = #{${_conditionParam_}.deviceSource}
</if>
<if test="conditionParamRef.deviceSource == null">
${_conditionType_} a.deviceSource is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceSourceList')">
${_conditionType_} a.deviceSource in
<foreach collection="conditionParamRef.deviceSourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceSourceStart') and conditionParamRef.deviceSourceStart != null">
${_conditionType_} a.deviceSource <![CDATA[ >= ]]> #{${_conditionParam_}.deviceSourceStart}
</if>
<if test="conditionParamRef.containsKey('deviceSourceEnd') and conditionParamRef.deviceSourceEnd != null">
${_conditionType_} a.deviceSource <![CDATA[ <= ]]> #{${_conditionParam_}.deviceSourceEnd}
</if>
<if test="conditionParamRef.containsKey('deviceRemark')"> <if test="conditionParamRef.containsKey('deviceRemark')">
<if test="conditionParamRef.deviceRemark != null and conditionParamRef.deviceRemark != ''"> <if test="conditionParamRef.deviceRemark != null and conditionParamRef.deviceRemark != ''">
...@@ -889,6 +932,11 @@ ...@@ -889,6 +932,11 @@
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if> <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceSource')">
a.deviceSource
<if test='orderCol.deviceSource != null and "DESC".equalsIgnoreCase(orderCol.deviceSource)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceRemark')"> <if test="orderCol.containsKey('deviceRemark')">
a.deviceRemark a.deviceRemark
<if test='orderCol.deviceRemark != null and "DESC".equalsIgnoreCase(orderCol.deviceRemark)'>DESC</if> <if test='orderCol.deviceRemark != null and "DESC".equalsIgnoreCase(orderCol.deviceRemark)'>DESC</if>
......
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
View file @ 5761b10c
...@@ -28,7 +28,7 @@ Content-Type: application/json ...@@ -28,7 +28,7 @@ Content-Type: application/json
"status":0, "status":0,
"deviceRemark":"plxklr", "deviceRemark":"plxklr",
"onlineTime":"1646755200000", "onlineTime":"1646755200000",
"offlineTime":"1646755200000", "offlineTime":"1646755200000"
} }
> {% > {%
...@@ -50,4 +50,12 @@ Accept: application/json ...@@ -50,4 +50,12 @@ Accept: application/json
###设备上报
POST {{baseUrl}}/api/device/upload
Content-Type: application/json
{
"devicenum":"AB:DD:DF:FD:AD:FA:DA:SS",
"action":"upload"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment