|
@@ -27,7 +27,9 @@ import javax.validation.Valid;
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
|
+import org.apache.http.message.BasicNameValuePair;
|
|
import org.springblade.archive.service.IArchiveAutoPdfService;
|
|
import org.springblade.archive.service.IArchiveAutoPdfService;
|
|
|
|
+import org.springblade.archive.utils.CallBgrsjk;
|
|
import org.springblade.business.entity.ArchiveFile;
|
|
import org.springblade.business.entity.ArchiveFile;
|
|
import org.springblade.common.utils.CommonUtil;
|
|
import org.springblade.common.utils.CommonUtil;
|
|
import org.springblade.core.mp.support.Condition;
|
|
import org.springblade.core.mp.support.Condition;
|
|
@@ -50,6 +52,7 @@ import org.springblade.archive.wrapper.ArchivesAutoWrapper;
|
|
import org.springblade.archive.service.IArchivesAutoService;
|
|
import org.springblade.archive.service.IArchivesAutoService;
|
|
import org.springblade.core.boot.ctrl.BladeController;
|
|
import org.springblade.core.boot.ctrl.BladeController;
|
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -529,5 +532,44 @@ public class ArchivesAutoController extends BladeController {
|
|
|
|
|
|
return R.fail("未找到对应的Id");
|
|
return R.fail("未找到对应的Id");
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 获取档案销毁人列表
|
|
|
|
+ */
|
|
|
|
+ @GetMapping("/getModelview")
|
|
|
|
+ @ApiOperationSupport(order = 8)
|
|
|
|
+ @ApiOperation(value = "获取BIM模型", notes = "获取BIM模型")
|
|
|
|
+ public R getModelview(@RequestParam String compareId,@RequestParam String fileId,@RequestParam String integrateId){
|
|
|
|
+ List<BasicNameValuePair> list = new ArrayList<BasicNameValuePair>();
|
|
|
|
+
|
|
|
|
+ if(StringUtils.isNotEmpty(compareId)){
|
|
|
|
+ list.add(new BasicNameValuePair("compareId", compareId));
|
|
|
|
+ }
|
|
|
|
+ if(StringUtils.isNotEmpty(fileId)){
|
|
|
|
+ list.add(new BasicNameValuePair("fileId", fileId));
|
|
|
|
+ }
|
|
|
|
+ if(StringUtils.isNotEmpty(compareId)){
|
|
|
|
+ list.add(new BasicNameValuePair("integrateId", integrateId));
|
|
|
|
+ }
|
|
|
|
+ if(!(list.size()>0)){
|
|
|
|
+ return R.data(null);
|
|
|
|
+ }
|
|
|
|
+ String value= "Basic T0VKb0FDeGdiU1RSb0pKZ2htZ0VYdVJlYzYwVVJrQXM6RHREUGZldU5qUE43VVY0Q01sdmhyRFYydXRZVzJFdlA=";
|
|
|
|
+ String value2= CallBgrsjk.callpostdata(value);
|
|
|
|
+ if(StringUtils.isEmpty(value2)){
|
|
|
|
+ return R.data(null);
|
|
|
|
+ }
|
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(value2);
|
|
|
|
+ Map<String,Object> map = (Map<String,Object>)jsonObject;
|
|
|
|
+ if(map.get("data") == null) {
|
|
|
|
+ return R.data(null);
|
|
|
|
+ }
|
|
|
|
+ JSONObject jsonObject1 = JSONObject.parseObject(map.get("data").toString());
|
|
|
|
+ Map<String,Object> map1 = (Map<String,Object>)jsonObject1;
|
|
|
|
+ if(map1.get("token") != null) {
|
|
|
|
+ String value3 = CallBgrsjk.callgetdata("Bearer " + map1.get("token"),list);
|
|
|
|
+ JSONObject jsonObject3 = JSONObject.parseObject(value3);
|
|
|
|
+ return R.data(jsonObject3);
|
|
|
|
+ }
|
|
|
|
+ return R.data(null);
|
|
|
|
+ }
|
|
}
|
|
}
|