2021-1214

完善空间任务同步操作
去掉实体中的多余字段

src/main/java/com/persagy/bdtp/adm/entity/db/AdmClientFlag.java

@@ -14,8 +14,6 @@ public class AdmClientFlag {
 	@TableId(type = IdType.AUTO)
 	private Integer id;
 
-	private String clientFlag;
-
 	private String userId;
 
 	private Timestamp ts;

src/main/java/com/persagy/bdtp/adm/entity/db/AdmPipe.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 @Data
 @TableName(value = "adm_pipe",autoResultMap = true)
-public class AdmPipe extends BaseDeliveryEntity {
+public class AdmPipe extends BaseAdmDataEntity {
 
     private String objFrom;
 

src/main/java/com/persagy/bdtp/adm/entity/db/AdmUploadLog.java

@@ -35,10 +35,6 @@ public class AdmUploadLog {
 
 	private Timestamp ts;
 
-	private String uploadTime;
-
-	private String uploadFlag;
-
 	public AdmUploadLog() {
 
 	}
@@ -49,12 +45,6 @@ public class AdmUploadLog {
 		this.operation = operation;
 	}
 
-	public AdmUploadLog(String uploadFlag, String uploadTime, Object data) {
-		this.uploadFlag = uploadFlag;
-		this.uploadTime = uploadTime;
-		setData(data, SpringUtil.getBean(ObjectMapper.class));
-	}
-
 	public void setData(Object data, ObjectMapper objectMapper){
 		this.entityType = getLogEntityType(data);
 		try {

src/main/java/com/persagy/bdtp/adm/entity/db/BaseAdmDataEntity.java

@@ -38,9 +38,6 @@ abstract public class BaseAdmDataEntity extends BaseAdmEntity {
 	@TableField(exist = false)
 	protected Integer state;
 
-	/** 待废弃 */
-	protected String uploadFlag;
-
 }
 
 class DateToLongSerializer extends JsonSerializer<Date> {

src/main/java/com/persagy/bdtp/adm/service/impl/SyncAppImpl0.java

@@ -377,7 +377,7 @@ public class SyncAppImpl0 implements ISyncApp {
 			if(obj == null)
 				continue;
 
-			logService.saveUploadLog(new AdmUploadLog(uploadFlag, timestamp, obj));
+			logService.saveUploadLog(new AdmUploadLog());
 
 			T dbObj = dbMap.get(obj.getId());
 			if (dbObj == null) {
@@ -386,7 +386,7 @@ public class SyncAppImpl0 implements ISyncApp {
 
 				obj.setCreationTime(timestamp);
 				obj.setCreator(AdmConst.CREATOR_APP);
-				obj.setUploadFlag(uploadFlag);
+				//obj.setUploadFlag(uploadFlag);
 
 				if(d2mType != null)
 					setDeliveryDataProps((BaseDeliveryEntity) obj, null);
@@ -411,7 +411,7 @@ public class SyncAppImpl0 implements ISyncApp {
 //				} else {
 					obj.setModifiedTime(timestamp);
 					obj.setModifier(AdmConst.CREATOR_APP);
-					obj.setUploadFlag(uploadFlag);
+					//obj.setUploadFlag(uploadFlag);
 
 					if(d2mType != null)
 						setDeliveryDataProps((BaseDeliveryEntity) obj, null);

src/main/java/com/persagy/bdtp/adm/service/impl/SyncOldAdmImpl.java

@@ -155,7 +155,7 @@ public class SyncOldAdmImpl implements ISyncOldAdm {
 				obj.setValid(ValidEnum.FALSE.getType());
 				obj.setModifiedTime(timestamp);
 				obj.setModifier(AdmConst.CREATOR_SYNC);
-				obj.setUploadFlag(null);
+				//obj.setUploadFlag(null);
 				operations[1].add(obj);
 			}
 		}
@@ -200,7 +200,7 @@ public class SyncOldAdmImpl implements ISyncOldAdm {
 
 		dbItem.setModifiedTime(timestamp);
 		dbItem.setModifier(AdmConst.CREATOR_SYNC);
-		dbItem.setUploadFlag(null);
+		//dbItem.setUploadFlag(null);
 		dbItem.setD2mState(ValidEnum.TRUE.getType());
 		dbItem.setDeliveryState(ValidEnum.FALSE.getType());
 
@@ -454,7 +454,7 @@ public class SyncOldAdmImpl implements ISyncOldAdm {
 		for(AdmJobSpace job : toModify) {
 			job.setModifiedTime(time);
 			job.setModifier(AdmConst.CREATOR_SYNC);
-			job.setUploadFlag(null);
+			//job.setUploadFlag(null);
 			jobSpaceMapper.updateById(job);
 		}
 	}

src/main/java/com/persagy/bdtp/adm/service/impl/SyncSpaceImpl.java

@@ -90,6 +90,7 @@ public class SyncSpaceImpl implements ISyncSpace {
 		for(AdmJobSpace job : toModify) {
 			job.setModifiedTime(time);
 			job.setModifier(AdmConst.CREATOR_SYNC);
+			job.setTs(null); //更新时清空ts字段
 			jobSpaceMapper.updateById(job);
 		}
 
@@ -240,11 +241,20 @@ public class SyncSpaceImpl implements ISyncSpace {
 				if(ring.size() > 2) {
 					JsonNode from = ring.get(0);
 					JsonNode to = ring.get(ring.size() - 1);
-					if(!(from.get("x").asDouble() == to.get("x").asDouble() && from.get("y").asDouble() == to.get("y").asDouble())) {
-						//自动闭合
-						ObjectNode close = objectMapper.createObjectNode();
-						close.put("x", from.get("x").asDouble()).put("y", from.get("y").asDouble());
-						ring.add(close);
+					JsonNode x1,y1,x2,y2;
+					if(from != null && to != null){
+						x1 = from.get("x");
+						y1 = from.get("y");
+						x2 = to.get("x");
+						y2 = to.get("y");
+						if(x1 != null && y1 != null && x2 != null && y2 != null) {
+							if(x1.asDouble() != x2.asDouble() || y1.asDouble() != y2.asDouble()) {
+								//自动闭合
+								ObjectNode close = objectMapper.createObjectNode();
+								close.put("x", x1.asDouble()).put("y", y1.asDouble());
+								ring.add(close);
+							}
+						}
 					}
 				}
 			}

src/test/java/com/persagy/bdtp/adm/test/AdmApplicationTests.java

@@ -330,7 +330,7 @@ public class AdmApplicationTests {
 //		logMapper.insert(log);
 
 		AdmClientFlag flag = new AdmClientFlag();
-		flag.setClientFlag("flag");
+		//flag.setClientFlag("flag");
 		flag.setUserId("bdtp");
 		clientFlagMapper.insert(flag);
 		System.out.println(flag.getId());