Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115

liquidnet-bus-api/liquidnet-service-chime-api/src/main/java/com/liquidnet/service/chime/constant/ChimeConstant.java

@@ -30,4 +30,7 @@ public class ChimeConstant {
 
     public static final String LOG_USER_OPERATION_LIKE = "1";
     public static final String LOG_USER_OPERATION_DISLIKE = "2";
+
+    public static final String LOG_USER_OPERATION_LIKE_MYSELF_CLICK = "3";
+    public static final String LOG_USER_OPERATION_DISLIKE_MYSELF_CLICK = "4";
 }

liquidnet-bus-api/liquidnet-service-chime-api/src/main/java/com/liquidnet/service/chime/vo/mongo/ChimeUserInfoVo.java

@@ -38,6 +38,10 @@ public class ChimeUserInfoVo {
     private long likeCount;
     @ApiModelProperty(position = 11, value = "不喜欢操作")
     private long disLikeCount;
+    @ApiModelProperty(position = 10, value = "点击喜欢操作")
+    private long ClickLikeCount;
+    @ApiModelProperty(position = 11, value = "点击不喜欢操作")
+    private long ClickDisLikeCount;
 
     private static final ChimeUserInfoVo obj = new ChimeUserInfoVo();
     public static ChimeUserInfoVo getNew() {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html

@@ -200,7 +200,7 @@
 <script th:src="@{/js/jquery.tmpl.js}"></script>
 <th:block th:include="include :: bootstrap-fileinput-js" />
 <script type="text/javascript">
-    var platformUrl = [[${platformUrl}]];
+    var platformUrl = [[${platformUrl}]]+'';
     var prefix = ctx + "sweet/sweetIntegralActivity";
     let showIndex = null;
     // 初始化数据, 可以由后台传过来

liquidnet-bus-config/liquidnet-config/liquidnet-service-chime.yml

@@ -69,6 +69,18 @@ spring:
       max-request-size: 10MB
   profiles:
     include: common-service #这里加载management相关公共配置
+  redis:
+    database: ${liquidnet.redis.sweet.database}
+    dbs: ${liquidnet.redis.sweet.dbs}
+    port: ${liquidnet.redis.sweet.port}
+    host: ${liquidnet.redis.sweet.host}
+    password: ${liquidnet.redis.sweet.password}
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
   autoconfigure:
     exclude:
       - org.springframework.cloud.bus.BusAutoConfiguration

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/service/impl/ChimeUserServiceImpl.java

@@ -151,6 +151,8 @@ public class ChimeUserServiceImpl implements IChimeUserService {
         chimeUserOperLogVo.setOpType(ChimeConstant.LOG_USER_OPERATION_LIKE);
         chimeUserOperLogVo.setCreatedAt(LocalDateTime.now().toString());
         queueUtils.sendMsgByRedis(MQConst.ChimeQueue.USER_OPERATION_LIKE.getKey(), JsonUtils.toJson(chimeUserOperLogVo));
+        chimeUserOperLogVo.setOpType(ChimeConstant.LOG_USER_OPERATION_LIKE_MYSELF_CLICK);
+        queueUtils.sendMsgByRedis(MQConst.ChimeQueue.USER_OPERATION_LIKE.getKey(), JsonUtils.toJson(chimeUserOperLogVo));
         return true;
     }
 
@@ -163,6 +165,8 @@ public class ChimeUserServiceImpl implements IChimeUserService {
         chimeUserOperLogVo.setOpType(ChimeConstant.LOG_USER_OPERATION_DISLIKE);
         chimeUserOperLogVo.setCreatedAt(LocalDateTime.now().toString());
         queueUtils.sendMsgByRedis(MQConst.ChimeQueue.USER_OPERATION_DISLIKE.getKey(), JsonUtils.toJson(chimeUserOperLogVo));
+        chimeUserOperLogVo.setOpType(ChimeConstant.LOG_USER_OPERATION_DISLIKE_MYSELF_CLICK);
+        queueUtils.sendMsgByRedis(MQConst.ChimeQueue.USER_OPERATION_DISLIKE.getKey(), JsonUtils.toJson(chimeUserOperLogVo));
         return true;
     }
 }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/adam/util/ChimeDataUtils.java

@@ -32,7 +32,12 @@ public class ChimeDataUtils {
      * @param chimeUserOperLogVo
      */
     public void updateChimeUser(ChimeUserOperLogVo chimeUserOperLogVo) {
-        ChimeUserInfoVo chimeUserInfoVo = this.getUserByUserId(chimeUserOperLogVo.getTargetUserId());
+        ChimeUserInfoVo chimeUserInfoVo = null;
+        if(chimeUserOperLogVo.getOpType().equalsIgnoreCase(ChimeConstant.LOG_USER_OPERATION_LIKE)||chimeUserOperLogVo.getOpType().equalsIgnoreCase(ChimeConstant.LOG_USER_OPERATION_DISLIKE)){
+            chimeUserInfoVo = this.getUserByUserId(chimeUserOperLogVo.getTargetUserId());
+        }else if(chimeUserOperLogVo.getOpType().equalsIgnoreCase(ChimeConstant.LOG_USER_OPERATION_LIKE_MYSELF_CLICK)||chimeUserOperLogVo.getOpType().equalsIgnoreCase(ChimeConstant.LOG_USER_OPERATION_DISLIKE_MYSELF_CLICK)){
+            chimeUserInfoVo = this.getUserByUserId(chimeUserOperLogVo.getCurrentUserId());
+        }
         if(chimeUserInfoVo == null){
             log.error("chimeUserInfoVo is null userId is not exist:");
             return;
@@ -43,6 +48,10 @@ public class ChimeDataUtils {
             update.set("likeCount", chimeUserInfoVo.getLikeCount() + 1);
         }else if(chimeUserOperLogVo.getOpType().equalsIgnoreCase(ChimeConstant.LOG_USER_OPERATION_DISLIKE)){
             update.set("disLikeCount", chimeUserInfoVo.getDisLikeCount() + 1);
+        }else if(chimeUserOperLogVo.getOpType().equalsIgnoreCase(ChimeConstant.LOG_USER_OPERATION_LIKE_MYSELF_CLICK)){
+            update.set("clickLikeCount", chimeUserInfoVo.getClickLikeCount() + 1);
+        }else if(chimeUserOperLogVo.getOpType().equalsIgnoreCase(ChimeConstant.LOG_USER_OPERATION_DISLIKE_MYSELF_CLICK)){
+            update.set("clickDisLikeCount", chimeUserInfoVo.getClickDisLikeCount() + 1);
         }
 
         UpdateResult result = mongoTemplate.updateFirst(query,update,ChimeUserInfoVo.class,ChimeUserInfoVo.class.getSimpleName());