钉钉告警添加-未完成

ManagerController-重复提交问题

pom.xml

@@ -224,6 +224,13 @@
 			<classifier>jdk15</classifier>
 		</dependency>
 
+		<!-- 钉钉告警 -->
+		<dependency>
+			<groupId>com.aliyun</groupId>
+			<artifactId>alibaba-dingtalk-service-sdk</artifactId>
+			<version>1.0.1</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

src/main/java/com/example/demo/config/ChangingConfig.java

@@ -0,0 +1,16 @@
+package com.example.demo.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Admin
+ */
+@Configuration
+@Data
+public class ChangingConfig {
+
+    @Value("${dingding.warning.address}")
+    private String dingdingWarnAddr;
+}

src/main/java/com/example/demo/controller/ManagerController.java

@@ -602,6 +602,12 @@ public class ManagerController {
         uploadToOssUtil.uploadTo4dTjw(array.toJSONString().getBytes(), "domain/eHome/furniture/syncdata/" +
                 version + "/SyncData.json");
 
+        //todo 判断是否已经重复提交， 后续删掉这个判断，看log日志，现临时解决，
+        if (checkReaptPost(param)) {
+            log.info("模型已被提交,模型id-{}", param.getModelUploadId());
+            return Result.failure(9999, "模型已被提交,模型id-" + param.getModelUploadId());
+        }
+
         String resultData = OkHttpUtils.httpPostJson(buildUrl + "syncmodel", jsonObject.toJSONString());
         JSONObject resultJson = JSONObject.parseObject(resultData);
         if("error".equals(resultJson.getString("state"))){
@@ -670,6 +676,14 @@ public class ManagerController {
         return Result.success();
     }
 
+    private boolean checkReaptPost(RequestRenovationPartsDetailManager param) {
+        ModelUploadEntity modelUploadEntity = modelUploadService.findById(param.getModelUploadId());
+        if (modelUploadEntity.getPartsDetailId() != null) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * 获取所有企业信息
      * @return

src/main/java/com/example/demo/listener/RunBuild.java

@@ -188,11 +188,13 @@ public class RunBuild {
 
                     if(isCanDownLoad(uploadObj, objectJson, vrNum)){
 
-                        log.info("下载前先睡眠5秒-{}", vrNum);
+                        log.info("在下载前先睡眠5秒-{}", vrNum);
                         // 由于阿里云资源上传有延时问题，所以需要延时一点时间再下载
                         Thread.sleep(5000L);
 
+                        log.info("上传obj文件，vrnum-{}, 开始时间-{}", vrNum, new Date());
                         uploadObjData(vrNum, sceneNum);
+                        log.info("上传obj文件，vrnum-{}, 结束时间-{}", vrNum, new Date());
                         uploadObj = false;
                     }
 
@@ -208,7 +210,7 @@ public class RunBuild {
 
                     if(objectJson.containsKey("progress")){
                         Integer progress = objectJson.getInteger("progress");
-                        log.info("vrNum-{}, 第{}次获取上传进度，进度为{}%", vrNum, times++, progress);
+                        log.info("vrNum-{}, 第{}次获取渲染进度，进度为{}%", vrNum, times++, progress);
                         updateSceneStyleEntity.setProgress(progress);
                         updateSceneStyleEntity.setUpdateTime(new Date());
                         sceneStyleService.update(updateSceneStyleEntity);
@@ -324,10 +326,14 @@ public class RunBuild {
         String path = buildPath + "Output/" + vrNum + File.separator + "obj";
         CreateObjUtil.ossUtilCp("images/images" + vrNum + "/obj/", path);
 
+        log.info("vrNum-{},删除文件开始");
         FileUtils.deleteDirectory(path + File.separator + "results");
         FileUtils.deleteDirectory(path + File.separator + "caches");
+        log.info("vrNum-{},删除文件结束");
 
+        log.info("vrNum-{},拷贝obj文件开始");
         FileUtils.copyFile(path + "/extras/mesh.obj", path + "/extras/copy-mesh.obj", true);
+        log.info("vrNum-{},拷贝obj文件结束");
 
 //        OkHttpUtils.httpGet(maxObjUrl + "objToObj?inObj=" + path + "/extras/copy-mesh.obj" +
 //                "&outObj=" + path + "/extras/mesh.obj" + "&r=40");
@@ -398,15 +404,18 @@ public class RunBuild {
             }
         }
 
+        log.info("vrnum-{}, txt转换dam,开始时间-{}", vrNum, new Date());
         CreateObjUtil.convertTxtToDam( path + File.separator + "results" +File.separator+"modeldata.txt", path + File.separator + "results" +File.separator+ ConstantFileName.modelUUID+"_50k.dam");
-//            CreateObjUtil.convertDamToLzma(path + File.separator + "results");
-//            CreateObjUtil.convertTxtToDam( path + File.separator + "results" +File.separator+"modeldata.txt", path + File.separator + "results" + File.separator+ConstantFileName.modelUUID+"_50k.dam");
+        log.info("vrnum-{}, txt转换dam,结束时间-{}", vrNum, new Date());
+
         map.put(path + File.separator + "results" +File.separator+ConstantFileName.modelUUID+"_50k.dam.lzma", "images/images"+vrNum+"/"+ConstantFileName.modelUUID+"_50k.dam.lzma");
         map.put(path + File.separator + "results" +File.separator+ConstantFileName.modelUUID+"_50k.dam", "images/images"+vrNum+"/"+ConstantFileName.modelUUID+"_50k.dam");
 
         //下载源场景vision.modeldata上传到新风格场景
+        log.info("vrnum-{}, 下载源场景vision.modeldata上传到新风格场景,开始时间-{}", vrNum, new Date());
         FileUtils.downLoadFromUrl("https://4dkk.4dage.com/images/images" + sceneNum + "/vision.modeldata",
                 "vision.modeldata", path);
+        log.info("vrnum-{}, 下载源场景vision.modeldata上传到新风格场景,结束时间-{}", vrNum, new Date());
         map.put(path + File.separator + "vision.modeldata", "images/images"+vrNum+"/"+"vision.modeldata");
         log.info("vrNum-{},上传文件",vrNum);
         uploadToOssUtil.uploadMulFiles(map);

src/main/resources/application-dev.properties

@@ -44,4 +44,4 @@ model.build.url=http://192.168.0.30:8100
 max.obj.url=http://192.168.0.75:8080/
 
 
-
+dingding.warning.address=https://oapi.dingtalk.com/robot/send?access_token=13ae02d6821a56ce86c3e6ad98d0260896eba5888a9bd18aed141c39f11299a8