Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java

@@ -19,6 +19,7 @@ import com.tuoheng.admin.service.IQuestionService;
 import com.tuoheng.admin.service.IQuestionTypeService;
 import com.tuoheng.admin.service.warning.IWarningService;
 import com.tuoheng.admin.service.warning.WarningServiceImpl;
+import com.tuoheng.admin.utils.GaodeUtil;
 import com.tuoheng.admin.utils.TimeUtil;
 import com.tuoheng.common.common.BaseServiceImpl;
 import com.tuoheng.common.exception.ServiceException;
@@ -406,12 +407,15 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
             if (question.getType().equals(QuestionTypeEnum.Q4.getCode()) || question.getType().equals(QuestionTypeEnum.Q3.getCode())) {
                 warning.setTenantId(question.getTenantId());
                 warning.setDiscoveryWay(DiscoveryWayEnum.UAV_PATROL.getCode());
-                warning.setLocation("");
                 warning.setStatus(WarningStatusEnum.WAIT_CONFIRM.getCode());
                 warning.setQuestionId(question.getId());
                 warning.setCreateUser(question.getCreateUser());
                 warning.setCreateTime(question.getCreateTime());
                 warning.setMark(MarkTypeEnum.VALID.getCode());
+                if(StringUtils.isNotEmpty(question.getLng()) && StringUtils.isNotEmpty(question.getLat())){
+                    String gaodeAddress = GaodeUtil.getGaodeAddress(question.getLng(), question.getLat());
+                    warning.setLocation(gaodeAddress);
+                }
                 warningList.add(warning);
             }
         }