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

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-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/syncRedis/RedisDataController.java

@@ -93,6 +93,13 @@ public class RedisDataController {
         return ResponseDto.success(result);
     }
 
+    @PostMapping("sweet/cityVote")
+    @ApiOperation("sweet-cityVote数据迁移")
+    public ResponseDto<Boolean> cityVote() {
+        Boolean result = redisDataService.cityVote();
+        return ResponseDto.success(result);
+    }
+
     /*kylin:order:ExpressStatus:id:138291855523471362201224 // 无数据暂时 一条是测试
     // 下面会自动降级mongo
     kylin:order:refund:orderId:1000651

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/RedisDataServiceImpl.java

@@ -213,4 +213,31 @@ public class RedisDataServiceImpl {
             return false;
         }
     }
+
+    public Boolean cityVote() {
+        try {
+//        RedisTemplate<String, Object> redis = redisUtil.getRedisTemplateByDb(15);
+            Jedis redis = getRedis();
+
+            String redisKey = "sweet:cityVote3:cityCode*";
+
+            Set<String> keys = redis.keys(redisKey);
+            for (String key : keys) {
+                String value = redis.get(key);
+                redisUtil.set(key, value);
+            }
+
+            String redisKey2 = "sweet:cityVote3:user*";
+            Set<String> keys2 = redis.keys(redisKey2);
+            for (String key : keys2) {
+                String value = redis.get(key);
+                redisUtil.set(key, value);
+            }
+
+            return true;
+        } catch (Exception e) {
+            log.error("sweetUnionIdStrError", e);
+            return false;
+        }
+    }
 }