1.上班数据上报入库代码修改

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/domain/IotDayWork.java

@@ -11,7 +11,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -64,11 +64,11 @@ public class IotDayWork implements Serializable {
 
     @ApiModelProperty(value = "数据创建时间")
     @TableField("create_time")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "数据最后一次更新时间")
     @TableField("update_time")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     @ApiModelProperty(value = "数据生成 格式化字符串天：yyyy-MM-dd")
     @TableField("work_date")

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/work/domain/IotDayWorkOperation.java

@@ -10,7 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -61,15 +61,15 @@ public class IotDayWorkOperation implements Serializable {
 
     @ApiModelProperty(value = "操作时间")
     @TableField("operation_time")
-    private LocalDateTime operationTime;
+    private Date operationTime;
 
     @ApiModelProperty(value = "数据强制结束时间")
     @TableField("force_end_time")
-    private LocalDateTime forceEndTime;
+    private Date forceEndTime;
 
     @ApiModelProperty(value = "实际结束时间")
     @TableField("real_end_time")
-    private LocalDateTime realEndTime;
+    private Date realEndTime;
 
     @ApiModelProperty(value = "数据状态：0 进行中，1已完成，2强制结束")
     @TableField("operation_status")

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/work/service/impl/IotDayWorkOperationServiceImpl.java

@@ -58,10 +58,12 @@ public class IotDayWorkOperationServiceImpl extends ServiceImpl<IotDayWorkOperat
         IotDayWorkOperation operation = findByHostDataIdAndIotCode(dayWorkOperation.getWorkId(), dayWorkOperation.getId(), serverInfo.getIotCode());
         if (operation != null) {
             BeanUtils.copyProperties(dayWorkOperation, operation);
+            operation.setForceEndTime(dayWorkOperation.getDataEndTime());
             updateById(operation);
         } else {
             operation = new IotDayWorkOperation();
             BeanUtils.copyProperties(dayWorkOperation, operation);
+            operation.setForceEndTime(dayWorkOperation.getDataEndTime());
             operation.setHostDataId(dayWorkOperation.getWorkId());
             operation.setHostDataOperationId(dayWorkOperation.getId());
             operation.setIotCode(serverInfo.getIotCode());

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/work/service/impl/IotDayWorkServiceImpl.java

@@ -61,6 +61,9 @@ public class IotDayWorkServiceImpl extends ServiceImpl<IotDayWorkMapper, IotDayW
         } else {
             dayWork = new IotDayWork();
             dayWork.setId(IdWorker.getId());
+            dayWork.setOrgId(serverInfo.getOrgId());
+            dayWork.setOrgName(serverInfo.getOrgName());
+            dayWork.setOrgPath(serverInfo.getOrgPath());
             dayWork.setHostDataId(work.getId());
             dayWork.setIotCode(serverInfo.getIotCode());
             dayWork.setOrgPath(serverInfo.getOrgPath());