修改bug

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -67,8 +67,5 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_WECHAT_MAODENG_OPEN_POSTER = "sweet:maoDeng:open:userId";
     //猫登活动整体
     public final static String REDIS_KEY_SWEET_WECHAT_MAODENG_POSTER = "sweet:maoDeng:naneAndImg:userId";
-    //猫登活动-文本
-    public final static String REDIS_KEY_SWEET_WECHAT_MAODENG_TEXT_POSTER = "sweet:maoDeng:text:userId";
-    //猫登活动-图片
-    public final static String REDIS_KEY_SWEET_WECHAT_MAODENG_IMAGE_POSTER = "sweet:maoDeng:image:userId";
+
 }

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/vo/SweetMaoDengVo.java

@@ -24,6 +24,10 @@ public class SweetMaoDengVo implements Serializable, Cloneable {
      * 图片url
      */
     private String picUrl;
+    /**
+     * 生成图url
+     */
+    private String imgUrl;
 
     private static final SweetMaoDengVo obj = new SweetMaoDengVo();
     public static SweetMaoDengVo getNew() {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatMaoDengController.java

@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.sweet.service.impl.SweetTestImpl;
 import com.liquidnet.service.sweet.utils.QueueUtils;
 import com.liquidnet.service.sweet.utils.WechatUsersRedisUtils;
 import com.liquidnet.service.sweet.vo.SweetMaoDengVo;
@@ -34,20 +35,15 @@ public class SweetWechatMaoDengController {
     @ApiOperation("返回文字图片")
     public ResponseDto<SweetMaoDengVo> backDatas(String userId){
 
-        SweetMaoDengVo sweetMaoDengVo = SweetMaoDengVo.getNew();
+
         SweetMaoDengVo sweetMaoDeng = redisUtils.getSweetMaoDengText(userId);
         String textMsg = sweetMaoDeng.getTextMsg();
         String image = sweetMaoDeng.getPicUrl();
-
-        sweetMaoDengVo.setPicUrl(image);
-        sweetMaoDengVo.setTextMsg(textMsg);
-        sweetMaoDengVo.setUserId(userId);
-
         if (StringUtil.isEmpty(textMsg) && StringUtil.isEmpty(image)) {
             return ResponseDto.failure("90081", "获取信息失败");
         }
 
-        return ResponseDto.success(sweetMaoDengVo);
+        return ResponseDto.success(sweetMaoDeng);
     }
 
     @PostMapping("/backData")
@@ -55,15 +51,16 @@ public class SweetWechatMaoDengController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "userId", value = "userId"),
             @ApiImplicitParam(type = "query", dataType = "String", name = "imgUrl", value = "imgUrl"),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "maoId", value = "maoId"),
     })
     public ResponseDto addBuilderImg(@RequestParam(value = "userId",required = false) String userId,
-                                     @RequestParam(value = "imgUrl",required = false)String imgUrl){
+                                     @RequestParam(value = "imgUrl",required = false)String imgUrl,
+                                     @RequestParam(value = "maoId",required = false)String maoId){
         //redis队列入库
-        String maoId = IDGenerator.nextSnowId();
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
         sqls.add(SqlMapping.get("sweet_wechat_maodeng.insert_img"));
-        sqlsDataA.add(new Object[]{maoId, userId,imgUrl});
+        sqlsDataA.add(new Object[]{imgUrl,userId,maoId});
         queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_MAODENG_TEXT_INSERT.getKey(), SqlMapping.gets(sqls, sqlsDataA));
         return ResponseDto.success();
     }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/MaoDengImageHandler.java

@@ -67,6 +67,7 @@ public class MaoDengImageHandler implements WxMpMessageHandler {
                 String textMsg = sweetMaoDeng.getTextMsg();
                 sweetMaoDengVo.setTextMsg(textMsg);
                 maoId = sweetMaoDeng.getMaoId();
+                sweetMaoDengVo.setMaoId(maoId);
                 //更新mysql
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
@@ -74,12 +75,13 @@ public class MaoDengImageHandler implements WxMpMessageHandler {
                 sqlsDataA.add(new Object[]{picUrl,fromUser,maoId});
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_MAODENG_TEXT_INSERT.getKey(), SqlMapping.gets(sqls, sqlsDataA));
             }else {
+                sweetMaoDengVo.setMaoId(maoId);
                 //redis队列入库
                 sweetMaoDengVo.setMaoId(maoId);
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
                 sqls.add(SqlMapping.get("sweet_wechat_maodeng.insert"));
-                sqlsDataA.add(new Object[]{maoId, fromUser, null, picUrl});
+                sqlsDataA.add(new Object[]{maoId, fromUser, null, picUrl,null});
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_MAODENG_TEXT_INSERT.getKey(), SqlMapping.gets(sqls, sqlsDataA));
             }
             redisUtils.setSweetMaoDeng(sweetMaoDengVo);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/TextMsgHandler.java

@@ -88,7 +88,7 @@ public class TextMsgHandler implements WxMpMessageHandler {
                 String picUrl = sweetMaoDeng.getPicUrl();
                 sweetMaoDengVo.setPicUrl(picUrl);
                 maoId=sweetMaoDeng.getMaoId();
-
+                sweetMaoDengVo.setMaoId(maoId);
                 //更新mysql
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
@@ -96,10 +96,11 @@ public class TextMsgHandler implements WxMpMessageHandler {
                 sqlsDataA.add(new Object[]{fromUser, maoContent,maoId});
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_MAODENG_TEXT_INSERT.getKey(), SqlMapping.gets(sqls, sqlsDataA));
             }else {
+                sweetMaoDengVo.setMaoId(maoId);
                 LinkedList<String> sqls = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
                 sqls.add(SqlMapping.get("sweet_wechat_maodeng.insert"));
-                sqlsDataA.add(new Object[]{maoId, fromUser, maoContent, null});
+                sqlsDataA.add(new Object[]{maoId, fromUser, maoContent, null,null});
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_MAODENG_TEXT_INSERT.getKey(), SqlMapping.gets(sqls, sqlsDataA));
             }
             redisUtils.setSweetMaoDeng(sweetMaoDengVo);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/WechatUsersRedisUtils.java

@@ -100,7 +100,7 @@ public class WechatUsersRedisUtils {
     }
 
     public SweetMaoDengVo getSweetMaoDengText(String userId) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_MAODENG_TEXT_POSTER.concat(userId);
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_MAODENG_POSTER.concat(userId);
         Object obj = redisUtil.get(redisKey);
         if (null == obj) {
             return null;

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -58,8 +58,8 @@ sweet_wechat_users.delete=DELETE FROM sweet_wechat_users WHERE union_id = ? and
 sweet_strawberry_poster_user=INSERT INTO sweet_strawberry_poster(open_id,poster_id,union_id,nickname,city_name,city_code,custom_text,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?)
 sweet_strawberry_poster_Musician=INSERT INTO sweet_strawberry_poster_lineup(lineup_id,poster_id,lineup_num,musician_name,created_at,updated_at) VALUES (?,?,?,?,?,?)
 #---------------------------猫登天空--------------------------------
-sweet_wechat_maodeng.insert=INSERT INTO sweet_wechat_maodeng(mao_id,user_id,text_msg,pic_url) VALUES (?,?,?,?)
-sweet_wechat_maodeng.insert_img=INSERT INTO sweet_wechat_maodeng_img(mao_id,user_id,img_url) VALUES (?,?,?)
+sweet_wechat_maodeng.insert=INSERT INTO sweet_wechat_maodeng(mao_id,user_id,text_msg,pic_url,img_url) VALUES (?,?,?,?,?)
+sweet_wechat_maodeng.insert_img=UPDATE sweet_wechat_maodeng SET img_url=? WHERE user_id=? AND mao_id=?
 sweet_wechat_maodeng.text.update=UPDATE sweet_wechat_maodeng SET text_msg=? WHERE user_id=? AND mao_id=?
 sweet_wechat_maodeng.img.update=UPDATE sweet_wechat_maodeng SET pic_url=? WHERE user_id=? AND mao_id=?