1.将capsule项目相关内容移到本项目，避免使用maven引用

2.使用新版了taobao sdk

pom.xml

@@ -15,7 +15,7 @@
     <description>galaxis first step into cloud</description>
 
     <properties>
-        <java.version>14</java.version>
+        <java.version>17</java.version>
         <spring-cloud.version>Hoxton.SR4</spring-cloud.version>
     </properties>
 
@@ -94,12 +94,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.dingtalk.open</groupId>
-            <artifactId>taobao-sdk-java</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
@@ -117,9 +111,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.galaxis</groupId>
-            <artifactId>capsule</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <groupId>com.aliyun</groupId>
+            <artifactId>alibaba-dingtalk-service-sdk</artifactId>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/galaxis/manatee/capsule/bo/ChuanyunObject.java

@@ -0,0 +1,26 @@
+package com.galaxis.manatee.capsule.bo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 用于记录氚云中人员、部门信息Id信息对象
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/13 1:31 下午
+ */
+@Data
+public class ChuanyunObject {
+
+    /**
+     * 主键
+     */
+    @JsonProperty("ObjectId")
+    private String objectId;
+
+    /**
+     * 名称
+     */
+    @JsonProperty("Name")
+    private String name;
+}

src/main/java/com/galaxis/manatee/capsule/dto/ChuanyunProjectDTO.java

@@ -0,0 +1,115 @@
+package com.galaxis.manatee.capsule.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/8 2:04 下午
+ */
+@Data
+public class ChuanyunProjectDTO {
+
+//    /**
+//     * 主键
+//     */
+//    private String projectId;
+
+//    /**
+//     * 项目编号
+//     */
+//    private String projectCode;
+
+    /**
+     * 联合主键信息
+     */
+    private ChuanyunProjectPrimaryKey chuanyunProjectPrimaryKey;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 项目类型git
+     */
+    private String projectTypeCode;
+
+    /**
+     * 下发组织机构编码
+     */
+    private String organizationCode;
+
+    /**
+     * 项目签约日期
+     */
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime projectSignDateTime;
+
+    /**
+     * 客户ID
+     */
+    private String customerCode;
+
+    /**
+     * 应用场景
+     * 多场景间用 ;隔开
+     */
+    private String scene;
+
+    /**
+     * 部门编号
+     */
+    private String department;
+
+    /**
+     * 项目经理(工号)
+     */
+    private String projectManager;
+
+    /**
+     * 项目所有人(工号)
+     */
+    private String projectOwner;
+
+    /**
+     * 计划开始时间
+     */
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime planStartDate;
+
+    /**
+     * 计划结束时间
+     */
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime planEndDate;
+
+    /**
+     * 默认支出类型编码
+     */
+    private String defaultExpenseCode;
+
+    /**
+     * 当前阶段编码
+     */
+    private String stage;
+
+    /**
+     * 业务来源
+     */
+    private String businessSource;
+
+    /**
+     * 业务类型
+     */
+    private String businessType;
+}

src/main/java/com/galaxis/manatee/capsule/dto/ChuanyunProjectPrimaryKey.java

@@ -0,0 +1,24 @@
+package com.galaxis.manatee.capsule.dto;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/23 10:13 下午
+ */
+@Data
+public class ChuanyunProjectPrimaryKey implements Serializable {
+    /**
+     * 项目编码
+     */
+    protected String projectCode;
+
+    /**
+     * 所有组织编码
+     */
+    protected String ownerOrganizationCode;
+}

src/main/java/com/galaxis/manatee/capsule/dto/ChuanyunReimbursementDTO.java

@@ -0,0 +1,135 @@
+package com.galaxis.manatee.capsule.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/28 5:44 下午
+ */
+@Data
+public class ChuanyunReimbursementDTO {
+
+    /**
+     * 主键
+     */
+    private String objectId;
+
+    /**
+     * 公司编码
+     *
+     */
+    private String reimburseUserCompanyCode;
+
+    /**
+     * 对公/对私
+     */
+    private String privateOrPublic;
+
+    /**
+     * 流水号
+     */
+    private String serialNumber;
+
+    /**
+     * 业务日期
+     */
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime businessDate;
+
+    /**
+     * 币种
+     */
+    private String currency;
+
+    /**
+     * 汇率
+     */
+    private BigDecimal exchangeRate;
+
+    /**
+     * 供应商编码
+     */
+    private String supplierCode;
+
+    /**
+     * 集团项目编码
+     */
+    private String groupProjectCode;
+
+    /**
+     * 报销人工号
+     */
+    private String reimburseUserCode;
+
+    /**
+     * 报销人成本中心编码
+     */
+    private String reimburseUserCostCode;
+
+    /**
+     * 核销方式
+     */
+    private String writeOffMethod;
+
+    /**
+     * 报销总金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 受益公司银行代码
+     */
+    private String beneficiaryBankCode;
+
+    /**
+     * 受益公司银行账号
+     */
+    private String beneficiaryBankAccount;
+
+    /**
+     * 结算方式
+     */
+    private String settlementMethod;
+
+    /**
+     * 报销原因
+     */
+    private String reason;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime createdTime;
+
+    /**
+     * u9传入标识
+     */
+    private Integer erpFlag;
+
+    /**
+     * 受益成本中心编码
+     */
+    private String beneficiaryCostCode;
+
+    /**
+     * 报销明细
+     */
+    private List<ChuanyunReimbursementDetailDTO> detailList;
+}

src/main/java/com/galaxis/manatee/capsule/dto/ChuanyunReimbursementDetailDTO.java

@@ -0,0 +1,63 @@
+package com.galaxis.manatee.capsule.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/28 5:50 下午
+ */
+@Data
+public class ChuanyunReimbursementDetailDTO {
+    /**
+     * 税率
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * 财务实核金额
+     */
+    private BigDecimal confirmAmount;
+
+    /**
+     * 财务实核税额
+     */
+    private BigDecimal confirmTax;
+
+    /**
+     * 实核未税金额
+     */
+    private BigDecimal confirmAmountWithoutTax;
+
+    /**
+     * 报销科目
+     */
+    private String reimburseSubjectName;
+
+    /**
+     * 成本费用项目
+     * 报销科目档案的U9成本费用项目栏位
+     */
+    private String reimburseSubjectCode;
+
+    /**
+     * 公司编码
+     */
+    private String reimburseUserCompanyCode;
+
+    /**
+     * 报销人成本中心编码
+     */
+    private String reimburseUserCostCode;
+
+    /**
+     * 项目编码
+     */
+    private String groupProjectCode;
+    /**
+     * 备注
+     */
+    private String content;
+}

src/main/java/com/galaxis/manatee/capsule/dto/MaterialDTO.java

@@ -0,0 +1,61 @@
+package com.galaxis.manatee.capsule.dto;
+
+import lombok.Data;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/15 10:37 上午
+ */
+@Data
+public class MaterialDTO {
+    /**
+     * 物料编号
+     */
+    private String code;
+
+    /**
+     * 品名
+     */
+    private String name;
+
+    /**
+     * 品名
+     */
+    private String title;
+
+    /**
+     * 名称（标签）
+     */
+    private String label;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 版本
+     */
+    private String version;
+
+    /**
+     * 库存分类
+     */
+    private String type;
+
+    /**
+     * 形态属性
+     */
+    private String property;
+
+    /**
+     * 组织编码
+     */
+    private String organizationCode;
+}

src/main/java/com/galaxis/manatee/capsule/dto/PageDTO.java

@@ -0,0 +1,131 @@
+package com.galaxis.manatee.capsule.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.springframework.data.domain.*;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * 实现Page接口的分页对象
+ * @author zcj
+ * @param <T>
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PageDTO<T> implements Page<T> {
+    private final Page<T> delegate;
+
+    public PageDTO(
+            @JsonProperty("content") List<T> content,
+            @JsonProperty("page")int number,
+            @JsonProperty("size") int size,
+            @JsonProperty("totalElements") long totalElements){
+        delegate = new PageImpl<>(content, PageRequest.of(number, size), totalElements);
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("{");
+        sb.append("\"delegate\":")
+                .append(delegate);
+        sb.append('}');
+        return sb.toString();
+    }
+
+    @JsonProperty
+    @Override
+    public int getTotalPages() {
+        return delegate.getTotalPages();
+    }
+
+    @JsonProperty
+    @Override
+    public long getTotalElements() {
+        return delegate.getTotalElements();
+    }
+
+    @JsonProperty("page")
+    @Override
+    public int getNumber() {
+        return delegate.getNumber();
+    }
+
+    @JsonProperty
+    @Override
+    public int getSize() {
+        return delegate.getSize();
+    }
+
+    @JsonProperty
+    @Override
+    public int getNumberOfElements() {
+        return delegate.getNumberOfElements();
+    }
+
+    @JsonProperty
+    @Override
+    public List<T> getContent() {
+        return delegate.getContent();
+    }
+
+    @JsonProperty
+    @Override
+    public boolean hasContent() {
+        return delegate.hasContent();
+    }
+
+    @JsonIgnore
+    @Override
+    public Sort getSort() {
+        return delegate.getSort();
+    }
+
+    @JsonProperty
+    @Override
+    public boolean isFirst() {
+        return delegate.isFirst();
+    }
+
+    @JsonProperty
+    @Override
+    public boolean isLast() {
+        return delegate.isLast();
+    }
+
+    @JsonIgnore
+    @Override
+    public boolean hasNext() {
+        return delegate.hasNext();
+    }
+
+    @JsonIgnore
+    @Override
+    public boolean hasPrevious() {
+        return delegate.hasPrevious();
+    }
+
+    @JsonIgnore
+    @Override
+    public Pageable nextPageable() {
+        return delegate.nextPageable();
+    }
+    @JsonIgnore
+    @Override
+    public Pageable previousPageable() {
+        return delegate.previousPageable();
+    }
+    @JsonIgnore
+    @Override
+    public <S> Page<S> map(Function<? super T, ? extends S> converter) {
+        return delegate.map(converter);
+    }
+
+    @JsonIgnore
+    @Override
+    public Iterator<T> iterator() {
+        return delegate.iterator();
+    }
+}

src/main/java/com/galaxis/manatee/capsule/dto/U9ResponseDTO.java

@@ -0,0 +1,22 @@
+package com.galaxis.manatee.capsule.dto;
+
+import lombok.Data;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/28 7:04 下午
+ */
+@Data
+public class U9ResponseDTO {
+
+    /**
+     * 错误名称
+     */
+    private String errorMessage;
+
+    /**
+     * 错误级别
+     */
+    private String errorLevel;
+}

src/main/java/com/galaxis/manatee/capsule/entity/Class.java

@@ -0,0 +1,40 @@
+package com.galaxis.manatee.capsule.entity;
+
+import lombok.Getter;
+
+/**
+ * @author zcj
+ * @version 1.0
+ */
+@Getter
+public enum Class{
+
+    /**
+     * 字符串
+     */
+    String,
+    /**
+     * 整形
+     */
+    Integer,
+    /**
+     * 长整形
+     */
+    Long,
+    /**
+     * 时间
+     */
+    LocalDateTime,
+    /**
+     * bigDecimal
+     */
+    BigDecimal,
+    /**
+     * bool类型
+     */
+    Boolean,
+    /**
+     * 时间类型
+     */
+    Date
+}

src/main/java/com/galaxis/manatee/capsule/exception/AfterInsertVerifyException.java

@@ -0,0 +1,24 @@
+package com.galaxis.manatee.capsule.exception;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/28 7:08 下午
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AfterInsertVerifyException extends Exception{
+
+    /**
+     * 错误信息
+     */
+    private String errorMessage;
+
+    /**
+     * 错误级别
+     */
+    private String errorLevel;
+}

src/main/java/com/galaxis/manatee/capsule/exception/DaoMissingException.java

@@ -0,0 +1,22 @@
+package com.galaxis.manatee.capsule.exception;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/8 11:48 上午
+ */
+public class DaoMissingException extends Exception {
+    /**
+     * 默认构造函数
+     */
+    public DaoMissingException() {
+    }
+
+    /**
+     * 缺少dao对象异常
+     * @param message   异常信息
+     */
+    public DaoMissingException(String message) {
+        super(message);
+    }
+}

src/main/java/com/galaxis/manatee/capsule/exception/ServerException.java

@@ -0,0 +1,11 @@
+package com.galaxis.manatee.capsule.exception;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/8 3:49 下午
+ */
+public class ServerException extends Exception{
+    public ServerException() {
+    }
+}

src/main/java/com/galaxis/manatee/capsule/exception/SpecificationMissingException.java

@@ -0,0 +1,22 @@
+package com.galaxis.manatee.capsule.exception;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/8 11:54 上午
+ */
+public class SpecificationMissingException extends Exception {
+    /**
+     * 默认构造函数
+     */
+    public SpecificationMissingException() {
+    }
+
+    /**
+     * 查询信息缺失异常
+     * @param message   缺失消息
+     */
+    public SpecificationMissingException(String message) {
+        super(message);
+    }
+}

src/main/java/com/galaxis/manatee/capsule/util/BasicController.java

@@ -0,0 +1,77 @@
+package com.galaxis.manatee.capsule.util;
+
+import com.galaxis.manatee.capsule.exception.DaoMissingException;
+import com.galaxis.manatee.capsule.exception.SpecificationMissingException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * @author zcj
+ * @version 0.1
+ */
+public class BasicController<T,K> extends JpaConfigurator<T,K> {
+
+    /**
+     * 注入dao对象
+     * @param galaxisRepository  dao对象
+     */
+    public void setDao(GalaxisRepository<T,K> galaxisRepository){
+        this.dao=galaxisRepository;
+    }
+
+    /**
+     * 保存对象实例
+     * @param t 待保存对象
+     * @return  保存请求结果
+     * @throws  DaoMissingException dao对象缺失的异常
+     */
+    @PostMapping("/save")
+    public ResponseEntity<T> save(@RequestBody T t) throws DaoMissingException {
+        if(this.dao==null){
+            throw new DaoMissingException();
+        }
+        if (t==null){
+            throw new IllegalArgumentException();
+        }
+        T result=dao.save(t);
+        try {
+            return new ResponseEntity<>(result, HttpStatus.OK);
+        }catch (IllegalArgumentException illegalArgumentException){
+            illegalArgumentException.printStackTrace();
+            return new ResponseEntity<>(HttpStatus.SERVICE_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param parameters 查询条件
+     *                   key为xxxx_yy,xxxx为查询参数名，yy为查询条件，如eq，lk等.
+     *                   例如：   status_eq,CREATE 表示查询status字段equal查询，值为CREATE
+     *                   property_lik,%234% 表示查询property字段like查询，值为%234%
+     *                   value为yy,yy,yy为参数的值，多个值中间用","分隔
+     * @return 分页数据
+     */
+    @GetMapping("/findAllByParameters")
+    public Page<T> findAllByParams(@RequestParam Map<String, String> parameters) throws DaoMissingException, SpecificationMissingException {
+        if(this.dao==null){
+            throw new DaoMissingException();
+        }
+        Specification<T> specification = this.getSpecification(parameters);
+        Pageable pageable=this.getPageable(parameters);
+        if (specification==null||pageable==null){
+            throw new SpecificationMissingException();
+        }else{
+            return dao.findAll(specification, pageable);
+        }
+    }
+}

src/main/java/com/galaxis/manatee/capsule/util/ColumnConditionBO.java

@@ -0,0 +1,90 @@
+package com.galaxis.manatee.capsule.util;
+
+import lombok.Data;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/8 11:28 上午
+ */
+@Data
+public class ColumnConditionBO {
+    /**
+     * 查询字段
+     */
+    private String column;
+    /**
+     * 查询条件
+     */
+    private Condition condition;
+
+    public enum Condition {
+        /**
+         * 等于
+         */
+        eq,
+        /**
+         * like
+         */
+        lk,
+        /**
+         * start with
+         * xxxxx%
+         */
+        sw,
+        /**
+         * end with
+         * %xxxx
+         */
+        ew,
+        /**
+         * containing
+         * %xxxxxx%
+         */
+        containing,
+        /**
+         * between
+         */
+        between,
+        /**
+         * in
+         */
+        in,
+        /**
+         * greater equal
+         */
+        ge,
+        /**
+         * great than
+         */
+        gt,
+        /**
+         * less equal
+         */
+        le,
+        /**
+         * less than
+         */
+        lt,
+        /**
+         * isNull
+         */
+        isNull,
+        /**
+         * isNotNull
+         */
+        isNotNull,
+        /**
+         * 不等于
+         */
+        not
+    }
+
+    public static ColumnConditionBO parse(String s) {
+        ColumnConditionBO columnConditionBO = new ColumnConditionBO();
+        String[] strings = s.split("_");
+        columnConditionBO.setColumn(strings[0]);
+        columnConditionBO.setCondition(Condition.valueOf(strings[1]));
+        return columnConditionBO;
+    }
+}

src/main/java/com/galaxis/manatee/capsule/util/GalaxisIdGenerator.java

@@ -0,0 +1,48 @@
+package com.galaxis.manatee.capsule.util;
+
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.id.Configurable;
+import org.hibernate.id.IdentifierGenerator;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.type.Type;
+
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.util.Properties;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/1/8 11:53 下午
+ */
+public class GalaxisIdGenerator implements Configurable, IdentifierGenerator {
+    /** 数据中心ID(0~31) */
+    private long dataCenterId = 0L;
+
+    @Override
+    public void configure(Type type, Properties params, ServiceRegistry serviceRegistry) throws MappingException {
+        try {
+            InetAddress addr = InetAddress.getLocalHost();
+            String[] a=addr.getHostName().split("-");
+            dataCenterId = Long.parseLong(a[a.length-1]);
+        }
+        catch (Exception e){
+            //10位长度最大值1023，这里简单写为1000，相信不会用到
+            dataCenterId =1000L;
+        }
+    }
+
+    public Serializable generate(SessionImplementor session, Object o) throws HibernateException {
+        SnowflakeIdGenerator snowflakeIdWorker = SnowflakeIdGenerator.getSnowflakeIdGenerator(this.dataCenterId);
+        return snowflakeIdWorker.nextId();
+    }
+
+    @Override
+    public Serializable generate(SharedSessionContractImplementor sharedSessionContractImplementor, Object o) throws HibernateException {
+        SnowflakeIdGenerator snowflakeIdWorker = SnowflakeIdGenerator.getSnowflakeIdGenerator(this.dataCenterId);
+        return snowflakeIdWorker.nextId();
+    }
+}

src/main/java/com/galaxis/manatee/capsule/util/GalaxisRepository.java

@@ -0,0 +1,12 @@
+package com.galaxis.manatee.capsule.util;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/8 3:39 下午
+ */
+public interface GalaxisRepository<T,ID> extends JpaRepository<T, ID>, JpaSpecificationExecutor<T> {
+}

src/main/java/com/galaxis/manatee/capsule/util/IdGenerate.java

@@ -0,0 +1,15 @@
+package com.galaxis.manatee.capsule.util;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/1/8 11:39 下午
+ */
+public interface IdGenerate<T> {
+
+    /**
+     * 下一个id
+     * @return 下一个id
+     */
+    T nextId();
+}

src/main/java/com/galaxis/manatee/capsule/util/JpaConfigurator.java

@@ -0,0 +1,335 @@
+package com.galaxis.manatee.capsule.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zcj
+ * @version 0.1
+ */
+@Slf4j
+public class JpaConfigurator<T,K> {
+
+    protected GalaxisRepository<T,K> dao;
+
+    private Class clazz;
+
+    /**
+     * 根据map参数构造specification查询条件
+     * @param map   map参数
+     * @return  查询条件
+     */
+    protected Specification<T> getSpecification(Map<String,String> map){
+        return  ((root, query, criteriaBuilder) -> {
+            List<Predicate> predicateList = new ArrayList<>();
+            map.forEach((k, v) -> {
+                try {
+                    ColumnConditionBO columnConditionBO = ColumnConditionBO.parse(k);
+                    Predicate predicate=this.getPredicate(columnConditionBO, v, criteriaBuilder, root);
+                    if(predicate==null){
+                        log.warn(k+"查询条件错误");
+                    }else{
+                        predicateList.add(predicate);
+                    }
+                } catch (Exception e) {
+                    log.error(e.getMessage());
+                }
+            });
+            Predicate[] p = new Predicate[predicateList.size()];
+            return criteriaBuilder.and(predicateList.toArray(p));
+        });
+    }
+
+    /**
+     * @param map map参数
+     *            page属性为页码从1开始；
+     *            size属性为页码大小，默认20
+     *            sort属性为排序字段， ASC,XXXX;DESC,YYYY
+     *
+     * @return 分页对象
+     */
+    protected Pageable getPageable(Map<String, String> map) {
+        int page;
+        int size;
+        try {
+            page = Integer.parseInt(map.get("page")) - 1;
+            size = Integer.parseInt(map.get("size"));
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            page = 0;
+            size = 20;
+        }
+        String sortString = map.get("sort");
+        if (null == sortString) {
+            return PageRequest.of(page, size);
+        } else {
+            List<Sort.Order> orderList=new ArrayList<>();
+            String[] columnAndDirections=sortString.split(";");
+            for (String andDirection : columnAndDirections) {
+                String[] columnAndDirection = andDirection.split(",");
+                Sort.Order order = new Sort.Order(Sort.Direction.valueOf(columnAndDirection[1]), columnAndDirection[0]);
+                orderList.add(order);
+            }
+            return PageRequest.of(page, size, Sort.by(orderList));
+        }
+    }
+
+    /**
+     * 获取查询
+     *
+     * @param columnConditionBO 字段、条件业务类
+     * @param value             查询值
+     * @param criteriaBuilder   cb
+     * @param root              root
+     * @return 查询条件
+     */
+    private Predicate getPredicate(ColumnConditionBO columnConditionBO, String value, CriteriaBuilder criteriaBuilder, Root<T> root) throws NoSuchFieldException {
+        //获取查询字段的类型，fieldClass为查询类中字段的类型，classType为根据类型定义的枚举类
+        clazz = (Class) ((ParameterizedType) this.getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+        while (clazz!=null){
+            try{
+                //对于子类无法获取父类的私有属性，需要递归向上获取父类的私有属性
+                Field field = this.getDeclaredField(clazz, columnConditionBO.getColumn());
+                Class fieldClass = field.getType();
+                //判断fieldClass是否是枚举类
+                if (!fieldClass.isEnum()) {
+                    return basicPredicate(columnConditionBO, value, criteriaBuilder, root, fieldClass);
+                } else {
+                    return enumPredicate(columnConditionBO, value, criteriaBuilder, root, fieldClass.getEnumConstants());
+                }
+            }catch (Exception e){
+                log.error(e.getMessage());
+                clazz=clazz.getSuperclass();
+            }
+        }
+        String noSuchFieldException="根据查询参数获取类中的域失败";
+        log.warn(noSuchFieldException);
+        throw new NoSuchFieldException(noSuchFieldException);
+    }
+
+    /**
+     * 基础类predicate生成方法
+     *
+     * @param columnConditionBO 参数条件
+     * @param value             查询条件值
+     * @param criteriaBuilder   构建起
+     * @param root              root
+     * @param fieldClass        fieldClass
+     * @return predicate
+     */
+    private Predicate basicPredicate(ColumnConditionBO columnConditionBO, String value, CriteriaBuilder criteriaBuilder, Root<T> root, Class fieldClass) {
+        com.galaxis.manatee.capsule.entity.Class classType = com.galaxis.manatee.capsule.entity.Class.valueOf(fieldClass.getSimpleName());
+        switch (columnConditionBO.getCondition()) {
+            case lk: {
+                return criteriaBuilder.like(root.get(columnConditionBO.getColumn()), value);
+            }case sw: {
+                return criteriaBuilder.like(root.get(columnConditionBO.getColumn()), value + "%");
+            }case ew: {
+                return criteriaBuilder.like(root.get(columnConditionBO.getColumn()), "%" + value);
+            }case containing: {
+                return criteriaBuilder.like(root.get(columnConditionBO.getColumn()), "%" + value + "%");
+            }case eq: {
+                return criteriaBuilder.equal(root.get(columnConditionBO.getColumn()), value);
+            }case not:{
+                return criteriaBuilder.notEqual(root.get(columnConditionBO.getColumn()), value);
+            }case isNull:{
+                return criteriaBuilder.isNull(root.get(columnConditionBO.getColumn()));
+            }case isNotNull:{
+                return criteriaBuilder.isNotNull(root.get(columnConditionBO.getColumn()));
+            }case between: {
+                String[] minAndMax = value.split(",");
+                switch (classType) {
+                    case LocalDateTime: {
+                        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+                        return criteriaBuilder.between(root.get(columnConditionBO.getColumn()), LocalDateTime.parse(minAndMax[0], dateTimeFormatter), LocalDateTime.parse(minAndMax[1], dateTimeFormatter));
+                    }case String: {
+                        return criteriaBuilder.between(root.get(columnConditionBO.getColumn()), minAndMax[0], minAndMax[1]);
+                    }case Integer: {
+                        return criteriaBuilder.between(root.get(columnConditionBO.getColumn()), Integer.parseInt(minAndMax[0]), Integer.parseInt(minAndMax[1]));
+                    }case Long: {
+                        return criteriaBuilder.between(root.get(columnConditionBO.getColumn()), Long.parseLong(minAndMax[0]), Long.parseLong(minAndMax[1]));
+                    }case BigDecimal: {
+                        return criteriaBuilder.between(root.get(columnConditionBO.getColumn()), new BigDecimal(minAndMax[0]), new BigDecimal(minAndMax[1]));
+                    }case Date:{
+                        SimpleDateFormat dateTimeFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+                        try {
+                            return criteriaBuilder.between(root.get(columnConditionBO.getColumn()), dateTimeFormatter.parse(minAndMax[0]),dateTimeFormatter.parse(minAndMax[1]));
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }default:
+                        return null;
+                }
+            }case ge:{
+                switch (classType){
+                    case Date:{
+                        SimpleDateFormat dateTimeFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+                        try {
+                            return criteriaBuilder.greaterThanOrEqualTo(root.get(columnConditionBO.getColumn()), dateTimeFormatter.parse(value));
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }default:
+                        return null;
+                }
+            }case gt:{
+                switch (classType){
+                    case Date:{
+                        SimpleDateFormat dateTimeFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+                        try {
+                            return criteriaBuilder.greaterThan(root.get(columnConditionBO.getColumn()), dateTimeFormatter.parse(value));
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }default:
+                        return null;
+                }
+            }case le:{
+                switch (classType){
+                    case Date:{
+                        SimpleDateFormat dateTimeFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+                        try {
+                            return criteriaBuilder.lessThanOrEqualTo(root.get(columnConditionBO.getColumn()), dateTimeFormatter.parse(value));
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }default:
+                        return null;
+                }
+            }case lt:{
+                switch (classType){
+                    case Date:{
+                        SimpleDateFormat dateTimeFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+                        try {
+                            return criteriaBuilder.lessThan(root.get(columnConditionBO.getColumn()), dateTimeFormatter.parse(value));
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }default:
+                        return null;
+                }
+            }case in: {
+                String[] inValues = value.split(",");
+                List<String> stringList = Arrays.asList(inValues);
+                switch (classType) {
+                    case LocalDateTime: {
+                        CriteriaBuilder.In<LocalDateTime> in = criteriaBuilder.in(root.get(columnConditionBO.getColumn()));
+                        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+                        stringList.forEach(s -> in.value(LocalDateTime.parse(s, dateTimeFormatter)));
+                        return in;
+                    }case String: {
+                        CriteriaBuilder.In<String> in = criteriaBuilder.in(root.get(columnConditionBO.getColumn()));
+                        stringList.forEach(in::value);
+                        return in;
+                    }case Long: {
+                        CriteriaBuilder.In<Long> in = criteriaBuilder.in(root.get(columnConditionBO.getColumn()));
+                        stringList.forEach(s -> in.value(Long.parseLong(s)));
+                        return in;
+                    }case BigDecimal: {
+                        CriteriaBuilder.In<BigDecimal> in = criteriaBuilder.in(root.get(columnConditionBO.getColumn()));
+                        stringList.forEach(s -> in.value(new BigDecimal(s)));
+                        return in;
+                    }case Integer: {
+                        CriteriaBuilder.In<Integer> in = criteriaBuilder.in(root.get(columnConditionBO.getColumn()));
+                        stringList.forEach(s -> in.value(Integer.parseInt(s)));
+                        return in;
+                    }default: {
+                        return null;
+                    }
+                }
+            }default: {
+                return null;
+            }
+        }
+    }
+
+    /**
+     * enum类predicate生成方法
+     *
+     * @param columnConditionBO 参数条件
+     * @param value             查询值
+     * @param criteriaBuilder   构建起
+     * @param root              root
+     * @param ys                ys
+     * @return predicate
+     */
+    private <Y> Predicate enumPredicate(ColumnConditionBO columnConditionBO, String value, CriteriaBuilder criteriaBuilder, Root<T> root, Y[] ys) {
+        //枚举类型处理
+        switch (columnConditionBO.getCondition()){
+            case not:{
+                Predicate eq = null;
+                for (Y y : ys) {
+                    if (y.toString().equals(value)) {
+                        eq = criteriaBuilder.notEqual(root.get(columnConditionBO.getColumn()), y);
+                    }
+                }
+                return eq;
+            }case in:{
+                CriteriaBuilder.In<Y> in = criteriaBuilder.in(root.get(columnConditionBO.getColumn()));
+                Arrays.asList(value.split(",")).forEach(s -> Arrays.asList(ys).forEach(f -> {
+                    if (f.toString().equals(s)) {
+                        in.value(f);
+                    }
+                }));
+                return in;
+            }case eq:{
+                Predicate eq = null;
+                for (Y y : ys) {
+                    if (y.toString().equals(value)) {
+                        eq = criteriaBuilder.equal(root.get(columnConditionBO.getColumn()), y);
+                    }
+                }
+                return eq;
+            }default:{
+                return null;
+//                CriteriaBuilder.In<Y> in = criteriaBuilder.in(root.get(columnConditionBO.getColumn()));
+//                Arrays.asList(value.split(",")).forEach(s -> Arrays.asList(ys).forEach(f -> {
+//                    if (f.toString().equals(s)) {
+//                        in.value(f);
+//                    }
+//                }));
+//                return in;
+            }
+        }
+    }
+
+    /**
+     * 循环向上转型, 获取对象的 DeclaredField
+     * @param clazz : 子类对象类型
+     * @param fieldName : 父类中的属性名
+     * @return 父类中的属性对象
+     */
+
+    private Field getDeclaredField(Class<?> clazz, String fieldName){
+        Field field;
+        for(; clazz != Object.class ; clazz = clazz.getSuperclass()) {
+            try {
+                field = clazz.getDeclaredField(fieldName) ;
+                return field ;
+            } catch (Exception e) {
+                //这里甚么都不要做！并且这里的异常必须这样写，不能抛出去。
+                //如果这里的异常打印或者往外抛，则就不会执行clazz = clazz.getSuperclass(),最后就不会进入到父类中了
+
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/galaxis/manatee/capsule/util/SnowflakeIdGenerator.java

@@ -0,0 +1,125 @@
+package com.galaxis.manatee.capsule.util;
+
+/**
+ * 雪花算法生成Id
+ * @author zcj
+ * @version 0.1
+ * @date 2020/1/8 11:40 下午
+ */
+public class SnowflakeIdGenerator implements IdGenerate<Long> {
+    private static SnowflakeIdGenerator snowflakeIdWorker;
+
+    private static final Object LOOK = new Object();
+
+    /**
+     * 获取 snowflake
+     * @param dataCenterId 数据中心ID (0~31)
+     */
+    public static SnowflakeIdGenerator getSnowflakeIdGenerator(long dataCenterId){
+        if(null == snowflakeIdWorker){
+            snowflakeIdWorker=new SnowflakeIdGenerator(dataCenterId);
+        }
+        return snowflakeIdWorker;
+    }
+
+    // ==============================Fields===========================================
+
+    /** 数据标识id所占的位数 */
+    private final long dataCenterIdBits = 10L;
+
+    /** 数据中心ID(0~31) */
+    private long dataCenterId;
+
+    /** 毫秒内序列(0~4095) */
+    private long sequence = 0L;
+
+    /** 上次生成ID的时间截 */
+    private long lastTimestamp = -1L;
+
+    //==============================Constructors=====================================
+    /**
+     * 构造函数
+     * @param dataCenterId 数据中心ID (0~31)
+     */
+    private SnowflakeIdGenerator(long dataCenterId) {
+        // 支持的最大数据标识id，结果是31
+        long maxDataCenterId = ~(-1L << dataCenterIdBits);
+        if (dataCenterId > maxDataCenterId || dataCenterId < 0) {
+            throw new IllegalArgumentException(String.format("dataCenter Id can't be greater than %d or less than 0", maxDataCenterId));
+        }
+        this.dataCenterId = dataCenterId;
+    }
+
+    // ==============================Methods==========================================
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     * @return SnowflakeId
+     */
+    @Override
+    public synchronized Long nextId() {
+
+        synchronized (LOOK){
+            long timeStamp = timeGen();
+
+            //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+            if (timeStamp < lastTimestamp) {
+                throw new RuntimeException(
+                        String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timeStamp));
+            }
+
+            //如果是同一时间生成的，则进行毫秒内序列
+            // 序列在id中占的位数 */
+            long sequenceBits = 12L;
+            if (lastTimestamp == timeStamp) {
+                // 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095) */
+                long sequenceMask = ~(-1L << sequenceBits);
+                sequence = (sequence + 1) & sequenceMask;
+                //毫秒内序列溢出
+                if (sequence == 0) {
+                    //阻塞到下一个毫秒,获得新的时间戳
+                    timeStamp = tilNextMillis(lastTimestamp);
+                }
+            }
+            //时间戳改变，毫秒内序列重置
+            else {
+                sequence = 0L;
+            }
+
+            //上次生成ID的时间截
+            lastTimestamp = timeStamp;
+
+            //移位并通过或运算拼到一起组成64位的ID
+            // 开始时间截 (2015-01-01)
+            long startTimeStamp = 1420041600000L;
+            // 时间截向左移22位(5+5+12) */
+            long timestampLeftShift = sequenceBits + dataCenterIdBits;
+            // 数据标识id向左移17位(12+5) */
+            return ((timeStamp - startTimeStamp) << timestampLeftShift)
+                    | (dataCenterId << sequenceBits)
+                    | sequence;
+        }
+
+
+    }
+
+    /**
+     * 阻塞到下一个毫秒，直到获得新的时间戳
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    private long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     * @return 当前时间(毫秒)
+     */
+    private long timeGen() {
+        return System.currentTimeMillis();
+    }
+}

src/main/java/com/galaxis/manatee/controller/ClawController.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.controller;
 
-import com.galaxis.capsule.dto.ChuanyunProjectDTO;
+import com.galaxis.manatee.capsule.dto.ChuanyunProjectDTO;
 import com.galaxis.manatee.manager.ClawFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;

src/main/java/com/galaxis/manatee/controller/UtilsController.java

@@ -1,25 +0,0 @@
-package com.galaxis.manatee.controller;
-
-import com.galaxis.capsule.util.SnowflakeIdGenerator;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author zcj
- * @version 0.1
- * @date 2020/1/8 11:59 下午
- */
-@RequestMapping("/utils")
-@RestController
-public class UtilsController {
-
-    /**
-     * 获取一个Id
-     * @return  id
-     */
-    @GetMapping("/useGalaxisIdGenerator")
-    public String useGalaxisIdGenerator(){
-        return SnowflakeIdGenerator.getSnowflakeIdGenerator(1L).nextId().toString();
-    }
-}

src/main/java/com/galaxis/manatee/dao/ChuanyunAskForLeaveDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunAskForLeaveDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

src/main/java/com/galaxis/manatee/dao/ChuanyunAttachmentDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunAttachmentDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunBudgetStatisticsDao.java

@@ -1,8 +1,7 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunBudgetStatisticsDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunMemberCostDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunBusinessEntertainmentDao.java

@@ -1,8 +1,7 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunBusinessEntertainmentDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCompanyDO;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/galaxis/manatee/dao/ChuanyunClientDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunClientDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunCompanyDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCompanyDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunCostCollectionDao.java

@@ -1,7 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCompanyDO;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCostCollectionDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunCostDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCostDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunDayWorkAbcDao.java

@@ -1,9 +1,7 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunDayWorkAbcDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunUserCompanyDO;
-import com.galaxis.manatee.entity.chuanyun.dto.ChuanyunDayWorkAbcDTO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/galaxis/manatee/dao/ChuanyunEquipmentInformDao.java

@@ -1,8 +1,7 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunEquipmentInformDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPayrollDO;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/galaxis/manatee/dao/ChuanyunGroupProjectDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunGroupProjectDO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/com/galaxis/manatee/dao/ChuanyunHolidaySalaryRuleDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunHolidaySalaryRuleDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunLaborCostDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunLaborCostDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

src/main/java/com/galaxis/manatee/dao/ChuanyunLogDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunLogDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunMaterialDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunMaterialDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunMemberCostDao.java

@@ -1,9 +1,8 @@
 package com.galaxis.manatee.dao;
 
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunMemberCostDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectCostDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/galaxis/manatee/dao/ChuanyunMonthLaborCostDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunMonthLaborCostDO;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPayrollDO;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/galaxis/manatee/dao/ChuanyunOperationInformationDao.java

@@ -1,7 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunMonthLaborCostDO;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunOperationInformationDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunPaymentReceiveActionDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPaymentReceiveActionDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunPaymentReceiveDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPaymentReceiveDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunPaymentReceiveInvoiceDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPaymentReceiveInvoiceDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunPaymentReceivePlanDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPaymentReceivePlanDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunPayrollDao.java

@@ -1,7 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunGroupProjectDO;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPayrollDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

src/main/java/com/galaxis/manatee/dao/ChuanyunPersonDaysDao.java

@@ -1,8 +1,7 @@
 package com.galaxis.manatee.dao;
 
 
-import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunLaborCostDO;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPersonDaysDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

src/main/java/com/galaxis/manatee/dao/ChuanyunProjectAttachmentDao.java

@@ -1,7 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunAttachmentDO;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectAttachmentDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunProjectCashFlowDao.java

@@ -1,7 +1,7 @@
 package com.galaxis.manatee.dao;
 
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectCashFlowDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunProjectChangeDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectChangeDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

src/main/java/com/galaxis/manatee/dao/ChuanyunProjectCostDao.java

@@ -1,7 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunMemberCostDO;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectCostDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

src/main/java/com/galaxis/manatee/dao/ChuanyunProjectTypeDao.java

@@ -1,8 +1,7 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectTypeDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunReimbursementDO;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/galaxis/manatee/dao/ChuanyunReimbursementAmountDao.java

@@ -1,7 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunMemberCostDO;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunReimbursementAmountDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

src/main/java/com/galaxis/manatee/dao/ChuanyunReimbursementDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunReimbursementDO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -12,7 +12,6 @@ import java.util.List;
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/4/27 4:18 下午
  */
 @Repository
 public interface ChuanyunReimbursementDao extends GalaxisRepository<ChuanyunReimbursementDO,String> {

src/main/java/com/galaxis/manatee/dao/ChuanyunReimbursementDetailDao.java

@@ -1,13 +1,12 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunReimbursementDetailDO;
 import org.springframework.stereotype.Repository;
 
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/4/27 4:19 下午
  */
 @Repository
 public interface ChuanyunReimbursementDetailDao extends GalaxisRepository<ChuanyunReimbursementDetailDO,String> {

src/main/java/com/galaxis/manatee/dao/ChuanyunReimbursementItemsDao.java

@@ -1,7 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunCompanyDO;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunReimbursementItemsDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunReimbursementSubjectDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunReimbursementSubjectDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunSaleContractDao.java

@@ -1,13 +1,12 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSaleContractDO;
 import org.springframework.stereotype.Repository;
 
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/5/1 1:48 下午
  */
 @Repository
 public interface ChuanyunSaleContractDao extends GalaxisRepository<ChuanyunSaleContractDO,String> {

src/main/java/com/galaxis/manatee/dao/ChuanyunSaleContractDetailDao.java

@@ -1,13 +1,12 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSaleContractDetailDO;
 import org.springframework.stereotype.Repository;
 
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/5/1 4:23 下午
  */
 @Repository
 public interface ChuanyunSaleContractDetailDao extends GalaxisRepository<ChuanyunSaleContractDetailDO,String> {

src/main/java/com/galaxis/manatee/dao/ChuanyunSelfCostDao.java

@@ -1,14 +1,12 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSelfCostDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSelfWorkHourDO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunSelfSubWorkHourDao.java

@@ -1,8 +1,7 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSelfSubWorkHourDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSelfWorkHourDO;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;

src/main/java/com/galaxis/manatee/dao/ChuanyunSelfWorkHourDao.java

@@ -1,7 +1,7 @@
 package com.galaxis.manatee.dao;
 
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSelfWorkHourDO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

src/main/java/com/galaxis/manatee/dao/ChuanyunSpecialProcedureDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSpecialProcedureDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunSubProjectDao.java

@@ -1,8 +1,7 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSubProjectDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSupplierDO;
 import org.springframework.stereotype.Repository;
 
 @Repository

src/main/java/com/galaxis/manatee/dao/ChuanyunSubWeekHourDao.java

@@ -1,9 +1,7 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSubWeekHourDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunWeekMemberHourDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunWorkHourDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;

src/main/java/com/galaxis/manatee/dao/ChuanyunSubWorkHourDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSubWorkHourDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

src/main/java/com/galaxis/manatee/dao/ChuanyunSupplierDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSupplierDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunUserCompanyDao.java

@@ -1,7 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectDO;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunUserCompanyDO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -12,7 +11,6 @@ import java.util.List;
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/4/28 11:38 上午
  */
 @Repository
 public interface ChuanyunUserCompanyDao extends GalaxisRepository<ChuanyunUserCompanyDO,String> {

src/main/java/com/galaxis/manatee/dao/ChuanyunUserDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunUserDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunUserDepartmentNameDao.java

@@ -1,7 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSelfWorkHourDO;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunUserDepartmentNameDO;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/dao/ChuanyunWeekMemberHourDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunWeekMemberHourDO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

src/main/java/com/galaxis/manatee/dao/ChuanyunWorkHourDao.java

@@ -1,7 +1,7 @@
 package com.galaxis.manatee.dao;
 
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunWorkHourDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

src/main/java/com/galaxis/manatee/dao/ProjectSwitchDao.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.dao;
 
-import com.galaxis.capsule.util.GalaxisRepository;
+import com.galaxis.manatee.capsule.util.GalaxisRepository;
 import com.galaxis.manatee.entity.chuanyun.data.object.ProjectSwitch;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunGroupProjectDO.java

@@ -3,7 +3,7 @@ package com.galaxis.manatee.entity.chuanyun.data.object;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import com.galaxis.manatee.util.ChuanyunLocalDateTimeDeserializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,7 +16,6 @@ import java.util.List;
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/2/13 4:09 下午
  */
 @Slf4j
 @EqualsAndHashCode(callSuper = true)

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunLogDO.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import com.galaxis.manatee.util.ChuanyunLocalDateTimeDeserializer;
 import com.galaxis.manatee.util.ChuanyunLocalDateTimeSerializer;
 import lombok.Data;
@@ -19,7 +19,6 @@ import java.util.List;
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/5/9 10:38 上午
  */
 @Slf4j
 @EqualsAndHashCode(callSuper = true)

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunOutDepartmentDO.java

@@ -3,7 +3,7 @@ package com.galaxis.manatee.entity.chuanyun.data.object;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunProjectDO.java

@@ -3,9 +3,9 @@ package com.galaxis.manatee.entity.chuanyun.data.object;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.galaxis.capsule.bo.ChuanyunObject;
-import com.galaxis.capsule.dto.ChuanyunProjectDTO;
-import com.galaxis.capsule.dto.ChuanyunProjectPrimaryKey;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.dto.ChuanyunProjectDTO;
+import com.galaxis.manatee.capsule.dto.ChuanyunProjectPrimaryKey;
 import com.galaxis.manatee.constant.ChuanYunConstant;
 import com.galaxis.manatee.util.ChuanyunLocalDateTimeDeserializer;
 import com.galaxis.manatee.util.StringArrayToStringDeserializer;
@@ -21,7 +21,6 @@ import java.time.LocalDateTime;
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/2/13 4:09 下午
  */
 @Slf4j
 @EqualsAndHashCode(callSuper = true)

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunReimbursementDO.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import com.galaxis.manatee.util.ChuanyunLocalDateTimeDeserializer;
 import com.galaxis.manatee.util.ChuanyunLocalDateTimeSerializer;
 import lombok.Data;
@@ -20,7 +20,6 @@ import java.util.List;
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/4/27 1:05 下午
  */
 @Slf4j
 @EqualsAndHashCode(callSuper = true)

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunSubProjectDO.java

@@ -2,7 +2,7 @@ package com.galaxis.manatee.entity.chuanyun.data.object;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunU9DepartmentDO.java

@@ -2,7 +2,7 @@ package com.galaxis.manatee.entity.chuanyun.data.object;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunUpdateDeptDO.java

@@ -3,12 +3,11 @@ package com.galaxis.manatee.entity.chuanyun.data.object;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.Entity;
 import javax.persistence.Transient;
 
 @Slf4j

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunUserCompanyDO.java

@@ -2,7 +2,7 @@ package com.galaxis.manatee.entity.chuanyun.data.object;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/galaxis/manatee/manager/ClawFeign.java

@@ -1,9 +1,9 @@
 package com.galaxis.manatee.manager;
 
-import com.galaxis.capsule.dto.*;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectCashFlowDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunPurCostDO;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunReimbursementDO;
+import com.galaxis.manatee.capsule.dto.ChuanyunProjectDTO;
+import com.galaxis.manatee.capsule.dto.ChuanyunReimbursementDTO;
+import com.galaxis.manatee.capsule.dto.PageDTO;
+import com.galaxis.manatee.capsule.dto.U9ResponseDTO;
 import com.galaxis.manatee.entity.chuanyun.dto.*;
 import com.galaxis.manatee.entity.chuanyun.dto.MaterialDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -19,7 +19,6 @@ import java.util.Map;
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/4/8 4:22 下午
  */
 @FeignClient(name = "claw",url = "${claw.url}")
 public interface ClawFeign {

src/main/java/com/galaxis/manatee/service/impl/ChuanyunServiceImpl.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import com.galaxis.manatee.constant.ChuanYunConstant;
 import com.galaxis.manatee.constant.StringConstant;
 import com.galaxis.manatee.dao.*;
@@ -14,7 +14,6 @@ import com.galaxis.manatee.entity.chuanyun.dto.Filter;
 import com.galaxis.manatee.exception.BigSizeException;
 import com.galaxis.manatee.manager.ChuanYunManager;
 import com.galaxis.manatee.service.ChuanyunService;
-import com.galaxis.manatee.task.ChuanyunBasicDataScheduledTask;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -25,7 +24,6 @@ import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,18 +37,12 @@ public class ChuanyunServiceImpl implements ChuanyunService {
     private final ChuanYunManager chuanYunManager;
     private final ChuanyunCostCollectionDao chuanyunCostCollectionDao;
     private final ChuanyunUserCompanyDao chuanyunUserCompanyDao;
-    private final ChuanyunEquipmentInformDao chuanyunEquipmentInformDao;
-    private final ChuanyunGroupProjectDao chuanyunGroupProjectDao;
-    private final ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask;
     private final ChuanyunOperationInformationDao chuanyunOperationInformationDao;
 
-    public ChuanyunServiceImpl(ChuanYunManager chuanYunManager, ChuanyunCostCollectionDao chuanyunCostCollectionDao, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunEquipmentInformDao chuanyunEquipmentInformDao, ChuanyunGroupProjectDao chuanyunGroupProjectDao, ChuanyunBasicDataScheduledTask chuanyunBasicDataScheduledTask, ChuanyunOperationInformationDao chuanyunOperationInformationDao) {
+    public ChuanyunServiceImpl(ChuanYunManager chuanYunManager, ChuanyunCostCollectionDao chuanyunCostCollectionDao, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunOperationInformationDao chuanyunOperationInformationDao) {
         this.chuanYunManager = chuanYunManager;
         this.chuanyunCostCollectionDao = chuanyunCostCollectionDao;
         this.chuanyunUserCompanyDao = chuanyunUserCompanyDao;
-        this.chuanyunEquipmentInformDao = chuanyunEquipmentInformDao;
-        this.chuanyunGroupProjectDao = chuanyunGroupProjectDao;
-        this.chuanyunBasicDataScheduledTask = chuanyunBasicDataScheduledTask;
         this.chuanyunOperationInformationDao = chuanyunOperationInformationDao;
     }
 
@@ -209,7 +201,6 @@ public class ChuanyunServiceImpl implements ChuanyunService {
     public void updateU9Department() {
         var objectMapper=new ObjectMapper();
         var start=0;
-        var totalCount=0L;
         var flag=true;
         while (flag){
             try{
@@ -283,7 +274,6 @@ public class ChuanyunServiceImpl implements ChuanyunService {
 
     /**
      * 更新外部部门名称
-     * @param
      */
     private void synchroOutDepartment(ChuanyunU9DepartmentDO chuanyunU9DepartmentDO) {
         try {

src/main/java/com/galaxis/manatee/task/ChuanyunBasicDataScheduledTask.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import com.galaxis.manatee.constant.ChuanYunConstant;
 import com.galaxis.manatee.constant.StringConstant;
 import com.galaxis.manatee.dao.*;
@@ -36,7 +36,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/4/27 5:14 下午
  */
 @Service
 @Slf4j

src/main/java/com/galaxis/manatee/task/ChuanyunScheduledTask.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.galaxis.capsule.bo.ChuanyunObject;
+import com.galaxis.manatee.capsule.bo.ChuanyunObject;
 import com.galaxis.manatee.constant.ChuanYunConstant;
 import com.galaxis.manatee.constant.DingTalkConstant;
 import com.galaxis.manatee.constant.StringConstant;
@@ -32,7 +32,6 @@ import java.util.*;
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/2/13 11:53 上午
  */
 @Service
 @Slf4j

src/main/java/com/galaxis/manatee/task/EquipmentInfoTask.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.galaxis.capsule.dto.PageDTO;
+import com.galaxis.manatee.capsule.dto.PageDTO;
 import com.galaxis.manatee.dao.*;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunEquipmentDO;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunEquipmentInformDO;
@@ -31,7 +31,6 @@ import java.util.Map;
 @Slf4j
 public class EquipmentInfoTask {
 
-    private final Integer pageSize=20;
     private final ChuanYunManager chuanYunManager;
     private final ClawFeign clawFeign;
     private final ChuanyunMaterialDao chuanyunMaterialDao;

src/main/java/com/galaxis/manatee/task/U9InfoTask.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.galaxis.capsule.dto.PageDTO;
+import com.galaxis.manatee.capsule.dto.PageDTO;
 import com.galaxis.manatee.dao.*;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunSubLaborCostDO;
 import com.galaxis.manatee.entity.chuanyun.data.object.*;
@@ -518,14 +518,15 @@ public class U9InfoTask {
             map.put("page",String.valueOf(page));
             map.put("size",String.valueOf(size));
             //获取物料成本
-            List<ChuanyunLaborCostDTO> pageInfo = clawFeign.findAlllabCost();
-//            if (page<=pageInfo.getTotalPages()){
-//                page += 1;
-//            }else {
-//                flag = false;
-//                break;
-//            }
-//            List<ChuanyunLaborCostDTO> list = pageInfo.getContent();
+            //@TODO这个方法找不到实现，代码可能未提交
+            PageDTO<ChuanyunLaborCostDTO> pageInfo = clawFeign.findChuanyunLaborCost(map);
+            if (page<=pageInfo.getTotalPages()){
+                page += 1;
+            }else {
+                flag = false;
+                break;
+            }
+            List<ChuanyunLaborCostDTO> list = pageInfo.getContent();
             pageInfo.forEach(chuanyunLaborCostDTO -> {
                 try {
                     if(chuanyunLaborCostDTO != null) {

src/main/java/com/galaxis/manatee/task/U9ScheduledTask.java

@@ -1,6 +1,6 @@
 package com.galaxis.manatee.task;
 
-import com.galaxis.capsule.dto.ChuanyunReimbursementDTO;
+import com.galaxis.manatee.capsule.dto.ChuanyunReimbursementDTO;
 import com.galaxis.manatee.dao.ChuanyunProjectDao;
 import com.galaxis.manatee.dao.ChuanyunReimbursementDao;
 import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunProjectDO;
@@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
 /**
  * @author zcj
  * @version 0.1
- * @date 2020/4/28 7:27 下午
  */
 @Service
 @Slf4j