diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java index 472ad37..a518516 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java @@ -71,6 +71,7 @@ public class MeituanController { /* 店铺history */ + @ApiOperation("店铺history") @GetMapping("/getReturnInfo") public R getReturnInfo(){ iMeituanService.getReturnInfo(null);//店铺id diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 6ad0d03..1d3cb94 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -70,7 +70,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://bj-cdb-7ezuofce.sql.tencentcdb.com:21965/youshi_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://bj-cdb-7ezuofce.sql.tencentcdb.com:21965/youshi_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true username: youshi password: youshi@2024 # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 14715d2..1e6d7dd 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -71,7 +71,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://bj-cdb-7ezuofce.sql.tencentcdb.com:21965/ry_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://bj-cdb-7ezuofce.sql.tencentcdb.com:21965/ry_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true username: youshi password: youshi@2024 # 从库数据源 diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java index 52ca4f3..7fcdfa3 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java @@ -54,7 +54,6 @@ public class RyTask { public void getReturnInfo() { log.error("***********history************************"); iMeituanService.getComments(null); - iMeituanService.getReturnInfo(null); log.error("***********historyEnd************************"); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java index 8b64979..e3c2a3e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java @@ -222,7 +222,6 @@ public class MeituanServiceImpl implements IMeituanService { * @return */ @Override - @Transactional(rollbackFor = Exception.class) public String getComments(String accountName) { BusStoreInfo busStoreInfo = new BusStoreInfo(); busStoreInfo.setGrantStatus("1"); @@ -240,6 +239,10 @@ public class MeituanServiceImpl implements IMeituanService { countDownLatch.await(); //保证之前的所有的线程都执行完成,才会走下面的; long endTime = System.currentTimeMillis(); //结束时间 log.error(("executeDayAsync一共耗时time: " + (endTime - startTime) / 1000 + " s")); + + long endTime1 = System.currentTimeMillis(); //结束时间 + getReturnInfo(null); + log.error(("更新history 耗时: " + (endTime1 - endTime) / 1000 + " s")); // 这样就可以在下面拿到所有线程执行完的集合结果 } catch (Exception e) { log.error("executeDayAsync阻塞异常:"+e.getMessage()); diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreDayHistoryInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreDayHistoryInfoMapper.xml index 5d3273c..8fe3a1c 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreDayHistoryInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreDayHistoryInfoMapper.xml @@ -154,8 +154,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bus_store_day_history_info - - store_id = #{item.storeId}, + + store_id = #{item.storeId}, last_order_num = #{item.lastOrderNum}, last_positive_reviews_num = #{item.lastPositiveReviewsNum}, last_five_star_reviews_num = #{item.lastFiveStarReviewsNum}, @@ -164,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" today_return_visit_num = #{item.todayReturnVisitNum}, score = #{item.score}, create_time = #{item.createTime}, - + where id = #{item.id}