|
@@ -1,6 +1,7 @@
|
|
package com.persagy.adm.server.custom.controller;
|
|
package com.persagy.adm.server.custom.controller;
|
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
+import com.persagy.adm.server.auth.service.AdmAuthService;
|
|
import com.persagy.adm.server.custom.common.AdmRequest;
|
|
import com.persagy.adm.server.custom.common.AdmRequest;
|
|
import com.persagy.adm.server.custom.datatx.DataTxHandler;
|
|
import com.persagy.adm.server.custom.datatx.DataTxHandler;
|
|
import com.persagy.adm.server.custom.dto.HasUpdateReq;
|
|
import com.persagy.adm.server.custom.dto.HasUpdateReq;
|
|
@@ -10,10 +11,12 @@ import com.persagy.adm.server.custom.entity.DownLoadData;
|
|
import com.persagy.adm.server.custom.entity.UploadRtn;
|
|
import com.persagy.adm.server.custom.entity.UploadRtn;
|
|
import com.persagy.adm.server.custom.service.ISyncApp;
|
|
import com.persagy.adm.server.custom.service.ISyncApp;
|
|
import com.persagy.adm.server.custom.service.ServiceUtil;
|
|
import com.persagy.adm.server.custom.service.ServiceUtil;
|
|
|
|
+import com.persagy.dmp.auth.domain.BossAuthUser;
|
|
import com.persagy.dmp.common.constant.ResponseCode;
|
|
import com.persagy.dmp.common.constant.ResponseCode;
|
|
import com.persagy.dmp.common.exception.BusinessException;
|
|
import com.persagy.dmp.common.exception.BusinessException;
|
|
import com.persagy.dmp.common.model.response.CommonResult;
|
|
import com.persagy.dmp.common.model.response.CommonResult;
|
|
import com.persagy.dmp.common.utils.ResultHelper;
|
|
import com.persagy.dmp.common.utils.ResultHelper;
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
@@ -30,6 +33,7 @@ import java.util.Map;
|
|
*/
|
|
*/
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping("/adm")
|
|
@RequestMapping("/adm")
|
|
|
|
+@Slf4j
|
|
public class AppController {
|
|
public class AppController {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -39,6 +43,9 @@ public class AppController {
|
|
@Autowired
|
|
@Autowired
|
|
private DataTxHandler dataTxHandler;
|
|
private DataTxHandler dataTxHandler;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private AdmAuthService admAuthService;
|
|
|
|
+
|
|
@RequestMapping("/clientId")
|
|
@RequestMapping("/clientId")
|
|
public CommonResult<Map<String, Object>> clientId(@RequestBody AdmRequest req){
|
|
public CommonResult<Map<String, Object>> clientId(@RequestBody AdmRequest req){
|
|
HashMap<String, Object> rtn = new HashMap<>();
|
|
HashMap<String, Object> rtn = new HashMap<>();
|
|
@@ -48,21 +55,25 @@ public class AppController {
|
|
|
|
|
|
@RequestMapping("/dict")
|
|
@RequestMapping("/dict")
|
|
public CommonResult<Dict> dict(@RequestBody AdmRequest req){
|
|
public CommonResult<Dict> dict(@RequestBody AdmRequest req){
|
|
|
|
+ req.setUserId(admAuthService.loginInfo().getId());
|
|
return ResultHelper.single(syncApp.downloadDict(req.getGroupCode(), req.getProjectId(), req.getUserId()));
|
|
return ResultHelper.single(syncApp.downloadDict(req.getGroupCode(), req.getProjectId(), req.getUserId()));
|
|
}
|
|
}
|
|
|
|
|
|
@RequestMapping("/config")
|
|
@RequestMapping("/config")
|
|
public CommonResult<ConfigData> config(@RequestBody AdmRequest req){
|
|
public CommonResult<ConfigData> config(@RequestBody AdmRequest req){
|
|
|
|
+ req.setUserId(admAuthService.loginInfo().getId());
|
|
return ResultHelper.single(syncApp.downloadConfig(req.getGroupCode(), req.getProjectId(), req.getUserId()));
|
|
return ResultHelper.single(syncApp.downloadConfig(req.getGroupCode(), req.getProjectId(), req.getUserId()));
|
|
}
|
|
}
|
|
|
|
|
|
@RequestMapping("/frame")
|
|
@RequestMapping("/frame")
|
|
public CommonResult<Map<String, Object>> frame(@RequestBody AdmRequest req){
|
|
public CommonResult<Map<String, Object>> frame(@RequestBody AdmRequest req){
|
|
|
|
+ req.setUserId(admAuthService.loginInfo().getId());
|
|
return ResultHelper.single(syncApp.downloadFrameData(req.getGroupCode(), req.getProjectId(), req.getUserId()));
|
|
return ResultHelper.single(syncApp.downloadFrameData(req.getGroupCode(), req.getProjectId(), req.getUserId()));
|
|
}
|
|
}
|
|
|
|
|
|
@RequestMapping("/download")
|
|
@RequestMapping("/download")
|
|
public CommonResult<DownLoadData> download(@RequestBody AdmRequest req){
|
|
public CommonResult<DownLoadData> download(@RequestBody AdmRequest req){
|
|
|
|
+ req.setUserId(admAuthService.loginInfo().getId());
|
|
DownLoadData data;
|
|
DownLoadData data;
|
|
if(StrUtil.isNotBlank(req.getBuildingId())) {
|
|
if(StrUtil.isNotBlank(req.getBuildingId())) {
|
|
data = syncApp.downloadBuildingData(req.getGroupCode(), req.getProjectId(), req.getUserId(), req.getClientId(), req.getBuildingId(), req.getBdtpDownloadTs(), req.getAdmDownloadTs());
|
|
data = syncApp.downloadBuildingData(req.getGroupCode(), req.getProjectId(), req.getUserId(), req.getClientId(), req.getBuildingId(), req.getBdtpDownloadTs(), req.getAdmDownloadTs());
|
|
@@ -77,12 +88,20 @@ public class AppController {
|
|
*/
|
|
*/
|
|
@RequestMapping("/downloadObjRel")
|
|
@RequestMapping("/downloadObjRel")
|
|
public CommonResult<DownLoadData> downloadObjRel(@RequestBody AdmRequest req){
|
|
public CommonResult<DownLoadData> downloadObjRel(@RequestBody AdmRequest req){
|
|
|
|
+ req.setUserId(admAuthService.loginInfo().getId());
|
|
return ResultHelper.single(syncApp.downloadProjectData(req.getGroupCode(), req.getProjectId(), req.getUserId(), req.getClientId(), req.getBdtpDownloadTs(), req.getAdmDownloadTs()));
|
|
return ResultHelper.single(syncApp.downloadProjectData(req.getGroupCode(), req.getProjectId(), req.getUserId(), req.getClientId(), req.getBdtpDownloadTs(), req.getAdmDownloadTs()));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 上传离线数据
|
|
|
|
+ * @param request
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@RequestMapping("/upload")
|
|
@RequestMapping("/upload")
|
|
public CommonResult<UploadRtn> upload(HttpServletRequest request){
|
|
public CommonResult<UploadRtn> upload(HttpServletRequest request){
|
|
AdmRequest admRequest = dataTxHandler.handleRequest(request);
|
|
AdmRequest admRequest = dataTxHandler.handleRequest(request);
|
|
|
|
+ BossAuthUser bossAuthUser = admAuthService.loginInfo();
|
|
|
|
+ log.info("用户:{},上传数据:{}",bossAuthUser,admRequest);
|
|
return ResultHelper.single(syncApp.uploadData(admRequest.getUploadData(), admRequest.getGroupCode(), admRequest.getProjectId(), admRequest.getUserId(), admRequest.getClientId()));
|
|
return ResultHelper.single(syncApp.uploadData(admRequest.getUploadData(), admRequest.getGroupCode(), admRequest.getProjectId(), admRequest.getUserId(), admRequest.getClientId()));
|
|
}
|
|
}
|
|
|
|
|