Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/update.html

@@ -71,7 +71,7 @@
         </div>
         <div class="form-group" id="provincesListSelect">
             <label class="col-sm-2 control-label">请选择省份</label>
-            <th:block if="null == ${KylinBannersVo.provincesList}">
+            <th:block th:if="${#lists.isEmpty(KylinBannersVo.provincesList)}">
                 <div class="col-sm-12 provincesAll">
                     <label class="col-sm-2 control-label"></label>
                     <div class="col-sm-5">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java

@@ -32,6 +32,7 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
@@ -70,7 +71,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
     public boolean create(BannersParam bannersParam) {
         try {
             // 时间
-            String bannersId = IDGenerator.nextSnowId().toString();
+            String bannersId = IDGenerator.nextSnowId();
             LocalDateTime createdAt = LocalDateTime.now();
             String createdAtString = DateUtil.Formatter.yyyyMMddHHmmss.format(createdAt);
             if (StringUtils.isEmpty(bannersParam.getOnlineStartTime())) {
@@ -84,7 +85,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
 
             List<String> positionList = bannersParam.getPositionList();
             KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
-            String bannersRelationsId = IDGenerator.nextSnowId().toString();
+            String bannersRelationsId = IDGenerator.nextSnowId();
             kylinBannersRelations.setBannersRelationsId(bannersRelationsId);
             kylinBannersRelations.setBannersId(bannersId);
             kylinBannersRelations.setCreatedAt(createdAtString);
@@ -94,8 +95,8 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
                 kylinBannersRelationsMapper.insert(kylinBannersRelations);
             }
             List<String> provincesList = bannersParam.getProvincesList();
-            List<String> provincesNameList = bannersParam.getProvincesNameList();
-            if (!provincesList.isEmpty()) {
+            if (!CollectionUtils.isEmpty(provincesList)) {
+                List<String> provincesNameList = bannersParam.getProvincesNameList();
                 for (int i = 0; i < provincesList.size(); i++) {
                     kylinBannersRelations.setFieldId(provincesList.get(i));
                     kylinBannersRelations.setFieldIdType(2);
@@ -153,7 +154,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
 
             List<String> positionList = bannersParam.getPositionList();
             KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
-            String bannersRelationsId = IDGenerator.nextSnowId().toString();
+            String bannersRelationsId = IDGenerator.nextSnowId();
             kylinBannersRelations.setBannersRelationsId(bannersRelationsId);
             kylinBannersRelations.setBannersId(bannersId);
             kylinBannersRelations.setCreatedAt(updatedAtString);
@@ -167,12 +168,13 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
                 kylinBannersRelationsMapper.insert(kylinBannersRelations);
             }
             List<String> provincesList = bannersParam.getProvincesList();
-            List<String> provincesNameList = bannersParam.getProvincesNameList();
-            if (!provincesList.isEmpty()) {
+            if (CollectionUtils.isEmpty(provincesList)) {
                 // 入数据库 先删除之前的
                 kylinBannersRelationsMapper.delete(
                         new UpdateWrapper<KylinBannersRelations>().eq("banners_id", bannersId).eq("field_id_type", 2)
                 );
+            } else {
+                List<String> provincesNameList = bannersParam.getProvincesNameList();
                 if (!provincesList.isEmpty()) {
                     for (int i = 0; i < provincesList.size(); i++) {
                         kylinBannersRelations.setFieldId(provincesList.get(i));

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -251,7 +251,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         Query query = new BasicQuery(queryObject);
         String nowTimeStr = DateUtil.getNowTime();
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
-        query.addCriteria(Criteria.where("appStatus").in(3, 6, 8, 9));
+        query.addCriteria(Criteria.where("appStatus").in(3, 6, 8, 9, 10));
 
         long count = mongoTemplate.count(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());