上传bim

src/main/java/com/fdkankan/site/common/ResultCode.java

@@ -14,6 +14,7 @@ public enum ResultCode {
     UPLOAD_ERROR(7001,"文件上传失败"),
     UPLOAD_FILE_NO_EXIST(7002,"上传文件不存在"),
     UPLOAD_FILE_TO_LONG(7003,"文件上传过大"),
+    UPLOAD_BIM_ERROR(7004,"上传调用bim失败"),
     UPLOAD_FILE_TYPE_ERROR(7005,"文件类型错误"),
     UPLOAD_FILE_MSG_ERROR(7006,"文件内容错误"),
     ;

src/main/java/com/fdkankan/site/config/WebAppConfig.java

@@ -17,7 +17,7 @@ public class WebAppConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(tokenInterceptor).addPathPatterns("/**")
-				.excludePathPatterns("/test/**");
+				.excludePathPatterns("/**/test/**","/**/fdLogin/**","/**/bim/**","/**/callBack/**");
 		WebMvcConfigurer.super.addInterceptors(registry);
 	}
 

src/main/java/com/fdkankan/site/controller/LoginController.java

@@ -0,0 +1,53 @@
+package com.fdkankan.site.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.site.common.BaseController;
+import com.fdkankan.site.common.ResultData;
+import com.fdkankan.site.httpClient.client.FdKKClient;
+import com.fdkankan.site.httpClient.request.FdkkLoginRequest;
+import com.fdkankan.site.httpClient.response.FdkkLoginVo;
+import com.fdkankan.site.httpClient.response.FdkkResponse;
+import com.fdkankan.redis.constant.RedisKey;
+import com.fdkankan.redis.util.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping
+public class LoginController extends BaseController {
+
+
+    @Resource
+    FdKKClient fdKKClient;
+    @Autowired
+    RedisUtil redisUtil;
+
+    @PostMapping("/fdLogin")
+    public ResultData fdLogin(@RequestBody FdkkLoginRequest request){
+        FdkkResponse<FdkkLoginVo> fdkkLoginVo = fdKKClient.fdkkLogin(request);
+        if(fdkkLoginVo.getCode() == 0){
+            return ResultData.ok(fdkkLoginVo.getData());
+        }
+        return ResultData.error(fdkkLoginVo.getCode(),fdkkLoginVo.getMsg());
+    }
+
+    @PostMapping("/fdLogout")
+    public ResultData fdLogout(){
+        String fdToken = String.format(RedisKey.TOKEN_V3,getToken());
+        redisUtil.del(fdToken);
+        return ResultData.ok();
+    }
+
+    /**
+     * 四维场景列表
+     */
+    @PostMapping("/getUserInfo")
+    public ResultData getUserInfo(){
+        return ResultData.ok(fdKKClient.getUserInfo(new JSONObject(),getToken()).getData());
+    }
+}

src/main/java/com/fdkankan/site/controller/TestController.java

@@ -0,0 +1,34 @@
+package com.fdkankan.site.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.site.common.BaseController;
+import com.fdkankan.site.common.ResultCode;
+import com.fdkankan.site.common.ResultData;
+import com.fdkankan.site.exception.BusinessException;
+import com.fdkankan.site.httpClient.bim.BimCallBackDTO;
+import com.fdkankan.site.httpClient.bim.BimFaceVO;
+import com.fdkankan.site.httpClient.client.BimClient;
+import com.fdkankan.site.httpClient.bim.BimUploadParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/test")
+public class TestController extends BaseController {
+
+
+    @PostMapping("/test")
+    public ResultData test(){
+        String url="http://" + request.getServerName() //服务器地址
+                + ":"
+                + request.getServerPort()           //端口号
+                + request.getRequestURI();
+        return ResultData.ok(url);
+    }
+    @PostMapping("/test1")
+    public ResultData test1(@RequestBody BimCallBackDTO param){
+        System.out.println("----------------------bimcallBack-------------------------------");
+        return ResultData.ok();
+    }
+}

src/main/java/com/fdkankan/site/controller/UploadController.java

@@ -1,27 +1,35 @@
 package com.fdkankan.site.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.site.common.BaseController;
 import com.fdkankan.site.common.FilePath;
 import com.fdkankan.site.common.ResultCode;
 import com.fdkankan.site.common.ResultData;
 import com.fdkankan.site.common.util.UploadToOssUtil;
+import com.fdkankan.site.common.util.VUtils;
 import com.fdkankan.site.entity.ProjectBim;
 import com.fdkankan.site.exception.BusinessException;
+import com.fdkankan.site.httpClient.bim.BimCallBackDTO;
+import com.fdkankan.site.httpClient.bim.BimFaceVO;
+import com.fdkankan.site.httpClient.bim.BimUploadParam;
+import com.fdkankan.site.httpClient.bim.BusinessStatus;
+import com.fdkankan.site.httpClient.client.BimClient;
 import com.fdkankan.site.service.IProjectBimService;
 import com.fdkankan.site.service.impl.UploadService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.File;
 
+@Slf4j
 @RestController
 @RequestMapping("/upload")
-public class UploadController {
+public class UploadController extends BaseController {
 
     @Autowired
     UploadService uploadService;
@@ -32,6 +40,8 @@ public class UploadController {
     private String queryPath;
     @Autowired
     private IProjectBimService projectBimService;
+    @Resource
+    BimClient bimClient;
 
 
     @PostMapping("/file")
@@ -43,11 +53,58 @@ public class UploadController {
     }
 
     @PostMapping("/bim")
-    public ResultData bim(@RequestParam(required = false) MultipartFile file)  {
+    public ResultData bim(@RequestParam(required = false) MultipartFile file,@RequestParam(required = false)String projectName)  {
+        VUtils.isTure(file == null || file.getSize() <=0 ).throwMessage(ResultCode.PARAM_MISS);
+        VUtils.isTure(StringUtils.isBlank(projectName)).throwMessage(ResultCode.PARAM_MISS);
         File localFile = uploadService.uploadFile(file);
         ProjectBim projectBim = new ProjectBim();
         projectBim.setBimLocalFilePath(localFile.getPath());
         projectBimService.save(projectBim);
-        return ResultData.ok(projectBim );
+
+        BimUploadParam param = new BimUploadParam();
+        String callBackUrl = "http://" + request.getServerName() //服务器地址
+                + ":"
+                + request.getServerPort()                        //端口号
+                + request.getRequestURI().replace("bim","callBack");
+        param.setTask(projectBim.getBimId().toString());
+        param.setProjectName(projectName);
+        param.setSource(request.getContextPath());
+        param.setCallBack(callBackUrl);
+        try {
+            JSONObject jsonObject = bimClient.bimUpload(localFile.getPath(), JSONObject.toJSONString(param));
+            if(jsonObject.getInteger("code") !=200){
+                throw new BusinessException(ResultCode.UPLOAD_BIM_ERROR);
+            }
+            BimFaceVO faceVO = JSONObject.parseObject(jsonObject.getString("data"),BimFaceVO.class);
+            projectBim.setBimStatus(faceVO.getCallType());
+            projectBim.setBimServiceId(faceVO.getId());
+        }catch (Exception e){
+            projectBim.setBimStatus("ERROR");
+            throw new BusinessException(ResultCode.UPLOAD_BIM_ERROR);
+        } finally {
+            projectBimService.updateById(projectBim);
+            localFile.delete();
+        }
+        return ResultData.ok(projectBim);
+    }
+
+    @PostMapping("/callBack")
+    public ResultData callBack(@RequestBody BimCallBackDTO param){
+        log.info("bim-service-callBack:{}",param);
+        String task = param.getTask();
+        ProjectBim bim = projectBimService.getById(Integer.valueOf(task));
+        bim.setBimStatus(param.getCallType());
+        if(param.getCallType().equals(BusinessStatus.DONE.getInfo())){ //完成
+            JSONObject jsonObject = bimClient.fileInfoById(bim.getBimServiceId());
+            if(jsonObject.getInteger("code") !=200){
+                bim.setBimStatus("ERROR");
+            }else {
+                BimFaceVO faceVO = JSONObject.parseObject(jsonObject.getString("data"),BimFaceVO.class);
+                bim.setBimOssFilePath(faceVO.getOssUrl());
+            }
+            bim.setUpdateTime(null);
+            projectBimService.updateById(bim);
+        }
+        return ResultData.ok();
     }
 }

src/main/java/com/fdkankan/site/entity/ProjectBim.java

@@ -40,16 +40,25 @@ public class ProjectBim implements Serializable {
     /**
      * bim文件路径
      */
-    @TableField("bim_file_path")
-    private String bimFilePath;
+    @TableField("bim_oss_file_path")
+    private String bimOssFilePath;
     /**
      * bim文件路径
      */
     @TableField("bim_local_file_path")
     private String bimLocalFilePath;
 
+    /**
+     * ERROR(-1, "ERROR") 错误, DONE(0, "DONE") 完成,UPLOAD(1, "UPLOAD") 上传, TRANSLATE(2, "TRANSLATE") 转换, OFFLINE(3, "OFFLINE") 离线包生成;
+     */
     @TableField("bim_status")
-    private Integer bimStatus;
+    private String bimStatus;
+
+    /**
+     * bim上传服务，返回id
+     */
+    @TableField("bim_service_id")
+    private Integer bimServiceId;
 
     @TableField("tb_status")
     @TableLogic

src/main/java/com/fdkankan/site/exception/GlobalExceptionHandler.java

@@ -20,7 +20,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(value = Exception.class)
     public ResultData exceptionHandler(Exception e) throws Exception {
         log.error("服务错误:", e);
-        return ResultData.error( 500, e.getMessage());
+        return ResultData.error( 500, "系统错误");
     }
 
     /**

src/main/java/com/fdkankan/site/httpClient/address/BimAddressSource.java

@@ -0,0 +1,22 @@
+package com.fdkankan.site.httpClient.address;
+
+import com.dtflys.forest.callback.AddressSource;
+import com.dtflys.forest.http.ForestAddress;
+import com.dtflys.forest.http.ForestRequest;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BimAddressSource implements AddressSource {
+
+    @Value("${4dkk.bimService.basePath}")
+    private String basePath;
+
+    @Value("${4dkk.bimService.port}")
+    private String port;
+
+    @Override
+    public ForestAddress getAddress(ForestRequest forestRequest) {
+        return new ForestAddress("","",Integer.valueOf(port),basePath);
+    }
+}

src/main/java/com/fdkankan/site/httpClient/bim/BimCallBackDTO.java

@@ -0,0 +1,31 @@
+package com.fdkankan.site.httpClient.bim;
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @author Xiewj
+ * @date 2022/10/9
+ */
+@Data
+@ToString
+public class BimCallBackDTO {
+
+   /***
+    * bim服务主键
+    */
+   private Integer itemId;
+   /***
+    * 文件id
+    */
+   private String fileId;
+   /***
+    * 业务字段id
+    */
+   private String task;
+   /***
+    * 业务类型
+    */
+   private String callType;
+
+}

src/main/java/com/fdkankan/site/httpClient/bim/BimFaceVO.java

@@ -0,0 +1,50 @@
+package com.fdkankan.site.httpClient.bim;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author Xiewj
+ * @date 2022/10/11
+ */
+@Data
+public class BimFaceVO {
+
+   private Integer id;
+
+   private String task;
+
+   private String fileUrl;
+
+   private String projectId;
+
+   private String projectName;
+
+   private String fileId;
+
+   private String fileName;
+
+   private String uploadStatus;
+
+   private String translateStatus;
+
+   private String offlineStatus;
+
+   /***
+    *     ERROR(-1, "ERROR"), DONE(0, "DONE"),UPLOAD(1, "UPLOAD"), TRANSLATE(2, "TRANSLATE"), OFFLINE(3, "OFFLINE");
+    */
+   private String callType;
+
+   private String ossUrl;
+
+   private String  source;
+
+   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")//set
+   private Date createTime;
+}

src/main/java/com/fdkankan/site/httpClient/bim/BimUploadParam.java

@@ -0,0 +1,11 @@
+package com.fdkankan.site.httpClient.bim;
+
+import lombok.Data;
+
+@Data
+public class BimUploadParam {
+    private String task;
+    private String projectName;
+    private String source;
+    private String callBack;
+}

src/main/java/com/fdkankan/site/httpClient/bim/BusinessStatus.java

@@ -0,0 +1,31 @@
+package com.fdkankan.site.httpClient.bim;
+
+/**
+ * 操作状态
+ *
+ * @author fdkk
+ *
+ */
+public enum BusinessStatus
+{
+    ERROR(-1, "ERROR"), DONE(0, "DONE"),UPLOAD(1, "UPLOAD"), TRANSLATE(2, "TRANSLATE"), OFFLINE(3, "OFFLINE");
+
+    private final Integer code;
+    private final String info;
+
+    BusinessStatus(Integer code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public Integer getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

src/main/java/com/fdkankan/site/httpClient/client/BimClient.java

@@ -0,0 +1,29 @@
+package com.fdkankan.site.httpClient.client;
+
+import com.alibaba.fastjson.JSONObject;
+import com.dtflys.forest.annotation.*;
+import com.fdkankan.site.httpClient.address.BimAddressSource;
+
+/**
+ * 获取，调用bim服务
+ */
+@Address(source = BimAddressSource.class)
+public interface BimClient {
+
+    /**
+     * 调用bim服务上传文件
+     */
+    @Post("/bim/file/upload")
+    JSONObject bimUpload(@DataFile("file") String filePath, @Body("dto") String dto);
+
+    /**
+     * 调用bim服务上传文件
+     */
+    @Get("/bim/file/fileInfo/f/{fileId}")
+    JSONObject fileInfoByFileId(@Var("fileId") String fileId);
+    /**
+     * 调用bim服务上传文件
+     */
+    @Get("/bim/file/fileInfo/i/{id}")
+    JSONObject fileInfoById(@Var("id") Integer id );
+}

src/main/java/com/fdkankan/site/request/ProjectListParam.java

@@ -6,5 +6,9 @@ import lombok.Data;
 
 @Data
 public class ProjectListParam extends RequestBase {
-
+    private String projectName;             //项目名称
+    private String projectCreater;          //项目创建人
+    private String startTime;               //开始时间
+    private String endTime;                 //结束时间
+    private Integer projectStatus;          //项目状态，0 进行中，1完成
 }

src/main/java/com/fdkankan/site/response/ProjectVo.java

@@ -0,0 +1,9 @@
+package com.fdkankan.site.response;
+
+import com.fdkankan.site.entity.Project;
+import lombok.Data;
+
+@Data
+public class ProjectVo extends Project {
+    private String projectCreater;          //项目创建人
+}

src/main/java/com/fdkankan/site/service/IProjectTeamService.java

@@ -4,7 +4,9 @@ import com.fdkankan.site.entity.ProjectTeam;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.site.request.ProjectTeamListParam;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -30,9 +32,13 @@ public interface IProjectTeamService extends IService<ProjectTeam> {
 
     ProjectTeam getProjectCreater(Integer projectId);
 
+    HashMap<Integer, String> getProjectCreaterMap(Set<Integer> projectIds);
+
     Boolean checkUserName(String userName);
 
     void deleteUser(ProjectTeam param, String token);
 
     void updateRemark(ProjectTeam param);
+
+    Set<Integer> getProjectIdByCreater(String projectCreater);
 }

src/main/java/com/fdkankan/site/service/impl/ProjectServiceImpl.java

@@ -19,6 +19,7 @@ import com.fdkankan.site.request.ProjectAddSceneParam;
 import com.fdkankan.site.request.ProjectListParam;
 import com.fdkankan.site.request.SceneNumParam;
 import com.fdkankan.site.response.ProjectInfoVo;
+import com.fdkankan.site.response.ProjectVo;
 import com.fdkankan.site.response.SceneVo;
 import com.fdkankan.site.response.UserData;
 import com.fdkankan.site.service.*;
@@ -77,11 +78,41 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
     @Override
     public Object pageList(ProjectListParam param, String token) {
         LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(param.getProjectName())){
+            wrapper.like(Project::getProjectName,param.getProjectName());
+        }
+        if(StringUtils.isNotBlank(param.getStartTime())){
+            wrapper.ge(Project::getCreateTime,param.getStartTime());
+        }
+        if(StringUtils.isNotBlank(param.getEndTime())){
+            wrapper.le(Project::getCreateTime,param.getEndTime());
+        }
+        if(param.getProjectStatus() !=null){
+            wrapper.eq(Project::getProjectStatus,param.getProjectStatus());
+        }
+        if(StringUtils.isNotBlank(param.getProjectCreater())){
+            Set<Integer> projectIds = projectTeamService.getProjectIdByCreater(param.getProjectCreater());
+            if(projectIds.size() >0){
+                wrapper.in(Project::getProjectId,projectIds);
+            }
+        }
+
         wrapper.orderByDesc(Project::getCreateTime);
 
         Page<Project> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
-
-        return PageInfo.PageInfo(page);
+        Set<Integer> projectIds = page.getRecords().stream().map(Project::getProjectId).collect(Collectors.toSet());
+        HashMap<Integer,String> createrMap = projectTeamService.getProjectCreaterMap(projectIds);
+        List<ProjectVo> voList = new ArrayList<>();
+        for (Project record : page.getRecords()) {
+            ProjectVo projectVo = new ProjectVo();
+            BeanUtils.copyProperties(record,projectVo);
+            projectVo.setProjectCreater(createrMap.get(record.getProjectId()));
+            voList.add(projectVo);
+        }
+        Page<ProjectVo> voPage = new Page<>(param.getPageNum(), param.getPageSize());
+        voPage.setTotal(page.getTotal());
+        voPage.setRecords(voList);
+        return PageInfo.PageInfo(voPage);
     }
 
     @Override
@@ -119,9 +150,6 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
         Project project = new Project();
         BeanUtils.copyProperties(param,project);
         this.save(project);
-        if(param.getBimId() != null){
-            //todo 调用生成bim
-        }
         projectTeamService.addProject(project.getProjectId(),token);
         return project;
     }

src/main/java/com/fdkankan/site/service/impl/ProjectTeamServiceImpl.java

@@ -22,7 +22,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -94,6 +97,19 @@ public class ProjectTeamServiceImpl extends ServiceImpl<IProjectTeamMapper, Proj
     }
 
     @Override
+    public HashMap<Integer, String> getProjectCreaterMap(Set<Integer> projectIds) {
+        HashMap<Integer, String> map = new HashMap<>();
+        if(projectIds.size() >0){
+            LambdaQueryWrapper<ProjectTeam> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(ProjectTeam::getProjectId,projectIds);
+            wrapper.eq(ProjectTeam::getIsCreater,1);
+            List<ProjectTeam> list = this.list(wrapper);
+            list.forEach(entity -> map.put(entity.getProjectId(),entity.getUserName()));
+        }
+        return map;
+    }
+
+    @Override
     public Boolean checkUserName(String userName) {
         FdkkResponse fdkkResponse = fdKKClient.checkUser(new FdkkLoginRequest(userName, ""));
         if(fdkkResponse.getCode() != 0){
@@ -124,4 +140,12 @@ public class ProjectTeamServiceImpl extends ServiceImpl<IProjectTeamMapper, Proj
         this.update(wrapper);
 
     }
+
+    @Override
+    public Set<Integer> getProjectIdByCreater(String projectCreater) {
+        LambdaQueryWrapper<ProjectTeam> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(ProjectTeam::getUserName,projectCreater);
+        wrapper.eq(ProjectTeam::getIsCreater,1);
+        return this.list(wrapper).stream().map(ProjectTeam::getProjectId).collect(Collectors.toSet());
+    }
 }

src/main/java/com/fdkankan/site/service/impl/UploadService.java

@@ -44,10 +44,6 @@ public class UploadService {
 
             localFile = File.createTempFile(fileName + suffixName,suffixName);
 
-            localFile = new File(FilePath.OSS_FILE_PATH  +"/"+fileName + suffixName );
-            if(!localFile.getParentFile().exists()){
-                localFile.mkdirs();
-            }
             file.transferTo(localFile);
             return localFile;
         }catch (Exception e){

src/main/resources/application-local.yaml

@@ -39,3 +39,7 @@ spring:
     #深时（激光）地址 生产环境：https://laser.4dkankan.com/
     basePath: http://uat-laser.4dkankan.com
     port: 80
+  bimService:
+    #bim 服务
+    basePath: http://192.168.0.152
+    port: 8787