fix:更换公众好

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsController.java

@@ -119,7 +119,7 @@ public class TJsController extends BaseController {
     }
 
     @Log(title = "实时更新技师位置", businessType = BusinessType.UPDATE)
-    @RequestMapping(value = "wx/updateLocation", method = RequestMethod.POST)
+    @RequestMapping(value = "wx/updateLocation/f", method = RequestMethod.POST)
     @ApiOperation("实时更新技师位置")
     public R updateLocation(@RequestBody TJs js) {
         try {
@@ -183,15 +183,15 @@ public class TJsController extends BaseController {
                 location.setRadius(1000.00);
                 List<TJs> nearbyTechnicians = locationUtil.dis(location);
                 if (nearbyTechnicians != null) {
-                    Map<String, BigDecimal> collect = nearbyTechnicians.stream().collect(Collectors.toMap(TJs::getcOpenId, TJs::getDistance));
-                    js.setIds(nearbyTechnicians.stream().map(TJs::getcOpenId).collect(Collectors.toList()));
+                    Map<String, BigDecimal> collect = nearbyTechnicians.stream().collect(Collectors.toMap(TJs::getcPhone, TJs::getDistance));
+                    js.setIds(nearbyTechnicians.stream().map(TJs::getcPhone).collect(Collectors.toList()));
                     int size = (int) page.getSize();
                     int pageNum = (int) page.getCurrent();
                     page.setSize(nearbyTechnicians.size());
                     page.setCurrent(1);
                     Page<TJs> all = jsService.getAll(page, js);
                     all.getRecords().forEach(item -> {
-                        item.setDistance(collect.get(item.getcOpenId()).setScale(2, RoundingMode.DOWN));
+                        item.setDistance(collect.get(item.getcPhone()).setScale(2, RoundingMode.DOWN));
                     });
                     List<TJs> objects = (List<TJs>) ListUtils.subList(all.getRecords(), size, pageNum);
                     page.setRecords(objects);

nightFragrance-admin/src/main/resources/application-test.yml

@@ -231,9 +231,9 @@ wx:
   # 微信公众号
 wechat:
 
-  mpAppId: wx9aaa5016e4b259bd
+  mpAppId: wxa72f643173a90106
 
-  mpAppSecret: d3fec271ac82c22c8d267fc20ce6f4f1
+  mpAppSecret: 6ceb4647506a4f1654bb10773b227357
   # 获取code
   get-code-url: https://open.weixin.qq.com/connect/oauth2/authorize
   # 回调地址

nightFragrance-massage/src/main/java/com/ylx/massage/task/massageTask.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.constant.MassageConstants;
 import com.ylx.common.core.domain.entity.SysDept;
+import com.ylx.common.utils.DateUtils;
 import com.ylx.common.utils.StringUtils;
 import com.ylx.massage.domain.*;
 import com.ylx.massage.enums.BillTypeEnum;
@@ -13,6 +14,7 @@ import com.ylx.massage.enums.OrderStatusEnum;
 import com.ylx.massage.mapper.TConsumptionLogMapper;
 import com.ylx.massage.service.*;
 import com.ylx.massage.utils.DateTimeUtils;
+import com.ylx.massage.utils.LocationUtil;
 import com.ylx.system.service.ISysDeptService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,9 @@ public class massageTask {
     @Resource
     private TOrderService orderService;
 
+    @Resource
+    private LocationUtil locationUtil;
+
     @Resource
     private TJsService jsService;
 
@@ -338,4 +343,33 @@ public class massageTask {
 
     }
 
+    public void sysJsWeiZhi() {
+        log.info("开始执行同步技师位置时间,{}", DateUtils.getNowDate());
+        long flag = 1L;
+        while (flag > 0L) {
+            LambdaQueryWrapper<TJs> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+            objectLambdaQueryWrapper.gt(TJs::getId, String.valueOf(flag)).orderByAsc(TJs::getId);
+
+            Page<TJs> page = new Page<>();
+            page.setSize(MassageConstants.TWO_HUNDRED);
+            Page<TJs> page1 = jsService.page(page, objectLambdaQueryWrapper);
+
+            if (CollectionUtil.isNotEmpty(page1.getRecords())) {
+                page1.getRecords().forEach(tjs -> {
+                    if (StringUtils.isNotBlank(tjs.getcPhone()) && null != tjs.getLongitude() && null != tjs.getLatitude()) {
+                        locationUtil.geoAdd(LocationUtil.GEO_KEY, tjs.getcPhone(),
+                                Double.parseDouble(tjs.getLongitude().toString()),
+                                Double.parseDouble(tjs.getLatitude().toString()));
+                    }
+                });
+                Optional<String> maxId = page1.getRecords().stream().max(Comparator.comparing(TJs::getId)).map(TJs::getId);
+                flag = Long.parseLong(maxId.orElse("0"));
+            } else {
+                flag = 0L;
+            }
+        }
+        log.info("结束执行同步技师位置时间,{}", DateUtils.getNowDate());
+    }
+
 }

nightFragrance-massage/src/main/java/com/ylx/massage/utils/LocationUtil.java

@@ -130,7 +130,7 @@ public class LocationUtil {
         }
         radius.forEach(content -> {
             TJs tJs = new TJs();
-            tJs.setcOpenId(content.getContent().getName());
+            tJs.setcPhone(content.getContent().getName());
             tJs.setDistance(BigDecimal.valueOf(content.getDistance().getValue()));
             js.add(tJs);
         });

nightFragrance-massage/src/main/resources/mapper/massage/TJsMapper.xml

@@ -137,7 +137,7 @@
                 AND (daytime_mileage > 0 OR nigth_mileage > 0)
             </if>
             <if test="param.ids != null and param.ids.size() > 0">
-                and js.c_open_id in
+                and js.c_phone in
                 <foreach item="id" collection="param.ids" open="(" separator="," close=")">
                     #{id}
                 </foreach>