Skip to content

P
property-management
Commit 89e17f37 by 416409548@qq.com
Options

一卡通-门禁设备可视化/门禁设备配置优化

parent 63688d89
Showing with 114 additions and 176 deletions
ant-design-vue-jeecg/src/views/pm/access-control-device/PmAccessControlDeviceList.vue
...@@ -4,48 +4,26 @@ ...@@ -4,48 +4,26 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="4" :lg="4" :md="5" :sm="24"> <a-col :md="4" :sm="8">
<a-form-item label="选择楼栋">
<a-select placeholder="选择楼栋" v-model="queryParam.buildingName" @change="buildingChange">
<a-select-option v-for="buildingInfo in buildingInfos" :key="buildingInfo.name">
{{ buildingInfo.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="4" :md="5" :sm="24">
<a-form-item label="选择楼层">
<a-select placeholder="选择楼层" v-model="queryParam.floor">
<a-select-option v-for="floor in targetFloorList" :key="floor">
{{ floor }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="4" :md="5" :sm="24">
<a-form-item label="设备类型"> <a-form-item label="设备类型">
<a-select placeholder="设备类型" v-model="queryParam.type"> <j-dict-select-tag v-model="queryParam.type" placeholder="请选择设备类型" dict-code="alarm_query_equipmentType"/>
<a-select-option v-for="type in types" :key="type">
{{ type }}
</a-select-option>
</a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="4" :md="5" :sm="24"> <a-col :md="4" :sm="8">
<a-form-item label="设备名称"> <a-form-item label="设备名称">
<j-input placeholder="请输入设备名称" v-model="queryParam.buildingName"></j-input> <j-input placeholder="请输入设备名称" v-model="queryParam.name"></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="4" :md="5" :sm="24"> <a-col :md="4" :sm="8">
<a-space style="float: left"> <a-space style="float: left">
<a-button type="primary" @click="searchQuery">查询</a-button> <a-button type="primary" @click="searchQuery">查询</a-button>
<a-button type="default" @click="searchReset">重置</a-button> <a-button type="default" @click="searchReset">重置</a-button>
</a-space> </a-space>
</a-col> </a-col>
<a-col :xl="4" :lg="4" :md="5" :sm="24"> <a-col :md="12" :sm="8">
<a-space style="float: right"> <a-space style="float: right">
<a-button @click="handleAdd" type="primary">新增</a-button> <!-- <a-button @click="handleAdd" type="primary">新增</a-button> -->
<a-button @click="handleExportXls('pm_access_control_device')" type="primary">导出</a-button> <a-button @click="handleExportXls('门禁设备配置导出')" type="primary">导出</a-button>
</a-space> </a-space>
</a-col> </a-col>
</a-row> </a-row>
...@@ -167,6 +145,11 @@ export default { ...@@ -167,6 +145,11 @@ export default {
} }
}, },
{ {
title: '区域名称',
align: "center",
dataIndex: 'districtName'
},
{
title: '设备编码', title: '设备编码',
align: "center", align: "center",
dataIndex: 'code' dataIndex: 'code'
...@@ -174,7 +157,7 @@ export default { ...@@ -174,7 +157,7 @@ export default {
{ {
title: '设备类型', title: '设备类型',
align: "center", align: "center",
dataIndex: 'type' dataIndex: 'type_dictText'
}, },
{ {
title: '设备名称', title: '设备名称',
...@@ -187,16 +170,6 @@ export default { ...@@ -187,16 +170,6 @@ export default {
dataIndex: 'ip' dataIndex: 'ip'
}, },
{ {
title: '楼栋',
align: "center",
dataIndex: 'buildingName'
},
{
title: '楼层',
align: "center",
dataIndex: 'floor'
},
{
title: '设备位置', title: '设备位置',
align: "center", align: "center",
dataIndex: 'place' dataIndex: 'place'
...@@ -219,6 +192,7 @@ export default { ...@@ -219,6 +192,7 @@ export default {
return t + 's'; return t + 's';
}, },
}, },
{ {
title: '创建人', title: '创建人',
align: "center", align: "center",
...@@ -256,10 +230,10 @@ export default { ...@@ -256,10 +230,10 @@ export default {
}, },
created() { created() {
this.getSuperFieldList(); this.getSuperFieldList();
getAction('/pm/pmBuildingInfo/list') // getAction('/pm/pmBuildingInfo/list')
.then(value => this.buildingInfos = value.result); // .then(value => this.buildingInfos = value.result);
getAction('/pm/pmAccessControlDevice/types') // getAction('/pm/pmAccessControlDevice/types')
.then(value => this.types = value.result); // .then(value => this.types = value.result);
}, },
computed: { computed: {
importExcelUrl: function () { importExcelUrl: function () {
......
ant-design-vue-jeecg/src/views/pm/access-control-device/PmAccessControlDeviceOverview.vue
...@@ -5,30 +5,8 @@ ...@@ -5,30 +5,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="4" :lg="4" :md="5" :sm="24"> <a-col :xl="4" :lg="4" :md="5" :sm="24">
<a-form-item label="选择楼栋">
<a-select placeholder="选择楼栋" v-model="queryParam.buildingName" @change="buildingChange">
<a-select-option v-for="buildingInfo in buildingInfos" :key="buildingInfo.name">
{{ buildingInfo.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="4" :md="5" :sm="24">
<a-form-item label="选择楼层">
<a-select placeholder="选择楼层" v-model="queryParam.floor">
<a-select-option v-for="floor in targetFloorList" :key="floor">
{{ floor }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="4" :md="5" :sm="24">
<a-form-item label="设备类型"> <a-form-item label="设备类型">
<a-select placeholder="设备类型" v-model="queryParam.type"> <j-dict-select-tag v-model="queryParam.type" placeholder="请选择设备类型" dict-code="alarm_query_equipmentType"/>
<a-select-option v-for="type in types" :key="type">
{{ type }}
</a-select-option>
</a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="4" :md="5" :sm="24"> <a-col :xl="4" :lg="4" :md="5" :sm="24">
...@@ -73,12 +51,12 @@ ...@@ -73,12 +51,12 @@
<div style="position: relative"> <div style="position: relative">
<img ref="floorImg" src="@/assets/floor.png" alt="floor" width="100%" height="100%" <img ref="floorImg" src="@/assets/floor.png" alt="floor" width="100%" height="100%"
@load="floorImgLoadComplete()"/> @load="floorImgLoadComplete()"/>
<img v-for="(item, index) in list" <img v-for="item in list"
ref="icon" :key="item.id"
:src="item.status === 'NORMAL' ref="icon"
? statusList[0].imgPath :src="item.status === 1? statusList[0].imgPath
: (item.status === 'OFFLINE' ? statusList[1].imgPath : statusList[2].imgPath)" :(item.status === 2 ? statusList[1].imgPath : statusList[2].imgPath)"
:alt="item.name + ':' + item.ip"/> :alt="item.name + ':' + item.ip"/>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
...@@ -112,17 +90,17 @@ export default { ...@@ -112,17 +90,17 @@ export default {
targetFloorList: [], targetFloorList: [],
types: [], types: [],
statusList: [ statusList: [
{name: '正常', value: 'NORMAL', imgPath: require('@/assets/door-close.png')}, {name: '正常', value: 1, imgPath: require('@/assets/door-close.png')},
{name: '离线', value: 'OFFLINE', imgPath: require('@/assets/door-offline.png')}, {name: '离线', value: 2, imgPath: require('@/assets/door-offline.png')},
{name: '损坏', value: 'BREAKDOWN', imgPath: require('@/assets/door-warning.png')}], {name: '损坏', value: 3, imgPath: require('@/assets/door-warning.png')}
],
} }
}, },
created() { created() {
getAction('/pm/pmBuildingInfo/list') // getAction('/pm/pmBuildingInfo/list')
.then(value => this.buildingInfos = value.result); // .then(value => this.buildingInfos = value.result);
getAction('/pm/pmAccessControlDevice/types') // getAction('/pm/pmAccessControlDevice/types')
.then(value => this.types = value.result); // .then(value => this.types = value.result);
}, },
computed: { computed: {
importExcelUrl: function () { importExcelUrl: function () {
...@@ -132,14 +110,14 @@ export default { ...@@ -132,14 +110,14 @@ export default {
methods: { methods: {
initDictConfig() { initDictConfig() {
}, },
buildingChange(value) { // buildingChange(value) {
let targetList = this.buildingInfos.filter(buildingInfo => buildingInfo.name === value); // let targetList = this.buildingInfos.filter(buildingInfo => buildingInfo.name === value);
if (targetList != null && targetList.length > 0) { // if (targetList != null && targetList.length > 0) {
this.targetFloorList = targetList[0].floorList; // this.targetFloorList = targetList[0].floorList;
} else { // } else {
this.targetFloorList = []; // this.targetFloorList = [];
} // }
}, // },
loadComplete() { loadComplete() {
if (this.list.length > 0) { if (this.list.length > 0) {
this.list.forEach((item, index) => { this.list.forEach((item, index) => {
......
ant-design-vue-jeecg/src/views/pm/access-control-device/modules/PmAccessControlDeviceForm.vue
...@@ -4,45 +4,49 @@ ...@@ -4,45 +4,49 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="设备编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code"> <a-form-model-item label="区域名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="districtName">
<a-input v-model="model.code" placeholder="请输入设备编码"></a-input> <a-input v-model="model.districtName" placeholder="请输入区域名称" disabled></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name"> <a-form-model-item label="设备编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
<a-input v-model="model.name" placeholder="请输入设备名称"></a-input> <a-input v-model="model.code" placeholder="请输入设备编码"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="设备ip" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ip">
<a-input v-model="model.ip" placeholder="请输入设备ip"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ip"> <a-form-model-item label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ip">
<a-select placeholder="选择设备类型" v-model="model.type"> <a-select v-model="model.type" placeholder="请选择设备类型">
<a-select-option v-for="type in types" :key="type"> <a-select-option :value="1">
{{ type }} 出入口闸机
</a-select-option>
<a-select-option :value="2">
访客一体机
</a-select-option>
<a-select-option :value="3">
自动访客机
</a-select-option>
<a-select-option :value="4">
身份证读卡器
</a-select-option>
<a-select-option :value="5">
人脸识别
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="楼栋" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buildingName"> <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<a-select placeholder="选择楼栋" v-model="model.buildingName" @change="buildingChange"> <a-input v-model="model.name" placeholder="请输入设备名称"></a-input>
<a-select-option v-for="buildingInfo in buildingInfos" :key="buildingInfo.name">
{{ buildingInfo.name }}
</a-select-option>
</a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="楼层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="floor"> <a-form-model-item label="设备位置" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="place">
<a-select placeholder="选择楼层" v-model="model.floor"> <a-input v-model="model.place" placeholder="请输入设备位置"></a-input>
<a-select-option v-for="floor in targetFloorList" :key="floor"> </a-form-model-item>
{{ floor }} </a-col>
</a-select-option> <a-col :span="12">
</a-select> <a-form-model-item label="设备ip" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ip">
<a-input v-model="model.ip" placeholder="请输入设备ip" disabled></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
...@@ -53,11 +57,6 @@ ...@@ -53,11 +57,6 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="设备位置" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="place">
<a-input v-model="model.place" placeholder="请输入设备位置"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="出产日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dateOfProduction"> <a-form-model-item label="出产日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dateOfProduction">
<j-date placeholder="请选择生产日期" v-model="model.dateOfProduction" style="width: 100%"/> <j-date placeholder="请选择生产日期" v-model="model.dateOfProduction" style="width: 100%"/>
</a-form-model-item> </a-form-model-item>
...@@ -79,9 +78,15 @@ ...@@ -79,9 +78,15 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status"> <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
<a-select placeholder="选择状态" v-model="model.status" @change="statusChange"> <a-select v-model="model.type" placeholder="请选择状态" disabled>
<a-select-option v-for="status in statusList" :key="status.value"> <a-select-option :value="1">
{{ status.name }} 正常
</a-select-option>
<a-select-option :value="2">
离线
</a-select-option>
<a-select-option :value="3">
自动访客机
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
...@@ -243,9 +248,9 @@ export default { ...@@ -243,9 +248,9 @@ export default {
queryById: "/pm/pmAccessControlDevice/queryById" queryById: "/pm/pmAccessControlDevice/queryById"
}, },
statusList: [ statusList: [
{name: '正常', value: 'NORMAL', imgPath: require('@/assets/door-close.png')}, {name: '正常', value: 1, imgPath: require('@/assets/door-close.png')},
{name: '离线', value: 'OFFLINE', imgPath: require('@/assets/door-offline.png')}, {name: '离线', value: 2, imgPath: require('@/assets/door-offline.png')},
{name: '损坏', value: 'BREAKDOWN', imgPath: require('@/assets/door-warning.png')}], {name: '损坏', value: 3, imgPath: require('@/assets/door-warning.png')}],
doorIconStyle: { doorIconStyle: {
position: 'absolute', position: 'absolute',
top: '0px', top: '0px',
...@@ -266,10 +271,10 @@ export default { ...@@ -266,10 +271,10 @@ export default {
created() { created() {
//备份model原始值 //备份model原始值
this.modelDefault = JSON.parse(JSON.stringify(this.model)); this.modelDefault = JSON.parse(JSON.stringify(this.model));
getAction('/pm/pmBuildingInfo/list') // getAction('/pm/pmBuildingInfo/list')
.then(value => this.buildingInfos = value.result); // .then(value => this.buildingInfos = value.result);
getAction('/pm/pmAccessControlDevice/types') // getAction('/pm/pmAccessControlDevice/types')
.then(value => this.types = value.result); // .then(value => this.types = value.result);
}, },
methods: { methods: {
add() { add() {
......
jeecg-boot-parent/jeecg-boot-module-property/src/main/java/org/jeecg/pm/controller/PmAccessControlDeviceController.java
...@@ -22,7 +22,7 @@ import java.util.Arrays; ...@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
* @Description: pm_access_control_device * @Description: 门禁设备
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2022-03-15 * @Date: 2022-03-15
* @Version: V1.0 * @Version: V1.0
...@@ -33,7 +33,7 @@ import java.util.List; ...@@ -33,7 +33,7 @@ import java.util.List;
@Slf4j @Slf4j
public class PmAccessControlDeviceController extends JeecgController<PmAccessControlDevice, IPmAccessControlDeviceService> { public class PmAccessControlDeviceController extends JeecgController<PmAccessControlDevice, IPmAccessControlDeviceService> {
private static final List<String> TYPES = Arrays.asList("出入口闸机", "访客一体机", "自助访客机", "身份证读卡器", "人脸识别"); // private static final List<String> TYPES = Arrays.asList("出入口闸机", "访客一体机", "自助访客机", "身份证读卡器", "人脸识别");
@Autowired @Autowired
private IPmAccessControlDeviceService pmAccessControlDeviceService; private IPmAccessControlDeviceService pmAccessControlDeviceService;
...@@ -156,8 +156,8 @@ public class PmAccessControlDeviceController extends JeecgController<PmAccessCon ...@@ -156,8 +156,8 @@ public class PmAccessControlDeviceController extends JeecgController<PmAccessCon
return super.importExcel(request, response, PmAccessControlDevice.class); return super.importExcel(request, response, PmAccessControlDevice.class);
} }
@GetMapping("/types") // @GetMapping("/types")
public Result<List<String>> getTypes() { // public Result<List<String>> getTypes() {
return Result.OK(TYPES); // return Result.OK(TYPES);
} // }
} }
jeecg-boot-parent/jeecg-boot-module-property/src/main/java/org/jeecg/pm/controller/PmAccessControlDeviceRecordController.java
...@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletResponse;
import java.util.Arrays; import java.util.Arrays;
/** /**
* @Description: pm_access_control_device_record * @Description: 一卡通出入记录
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2022-03-15 * @Date: 2022-03-15
* @Version: V1.0 * @Version: V1.0
......
jeecg-boot-parent/jeecg-boot-module-property/src/main/java/org/jeecg/pm/entity/PmAccessControlDevice.java
...@@ -39,6 +39,12 @@ public class PmAccessControlDevice implements Serializable { ...@@ -39,6 +39,12 @@ public class PmAccessControlDevice implements Serializable {
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private Long id; private Long id;
/** /**
* 区域名称
*/
@Excel(name = "区域名称", width = 15)
@ApiModelProperty(value = "区域名称")
private String districtName;
/**
* 设备编码 * 设备编码
*/ */
@Excel(name = "设备编码", width = 15) @Excel(name = "设备编码", width = 15)
...@@ -47,9 +53,10 @@ public class PmAccessControlDevice implements Serializable { ...@@ -47,9 +53,10 @@ public class PmAccessControlDevice implements Serializable {
/** /**
* 设备类型 * 设备类型
*/ */
@Excel(name = "设备类型", width = 15) @ApiModelProperty(value = "设备类型 1:出入口闸机 2:访客一体机 3:自助访客机 4:身份证读卡器 5:人脸识别")
@ApiModelProperty(value = "设备类型") @Excel(name = "设备类型", width = 15,dicCode = "alarm_query_equipmentType")
private String type; @Dict(dicCode = "alarm_query_equipmentType")
private Integer type;
/** /**
* 设备名称 * 设备名称
*/ */
...@@ -63,18 +70,6 @@ public class PmAccessControlDevice implements Serializable { ...@@ -63,18 +70,6 @@ public class PmAccessControlDevice implements Serializable {
@ApiModelProperty(value = "设备ip") @ApiModelProperty(value = "设备ip")
private String ip; private String ip;
/** /**
* 楼栋
*/
@Excel(name = "楼栋", width = 15)
@ApiModelProperty(value = "楼栋")
private String buildingName;
/**
* 楼层
*/
@Excel(name = "楼层", width = 15)
@ApiModelProperty(value = "楼层")
private String floor;
/**
* 设备位置 * 设备位置
*/ */
@Excel(name = "设备位置", width = 15) @Excel(name = "设备位置", width = 15)
...@@ -83,20 +78,17 @@ public class PmAccessControlDevice implements Serializable { ...@@ -83,20 +78,17 @@ public class PmAccessControlDevice implements Serializable {
/** /**
* xy值 * xy值
*/ */
@Excel(name = "xy值", width = 15)
@ApiModelProperty(value = "xy值") @ApiModelProperty(value = "xy值")
@TableField(typeHandler = Coordinate.TypeHandler.class) @TableField(typeHandler = Coordinate.TypeHandler.class)
private Coordinate coordinate; private Coordinate coordinate;
/** /**
* 开门时间 * 开门时间
*/ */
@Excel(name = "开门时间", width = 15)
@ApiModelProperty(value = "开门时间") @ApiModelProperty(value = "开门时间")
private Integer doorOpenTime; private Integer doorOpenTime;
/** /**
* 生产日期 * 生产日期
*/ */
@Excel(name = "生产日期", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "生产日期") @ApiModelProperty(value = "生产日期")
...@@ -104,7 +96,6 @@ public class PmAccessControlDevice implements Serializable { ...@@ -104,7 +96,6 @@ public class PmAccessControlDevice implements Serializable {
/** /**
* 安装日期 * 安装日期
*/ */
@Excel(name = "安装日期", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "安装日期") @ApiModelProperty(value = "安装日期")
...@@ -112,7 +103,6 @@ public class PmAccessControlDevice implements Serializable { ...@@ -112,7 +103,6 @@ public class PmAccessControlDevice implements Serializable {
/** /**
* 保修截止日期 * 保修截止日期
*/ */
@Excel(name = "保修截止日期", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "保修截止日期") @ApiModelProperty(value = "保修截止日期")
...@@ -126,30 +116,23 @@ public class PmAccessControlDevice implements Serializable { ...@@ -126,30 +116,23 @@ public class PmAccessControlDevice implements Serializable {
/** /**
* 状态 * 状态
*/ */
@Excel(name = "状态", width = 15) @Excel(name = "状态", width = 15,dicCode = "access_control_status")
@ApiModelProperty(value = "状态") @Dict(dicCode = "access_control_status")
private Status status; @ApiModelProperty(value = "状态 1:正常 2:离线 3:维修")
private Integer status;
/** /**
* 创建人Id（sys_user） * 创建人Id（sys_user）
*/ */
@Excel(name = "创建人Id（sys_user）", width = 15)
@ApiModelProperty(value = "创建人Id（sys_user）") @ApiModelProperty(value = "创建人Id（sys_user）")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
private String createUserId; private String createUserId;
/** /**
* 修改人Id（sys_user） * 修改人Id（sys_user）
*/ */
@Excel(name = "修改人Id（sys_user）", width = 15)
@ApiModelProperty(value = "修改人Id（sys_user）") @ApiModelProperty(value = "修改人Id（sys_user）")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
private String modifyUserId; private String modifyUserId;
/** /**
* 删除状态
*/
@Excel(name = "删除状态", width = 15)
@ApiModelProperty(value = "删除状态")
private Boolean deleted;
/**
* 创建时间 * 创建时间
*/ */
@Excel(name = "修改时间", width = 15, format = "yyyy-MM-dd hh:mm:ss") @Excel(name = "修改时间", width = 15, format = "yyyy-MM-dd hh:mm:ss")
...@@ -160,15 +143,13 @@ public class PmAccessControlDevice implements Serializable { ...@@ -160,15 +143,13 @@ public class PmAccessControlDevice implements Serializable {
/** /**
* 修改时间 * 修改时间
*/ */
@Excel(name = "修改时间", width = 15, format = "yyyy-MM-dd hh:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
private Date modifyTime; private Date modifyTime;
/**
public enum Status { * 删除状态
NORMAL, */
OFFLINE, @ApiModelProperty(value = "删除状态")
BREAKDOWN private Boolean deleted;
}
} }
jeecg-boot-parent/jeecg-boot-module-property/src/main/java/org/jeecg/pm/entity/PmEventInfo.java
...@@ -15,7 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat; ...@@ -15,7 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @Description: pm_event_info * @Description: 事件详情
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2022-04-01 * @Date: 2022-04-01
* @Version: V1.0 * @Version: V1.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment