调度预案

zoniot-common/zoniot-core-common/src/main/java/com/zcxk/core/common/util/BeanCopyUtils.java

@@ -1,5 +1,6 @@
 package com.zcxk.core.common.util;
 
+import com.alibaba.fastjson.JSON;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.FatalBeanException;
@@ -78,5 +79,16 @@ public class BeanCopyUtils {
         }
     }
 
+    /**
+     * 从对象A copy到 对象B
+     * @param ob A
+     * @param clazz B.class
+     * @return B
+     */
+    public static <T> T copy(Object ob,Class<T> clazz){
+        String oldOb = JSON.toJSONString(ob);
+        return JSON.parseObject(oldOb, clazz);
+    }
+
 
 }

zoniot-common/zoniot-core-mongo/src/main/java/com/zcxk/core/mongo/base/BaseDO.java

@@ -2,6 +2,9 @@ package com.zcxk.core.mongo.base;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.zcxk.core.common.enums.StatusEnum;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,7 +18,22 @@ import lombok.Data;
 @Data
 public class BaseDO implements Serializable {
 
-    private Long id;
+    private String id;
+
+    /**
+     * 租户ID
+     **/
+    private String tenantId;
+
+    /**
+     * 公司Id
+     */
+    private Integer companyOrgId;
+
+    /**
+     * 部门ID
+     */
+    private Integer deptOrgId;
 
     /**
      * 创建时间
@@ -47,4 +65,9 @@ public class BaseDO implements Serializable {
      **/
     private Date updateTime;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
 }

zoniot-common/zoniot-core-mongo/src/main/java/com/zcxk/core/mongo/base/BaseDao.java

@@ -1,11 +1,18 @@
 package com.zcxk.core.mongo.base;
 
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.Updates;
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 import com.zcxk.core.common.pojo.PageResult;
 import com.zcxk.core.mongo.annotation.QueryField;
 import com.zcxk.core.mongo.pageing.Page;
+import com.zcxk.core.mongo.utils.StringUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.bson.Document;
+import org.bson.conversions.Bson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -72,6 +79,17 @@ public class BaseDao<T, PK extends Serializable> {
         return mongoTemplate.upsert(query, update, entityClass);
     }
 
+
+    public UpdateResult updateOne(Bson filters, List<Bson> arrayFilters, Bson update) {
+
+        UpdateOptions updateOptions = new UpdateOptions().arrayFilters(arrayFilters);
+
+        MongoCollection<Document> collection = mongoTemplate.getDb().getCollection(mongoTemplate.getCollectionName(this.entityClass));
+
+        return collection.updateOne(filters,update,updateOptions);
+
+    }
+
     public UpdateResult updateById(PK id, Update update) {
         Query query = Query.query(Criteria.where(ID_FIELD).is(id));
         return update(query, update, true);
@@ -228,7 +246,7 @@ public class BaseDao<T, PK extends Serializable> {
     * @param unwind：需要拆开的子文档
     * @param unwindCriteria ：子文档查询,
     * @param groupOperation : 分组查询
-    * @return java.util.List<org.springframework.data.mongodb.core.aggregation.AggregationOperation>
+    * @return java.util.List<org.springframework.data.mongo.core.aggregation.AggregationOperation>
     **/
     public List<AggregationOperation> aggrQueryCondition(Criteria mainCriteria, String unwind, Criteria unwindCriteria, GroupOperation groupOperation) {
         List<AggregationOperation> commonOperations = new ArrayList<>();

zoniot-common/zoniot-core-utils/src/main/java/com/zcxk/core/utils/BigDecimalUtils.java

@@ -240,9 +240,4 @@ public class BigDecimalUtils {
         }
         return convert(value).compareTo(convert(value2)) == -1;
     }
-
-    public static void main(String[] args) {
-        System.out.println(new BigDecimal("12.150"));
-        System.out.println(convert(12.150 + ""));
-    }
 }

zoniot-common/zoniot-core-utils/src/main/java/com/zcxk/core/utils/DateUtil.java

@@ -198,6 +198,14 @@ public class DateUtil extends DateFormatUtils {
         return formatDate(new Date(), "E");
     }
 
+    /**
+     * 得到当前是几点
+     * @return
+     */
+    public static String getHour() {
+        return formatDate(new Date(), "HH");
+    }
+
     /**
      * 获取过去的天数
      */