Browse Source

fix:钱塘江设备管理页面,无人机机巢数据不展示

master
wangguangyuan 1 week ago
parent
commit
8b497a71ea
4 changed files with 14 additions and 1 deletions
  1. +4
    -0
      inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestRunData.java
  2. +4
    -0
      inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestStaData.java
  3. +5
    -0
      inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevAlmAbn.java
  4. +1
    -1
      inspect-metadata/src/main/java/com/inspect/metadata/montdata/service/impl/BasedataMontQueryServiceImpl.java

+ 4
- 0
inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestRunData.java View File

@ -1,5 +1,6 @@
package com.inspect.metadata.montdata.domain; package com.inspect.metadata.montdata.domain;
import com.alibaba.fastjson.annotation.JSONField;
import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.annotation.Excel;
import com.inspect.base.core.web.domain.BaseEntity; import com.inspect.base.core.web.domain.BaseEntity;
@ -40,6 +41,7 @@ public class BasedataMontNestRunData extends BaseEntity {
@Excel( @Excel(
name = "类型名称" name = "类型名称"
) )
@JSONField(name = "type_name")
private String typeName; private String typeName;
@Excel( @Excel(
name = "值" name = "值"
@ -48,10 +50,12 @@ public class BasedataMontNestRunData extends BaseEntity {
@Excel( @Excel(
name = "值对名称" name = "值对名称"
) )
@JSONField(name = "value_name")
private String valueName; private String valueName;
@Excel( @Excel(
name = "值带单位" name = "值带单位"
) )
@JSONField(name = "value_unit")
private String valueUnit; private String valueUnit;
@Excel( @Excel(
name = "单位" name = "单位"


+ 4
- 0
inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontNestStaData.java View File

@ -1,5 +1,6 @@
package com.inspect.metadata.montdata.domain; package com.inspect.metadata.montdata.domain;
import com.alibaba.fastjson.annotation.JSONField;
import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.annotation.Excel;
import com.inspect.base.core.web.domain.BaseEntity; import com.inspect.base.core.web.domain.BaseEntity;
@ -38,6 +39,7 @@ public class BasedataMontNestStaData extends BaseEntity {
@Excel( @Excel(
name = "类型名称" name = "类型名称"
) )
@JSONField(name = "type_name")
private String typeName; private String typeName;
@Excel( @Excel(
name = "值" name = "值"
@ -46,10 +48,12 @@ public class BasedataMontNestStaData extends BaseEntity {
@Excel( @Excel(
name = "值对名称" name = "值对名称"
) )
@JSONField(name = "value_name")
private String valueName; private String valueName;
@Excel( @Excel(
name = "值带单位" name = "值带单位"
) )
@JSONField(name = "value_unit")
private String valueUnit; private String valueUnit;
@Excel( @Excel(
name = "单位" name = "单位"


+ 5
- 0
inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevAlmAbn.java View File

@ -1,5 +1,6 @@
package com.inspect.metadata.montdata.domain; package com.inspect.metadata.montdata.domain;
import com.alibaba.fastjson.annotation.JSONField;
import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.annotation.Excel;
import com.inspect.base.core.web.domain.BaseEntity; import com.inspect.base.core.web.domain.BaseEntity;
@ -30,9 +31,13 @@ public class BasedataMontPatDevAlmAbn extends BaseEntity {
) )
private String time; private String time;
private String type; private String type;
@JSONField(name = "type_name")
private String typeName; private String typeName;
private String value; private String value;
@JSONField(name = "value_name")
private String valueName; private String valueName;
@JSONField(name = "value_unit")
private String valueUnit; private String valueUnit;
private String unit; private String unit;
@Excel( @Excel(


+ 1
- 1
inspect-metadata/src/main/java/com/inspect/metadata/montdata/service/impl/BasedataMontQueryServiceImpl.java View File

@ -72,7 +72,7 @@ public class BasedataMontQueryServiceImpl implements IBasedataMontQueryService {
} }
public JSONObject getMontNestRunData(String nestCode) { public JSONObject getMontNestRunData(String nestCode) {
return this.redisService.getCacheObject("mont_nest_rundata:" + nestCode);
return this.redisService.getCacheObject("mont_nest_run_data:" + nestCode);
} }
public JSONObject getMontNestStaData(String nestCode) { public JSONObject getMontNestStaData(String nestCode) {


Loading…
Cancel
Save