Browse Source

数据接入 debug 按钮失效bug修复

thing_master
xiachao 1 year ago
parent
commit
376ffe80bd
  1. 7
      modules/carbon-public/src/main/java/com/thing/carbon/pub/dto/CarbonPubProductionReportDTO.java
  2. 5
      modules/carbon-public/src/main/java/com/thing/carbon/pub/dto/CockpitProductionCarbon.java
  3. 5
      modules/carbon-track/src/main/java/com/thing/carbontrack/outbound/dto/IotCarbonOutboundConfigDTO.java
  4. 7
      modules/carbon-track/src/main/java/com/thing/carbontrack/productionRecord/dto/IotCarbonProductionRecordDTO.java
  5. 7
      modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/IotCarbonProductionResultDTO.java
  6. 7
      modules/carbon-track/src/main/java/com/thing/carbontrack/report/dto/IotCarbonProductionReportDTO.java
  7. 2
      modules/thing/src/main/java/com/thing/extend/dto/TransportExtendCalculationDTO.java

7
modules/carbon-public/src/main/java/com/thing/carbon/pub/dto/CarbonPubProductionReportDTO.java

@ -1,5 +1,8 @@
package com.thing.carbon.pub.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.thing.common.core.utils.DateTimeUtils;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -37,8 +40,12 @@ public class CarbonPubProductionReportDTO implements Serializable {
@Schema(description = "数据边界类型:1-自然月;2-自然年;3-自定义")
private Integer boundaryType;
@Schema(description = "数据边界开始时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date boundaryStart;
@Schema(description = "数据边界结束时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date boundaryEnd;
@Schema(description = "碳足迹值")
private BigDecimal totalCarbon;

5
modules/carbon-public/src/main/java/com/thing/carbon/pub/dto/CockpitProductionCarbon.java

@ -1,5 +1,8 @@
package com.thing.carbon.pub.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.thing.common.core.utils.DateTimeUtils;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -28,5 +31,7 @@ public class CockpitProductionCarbon {
private BigDecimal carbon;
@Schema(description = "工单日期")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date prDate;
}

5
modules/carbon-track/src/main/java/com/thing/carbontrack/outbound/dto/IotCarbonOutboundConfigDTO.java

@ -1,6 +1,9 @@
package com.thing.carbontrack.outbound.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.thing.carbontrack.useConfig.dto.IotCarbonUseConfigDTO;
import com.thing.common.core.utils.DateTimeUtils;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -38,6 +41,8 @@ public class IotCarbonOutboundConfigDTO implements Serializable {
@Schema(description = "出库数量")
private Long num;
@Schema(description = "出库时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date outboundTime;
private List<IotCarbonUseConfigDTO> configDTOList;

7
modules/carbon-track/src/main/java/com/thing/carbontrack/productionRecord/dto/IotCarbonProductionRecordDTO.java

@ -1,5 +1,8 @@
package com.thing.carbontrack.productionRecord.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.thing.common.core.utils.DateTimeUtils;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -29,8 +32,12 @@ public class IotCarbonProductionRecordDTO implements Serializable {
@Schema(description = "生产车间")
private String workName;
@Schema(description = "生产开始时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date startTime;
@Schema(description = "生产结束时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date endTime;
@Schema(description = "生产数量")
private Long pNum;

7
modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/IotCarbonProductionResultDTO.java

@ -1,5 +1,8 @@
package com.thing.carbontrack.productionResult.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.thing.common.core.utils.DateTimeUtils;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -54,8 +57,12 @@ public class IotCarbonProductionResultDTO implements Serializable {
@Schema(description = "产品核算边界 1.摇篮到大门,2摇篮到坟墓")
private String boundary;
@Schema(description = "工单开始时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date startTime;
@Schema(description = "工单完工时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date finishTime;
@Schema(description = "生产耗时")
private Integer prDur;

7
modules/carbon-track/src/main/java/com/thing/carbontrack/report/dto/IotCarbonProductionReportDTO.java

@ -1,5 +1,8 @@
package com.thing.carbontrack.report.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.thing.common.core.utils.DateTimeUtils;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -36,8 +39,12 @@ public class IotCarbonProductionReportDTO implements Serializable {
@Schema(description = "数据边界类型:1-自然月;2-自然年;3-自定义")
private Integer boundaryType;
@Schema(description = "数据边界开始时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date boundaryStart;
@Schema(description = "数据边界结束时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date boundaryEnd;
@Schema(description = "报告有效期")
private Long validEndTime;

2
modules/thing/src/main/java/com/thing/extend/dto/TransportExtendCalculationDTO.java

@ -56,6 +56,8 @@ public class TransportExtendCalculationDTO implements Serializable {
@Schema(description = "是否在线")
private Boolean online;
@Schema(description = "更新时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = DateTimeUtils.DATE_TIME_PATTERN_STR)
private Date lastDate;
@Schema(description = "创建者")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)

Loading…
Cancel
Save