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

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/ServicePlatformApplication.java

@@ -18,14 +18,14 @@ import java.util.Arrays;
 
 @Slf4j
 @EnableFeignClients
-@MapperScan(basePackages = "com.liquidnet.service.platform.mapper")
+@MapperScan(basePackages = {"com.liquidnet.service.kylin.mapper","com.liquidnet.service.adam.mapper"})
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
 public class ServicePlatformApplication implements CommandLineRunner {
     @Autowired
     private Environment environment;
 
     public static void main(String[] args) {
-        SpringApplication.run(ServiceAdamApplication.class, args);
+        SpringApplication.run(ServicePlatformApplication.class, args);
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/config/KylinWebMvcConfig.java

+package com.liquidnet.service.platform.config;
+
+import com.liquidnet.common.web.config.WebMvcConfig;
+import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+
+@Configuration
+public class KylinWebMvcConfig extends WebMvcConfig {
+    @Autowired
+    GlobalAuthorityInterceptor globalAuthorityInterceptor;
+
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+//        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+//        super.addInterceptors(registry);
+    }
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/FieldsPartnerController.java

-package com.liquidnet.service.platform.controller.partner;
-
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
-import com.liquidnet.service.platform.service.partner.impl.FieldsPartnerServiceImpl;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-
-@Api
-@RestController
-@RequestMapping("partner/fields")
-public class FieldsPartnerController {
-
-    @Autowired
-    private FieldsPartnerServiceImpl fieldsPartnerService;
-
-//    @GetMapping(value = "details")
-//    @ApiOperation(value = "获取场地详情")
-//    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinFieldsVo> fieldDetails(@RequestParam(value = "fieldId", defaultValue = "59666659929161728") String fieldId) {
-        KylinFieldsVo result = null;
-        result = fieldsPartnerService.fieldDetails(fieldId);
-        if (null == result) {
-            return ResponseDto.failure("场地详情查询失败");
-        } else {
-            return ResponseDto.success(result);
-        }
-    }
-
-//    @GetMapping(value = "list")
-//    @ApiOperation(value = "获取场地列表")
-//    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<HashMap<String, Object>> fieldList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "size", defaultValue = "10") int size, @RequestParam(value = "name", defaultValue = "") String name) {
-        HashMap<String, Object> result = null;
-        result = fieldsPartnerService.fieldList(page-1,size,name);
-        if (null == result) {
-            return ResponseDto.failure("场地列表获取失败");
-        } else {
-            return ResponseDto.success(result);
-        }
-    }
-
-}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/partner/impl/FieldsPartnerServiceImpl.java

-package com.liquidnet.service.platform.service.partner.impl;
-
-import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
-import com.liquidnet.service.kylin.mapper.KylinFieldRelationMapper;
-import com.liquidnet.service.kylin.mapper.KylinFieldStatusMapper;
-import com.liquidnet.service.kylin.mapper.KylinFieldsMapper;
-import com.liquidnet.service.kylin.service.partner.KylinFieldsPartnerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-
-@Service
-public class FieldsPartnerServiceImpl implements KylinFieldsPartnerService {
-
-    @Autowired
-    MongoTemplate mongoTemplate;
-
-    @Autowired
-    private RedisUtil redisUtil;
-
-    @Autowired
-    private KylinFieldsMapper fieldsMapper;
-
-    @Autowired
-    private KylinFieldStatusMapper kylinFieldStatusMapper;
-
-    @Autowired
-    private KylinFieldRelationMapper fieldRelationsMapper;
-
-    /**
-     * 根据名字模糊查询 partner 场地列表
-     * @param page
-     * @param size
-     * @param name
-     * @return
-     */
-    @Override
-    public HashMap<String, Object> fieldList(int page, int size, String name) {
-        HashMap<String,Object> info = new HashMap<>();
-
-        // 排序 分页
-        Pageable pageable = PageRequest.of(0, size, Sort.by(Sort.Direction.DESC, "createdAt"));
-
-        //条件
-        Query query = Query.query(Criteria.where("name").regex(".*?\\" +name));
-
-        // 查询总数
-        long count = mongoTemplate.count(query, KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName());
-
-        query.with(pageable);
-        info.put("total",count);
-        info.put("data", mongoTemplate.find(query, KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName()));
-
-        return info;
-    }
-
-
-    /**
-     * partner 场地详情
-     * @param fieldId
-     * @return
-     */
-    @Override
-    public KylinFieldsVo fieldDetails(String fieldId) {
-        KylinFieldsVo info = null;
-        // 获取 redis数据
-        info = (KylinFieldsVo) redisUtil.hget(KylinRedisConst.FIELDS, fieldId + "");
-        //不存在 获取 mongo数据
-        if (null == info) {
-            info = mongoTemplate.findOne(Query.query(Criteria.where("fieldsId").is(fieldId)), KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName());
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldId + "",info);
-        }
-        return info;
-    }
-}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/partner/impl/KylinCheckUserPerformancesPartnerServiceImpl.java

@@ -14,8 +14,8 @@ import com.liquidnet.service.kylin.dto.param.CheckUserParam;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserPerformanceVo;
 import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
 import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper;
-import com.liquidnet.service.kylin.partner.utils.DataUtils;
 import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPerformancesPartnerService;
+import com.liquidnet.service.platform.utils.DataUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/partner/impl/KylinTicketsPartnerServiceImpl.java

@@ -13,8 +13,8 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
-import com.liquidnet.service.kylin.partner.utils.PerformanceVoTask;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
+import com.liquidnet.service.platform.utils.PerformanceVoTask;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/resources/bootstrap-service-platform.yml

@@ -9,9 +9,9 @@ eureka:
 spring:
   cloud:
     config:
-#      uri: http://127.0.0.1:7002/support-config
-      profile: ${liquidnet.cloudConfig.profile}
-      name: ${spring.application.name} #默认为spring.application.name
-      discovery:
-        enabled: true
-        service-id: liquidnet-support-config
\ No newline at end of file
+      uri: http://39.106.122.201:7002/support-config
+#      profile: ${liquidnet.cloudConfig.profile}
+#      name: ${spring.application.name} #默认为spring.application.name
+#      discovery:
+#        enabled: true
+#        service-id: liquidnet-support-config