init: init project step4: biz code support

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -3,7 +3,6 @@ package com.qunzhixinxi.hnqz.admin.controller;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
@@ -827,9 +826,7 @@ public class ApiController {
                                     if ("3".equals(wmScorePackage.getPackageType1())) {
                                         continue;
                                     }
-                                    /**
-                                     * 过滤有效任务类型
-                                     */
+                                    // 过滤有效任务类型
                                     WmScoreTaskType taskType = new WmScoreTaskType();
                                     taskType.setTaskTypeId(taskTypeId);
                                     taskType.setScoreId(wmScorePackage.getId());
@@ -2750,6 +2747,12 @@ public class ApiController {
                 if ("16".equals(wmTask.getTaskTypeId())) {
                     wmTaskContent.setTemp31(wmTaskContent.getTemp4());
                 }
+                if (StrUtil.isNotBlank(wmTaskContent.getTemp24())) {
+                    WmDaHospital hospital = wmDaHospitalService.getById(wmTaskContent.getTemp24());
+                    if (hospital != null) {
+                        wmTaskContent.setTemp24label(hospital.getYymc());
+                    }
+                }
             }
             map.put("wmTaskContent", wmTaskContent);
 
@@ -3198,12 +3201,14 @@ public class ApiController {
 
 
     /**
-     * @param longitude
-     * @param latitude
-     * @return
+     * 根据经纬度获取周围的医院、商业公司、药店
+     *
+     * @param longitude 经度
+     * @param latitude  维度
+     * @return 信息列表
      */
     @GetMapping("/getPointSignInfo")
-    public R getPointSignInfo(String longitude, String latitude) {
+    public R<List<Map<String, Object>>> getPointSignInfo(String longitude, String latitude) {
         List<Map<String, Object>> mapList = new ArrayList<>();
 
         // 医院
@@ -3212,7 +3217,7 @@ public class ApiController {
         qWmDaHospital.setLatitude(latitude);
 
         List<WmDaHospital> wmDaHospitalList = wmDaHospitalService.listByPoint(qWmDaHospital);
-        if (wmDaHospitalList.size() > 0) {
+        if (CollUtil.isNotEmpty(wmDaHospitalList)) {
             for (WmDaHospital wmDaHospital : wmDaHospitalList) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("signEntId", wmDaHospital.getId());
@@ -3224,42 +3229,6 @@ public class ApiController {
             }
         }
 
-        // 商业公司
-        WmDaDistribution qwmDaDistribution = new WmDaDistribution();
-        qwmDaDistribution.setLatitude(latitude);
-        qwmDaDistribution.setLongitude(longitude);
-
-        List<WmDaDistribution> wmDaDistributions = wmDaDistributionService.listByPoint(qwmDaDistribution);
-        if (wmDaDistributions.size() > 0) {
-            for (WmDaDistribution wmDaDistribution : wmDaDistributions) {
-                Map<String, Object> map = new HashMap<>();
-                map.put("signEntId", wmDaDistribution.getId());
-                map.put("signEntName", wmDaDistribution.getGsmc());
-                map.put("longitude", wmDaDistribution.getLongitude());
-                map.put("latitude", wmDaDistribution.getLatitude());
-                map.put("signEntType", "2");
-                mapList.add(map);
-
-            }
-        }
-
-        // 药店
-        WmDaPharmacy qWmDaPharmacy = new WmDaPharmacy();
-        qWmDaPharmacy.setLatitude(latitude);
-        qWmDaPharmacy.setLongitude(longitude);
-        List<WmDaPharmacy> pharmacyList = wmDaPharmacyService.listByPoint(qWmDaPharmacy);
-        if (CollectionUtil.isNotEmpty(pharmacyList)) {
-            pharmacyList.forEach(wmDaPharmacy -> {
-                Map<String, Object> map = new HashMap<>();
-                map.put("signEntId", wmDaPharmacy.getId());
-                map.put("signEntName", wmDaPharmacy.getPharmacyName());
-                map.put("longitude", wmDaPharmacy.getLongitude());
-                map.put("latitude", wmDaPharmacy.getLatitude());
-                map.put("signEntType", "3");
-                mapList.add(map);
-            });
-        }
-
         return R.ok(mapList);
     }