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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinFrontBannerController.java

@@ -7,6 +7,7 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.goblin.service.impl.GoblinFrontBannerServiceImpl;
 import com.liquidnet.client.admin.zhengzai.goblin.service.impl.GoblinFrontHotWordServiceImpl;
 import com.liquidnet.client.admin.zhengzai.goblin.service.impl.GoblinFrontNavigationServiceImpl;
+import com.liquidnet.client.admin.zhengzai.goblin.service.impl.GoblinFrontSeckillServiceImpl;
 import com.liquidnet.service.goblin.entity.GoblinFrontBanner;
 import com.liquidnet.service.goblin.param.GoblinFrontBannerBuildParam;
 import io.swagger.annotations.Api;
@@ -34,6 +35,8 @@ public class GoblinFrontBannerController extends BaseController {
     GoblinFrontHotWordServiceImpl goblinFrontHotWordService;
     @Autowired
     GoblinFrontNavigationServiceImpl goblinFrontNavigationService;
+    @Autowired
+    GoblinFrontSeckillServiceImpl goblinFrontSeckillService;
     /**
      * @author zhangfuxin
      * @Description:添加banner
@@ -113,6 +116,8 @@ public class GoblinFrontBannerController extends BaseController {
         logger.info("hotWordResult,{}",hotWordResult);
         boolean navigationResult=goblinFrontNavigationService.online();
         logger.info("navigationResult,{}",navigationResult);
+        boolean secillResult=goblinFrontSeckillService.online();
+        logger.info("secillResult,{}",secillResult);
         if (bannerResult&&hotWordResult&&navigationResult ) {
             return success("操作成功");
         } else {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontSelectGoodsServiceImpl.java

@@ -64,6 +64,29 @@ public class GoblinFrontSelectGoodsServiceImpl extends ServiceImpl<GoblinFrontSe
        LambdaQueryWrapper<GoblinFrontSelectGoods> queryWrapper = Wrappers.lambdaQuery(GoblinFrontSelectGoods.class);
        queryWrapper.eq(GoblinFrontSelectGoods::getDelTag,0);
        return goblinFrontSelectGoodsMapper.selectList(queryWrapper);
-
    }
+    public boolean online(){
+      //查询
+        LambdaQueryWrapper<GoblinFrontSelectGoods> queryWrapper = Wrappers.lambdaQuery(GoblinFrontSelectGoods.class);
+        queryWrapper.eq(GoblinFrontSelectGoods::getDelTag,0);
+        List<GoblinFrontSelectGoods> list=goblinFrontSelectGoodsMapper.selectList(queryWrapper);
+
+
+        /*//mongodb
+        for(GoblinFrontSeckill goblinFrontSeckill: list){
+            GoblinFrontSeckill goblinFrontNavigation1=mongoTemplate.findOne(Query.query(Criteria.where("seckilId").is(goblinFrontSeckill.getSeckilId())), GoblinFrontSeckill.class, GoblinFrontSeckill.class.getSimpleName());
+            if(null==goblinFrontNavigation1){
+                mongoTemplate.save(goblinFrontSeckill,GoblinFrontSeckill.class.getSimpleName());
+            }else{
+                BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(goblinFrontSeckill)));
+                mongoTemplate.getCollection(GoblinFrontSeckill.class.getSimpleName()).updateOne(
+                        Query.query(Criteria.where("seckilId").is(goblinFrontSeckill.getSeckilId())).getQueryObject(),
+                        orderObject
+                );
+            }
+        }
+        //redis  保存秒杀表信息
+        redisGoblinUtil.set(GoblinRedisConst.FRONT_SECKILL,list);*/
+        return  true;
+    }
 }

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

@@ -100,6 +100,7 @@ global-auth:
     - ${liquidnet.info.context}/swagger-resources/**
     - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/inner/*
+    - ${liquidnet.info.context}/front/*
   oncheck-url-pattern:
     -
 # -----------------------------------------------------------