#20230510 欣影管理平台装置信息查询代码

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SystemConfigServiceImpl.java

@@ -68,7 +68,7 @@ public class SystemConfigServiceImpl implements SystemConfigService {
 
     @Override
     public ServiceBody<SystemConfigModel> getSystemConfigDetail(SystemConfigReqVo vo) {
-        String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
+        String result = terminalPhotoDao.getRequestResult(5);//待修改
         SystemConfigModel model = new SystemConfigModel();
         if(StringUtils.isNotBlank(result)) {
             JSONObject resultObj = JSONObject.parseObject(result);
@@ -92,11 +92,10 @@ public class SystemConfigServiceImpl implements SystemConfigService {
 
     @Override
     public ServiceBody<UpperComputerInfoModel> getUpperComputerInfo(TerminalUpperComputerVo vo) {
-        String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
+        String result = terminalPhotoDao.getRequestResult(5);//待修改
         UpperComputerInfoModel model = new UpperComputerInfoModel();
         if(StringUtils.isNotBlank(result)) {
-            JSONObject resultObj = JSONObject.parseObject(result);
-            model = JSONObject.parseObject(resultObj.get("groupData").toString(), UpperComputerInfoModel.class);
+            model = JSONObject.parseObject(result, UpperComputerInfoModel.class);
             model.setIsNew(true);
         }else{
             UpperComputerInfoDto  dto = systemConfigDao.getUpperComputerInfo(vo.getTermId());

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java

@@ -107,11 +107,10 @@ public class TerminalGpsServiceImpl implements TerminalGpsService {
         TerminalGpsModel model = new TerminalGpsModel();
 //        Cma cma = new Cma("47.96.238.157", 6891);
 //        boolean b = cma.requestGpsInfo(vo.getTermid().toString());
-        String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
+        String result = terminalPhotoDao.getRequestResult(5);//待修改
         DateTime now = DateTime.now();
         if(StringUtils.isNotBlank(result)) {
-            JSONObject resultObj = JSONObject.parseObject(result);
-            model = JSONObject.parseObject(resultObj.get("groupData").toString(), TerminalGpsModel.class);
+            model = JSONObject.parseObject(result, TerminalGpsModel.class);
         }else {
             TerminalPositions bean = terminalPositionsDao.selectByPrimaryKey(vo.getTermid());
 

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -423,7 +423,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
 
     @Override
     public ServiceBody<TerminalPhotosParamsModel> getLastedPhotoQueryParam(ReturnedPhotoParamsVo vo) {
-        String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
+        String result = terminalPhotoDao.getRequestResult(5);//待修改
         TerminalPhotosParamsModel model = new TerminalPhotosParamsModel();
         if (StringUtils.isNotBlank(result)) {
             model = JSONObject.parseObject(result, TerminalPhotosParamsModel.class);
@@ -439,7 +439,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
 
     @Override
     public ServiceBody<TerminalScheduleRuleTimeListModel> selectPhotoTime(TerminalReqPhotoTimeVo vo) {
-        String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
+        String result = terminalPhotoDao.getRequestResult(5);//待修改
         TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel();
         if (StringUtils.isNotBlank(result)) {
             JSONObject resultObj = JSONObject.parseObject(result);

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java

@@ -224,7 +224,7 @@ public class TerminalServiceImpl implements TerminalService {
 
     @Override
     public ServiceBody<TerminalModel> getLastedTerminalStatus(TerminalStatusVo vo) {
-        String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
+        String result = terminalPhotoDao.getRequestResult(5);//待修改
         TerminalModel model = new TerminalModel();
         if (StringUtils.isNotBlank(result)) {
             model = JSONObject.parseObject(result, TerminalModel.class);