diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java index 9fbb5b8..23564c6 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java @@ -31,7 +31,7 @@ ReturnDTO deleteDevice(List ids); - Device deviceDetail(Long id); + Device deviceDetail(Long id) throws Exception; void importiFile(MultipartFile file) throws IOException; diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java index 9fbb5b8..23564c6 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java @@ -31,7 +31,7 @@ ReturnDTO deleteDevice(List ids); - Device deviceDetail(Long id); + Device deviceDetail(Long id) throws Exception; void importiFile(MultipartFile file) throws IOException; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java index 62cdcd9..a535795 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java @@ -25,7 +25,7 @@ ReturnDTO updateProduct(ProductInfo productInfo); - ProductInfo productDetail(Long id); + ProductInfo productDetail(Long id) throws Exception; ReturnDTO deleteProduct(List ids); diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java index 9fbb5b8..23564c6 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java @@ -31,7 +31,7 @@ ReturnDTO deleteDevice(List ids); - Device deviceDetail(Long id); + Device deviceDetail(Long id) throws Exception; void importiFile(MultipartFile file) throws IOException; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java index 62cdcd9..a535795 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java @@ -25,7 +25,7 @@ ReturnDTO updateProduct(ProductInfo productInfo); - ProductInfo productDetail(Long id); + ProductInfo productDetail(Long id) throws Exception; ReturnDTO deleteProduct(List ids); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java index 00d2b4d..f3402f1 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java @@ -65,6 +65,20 @@ return page; } + @Override + public List list(DeviceGroupListRequest request, DataScope dataScope) { + List deviceGroupListVOList = this.baseMapper.list(request, dataScope); + List> deptList = sysCommonMapper.getDeptMap(); + Map deptMap = deptList.stream() + .collect(Collectors.toMap(e -> (Long) e.get("id"), e -> (String) e.get("simpleName"))); + for (DeviceGroupListVO deviceGroupListVO : deviceGroupListVOList) { + if (ObjectUtil.isNotEmpty(deviceGroupListVO.getDeptid()) && deptMap.containsKey(deviceGroupListVO.getDeptid())) { + deviceGroupListVO.setDeptName(deptMap.get(deviceGroupListVO.getDeptid())); + } + } + return deviceGroupListVOList; + } + /** * 添加到redis @@ -123,5 +137,4 @@ } - } diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java index 9fbb5b8..23564c6 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java @@ -31,7 +31,7 @@ ReturnDTO deleteDevice(List ids); - Device deviceDetail(Long id); + Device deviceDetail(Long id) throws Exception; void importiFile(MultipartFile file) throws IOException; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java index 62cdcd9..a535795 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java @@ -25,7 +25,7 @@ ReturnDTO updateProduct(ProductInfo productInfo); - ProductInfo productDetail(Long id); + ProductInfo productDetail(Long id) throws Exception; ReturnDTO deleteProduct(List ids); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java index 00d2b4d..f3402f1 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java @@ -65,6 +65,20 @@ return page; } + @Override + public List list(DeviceGroupListRequest request, DataScope dataScope) { + List deviceGroupListVOList = this.baseMapper.list(request, dataScope); + List> deptList = sysCommonMapper.getDeptMap(); + Map deptMap = deptList.stream() + .collect(Collectors.toMap(e -> (Long) e.get("id"), e -> (String) e.get("simpleName"))); + for (DeviceGroupListVO deviceGroupListVO : deviceGroupListVOList) { + if (ObjectUtil.isNotEmpty(deviceGroupListVO.getDeptid()) && deptMap.containsKey(deviceGroupListVO.getDeptid())) { + deviceGroupListVO.setDeptName(deptMap.get(deviceGroupListVO.getDeptid())); + } + } + return deviceGroupListVOList; + } + /** * 添加到redis @@ -123,5 +137,4 @@ } - } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java index 055445a..a998cf3 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java @@ -107,7 +107,9 @@ } @Override - public Device deviceDetail(Long id) { + public Device deviceDetail(Long id) throws Exception { + Device device=this.baseMapper.selectById(id); + DictCodeUtils.convertDictCodeToName(device); return this.baseMapper.selectById(id); } diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java index 9fbb5b8..23564c6 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java @@ -31,7 +31,7 @@ ReturnDTO deleteDevice(List ids); - Device deviceDetail(Long id); + Device deviceDetail(Long id) throws Exception; void importiFile(MultipartFile file) throws IOException; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java index 62cdcd9..a535795 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java @@ -25,7 +25,7 @@ ReturnDTO updateProduct(ProductInfo productInfo); - ProductInfo productDetail(Long id); + ProductInfo productDetail(Long id) throws Exception; ReturnDTO deleteProduct(List ids); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java index 00d2b4d..f3402f1 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java @@ -65,6 +65,20 @@ return page; } + @Override + public List list(DeviceGroupListRequest request, DataScope dataScope) { + List deviceGroupListVOList = this.baseMapper.list(request, dataScope); + List> deptList = sysCommonMapper.getDeptMap(); + Map deptMap = deptList.stream() + .collect(Collectors.toMap(e -> (Long) e.get("id"), e -> (String) e.get("simpleName"))); + for (DeviceGroupListVO deviceGroupListVO : deviceGroupListVOList) { + if (ObjectUtil.isNotEmpty(deviceGroupListVO.getDeptid()) && deptMap.containsKey(deviceGroupListVO.getDeptid())) { + deviceGroupListVO.setDeptName(deptMap.get(deviceGroupListVO.getDeptid())); + } + } + return deviceGroupListVOList; + } + /** * 添加到redis @@ -123,5 +137,4 @@ } - } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java index 055445a..a998cf3 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java @@ -107,7 +107,9 @@ } @Override - public Device deviceDetail(Long id) { + public Device deviceDetail(Long id) throws Exception { + Device device=this.baseMapper.selectById(id); + DictCodeUtils.convertDictCodeToName(device); return this.baseMapper.selectById(id); } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java index b6cc8dc..7e946f7 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java @@ -115,7 +115,7 @@ } @Override - public ProductInfo productDetail(Long id) { + public ProductInfo productDetail(Long id) throws Exception{ ProductInfo productInfo = this.baseMapper.selectById(id); QueryWrapper configQueryWrapper = new QueryWrapper<>(); configQueryWrapper.eq("product_id", id); @@ -129,6 +129,7 @@ if (CollectionUtils.isNotEmpty(productDataItems)) { productInfo.setProductDataItems(productDataItems); } + DictCodeUtils.convertDictCodeToName(productInfo); return productInfo; } diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java index 9fbb5b8..23564c6 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java @@ -31,7 +31,7 @@ ReturnDTO deleteDevice(List ids); - Device deviceDetail(Long id); + Device deviceDetail(Long id) throws Exception; void importiFile(MultipartFile file) throws IOException; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java index 62cdcd9..a535795 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java @@ -25,7 +25,7 @@ ReturnDTO updateProduct(ProductInfo productInfo); - ProductInfo productDetail(Long id); + ProductInfo productDetail(Long id) throws Exception; ReturnDTO deleteProduct(List ids); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java index 00d2b4d..f3402f1 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java @@ -65,6 +65,20 @@ return page; } + @Override + public List list(DeviceGroupListRequest request, DataScope dataScope) { + List deviceGroupListVOList = this.baseMapper.list(request, dataScope); + List> deptList = sysCommonMapper.getDeptMap(); + Map deptMap = deptList.stream() + .collect(Collectors.toMap(e -> (Long) e.get("id"), e -> (String) e.get("simpleName"))); + for (DeviceGroupListVO deviceGroupListVO : deviceGroupListVOList) { + if (ObjectUtil.isNotEmpty(deviceGroupListVO.getDeptid()) && deptMap.containsKey(deviceGroupListVO.getDeptid())) { + deviceGroupListVO.setDeptName(deptMap.get(deviceGroupListVO.getDeptid())); + } + } + return deviceGroupListVOList; + } + /** * 添加到redis @@ -123,5 +137,4 @@ } - } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java index 055445a..a998cf3 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java @@ -107,7 +107,9 @@ } @Override - public Device deviceDetail(Long id) { + public Device deviceDetail(Long id) throws Exception { + Device device=this.baseMapper.selectById(id); + DictCodeUtils.convertDictCodeToName(device); return this.baseMapper.selectById(id); } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java index b6cc8dc..7e946f7 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java @@ -115,7 +115,7 @@ } @Override - public ProductInfo productDetail(Long id) { + public ProductInfo productDetail(Long id) throws Exception{ ProductInfo productInfo = this.baseMapper.selectById(id); QueryWrapper configQueryWrapper = new QueryWrapper<>(); configQueryWrapper.eq("product_id", id); @@ -129,6 +129,7 @@ if (CollectionUtils.isNotEmpty(productDataItems)) { productInfo.setProductDataItems(productDataItems); } + DictCodeUtils.convertDictCodeToName(productInfo); return productInfo; } diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java index 82f4651..3728d88 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java @@ -88,7 +88,7 @@ @ApiOperation("详情") @PostMapping("/detail") - public ReturnDTO deviceGroupDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deviceGroupDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ return ReturnUtil.success(deviceService.deviceDetail(idDTO.getId())); } diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java index 9fbb5b8..23564c6 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java @@ -31,7 +31,7 @@ ReturnDTO deleteDevice(List ids); - Device deviceDetail(Long id); + Device deviceDetail(Long id) throws Exception; void importiFile(MultipartFile file) throws IOException; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java index 62cdcd9..a535795 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java @@ -25,7 +25,7 @@ ReturnDTO updateProduct(ProductInfo productInfo); - ProductInfo productDetail(Long id); + ProductInfo productDetail(Long id) throws Exception; ReturnDTO deleteProduct(List ids); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java index 00d2b4d..f3402f1 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java @@ -65,6 +65,20 @@ return page; } + @Override + public List list(DeviceGroupListRequest request, DataScope dataScope) { + List deviceGroupListVOList = this.baseMapper.list(request, dataScope); + List> deptList = sysCommonMapper.getDeptMap(); + Map deptMap = deptList.stream() + .collect(Collectors.toMap(e -> (Long) e.get("id"), e -> (String) e.get("simpleName"))); + for (DeviceGroupListVO deviceGroupListVO : deviceGroupListVOList) { + if (ObjectUtil.isNotEmpty(deviceGroupListVO.getDeptid()) && deptMap.containsKey(deviceGroupListVO.getDeptid())) { + deviceGroupListVO.setDeptName(deptMap.get(deviceGroupListVO.getDeptid())); + } + } + return deviceGroupListVOList; + } + /** * 添加到redis @@ -123,5 +137,4 @@ } - } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java index 055445a..a998cf3 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java @@ -107,7 +107,9 @@ } @Override - public Device deviceDetail(Long id) { + public Device deviceDetail(Long id) throws Exception { + Device device=this.baseMapper.selectById(id); + DictCodeUtils.convertDictCodeToName(device); return this.baseMapper.selectById(id); } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java index b6cc8dc..7e946f7 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java @@ -115,7 +115,7 @@ } @Override - public ProductInfo productDetail(Long id) { + public ProductInfo productDetail(Long id) throws Exception{ ProductInfo productInfo = this.baseMapper.selectById(id); QueryWrapper configQueryWrapper = new QueryWrapper<>(); configQueryWrapper.eq("product_id", id); @@ -129,6 +129,7 @@ if (CollectionUtils.isNotEmpty(productDataItems)) { productInfo.setProductDataItems(productDataItems); } + DictCodeUtils.convertDictCodeToName(productInfo); return productInfo; } diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java index 82f4651..3728d88 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java @@ -88,7 +88,7 @@ @ApiOperation("详情") @PostMapping("/detail") - public ReturnDTO deviceGroupDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deviceGroupDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ return ReturnUtil.success(deviceService.deviceDetail(idDTO.getId())); } diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java index 6ac5303..9660fa4 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java @@ -47,6 +47,16 @@ private final IDeviceGroupService deviceGroupService; private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("分页列表") + @PostMapping("/list") + public ReturnDTO> list(@RequestBody @Validated DeviceGroupListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(deviceGroupService.listPage(page, request, dataScope))); + } @ApiOperation("分页列表") @PostMapping("/list-page") diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java index 9fbb5b8..23564c6 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java @@ -31,7 +31,7 @@ ReturnDTO deleteDevice(List ids); - Device deviceDetail(Long id); + Device deviceDetail(Long id) throws Exception; void importiFile(MultipartFile file) throws IOException; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java index 62cdcd9..a535795 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java @@ -25,7 +25,7 @@ ReturnDTO updateProduct(ProductInfo productInfo); - ProductInfo productDetail(Long id); + ProductInfo productDetail(Long id) throws Exception; ReturnDTO deleteProduct(List ids); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java index 00d2b4d..f3402f1 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java @@ -65,6 +65,20 @@ return page; } + @Override + public List list(DeviceGroupListRequest request, DataScope dataScope) { + List deviceGroupListVOList = this.baseMapper.list(request, dataScope); + List> deptList = sysCommonMapper.getDeptMap(); + Map deptMap = deptList.stream() + .collect(Collectors.toMap(e -> (Long) e.get("id"), e -> (String) e.get("simpleName"))); + for (DeviceGroupListVO deviceGroupListVO : deviceGroupListVOList) { + if (ObjectUtil.isNotEmpty(deviceGroupListVO.getDeptid()) && deptMap.containsKey(deviceGroupListVO.getDeptid())) { + deviceGroupListVO.setDeptName(deptMap.get(deviceGroupListVO.getDeptid())); + } + } + return deviceGroupListVOList; + } + /** * 添加到redis @@ -123,5 +137,4 @@ } - } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java index 055445a..a998cf3 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java @@ -107,7 +107,9 @@ } @Override - public Device deviceDetail(Long id) { + public Device deviceDetail(Long id) throws Exception { + Device device=this.baseMapper.selectById(id); + DictCodeUtils.convertDictCodeToName(device); return this.baseMapper.selectById(id); } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java index b6cc8dc..7e946f7 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java @@ -115,7 +115,7 @@ } @Override - public ProductInfo productDetail(Long id) { + public ProductInfo productDetail(Long id) throws Exception{ ProductInfo productInfo = this.baseMapper.selectById(id); QueryWrapper configQueryWrapper = new QueryWrapper<>(); configQueryWrapper.eq("product_id", id); @@ -129,6 +129,7 @@ if (CollectionUtils.isNotEmpty(productDataItems)) { productInfo.setProductDataItems(productDataItems); } + DictCodeUtils.convertDictCodeToName(productInfo); return productInfo; } diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java index 82f4651..3728d88 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java @@ -88,7 +88,7 @@ @ApiOperation("详情") @PostMapping("/detail") - public ReturnDTO deviceGroupDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deviceGroupDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ return ReturnUtil.success(deviceService.deviceDetail(idDTO.getId())); } diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java index 6ac5303..9660fa4 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java @@ -47,6 +47,16 @@ private final IDeviceGroupService deviceGroupService; private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("分页列表") + @PostMapping("/list") + public ReturnDTO> list(@RequestBody @Validated DeviceGroupListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(deviceGroupService.listPage(page, request, dataScope))); + } @ApiOperation("分页列表") @PostMapping("/list-page") diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java index 2578f26..2a6feaa 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java @@ -75,7 +75,7 @@ @ApiOperation("编辑") @PostMapping("/detail") - public ReturnDTO productDetail(@RequestBody @Validated IdDTO idDTO, BindingResult bindingResult) { + public ReturnDTO productDetail(@RequestBody @Validated IdDTO idDTO, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java index 9fbb5b8..23564c6 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java @@ -31,7 +31,7 @@ ReturnDTO deleteDevice(List ids); - Device deviceDetail(Long id); + Device deviceDetail(Long id) throws Exception; void importiFile(MultipartFile file) throws IOException; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java index 62cdcd9..a535795 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java @@ -25,7 +25,7 @@ ReturnDTO updateProduct(ProductInfo productInfo); - ProductInfo productDetail(Long id); + ProductInfo productDetail(Long id) throws Exception; ReturnDTO deleteProduct(List ids); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java index 00d2b4d..f3402f1 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java @@ -65,6 +65,20 @@ return page; } + @Override + public List list(DeviceGroupListRequest request, DataScope dataScope) { + List deviceGroupListVOList = this.baseMapper.list(request, dataScope); + List> deptList = sysCommonMapper.getDeptMap(); + Map deptMap = deptList.stream() + .collect(Collectors.toMap(e -> (Long) e.get("id"), e -> (String) e.get("simpleName"))); + for (DeviceGroupListVO deviceGroupListVO : deviceGroupListVOList) { + if (ObjectUtil.isNotEmpty(deviceGroupListVO.getDeptid()) && deptMap.containsKey(deviceGroupListVO.getDeptid())) { + deviceGroupListVO.setDeptName(deptMap.get(deviceGroupListVO.getDeptid())); + } + } + return deviceGroupListVOList; + } + /** * 添加到redis @@ -123,5 +137,4 @@ } - } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java index 055445a..a998cf3 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java @@ -107,7 +107,9 @@ } @Override - public Device deviceDetail(Long id) { + public Device deviceDetail(Long id) throws Exception { + Device device=this.baseMapper.selectById(id); + DictCodeUtils.convertDictCodeToName(device); return this.baseMapper.selectById(id); } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java index b6cc8dc..7e946f7 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java @@ -115,7 +115,7 @@ } @Override - public ProductInfo productDetail(Long id) { + public ProductInfo productDetail(Long id) throws Exception{ ProductInfo productInfo = this.baseMapper.selectById(id); QueryWrapper configQueryWrapper = new QueryWrapper<>(); configQueryWrapper.eq("product_id", id); @@ -129,6 +129,7 @@ if (CollectionUtils.isNotEmpty(productDataItems)) { productInfo.setProductDataItems(productDataItems); } + DictCodeUtils.convertDictCodeToName(productInfo); return productInfo; } diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java index 82f4651..3728d88 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java @@ -88,7 +88,7 @@ @ApiOperation("详情") @PostMapping("/detail") - public ReturnDTO deviceGroupDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deviceGroupDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ return ReturnUtil.success(deviceService.deviceDetail(idDTO.getId())); } diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java index 6ac5303..9660fa4 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java @@ -47,6 +47,16 @@ private final IDeviceGroupService deviceGroupService; private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("分页列表") + @PostMapping("/list") + public ReturnDTO> list(@RequestBody @Validated DeviceGroupListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(deviceGroupService.listPage(page, request, dataScope))); + } @ApiOperation("分页列表") @PostMapping("/list-page") diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java index 2578f26..2a6feaa 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java @@ -75,7 +75,7 @@ @ApiOperation("编辑") @PostMapping("/detail") - public ReturnDTO productDetail(@RequestBody @Validated IdDTO idDTO, BindingResult bindingResult) { + public ReturnDTO productDetail(@RequestBody @Validated IdDTO idDTO, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } diff --git a/casic-iot-web/src/main/resources/config/application-dev.yml b/casic-iot-web/src/main/resources/config/application-dev.yml index bea40b6..0e32987 100644 --- a/casic-iot-web/src/main/resources/config/application-dev.yml +++ b/casic-iot-web/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 7093 + port: 7096 ################### spring配置 ################### spring: datasource: diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java index de4116e..e66ef1e 100644 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java +++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceGroupMapper.java @@ -24,6 +24,9 @@ @Param("request") DeviceGroupListRequest request, @Param("dataScope") DataScope dataScope); + List list(@Param("request") DeviceGroupListRequest request, + @Param("dataScope") DataScope dataScope); + Long selectMaxNo(); } diff --git a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml index 4081430..ef0fc53 100644 --- a/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml +++ b/casic-iot-dao/src/resource/mapper/DeviceGroupMapper.xml @@ -37,8 +37,8 @@ dg.id, group_no AS "groupNo", deptid, - count( d.id ) AS "deviceCount", - count( s.id ) AS "subscribeCount", + deviceCount, + subscribeCount, descn, create_time AS "createTime", group_name AS "groupName" @@ -76,15 +76,68 @@ SELECT id, group_id AS "groupId" FROM device d WHERE VALID = 1 - ) d ON d.groupId = dg.id + GROUP BY group_id + ) d ON d.groupId = dg.id LEFT JOIN ( - SELECT id, group_id AS "groupId" - FROM subscribe_store + SELECT count(id) AS "subscribeCount",group_id AS groupId + FROM subscribe_store GROUP BY group_id ) s ON s.groupId = dg.id - GROUP BY dg.id order by create_time desc + + SELECT device_type AS "deviceType",create_time AS "createTime",d.devcode,logtime, - data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName" + data_value AS "dataValue",model,imei,dd.cell,name AS "deviceName",status,d.id FROM ( SELECT * FROM device @@ -50,10 +50,11 @@ AND product_id =#{request.productId} - AND cell = ]]> beginCell + AND cell = ]]> #{request.beginCell} + - AND cell endCell + AND cell #{request.endCell} and id in diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java index 8bf485f..b5ecca1 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/device/DeviceListVO.java @@ -31,7 +31,12 @@ @ExcelProperty(value = "设备名称") private String deviceName; - @ExcelProperty(value = "设备最新数据", order = 2) + + @ApiModelProperty(value = "设备状态（0离线/1在线/2报警）", dataType = "String") + @ExcelProperty(value = "设备状态", order = 2) + private String status; + + @ExcelProperty(value = "设备最新数据", order = 3) @ApiModelProperty(value = "设备最新数据", dataType = "String") @TableField(exist = false) private String dataValue; @@ -41,7 +46,7 @@ @TableField("device_type") private Integer deviceType; - @ExcelProperty(value = "设备类型", order = 2) + @ExcelProperty(value = "设备类型", order = 4) @ApiModelProperty(value = "设备类型", dataType = "String") @TableField(exist = false) private String deviceTypeName; @@ -51,13 +56,13 @@ @TableField("model") private Integer model; - @ExcelProperty(value = "设备型号", order = 3) + @ExcelProperty(value = "设备型号", order = 5) @ApiModelProperty(value = "设备型号", dataType = "String") @TableField(exist = false) private String modelName; - @ExcelProperty(value = "IMEI", order = 4) + @ExcelProperty(value = "IMEI", order = 6) @ApiModelProperty(value = "IMEI", dataType = "String") @TableField(exist = false) private String imei; @@ -66,13 +71,13 @@ private Long productId; - @ExcelProperty(value = "电量", order = 5) + @ExcelProperty(value = "电量", order = 7) @ApiModelProperty(value = "电量", dataType = "String") @TableField("cell") private String cell; - @ExcelProperty(value = "所属产品", order = 5) + @ExcelProperty(value = "所属产品", order = 8) @ApiModelProperty(value = "所属产品", dataType = "String") @TableField(exist = false) private String productName; @@ -83,22 +88,22 @@ @TableField(exist = false) private Integer encipherType; - @ExcelProperty(value = "加密方式", order = 6) + @ExcelProperty(value = "加密方式", order = 9) @ApiModelProperty(value = "加密方式", dataType = "String") @TableField(exist = false) private String encipherTypeName; - @ExcelProperty(value = "最新上线时间", order = 7) + @ExcelProperty(value = "最新上线时间", order = 10) @ApiModelProperty(value = "最新上线时间", dataType = "String") @TableField(exist = false) private String logtime; - @ExcelProperty(value = "创建时间", order = 7) + @ExcelProperty(value = "创建时间", order = 11) @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; - @ExcelProperty(value = "创建人", order = 7) + @ExcelProperty(value = "创建人", order = 12) @ApiModelProperty(value = "创建人", dataType = "String") @TableField("create_user_name") private String createUserName; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java index 329dc6e..da568cf 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmConfig.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -69,6 +70,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java index ca503e7..06ee5d0 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/AlarmData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 报警时间 */ @TableField("alarm_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime alarmTime; /** @@ -75,6 +77,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java index 704e1b5..c5bd12f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/Device.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -108,9 +109,17 @@ private String imei; /** + * 设备imei号 + */ + @TableField("iccid") + @ApiModelProperty(value = "设备iccid号", dataType = "String") + private String iccid; + + /** * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期 默认为当前时间", dataType = "String") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java index f27d24d..0c05348 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceData.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -77,12 +78,14 @@ * 采集时间 */ @TableField("uptime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private String uptime; /** * 记录日期 默认为当前时间 */ @TableField("logtime") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date logtime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java index 05a885c..be38f6c 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceGroup.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -72,6 +73,7 @@ */ @ApiModelProperty("创建日期") @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java index a07194a..da264ba 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceUpgradeTask.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java index 117aeb8..414dca8 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/DeviceVersion.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -63,6 +64,7 @@ * 创建日期 默认为当前时间 */ @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; /** diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java index 856cbed..9df3092 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductConfigItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,6 +75,7 @@ private String regularExpression; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java index 114396a..c8ee49f 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductDataItem.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -51,6 +52,7 @@ private String dataItemField; @TableField("create_time") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } diff --git a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java index fe2d10a..8424c7b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/model/ProductInfo.java @@ -1,5 +1,6 @@ package com.casic.missiles.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -130,6 +131,7 @@ /** * 创建日期 默认为当前时间 */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @TableField("create_time") private LocalDateTime createTime; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java index 4052bd1..bf0a76b 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceGroupService.java @@ -25,6 +25,8 @@ Page listPage(Page page, DeviceGroupListRequest request, DataScope dataScope); + List list(DeviceGroupListRequest request, DataScope dataScope); + ReturnDTO addDeviceGroup(DeviceGroup deviceGroup); ReturnDTO updateDeviceGroup(DeviceGroup deviceGroup); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java index 9fbb5b8..23564c6 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java @@ -31,7 +31,7 @@ ReturnDTO deleteDevice(List ids); - Device deviceDetail(Long id); + Device deviceDetail(Long id) throws Exception; void importiFile(MultipartFile file) throws IOException; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java index 62cdcd9..a535795 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IProductInfoService.java @@ -25,7 +25,7 @@ ReturnDTO updateProduct(ProductInfo productInfo); - ProductInfo productDetail(Long id); + ProductInfo productDetail(Long id) throws Exception; ReturnDTO deleteProduct(List ids); diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java index 00d2b4d..f3402f1 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceGroupServiceImpl.java @@ -65,6 +65,20 @@ return page; } + @Override + public List list(DeviceGroupListRequest request, DataScope dataScope) { + List deviceGroupListVOList = this.baseMapper.list(request, dataScope); + List> deptList = sysCommonMapper.getDeptMap(); + Map deptMap = deptList.stream() + .collect(Collectors.toMap(e -> (Long) e.get("id"), e -> (String) e.get("simpleName"))); + for (DeviceGroupListVO deviceGroupListVO : deviceGroupListVOList) { + if (ObjectUtil.isNotEmpty(deviceGroupListVO.getDeptid()) && deptMap.containsKey(deviceGroupListVO.getDeptid())) { + deviceGroupListVO.setDeptName(deptMap.get(deviceGroupListVO.getDeptid())); + } + } + return deviceGroupListVOList; + } + /** * 添加到redis @@ -123,5 +137,4 @@ } - } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java index 055445a..a998cf3 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java @@ -107,7 +107,9 @@ } @Override - public Device deviceDetail(Long id) { + public Device deviceDetail(Long id) throws Exception { + Device device=this.baseMapper.selectById(id); + DictCodeUtils.convertDictCodeToName(device); return this.baseMapper.selectById(id); } diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java index b6cc8dc..7e946f7 100644 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java +++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/ProductInfoServiceImpl.java @@ -115,7 +115,7 @@ } @Override - public ProductInfo productDetail(Long id) { + public ProductInfo productDetail(Long id) throws Exception{ ProductInfo productInfo = this.baseMapper.selectById(id); QueryWrapper configQueryWrapper = new QueryWrapper<>(); configQueryWrapper.eq("product_id", id); @@ -129,6 +129,7 @@ if (CollectionUtils.isNotEmpty(productDataItems)) { productInfo.setProductDataItems(productDataItems); } + DictCodeUtils.convertDictCodeToName(productInfo); return productInfo; } diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java index 82f4651..3728d88 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceController.java @@ -88,7 +88,7 @@ @ApiOperation("详情") @PostMapping("/detail") - public ReturnDTO deviceGroupDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO deviceGroupDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ return ReturnUtil.success(deviceService.deviceDetail(idDTO.getId())); } diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java index 6ac5303..9660fa4 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceGroupController.java @@ -47,6 +47,16 @@ private final IDeviceGroupService deviceGroupService; private final AbstractPermissionContext iCommonPermissionService; + @ApiOperation("分页列表") + @PostMapping("/list") + public ReturnDTO> list(@RequestBody @Validated DeviceGroupListRequest request, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } + DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(deviceGroupService.listPage(page, request, dataScope))); + } @ApiOperation("分页列表") @PostMapping("/list-page") diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java index 2578f26..2a6feaa 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/ProductInfoController.java @@ -75,7 +75,7 @@ @ApiOperation("编辑") @PostMapping("/detail") - public ReturnDTO productDetail(@RequestBody @Validated IdDTO idDTO, BindingResult bindingResult) { + public ReturnDTO productDetail(@RequestBody @Validated IdDTO idDTO, BindingResult bindingResult) throws Exception { if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } diff --git a/casic-iot-web/src/main/resources/config/application-dev.yml b/casic-iot-web/src/main/resources/config/application-dev.yml index bea40b6..0e32987 100644 --- a/casic-iot-web/src/main/resources/config/application-dev.yml +++ b/casic-iot-web/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 7093 + port: 7096 ################### spring配置 ################### spring: datasource: diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index 95f595c..c377678 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -20,9 +20,9 @@ if (storeFieldList.size() > 0) { Map storeObjectMap = storeFieldList.get(0); if (storeObjectMap.containsKey("月") && storeObjectMap.containsKey("年") && storeObjectMap.containsKey("日") - && storeObjectMap.containsKey("uptime") && storeObjectMap.containsKey("采集间隔")) { + && storeObjectMap.containsKey("uptime") && storeObjectMap.containsKey("interval")) { Calendar tailMergeTime = mergeTimeFormat(storeObjectMap); - mergeAllTimeFormat(storeFieldList, tailMergeTime, (Integer) storeObjectMap.get("采集间隔")); + mergeAllTimeFormat(storeFieldList, tailMergeTime, (Integer) storeObjectMap.get("interval")); } } return; @@ -46,7 +46,7 @@ storeObjectMap.remove("月"); storeObjectMap.remove("年"); storeObjectMap.remove("日"); - storeObjectMap.remove("采集间隔"); + storeObjectMap.remove("interval"); tempTailTime.add(Calendar.MINUTE, interval); } }