From 87532065ba0c304817c31628ebb1000f4e308f12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 02 四月 2022 19:30:24 +0800
Subject: [PATCH] 功能完善

---
 app/src/main/java/com/yeshi/makemoney/app/dao/config/SystemConfigDao.java |   71 +++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/yeshi/makemoney/app/dao/config/SystemConfigDao.java b/app/src/main/java/com/yeshi/makemoney/app/dao/config/SystemConfigDao.java
index 3280ae9..ca20eb0 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/dao/config/SystemConfigDao.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/dao/config/SystemConfigDao.java
@@ -7,90 +7,105 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+
 import com.yeshi.makemoney.app.entity.config.SystemConfigKey;
 import com.yeshi.makemoney.app.entity.SystemEnum;
+
 import java.util.Date;
+
 import org.yeshi.utils.mongo.MongodbBaseDao;
+
 import java.lang.String;
+
 import com.yeshi.makemoney.app.entity.config.SystemConfig;
+
 import java.util.ArrayList;
 
 
 @Repository
-public class SystemConfigDao extends MongodbBaseDao<SystemConfig>{
+public class SystemConfigDao extends MongodbBaseDao<SystemConfig> {
 
-  public void updateSelective(SystemConfig bean) {
+    public void updateSelective(SystemConfig bean) {
         Query query = new Query();
-        Update update=new Update();
+        Update update = new Update();
         query.addCriteria(Criteria.where("id").is(bean.getId()));
-        if(bean.getName() != null) {
+        if (bean.getName() != null) {
             update.set("name", bean.getName());
         }
-        if(bean.getKey() != null) {
+        if (bean.getKey() != null) {
             update.set("key", bean.getKey());
         }
-        if(bean.getSystem() != null) {
+        if (bean.getSystem() != null) {
             update.set("system", bean.getSystem());
         }
-        if(bean.getValue() != null) {
+        if (bean.getValue() != null) {
             update.set("value", bean.getValue());
         }
-        if(bean.getRemarks() != null) {
+        if (bean.getRemarks() != null) {
             update.set("remarks", bean.getRemarks());
         }
-        if(bean.getCreateTime() != null) {
+        if (bean.getCreateTime() != null) {
             update.set("createTime", bean.getCreateTime());
         }
         update.set("updateTime", new Date());
         update(query, update);
-  }
+    }
 
 
-  public List<SystemConfig> list(DaoQuery daoQuery){
+    public List<SystemConfig> list(DaoQuery daoQuery) {
         Query query = getQuery(daoQuery);
-        if (daoQuery.sortList!=null && daoQuery.sortList.size()>0){
+        if (daoQuery.sortList != null && daoQuery.sortList.size() > 0) {
             query.with(Sort.by(daoQuery.sortList));
         }
         query.skip(daoQuery.start);
         query.limit(daoQuery.count);
         return findList(query);
-  }
+    }
 
-  public long count(DaoQuery daoQuery){
-        Query query=getQuery(daoQuery);
+    public long count(DaoQuery daoQuery) {
+        Query query = getQuery(daoQuery);
         return count(query);
-  }
+    }
 
-  private Query getQuery(DaoQuery daoQuery){
-        List<Criteria> andList=new ArrayList<>();
-        if(daoQuery.name!=null){
+    private Query getQuery(DaoQuery daoQuery) {
+        List<Criteria> andList = new ArrayList<>();
+        if (daoQuery.name != null) {
             andList.add(Criteria.where("name").regex(daoQuery.name));
         }
-        if(daoQuery.key!=null){
+        if (daoQuery.key != null) {
             andList.add(Criteria.where("key").is(daoQuery.key));
         }
-        if(daoQuery.system!=null){
+        if (daoQuery.keyList != null) {
+            Criteria[] keys = new Criteria[daoQuery.keyList.size()];
+            for (int i = 0; i < daoQuery.keyList.size(); i++) {
+                keys[i] = Criteria.where("key").is(daoQuery.keyList.get(i));
+            }
+            andList.add(new Criteria().orOperator(keys));
+        }
+
+        if (daoQuery.system != null) {
             andList.add(Criteria.where("system").is(daoQuery.system));
         }
-        if(daoQuery.value!=null){
+        if (daoQuery.value != null) {
             andList.add(Criteria.where("value").regex(daoQuery.value));
         }
-        Query query=new Query();
-        Criteria[]  ands=new Criteria[andList.size()];
+        Query query = new Query();
+        Criteria[] ands = new Criteria[andList.size()];
         andList.toArray(ands);
-        if(ands.length>0){
+        if (ands.length > 0) {
             query.addCriteria(new Criteria().andOperator(ands));
         }
         return query;
-  }
+    }
 
-  public static class DaoQuery{
+    public static class DaoQuery {
         public String name;
         public SystemConfigKey key;
+        public List<SystemConfigKey> keyList;
         public SystemEnum system;
         public String value;
         public int start;
         public int count;
         public List<Sort.Order> sortList;
-  }
+    }
 }

--
Gitblit v1.8.0