* 协议变更

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/cons/ConsUnitInfoController.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.annotation.Anonymous;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.huashe.common.domain.AjaxResult;
@@ -28,6 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringMatchUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 施工单元Controller
@@ -114,6 +117,14 @@ public class ConsUnitInfoController extends BaseController {
         return success();
     }
 
+    @Log(title = "施工单元分配施工机械", businessType = BusinessType.UPDATE)
+    @PostMapping("/upload")
+    @Anonymous
+    public AjaxResult upload(@RequestParam MultipartFile file) {
+        consUnitInfoService.upload(file);
+        return success();
+    }
+
     /**
      * 修改施工单元
      */

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IConsUnitInfoService.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.huashe.park.domain.dto.cons.ConsUnitMachine;
 import com.huashe.park.domain.entity.ConsUnitInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 施工单元Service接口
@@ -74,6 +75,8 @@ public interface IConsUnitInfoService {
 
     void exportConsUnitRes(ConsUnitInfo consUnitHole, HttpServletResponse response);
 
+    void upload(MultipartFile file);
+
     List<ConsUnitInfo> machineAssignedUnit(Long machineId);
 
 }

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ConsUnitInfoServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.huashe.common.exception.ServiceException;
@@ -52,6 +53,7 @@ import com.huashe.park.domain.entity.PileMachineInfo;
 import com.huashe.park.domain.entity.ProjectInfo;
 import com.huashe.park.infrastructure.cfg.forest.CADForestCfg;
 import com.huashe.park.infrastructure.excel.ExcelHandle;
+import com.huashe.park.infrastructure.mqtt.CADService;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.utils.file.FileUtils;
 
@@ -93,6 +95,9 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
     @Autowired
     private ExcelHandle excelHandle;
 
+    @Autowired
+    private CADService cadService;
+
     private final static String PROFILE = "/profile";
 
     @Autowired
@@ -295,6 +300,15 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
         writeFileToResponse(csvFile, response);
     }
 
+    @Override
+    public void upload(MultipartFile file) {
+        HttpRequest form = HttpRequest.post(cadForestCfg.getCadServer() + "/upload").form("dwg_file", file);
+        log.info(">>>>>>>>>>>>{}", form.toString());
+        String json = form.execute().body();
+        log.info(">>>>>>>>>>>>{}", json);
+        cadService.newTopic(file);
+    }
+
     private void writeFileToResponse(File file, HttpServletResponse response) {
         // 读取文件内容并写入响应输出流
         try (FileInputStream fis = new FileInputStream(file); OutputStream os = response.getOutputStream()) {

bd-park/park-backend/park-infrastructure/src/main/java/com/huashe/park/infrastructure/cfg/mybatis/MybatisInterceptor.java

@@ -20,6 +20,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
+import com.huashe.common.exception.ServiceException;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -164,8 +165,8 @@ public class MybatisInterceptor implements Interceptor {
             // try catch避免线程任务出错
             userNow = SecurityUtils.getLoginUser() != null ? SecurityUtils.getLoginUser() : null;
         }
-        catch (Exception e) {
-            log.debug("------MybatisInterceptor getLoginUser------,error:", e);
+        catch (ServiceException e) {
+            log.debug("------MybatisInterceptor getLoginUser------");
         }
         return userNow;
     }

bd-park/park-backend/park-infrastructure/src/main/java/com/huashe/park/infrastructure/mqtt/CADService.java

@@ -0,0 +1,16 @@
+package com.huashe.park.infrastructure.mqtt;
+
+import java.util.Map;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import com.dtflys.forest.annotation.BaseRequest;
+import com.dtflys.forest.annotation.DataFile;
+import com.dtflys.forest.annotation.Post;
+import com.dtflys.forest.http.ForestResponse;
+
+@BaseRequest(baseURL = "http://127.0.0.1:18080")
+public interface CADService {
+    @Post(url = "/upload",headers = {"Accept: */*"})
+    ForestResponse<Map> newTopic(@DataFile(value = "dwg_file") MultipartFile file);
+}