getStringValueOperations(RedisConnectionFactory connectionFactory) {
+ StringRedisTemplate template = new StringRedisTemplate();
+ template.setConnectionFactory(connectionFactory);
+ template.afterPropertiesSet();
+ return template.opsForValue();
+ }
}
diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java
index d82b02018..aae158683 100644
--- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java
+++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java
@@ -1,6 +1,7 @@
package com.iformall.controller;
import com.github.pagehelper.PageInfo;
+import com.iformall.annotation.RedisCache;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxBusiness;
import com.iformall.domain.po.WxCUser;
@@ -26,6 +27,7 @@ public class WxBusinessController extends BaseController {
@Autowired
private WxBusinessService wxBusinessService;
+ @RedisCache
@ApiOperation("业态全列表接口")
@GetMapping("listAll")
public ResultData listAll(Integer filter) {
diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java
index 5e32285b8..c0db1b156 100644
--- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java
+++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java
@@ -1,6 +1,7 @@
package com.iformall.controller;
import com.github.pagehelper.PageInfo;
+import com.iformall.annotation.RedisCache;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.base.BaseEntity;
@@ -38,6 +39,7 @@ public class WxCampaignController extends BaseController {
@Autowired
private WxCouponChannelService wxCouponChannelService;
+ @RedisCache
@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
index 9c9c681f4..c9b1809f7 100644
--- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
+++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
@@ -704,10 +704,14 @@ public class WxCarController extends BaseController {
String unionId = objParams.getString(BoLinkUtil.BOLINK_UNION_ID);
String key = objParams.getString(BoLinkUtil.BOLINK_KEY);
String ret = BoLinkUtil.getStopFee(url, comid, unionId, key, carNumber);
- JSONObject retObj = JSON.parseObject(ret);
- JSONObject dataObj = retObj.getJSONObject(BoLinkUtil.BOLINK_DATA);
- if (dataObj.getIntValue(BoLinkUtil.BOLINK_STATE) == BoLinkUtil.BOLINK_SUCCESS) {
- return new ResultData(dataObj);
+ if (ret != null) {
+ JSONObject retObj = JSON.parseObject(ret);
+ JSONObject dataObj = retObj.getJSONObject(BoLinkUtil.BOLINK_DATA);
+ if (dataObj.getIntValue(BoLinkUtil.BOLINK_STATE) == BoLinkUtil.BOLINK_SUCCESS) {
+ return new ResultData(dataObj);
+ } else {
+ return new ResultData(ErrorCode.BOLINK_STOP_FEE_FAIL);
+ }
} else {
return new ResultData(ErrorCode.BOLINK_STOP_FEE_FAIL);
}
diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
index 996f9ac55..657395cca 100644
--- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
+++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
@@ -1,6 +1,7 @@
package com.iformall.controller;
import com.github.pagehelper.PageInfo;
+import com.iformall.annotation.RedisCache;
import com.iformall.common.ResultData;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.po.WxCouponChannel;
@@ -97,7 +98,7 @@ public class WxCouponChannelController extends BaseController {
}
}
-
+ @RedisCache
@ApiOperation("分页列表接口")
@GetMapping("change")
public ResultData change(@ModelAttribute WxCouponChannel wxCouponChannel) {
diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java
new file mode 100755
index 000000000..fc239aadf
--- /dev/null
+++ b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java
@@ -0,0 +1,69 @@
+package com.iformall.controller;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import com.iformall.annotation.RedisCache;
+import com.iformall.common.ErrorCode;
+import com.iformall.common.ResultData;
+import com.iformall.domain.po.*;
+import com.iformall.exception.MallinkException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.concurrent.TimeUnit;
+
+@RestController
+@RequestMapping("/api/live")
+@Api(tags = "微信直播相关接口")
+public class WxLiveController extends BaseController {
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ /**
+ * 获取所有直播间和商品信息(没有分页直接获取全部)
+ *
+ * @return
+ */
+ @ApiOperation("获取所有直播间和商品信息")
+ @RedisCache(expireTime = 30,dateUnit = TimeUnit.MINUTES)
+ @GetMapping("/roomList")
+ public ResultData getLiveinfos(String appId) {
+ ResultData resultData = new ResultData();
+ try {
+ WxMaService wxMaService = getWeappService(appId);
+ resultData.data = wxMaService.getLiveService().getLiveinfos();
+ } catch (WxErrorException e) {
+ logger.error("getLiveinfos error", e);
+ throw new MallinkException(ErrorCode.SYS_SERVER_ERROR);
+ }
+ return resultData;
+ }
+
+ /**
+ * 获取直播房间回放数据信息.
+ *
+ * 获取回放 (默认:get_replay)
+ *
+ * @param room_id 直播间 id
+ * @param start 起始拉取视频,start = 0 表示从第 1 个视频片段开始拉取
+ * @param limit 每次拉取的个数上限,不要设置过大,建议 100 以内
+ * @return
+ */
+ @ApiOperation("获取直播房间回放数据和商品信息")
+ @RedisCache(expireTime = 30,dateUnit = TimeUnit.MINUTES)
+ @GetMapping("/replayList")
+ public ResultData getLiveReplay(Integer room_id, Integer start, Integer limit) {
+ ResultData resultData = new ResultData();
+ WxCUser user = getUser();
+ try {
+ WxMaService wxMaService = getWeappService(user.getAppId());
+ resultData.data = wxMaService.getLiveService().getLiveReplay(room_id,start,limit);
+ } catch (WxErrorException e) {
+ logger.error("getLiveReplay error", e);
+ throw new MallinkException(ErrorCode.SYS_SERVER_ERROR);
+ }
+ return resultData;
+ }
+}
diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java
index e203ad210..2f6b5813b 100644
--- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java
+++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java
@@ -1,13 +1,12 @@
package com.iformall.controller;
import com.iformall.annotation.AuthIgnore;
+import com.iformall.annotation.RedisCache;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
-import com.iformall.domain.vo.WxMerchantVo;
-import com.iformall.enums.EnumMerchantStatus;
import com.iformall.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -16,13 +15,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api/mall")
@@ -45,6 +40,10 @@ public class WxMallController extends BaseController {
@Autowired
private WxLevelConfigService wxLevelConfigService;
+ @Autowired
+ private RedisService redisService;
+
+ @RedisCache
@AuthIgnore
@ApiOperation("商场图标")
@GetMapping("/getAppIcon")
@@ -64,6 +63,7 @@ public class WxMallController extends BaseController {
return new ResultData(Result.SUCCESS, "查询成功", resultMap);
}
+ @RedisCache
@AuthIgnore
@ApiOperation("商场提示信息")
@GetMapping("/getWeapNote")
@@ -82,6 +82,7 @@ public class WxMallController extends BaseController {
return new ResultData(Result.SUCCESS, "查询成功", resultMap);
}
+ @RedisCache
@ApiOperation("商场信息")
@GetMapping("/mallInfo")
public ResultData getMallInfo() {
@@ -113,7 +114,7 @@ public class WxMallController extends BaseController {
return new ResultData(Result.SUCCESS, "查询成功", map);
}
-
+ @RedisCache()
@AuthIgnore
@ApiOperation("获取后端版本号")
@GetMapping("/version")
@@ -121,5 +122,16 @@ public class WxMallController extends BaseController {
return new ResultData(version);
}
+ @ApiOperation("获取热点缓存接口对应redis key")
+ @GetMapping("/hotApis")
+ public ResultData hotApis() {
+ return new ResultData(redisService.hotApi());
+ }
+
+ @ApiOperation("删除指定key")
+ @PostMapping("/delRedisKey")
+ public ResultData delRedisKey(@RequestBody Collection