Forráskód Böngészése

Merge remote-tracking branch 'origin/develop' into develop

liyang 3 éve
szülő
commit
8bef594a37

+ 1 - 4
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/controller/AppController.java

@@ -149,10 +149,7 @@ public class AppController {
 	@RequestMapping("/upload")
 	public AdmResult<UploadRtn> upload(HttpServletRequest request){
 		AdmRequest admRequest = dataTxHandler.handleRequest(request);
-		if(ServiceUtil.SYNC_APP_IMPL.equals("syncAppImpl")) //临时兼容
-			return AdmResult.success(syncApp.uploadData(admRequest.getUploadData(), admRequest.getGroupCode(), admRequest.getProjectId(), admRequest.getUserId(), admRequest.getClientId()));
-		else
-			return AdmResult.success(syncApp.uploadData(admRequest.getUploadData(), admRequest.getGroupCode(), admRequest.getProjectId(), admRequest.getUserId(), admRequest.getUploadFlag()));
+		return AdmResult.success(syncApp.uploadData(admRequest.getUploadData(), admRequest.getGroupCode(), admRequest.getProjectId(), admRequest.getUserId(), admRequest.getClientId()));
 	}
 
 	@PostMapping("/uploadFile")

+ 4 - 5
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/UploadData.java

@@ -24,14 +24,13 @@ public class UploadData {
 
 	private List<AdmJobSpace> jobSpace;
 
-	private List<AdmProblemArch> problemArch;
-
-	private List<AdmProblemEquip> problemEquip;
-
 	private List<AdmFile> file;
 
 	private List<AdmQrCode> qrCode;
 
+	// 核查问题数据
+	private List<AdmProblem> problems;
+
 
 	/** 待废弃 */
 	private List<AdmServeArea> serveArea;
@@ -44,7 +43,7 @@ public class UploadData {
 		return CollUtil.isNotEmpty(objects) || CollUtil.isNotEmpty(relations)
 				|| CollUtil.isNotEmpty(pipes)
 				|| CollUtil.isNotEmpty(jobSpace)
-				|| CollUtil.isNotEmpty(problemArch) || CollUtil.isNotEmpty(problemEquip)
+				|| CollUtil.isNotEmpty(problems)
 				|| CollUtil.isNotEmpty(file) || CollUtil.isNotEmpty(qrCode)
 				|| CollUtil.isNotEmpty(serveArea);
 	}

+ 7 - 3
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/entity/db/AdmProblem.java

@@ -1,10 +1,13 @@
 package com.persagy.bdtp.adm.entity.db;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.Data;
 @Data
 @TableName(value = "adm_problem", autoResultMap = true)
-public class AdmProblem {
+public class AdmProblem extends BaseAdmDataEntity{
     private String id;
 
     private String projectId;
@@ -29,8 +32,9 @@ public class AdmProblem {
 
     private String typeName;
 
-    private Byte state;
+    private Byte status;
 
-    private String info;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private ObjectNode info;
 
 }

+ 5 - 6
adm-business/adm-server/src/main/java/com/persagy/bdtp/adm/service/impl/SyncAppImpl.java

@@ -553,12 +553,6 @@ public class SyncAppImpl implements ISyncApp {
 		if (CollUtil.isNotEmpty(uploadData.getJobSpace())) {
 			uploadAdmEntities(uploadData.getJobSpace(), uploadParams, jobSpaceMapper, null, logs, false);
 		}
-		if (CollUtil.isNotEmpty(uploadData.getProblemArch())) {
-			uploadAdmEntities(uploadData.getProblemArch(), uploadParams, problemArchMapper, null, logs, false);
-		}
-		if (CollUtil.isNotEmpty(uploadData.getProblemEquip())) {
-			uploadAdmEntities(uploadData.getProblemEquip(), uploadParams, problemEquipMapper, null, logs, false);
-		}
 		if (CollUtil.isNotEmpty(uploadData.getFile())) {
 			uploadAdmEntities(uploadData.getFile(), uploadParams, fileMapper, null, logs, false);
 		}
@@ -568,6 +562,11 @@ public class SyncAppImpl implements ISyncApp {
 		if (CollUtil.isNotEmpty(uploadData.getServeArea())) {
 			uploadAdmEntities(uploadData.getServeArea(), uploadParams, serveAreaMapper, null, logs, false);
 		}
+
+		// 核查问题
+		if (CollUtil.isNotEmpty(uploadData.getProblems())){
+			uploadAdmEntities(uploadData.getProblems(),uploadParams,problemMapper,null,logs,false);
+		}
 	}
 
 	private <T extends BaseAdmDataEntity> void uploadAdmEntities(List<T> list, UploadParams ps, BaseMapper<T> mapper, D2mMessage d2mMessage, List<AdmUploadLog> logs, boolean merge) {