lab_gzf 部署微服务接口

assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /assetmanagement-app-assetmanagement.jar
 
-EXPOSE 10325
+EXPOSE 8080
 
 ADD assetmanagement-app-assetmanagement.jar /assetmanagement-app-assetmanagement.jar

assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/assetmanagement-app-assetmanagement.yaml

@@ -3,25 +3,9 @@ services:
   assetmanagement-app-assetmanagement:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-app-assetmanagement:latest
     ports:
-      - "10325:10325"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10325
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

assetmanagement-app/assetmanagement-app-assetmanagement/src/main/java/cn/ibizlab/assetmanagement/assetmanagement/AssetManagementApplication.java

@@ -13,6 +13,8 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import cn.ibizlab.assetmanagement.util.web.SearchContextHandlerMethodArgumentResolver;
+import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
 
 @Slf4j
@@ -30,6 +32,9 @@ import java.util.List;
 })
 public class AssetManagementApplication extends WebMvcConfigurerAdapter{
 
+    @Autowired
+    SearchContextHandlerMethodArgumentResolver resolver;
+
     public static void main(String[] args) {
         SpringApplication.run(AssetManagementApplication.class,args);
     }
@@ -37,6 +42,6 @@ public class AssetManagementApplication extends WebMvcConfigurerAdapter{
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
         super.addArgumentResolvers(argumentResolvers);
-        argumentResolvers.add(new cn.ibizlab.assetmanagement.util.web.SearchContextHandlerMethodArgumentResolver());
+        argumentResolvers.add(resolver);
     }
 }

assetmanagement-app/assetmanagement-app-assetmanagement/src/main/resources/application-assetmanagement-prod.yml

@@ -7,6 +7,10 @@ logging:
 #zuul网关路由设置
 zuul:
   routes:
+    eamdocument:
+      path: /eamdocuments/**
+      serviceId: ${ibiz.ref.service.ibizassetmanagement-assetapi:ibizassetmanagement-assetapi}
+      stripPrefix: false
     eamlocationstatemodel:
       path: /eamlocationstatemodels/**
       serviceId: ${ibiz.ref.service.ibizassetmanagement-assetapi:ibizassetmanagement-assetapi}
@@ -111,6 +115,10 @@ zuul:
       path: /eamwostates/**
       serviceId: ${ibiz.ref.service.ibizassetmanagement-assetapi:ibizassetmanagement-assetapi}
       stripPrefix: false
+    eamdocumenttype:
+      path: /eamdocumenttypes/**
+      serviceId: ${ibiz.ref.service.ibizassetmanagement-assetapi:ibizassetmanagement-assetapi}
+      stripPrefix: false
     eamassetstatemodel:
       path: /eamassetstatemodels/**
       serviceId: ${ibiz.ref.service.ibizassetmanagement-assetapi:ibizassetmanagement-assetapi}

assetmanagement-boot/src/main/java/cn/ibizlab/assetmanagement/DevBootApplication.java

@@ -14,6 +14,8 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import java.util.List;
+import cn.ibizlab.assetmanagement.util.web.SearchContextHandlerMethodArgumentResolver;
+import org.springframework.beans.factory.annotation.Autowired;
 
 @Slf4j
 @EnableDiscoveryClient
@@ -34,6 +36,9 @@ import java.util.List;
 @EnableScheduling
 public class DevBootApplication extends WebMvcConfigurerAdapter{
 
+    @Autowired
+    SearchContextHandlerMethodArgumentResolver resolver;
+
     public static void main(String[] args) {
         SpringApplication.run(DevBootApplication.class,args);
     }
@@ -41,6 +46,6 @@ public class DevBootApplication extends WebMvcConfigurerAdapter{
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
         super.addArgumentResolvers(argumentResolvers);
-        argumentResolvers.add(new cn.ibizlab.assetmanagement.util.web.SearchContextHandlerMethodArgumentResolver());
+        argumentResolvers.add(resolver);
     }
 }

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/domain/EAMAsset.java

@@ -152,6 +152,13 @@ public class EAMAsset extends EntityMP implements Serializable {
     @JSONField(name = "assetnumber")
     @JsonProperty("assetnumber")
     private String assetnumber;
+    /**
+     * 描述
+     */
+    @TableField(value = "description")
+    @JSONField(name = "description")
+    @JsonProperty("description")
+    private String description;
 
     /**
      * 
@@ -235,6 +242,14 @@ public class EAMAsset extends EntityMP implements Serializable {
         this.modify("assetnumber",assetnumber);
     }
 
+    /**
+     * 设置 [描述]
+     */
+    public void setDescription(String description){
+        this.description = description ;
+        this.modify("description",description);
+    }
+
 
 }
 

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/domain/EAMAssetType.java

@@ -110,6 +110,13 @@ public class EAMAssetType extends EntityMP implements Serializable {
     @JSONField(name = "assettypenumber")
     @JsonProperty("assettypenumber")
     private String assettypenumber;
+    /**
+     * 描述
+     */
+    @TableField(value = "description")
+    @JSONField(name = "description")
+    @JsonProperty("description")
+    private String description;
 
     /**
      * 
@@ -145,6 +152,14 @@ public class EAMAssetType extends EntityMP implements Serializable {
         this.modify("assettypenumber",assettypenumber);
     }
 
+    /**
+     * 设置 [描述]
+     */
+    public void setDescription(String description){
+        this.description = description ;
+        this.modify("description",description);
+    }
+
 
 }
 

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/domain/EAMDocument.java

+package cn.ibizlab.assetmanagement.core.asset.domain;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
+import cn.ibizlab.assetmanagement.util.domain.EntityBase;
+import cn.ibizlab.assetmanagement.util.annotation.DEField;
+import cn.ibizlab.assetmanagement.util.enums.DEPredefinedFieldType;
+import cn.ibizlab.assetmanagement.util.enums.DEFieldDefaultValueType;
+import java.io.Serializable;
+import lombok.*;
+import org.springframework.data.annotation.Transient;
+import cn.ibizlab.assetmanagement.util.annotation.Audit;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.ibizlab.assetmanagement.util.domain.EntityMP;
+
+/**
+ * 实体[文档]
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@JsonIgnoreProperties(value = "handler")
+@TableName(value = "EAMDOCUMENT",resultMap = "EAMDocumentResultMap")
+public class EAMDocument extends EntityMP implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 建立时间
+     */
+    @DEField(preType = DEPredefinedFieldType.CREATEDATE)
+    @TableField(value = "createdate" , fill = FieldFill.INSERT)
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("createdate")
+    private Timestamp createdate;
+    /**
+     * 文档名称
+     */
+    @TableField(value = "eamdocumentname")
+    @JSONField(name = "eamdocumentname")
+    @JsonProperty("eamdocumentname")
+    private String eamdocumentname;
+    /**
+     * 建立人
+     */
+    @DEField(preType = DEPredefinedFieldType.CREATEMAN)
+    @TableField(value = "createman" , fill = FieldFill.INSERT)
+    @JSONField(name = "createman")
+    @JsonProperty("createman")
+    private String createman;
+    /**
+     * 文档标识
+     */
+    @DEField(isKeyField=true)
+    @TableId(value= "eamdocumentid",type=IdType.ASSIGN_UUID)
+    @JSONField(name = "eamdocumentid")
+    @JsonProperty("eamdocumentid")
+    private String eamdocumentid;
+    /**
+     * 更新时间
+     */
+    @DEField(preType = DEPredefinedFieldType.UPDATEDATE)
+    @TableField(value = "updatedate")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("updatedate")
+    private Timestamp updatedate;
+    /**
+     * 更新人
+     */
+    @DEField(preType = DEPredefinedFieldType.UPDATEMAN)
+    @TableField(value = "updateman")
+    @JSONField(name = "updateman")
+    @JsonProperty("updateman")
+    private String updateman;
+    /**
+     * 资产类型标识
+     */
+    @TableField(value = "eamassettypeid")
+    @JSONField(name = "eamassettypeid")
+    @JsonProperty("eamassettypeid")
+    private String eamassettypeid;
+    /**
+     * 资产类型
+     */
+    @TableField(exist = false)
+    @JSONField(name = "eamassettypename")
+    @JsonProperty("eamassettypename")
+    private String eamassettypename;
+    /**
+     * 文档编号
+     */
+    @TableField(value = "documentnumber")
+    @JSONField(name = "documentnumber")
+    @JsonProperty("documentnumber")
+    private String documentnumber;
+    /**
+     * 文档类型标识
+     */
+    @TableField(value = "eamdocumenttypeid")
+    @JSONField(name = "eamdocumenttypeid")
+    @JsonProperty("eamdocumenttypeid")
+    private String eamdocumenttypeid;
+    /**
+     * 文档类型
+     */
+    @TableField(exist = false)
+    @JSONField(name = "eamdocumenttypename")
+    @JsonProperty("eamdocumenttypename")
+    private String eamdocumenttypename;
+    /**
+     * 内容
+     */
+    @TableField(value = "content")
+    @JSONField(name = "content")
+    @JsonProperty("content")
+    private String content;
+    /**
+     * 文件
+     */
+    @TableField(value = "docfile")
+    @JSONField(name = "docfile")
+    @JsonProperty("docfile")
+    private String docfile;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetType eamassettype;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType eamdocumenttype;
+
+
+
+    /**
+     * 设置 [文档名称]
+     */
+    public void setEamdocumentname(String eamdocumentname){
+        this.eamdocumentname = eamdocumentname ;
+        this.modify("eamdocumentname",eamdocumentname);
+    }
+
+    /**
+     * 设置 [资产类型标识]
+     */
+    public void setEamassettypeid(String eamassettypeid){
+        this.eamassettypeid = eamassettypeid ;
+        this.modify("eamassettypeid",eamassettypeid);
+    }
+
+    /**
+     * 设置 [文档编号]
+     */
+    public void setDocumentnumber(String documentnumber){
+        this.documentnumber = documentnumber ;
+        this.modify("documentnumber",documentnumber);
+    }
+
+    /**
+     * 设置 [文档类型标识]
+     */
+    public void setEamdocumenttypeid(String eamdocumenttypeid){
+        this.eamdocumenttypeid = eamdocumenttypeid ;
+        this.modify("eamdocumenttypeid",eamdocumenttypeid);
+    }
+
+    /**
+     * 设置 [内容]
+     */
+    public void setContent(String content){
+        this.content = content ;
+        this.modify("content",content);
+    }
+
+    /**
+     * 设置 [文件]
+     */
+    public void setDocfile(String docfile){
+        this.docfile = docfile ;
+        this.modify("docfile",docfile);
+    }
+
+
+}
+
+

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/domain/EAMDocumentType.java

+package cn.ibizlab.assetmanagement.core.asset.domain;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
+import cn.ibizlab.assetmanagement.util.domain.EntityBase;
+import cn.ibizlab.assetmanagement.util.annotation.DEField;
+import cn.ibizlab.assetmanagement.util.enums.DEPredefinedFieldType;
+import cn.ibizlab.assetmanagement.util.enums.DEFieldDefaultValueType;
+import java.io.Serializable;
+import lombok.*;
+import org.springframework.data.annotation.Transient;
+import cn.ibizlab.assetmanagement.util.annotation.Audit;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.ibizlab.assetmanagement.util.domain.EntityMP;
+
+/**
+ * 实体[文档类型]
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@JsonIgnoreProperties(value = "handler")
+@TableName(value = "EAMDOCUMENTTYPE",resultMap = "EAMDocumentTypeResultMap")
+public class EAMDocumentType extends EntityMP implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文档类型名称
+     */
+    @TableField(value = "eamdocumenttypename")
+    @JSONField(name = "eamdocumenttypename")
+    @JsonProperty("eamdocumenttypename")
+    private String eamdocumenttypename;
+    /**
+     * 文档类型标识
+     */
+    @DEField(isKeyField=true)
+    @TableId(value= "eamdocumenttypeid",type=IdType.ASSIGN_UUID)
+    @JSONField(name = "eamdocumenttypeid")
+    @JsonProperty("eamdocumenttypeid")
+    private String eamdocumenttypeid;
+    /**
+     * 建立时间
+     */
+    @DEField(preType = DEPredefinedFieldType.CREATEDATE)
+    @TableField(value = "createdate" , fill = FieldFill.INSERT)
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("createdate")
+    private Timestamp createdate;
+    /**
+     * 更新人
+     */
+    @DEField(preType = DEPredefinedFieldType.UPDATEMAN)
+    @TableField(value = "updateman")
+    @JSONField(name = "updateman")
+    @JsonProperty("updateman")
+    private String updateman;
+    /**
+     * 更新时间
+     */
+    @DEField(preType = DEPredefinedFieldType.UPDATEDATE)
+    @TableField(value = "updatedate")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("updatedate")
+    private Timestamp updatedate;
+    /**
+     * 建立人
+     */
+    @DEField(preType = DEPredefinedFieldType.CREATEMAN)
+    @TableField(value = "createman" , fill = FieldFill.INSERT)
+    @JSONField(name = "createman")
+    @JsonProperty("createman")
+    private String createman;
+    /**
+     * 上级文档类型标识
+     */
+    @TableField(value = "peamdocumenttypeid")
+    @JSONField(name = "peamdocumenttypeid")
+    @JsonProperty("peamdocumenttypeid")
+    private String peamdocumenttypeid;
+    /**
+     * 上级文档类型
+     */
+    @TableField(exist = false)
+    @JSONField(name = "peamdocumenttypename")
+    @JsonProperty("peamdocumenttypename")
+    private String peamdocumenttypename;
+
+    /**
+     * 
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType peamdocumenttype;
+
+
+
+    /**
+     * 设置 [文档类型名称]
+     */
+    public void setEamdocumenttypename(String eamdocumenttypename){
+        this.eamdocumenttypename = eamdocumenttypename ;
+        this.modify("eamdocumenttypename",eamdocumenttypename);
+    }
+
+    /**
+     * 设置 [上级文档类型标识]
+     */
+    public void setPeamdocumenttypeid(String peamdocumenttypeid){
+        this.peamdocumenttypeid = peamdocumenttypeid ;
+        this.modify("peamdocumenttypeid",peamdocumenttypeid);
+    }
+
+
+}
+
+

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/filter/EAMDocumentSearchContext.java

+package cn.ibizlab.assetmanagement.core.asset.filter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.*;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+
+import cn.ibizlab.assetmanagement.util.filter.QueryWrapperContext;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.ibizlab.assetmanagement.core.asset.domain.EAMDocument;
+/**
+ * 关系型数据实体[EAMDocument] 查询条件对象
+ */
+@Slf4j
+@Data
+public class EAMDocumentSearchContext extends QueryWrapperContext<EAMDocument> {
+
+	private String n_eamdocumentname_like;//[文档名称]
+	public void setN_eamdocumentname_like(String n_eamdocumentname_like) {
+        this.n_eamdocumentname_like = n_eamdocumentname_like;
+        if(!ObjectUtils.isEmpty(this.n_eamdocumentname_like)){
+            this.getSearchCond().like("eamdocumentname", n_eamdocumentname_like);
+        }
+    }
+	private String n_eamassettypeid_eq;//[资产类型标识]
+	public void setN_eamassettypeid_eq(String n_eamassettypeid_eq) {
+        this.n_eamassettypeid_eq = n_eamassettypeid_eq;
+        if(!ObjectUtils.isEmpty(this.n_eamassettypeid_eq)){
+            this.getSearchCond().eq("eamassettypeid", n_eamassettypeid_eq);
+        }
+    }
+	private String n_eamassettypename_eq;//[资产类型]
+	public void setN_eamassettypename_eq(String n_eamassettypename_eq) {
+        this.n_eamassettypename_eq = n_eamassettypename_eq;
+        if(!ObjectUtils.isEmpty(this.n_eamassettypename_eq)){
+            this.getSearchCond().eq("eamassettypename", n_eamassettypename_eq);
+        }
+    }
+	private String n_eamassettypename_like;//[资产类型]
+	public void setN_eamassettypename_like(String n_eamassettypename_like) {
+        this.n_eamassettypename_like = n_eamassettypename_like;
+        if(!ObjectUtils.isEmpty(this.n_eamassettypename_like)){
+            this.getSearchCond().like("eamassettypename", n_eamassettypename_like);
+        }
+    }
+	private String n_eamdocumenttypeid_eq;//[文档类型标识]
+	public void setN_eamdocumenttypeid_eq(String n_eamdocumenttypeid_eq) {
+        this.n_eamdocumenttypeid_eq = n_eamdocumenttypeid_eq;
+        if(!ObjectUtils.isEmpty(this.n_eamdocumenttypeid_eq)){
+            this.getSearchCond().eq("eamdocumenttypeid", n_eamdocumenttypeid_eq);
+        }
+    }
+	private String n_eamdocumenttypename_eq;//[文档类型]
+	public void setN_eamdocumenttypename_eq(String n_eamdocumenttypename_eq) {
+        this.n_eamdocumenttypename_eq = n_eamdocumenttypename_eq;
+        if(!ObjectUtils.isEmpty(this.n_eamdocumenttypename_eq)){
+            this.getSearchCond().eq("eamdocumenttypename", n_eamdocumenttypename_eq);
+        }
+    }
+	private String n_eamdocumenttypename_like;//[文档类型]
+	public void setN_eamdocumenttypename_like(String n_eamdocumenttypename_like) {
+        this.n_eamdocumenttypename_like = n_eamdocumenttypename_like;
+        if(!ObjectUtils.isEmpty(this.n_eamdocumenttypename_like)){
+            this.getSearchCond().like("eamdocumenttypename", n_eamdocumenttypename_like);
+        }
+    }
+
+    /**
+	 * 启用快速搜索
+	 */
+	public void setQuery(String query)
+	{
+		 this.query=query;
+		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("eamdocumentname", query)   
+            );
+		 }
+	}
+}
+
+
+

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/filter/EAMDocumentTypeSearchContext.java

+package cn.ibizlab.assetmanagement.core.asset.filter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.*;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+
+import cn.ibizlab.assetmanagement.util.filter.QueryWrapperContext;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType;
+/**
+ * 关系型数据实体[EAMDocumentType] 查询条件对象
+ */
+@Slf4j
+@Data
+public class EAMDocumentTypeSearchContext extends QueryWrapperContext<EAMDocumentType> {
+
+	private String n_eamdocumenttypename_like;//[文档类型名称]
+	public void setN_eamdocumenttypename_like(String n_eamdocumenttypename_like) {
+        this.n_eamdocumenttypename_like = n_eamdocumenttypename_like;
+        if(!ObjectUtils.isEmpty(this.n_eamdocumenttypename_like)){
+            this.getSearchCond().like("eamdocumenttypename", n_eamdocumenttypename_like);
+        }
+    }
+	private String n_peamdocumenttypeid_eq;//[上级文档类型标识]
+	public void setN_peamdocumenttypeid_eq(String n_peamdocumenttypeid_eq) {
+        this.n_peamdocumenttypeid_eq = n_peamdocumenttypeid_eq;
+        if(!ObjectUtils.isEmpty(this.n_peamdocumenttypeid_eq)){
+            this.getSearchCond().eq("peamdocumenttypeid", n_peamdocumenttypeid_eq);
+        }
+    }
+	private String n_peamdocumenttypename_eq;//[上级文档类型]
+	public void setN_peamdocumenttypename_eq(String n_peamdocumenttypename_eq) {
+        this.n_peamdocumenttypename_eq = n_peamdocumenttypename_eq;
+        if(!ObjectUtils.isEmpty(this.n_peamdocumenttypename_eq)){
+            this.getSearchCond().eq("peamdocumenttypename", n_peamdocumenttypename_eq);
+        }
+    }
+	private String n_peamdocumenttypename_like;//[上级文档类型]
+	public void setN_peamdocumenttypename_like(String n_peamdocumenttypename_like) {
+        this.n_peamdocumenttypename_like = n_peamdocumenttypename_like;
+        if(!ObjectUtils.isEmpty(this.n_peamdocumenttypename_like)){
+            this.getSearchCond().like("peamdocumenttypename", n_peamdocumenttypename_like);
+        }
+    }
+
+    /**
+	 * 启用快速搜索
+	 */
+	public void setQuery(String query)
+	{
+		 this.query=query;
+		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("eamdocumenttypename", query)   
+            );
+		 }
+	}
+}
+
+
+

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/mapper/EAMDocumentMapper.java

+package cn.ibizlab.assetmanagement.core.asset.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.*;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.HashMap;
+import org.apache.ibatis.annotations.Select;
+import cn.ibizlab.assetmanagement.core.asset.domain.EAMDocument;
+import cn.ibizlab.assetmanagement.core.asset.filter.EAMDocumentSearchContext;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.alibaba.fastjson.JSONObject;
+
+public interface EAMDocumentMapper extends BaseMapper<EAMDocument>{
+
+    Page<EAMDocument> searchDefault(IPage page, @Param("srf") EAMDocumentSearchContext context, @Param("ew") Wrapper<EAMDocument> wrapper) ;
+    @Override
+    EAMDocument selectById(Serializable id);
+    @Override
+    int insert(EAMDocument entity);
+    @Override
+    int updateById(@Param(Constants.ENTITY) EAMDocument entity);
+    @Override
+    int update(@Param(Constants.ENTITY) EAMDocument entity, @Param("ew") Wrapper<EAMDocument> updateWrapper);
+    @Override
+    int deleteById(Serializable id);
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    List<EAMDocument> selectByEamassettypeid(@Param("eamassettypeid") Serializable eamassettypeid) ;
+
+    List<EAMDocument> selectByEamdocumenttypeid(@Param("eamdocumenttypeid") Serializable eamdocumenttypeid) ;
+
+}

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/mapper/EAMDocumentTypeMapper.java

+package cn.ibizlab.assetmanagement.core.asset.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.*;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.HashMap;
+import org.apache.ibatis.annotations.Select;
+import cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType;
+import cn.ibizlab.assetmanagement.core.asset.filter.EAMDocumentTypeSearchContext;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.alibaba.fastjson.JSONObject;
+
+public interface EAMDocumentTypeMapper extends BaseMapper<EAMDocumentType>{
+
+    Page<EAMDocumentType> searchDefault(IPage page, @Param("srf") EAMDocumentTypeSearchContext context, @Param("ew") Wrapper<EAMDocumentType> wrapper) ;
+    Page<EAMDocumentType> searchTop(IPage page, @Param("srf") EAMDocumentTypeSearchContext context, @Param("ew") Wrapper<EAMDocumentType> wrapper) ;
+    @Override
+    EAMDocumentType selectById(Serializable id);
+    @Override
+    int insert(EAMDocumentType entity);
+    @Override
+    int updateById(@Param(Constants.ENTITY) EAMDocumentType entity);
+    @Override
+    int update(@Param(Constants.ENTITY) EAMDocumentType entity, @Param("ew") Wrapper<EAMDocumentType> updateWrapper);
+    @Override
+    int deleteById(Serializable id);
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    List<EAMDocumentType> selectByPeamdocumenttypeid(@Param("eamdocumenttypeid") Serializable eamdocumenttypeid) ;
+
+}

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/IEAMDocumentService.java

+package cn.ibizlab.assetmanagement.core.asset.service;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.math.BigInteger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
+
+import cn.ibizlab.assetmanagement.core.asset.domain.EAMDocument;
+import cn.ibizlab.assetmanagement.core.asset.filter.EAMDocumentSearchContext;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 实体[EAMDocument] 服务对象接口
+ */
+public interface IEAMDocumentService extends IService<EAMDocument>{
+
+    boolean create(EAMDocument et) ;
+    void createBatch(List<EAMDocument> list) ;
+    boolean update(EAMDocument et) ;
+    void updateBatch(List<EAMDocument> list) ;
+    boolean remove(String key) ;
+    void removeBatch(Collection<String> idList) ;
+    EAMDocument get(String key) ;
+    EAMDocument getDraft(EAMDocument et) ;
+    boolean checkKey(EAMDocument et) ;
+    boolean save(EAMDocument et) ;
+    void saveBatch(List<EAMDocument> list) ;
+    Page<EAMDocument> searchDefault(EAMDocumentSearchContext context) ;
+    List<EAMDocument> selectByEamassettypeid(String eamassettypeid) ;
+    void removeByEamassettypeid(String eamassettypeid) ;
+    List<EAMDocument> selectByEamdocumenttypeid(String eamdocumenttypeid) ;
+    void removeByEamdocumenttypeid(String eamdocumenttypeid) ;
+    /**
+     *自定义查询SQL
+     * @param sql  select * from table where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return select * from table where id = '1'
+     */
+    List<JSONObject> select(String sql, Map param);
+    /**
+     *自定义SQL
+     * @param sql  update table  set name ='test' where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return     update table  set name ='test' where id = '1'
+     */
+    boolean execute(String sql, Map param);
+
+    List<EAMDocument> getEamdocumentByIds(List<String> ids) ;
+    List<EAMDocument> getEamdocumentByEntities(List<EAMDocument> entities) ;
+}
+
+

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/IEAMDocumentTypeService.java

+package cn.ibizlab.assetmanagement.core.asset.service;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.math.BigInteger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
+
+import cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType;
+import cn.ibizlab.assetmanagement.core.asset.filter.EAMDocumentTypeSearchContext;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 实体[EAMDocumentType] 服务对象接口
+ */
+public interface IEAMDocumentTypeService extends IService<EAMDocumentType>{
+
+    boolean create(EAMDocumentType et) ;
+    void createBatch(List<EAMDocumentType> list) ;
+    boolean update(EAMDocumentType et) ;
+    void updateBatch(List<EAMDocumentType> list) ;
+    boolean remove(String key) ;
+    void removeBatch(Collection<String> idList) ;
+    EAMDocumentType get(String key) ;
+    EAMDocumentType getDraft(EAMDocumentType et) ;
+    boolean checkKey(EAMDocumentType et) ;
+    boolean save(EAMDocumentType et) ;
+    void saveBatch(List<EAMDocumentType> list) ;
+    Page<EAMDocumentType> searchDefault(EAMDocumentTypeSearchContext context) ;
+    Page<EAMDocumentType> searchTop(EAMDocumentTypeSearchContext context) ;
+    List<EAMDocumentType> selectByPeamdocumenttypeid(String eamdocumenttypeid) ;
+    void removeByPeamdocumenttypeid(String eamdocumenttypeid) ;
+    /**
+     *自定义查询SQL
+     * @param sql  select * from table where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return select * from table where id = '1'
+     */
+    List<JSONObject> select(String sql, Map param);
+    /**
+     *自定义SQL
+     * @param sql  update table  set name ='test' where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return     update table  set name ='test' where id = '1'
+     */
+    boolean execute(String sql, Map param);
+
+    List<EAMDocumentType> getEamdocumenttypeByIds(List<String> ids) ;
+    List<EAMDocumentType> getEamdocumenttypeByEntities(List<EAMDocumentType> entities) ;
+}
+
+

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/impl/EAMAssetTypeServiceImpl.java

@@ -53,6 +53,9 @@ public class EAMAssetTypeServiceImpl extends ServiceImpl<EAMAssetTypeMapper, EAM
     protected cn.ibizlab.assetmanagement.core.asset.service.IEAMAssetService eamassetService;
     @Autowired
     @Lazy
+    protected cn.ibizlab.assetmanagement.core.asset.service.IEAMDocumentService eamdocumentService;
+    @Autowired
+    @Lazy
     protected cn.ibizlab.assetmanagement.core.asset.service.IEAMAssetStateModelService eamassetstatemodelService;
 
     protected int batchSize = 500;

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/impl/EAMDocumentServiceImpl.java

+package cn.ibizlab.assetmanagement.core.asset.service.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.math.BigInteger;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.ObjectUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Lazy;
+import cn.ibizlab.assetmanagement.core.asset.domain.EAMDocument;
+import cn.ibizlab.assetmanagement.core.asset.filter.EAMDocumentSearchContext;
+import cn.ibizlab.assetmanagement.core.asset.service.IEAMDocumentService;
+
+import cn.ibizlab.assetmanagement.util.helper.CachedBeanCopier;
+import cn.ibizlab.assetmanagement.util.helper.DEFieldCacheMap;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.ibizlab.assetmanagement.core.asset.mapper.EAMDocumentMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.util.StringUtils;
+
+/**
+ * 实体[文档] 服务对象接口实现
+ */
+@Slf4j
+@Service("EAMDocumentServiceImpl")
+public class EAMDocumentServiceImpl extends ServiceImpl<EAMDocumentMapper, EAMDocument> implements IEAMDocumentService {
+
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.assetmanagement.core.asset.service.IEAMAssetTypeService eamassettypeService;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.assetmanagement.core.asset.service.IEAMDocumentTypeService eamdocumenttypeService;
+
+    protected int batchSize = 500;
+
+    @Override
+    @Transactional
+    public boolean create(EAMDocument et) {
+        fillParentData(et);
+        if(!this.retBool(this.baseMapper.insert(et)))
+            return false;
+        CachedBeanCopier.copy(get(et.getEamdocumentid()),et);
+        return true;
+    }
+
+    @Override
+    public void createBatch(List<EAMDocument> list) {
+        list.forEach(item->fillParentData(item));
+        this.saveBatch(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean update(EAMDocument et) {
+        fillParentData(et);
+        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("eamdocumentid",et.getEamdocumentid())))
+            return false;
+        CachedBeanCopier.copy(get(et.getEamdocumentid()),et);
+        return true;
+    }
+
+    @Override
+    public void updateBatch(List<EAMDocument> list) {
+        list.forEach(item->fillParentData(item));
+        updateBatchById(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean remove(String key) {
+        boolean result=removeById(key);
+        return result ;
+    }
+
+    @Override
+    public void removeBatch(Collection<String> idList) {
+        removeByIds(idList);
+    }
+
+    @Override
+    @Transactional
+    public EAMDocument get(String key) {
+        EAMDocument et = getById(key);
+        if(et==null){
+            et=new EAMDocument();
+            et.setEamdocumentid(key);
+        }
+        else{
+        }
+        return et;
+    }
+
+    @Override
+    public EAMDocument getDraft(EAMDocument et) {
+        fillParentData(et);
+        return et;
+    }
+
+    @Override
+    public boolean checkKey(EAMDocument et) {
+        return (!ObjectUtils.isEmpty(et.getEamdocumentid()))&&(!Objects.isNull(this.getById(et.getEamdocumentid())));
+    }
+    @Override
+    @Transactional
+    public boolean save(EAMDocument et) {
+        if(!saveOrUpdate(et))
+            return false;
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public boolean saveOrUpdate(EAMDocument et) {
+        if (null == et) {
+            return false;
+        } else {
+            return checkKey(et) ? this.update(et) : this.create(et);
+        }
+    }
+
+    @Override
+    public boolean saveBatch(Collection<EAMDocument> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+        return true;
+    }
+
+    @Override
+    public void saveBatch(List<EAMDocument> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+    }
+
+
+	@Override
+    public List<EAMDocument> selectByEamassettypeid(String eamassettypeid) {
+        return baseMapper.selectByEamassettypeid(eamassettypeid);
+    }
+
+    @Override
+    public void removeByEamassettypeid(String eamassettypeid) {
+        this.remove(new QueryWrapper<EAMDocument>().eq("eamassettypeid",eamassettypeid));
+    }
+
+	@Override
+    public List<EAMDocument> selectByEamdocumenttypeid(String eamdocumenttypeid) {
+        return baseMapper.selectByEamdocumenttypeid(eamdocumenttypeid);
+    }
+
+    @Override
+    public void removeByEamdocumenttypeid(String eamdocumenttypeid) {
+        this.remove(new QueryWrapper<EAMDocument>().eq("eamdocumenttypeid",eamdocumenttypeid));
+    }
+
+
+    /**
+     * 查询集合 DEFAULT
+     */
+    @Override
+    public Page<EAMDocument> searchDefault(EAMDocumentSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<EAMDocument> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<EAMDocument>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+
+
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(EAMDocument et){
+        //实体关系[DER1N_EAMDOCUMENT_EAMASSETTYPE_EAMASSETTYPEID]
+        if(!ObjectUtils.isEmpty(et.getEamassettypeid())){
+            cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetType eamassettype=et.getEamassettype();
+            if(ObjectUtils.isEmpty(eamassettype)){
+                cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetType majorEntity=eamassettypeService.get(et.getEamassettypeid());
+                et.setEamassettype(majorEntity);
+                eamassettype=majorEntity;
+            }
+            et.setEamassettypename(eamassettype.getEamassettypename());
+        }
+        //实体关系[DER1N_EAMDOCUMENT_EAMDOCUMENTTYPE_EAMDOCUMENTTYPEID]
+        if(!ObjectUtils.isEmpty(et.getEamdocumenttypeid())){
+            cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType eamdocumenttype=et.getEamdocumenttype();
+            if(ObjectUtils.isEmpty(eamdocumenttype)){
+                cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType majorEntity=eamdocumenttypeService.get(et.getEamdocumenttypeid());
+                et.setEamdocumenttype(majorEntity);
+                eamdocumenttype=majorEntity;
+            }
+            et.setEamdocumenttypename(eamdocumenttype.getEamdocumenttypename());
+        }
+    }
+
+
+
+
+    @Override
+    public List<JSONObject> select(String sql, Map param){
+        return this.baseMapper.selectBySQL(sql,param);
+    }
+
+    @Override
+    @Transactional
+    public boolean execute(String sql , Map param){
+        if (sql == null || sql.isEmpty()) {
+            return false;
+        }
+        if (sql.toLowerCase().trim().startsWith("insert")) {
+            return this.baseMapper.insertBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("update")) {
+            return this.baseMapper.updateBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("delete")) {
+            return this.baseMapper.deleteBySQL(sql,param);
+        }
+        log.warn("暂未支持的SQL语法");
+        return true;
+    }
+
+    @Override
+    public List<EAMDocument> getEamdocumentByIds(List<String> ids) {
+         return this.listByIds(ids);
+    }
+
+    @Override
+    public List<EAMDocument> getEamdocumentByEntities(List<EAMDocument> entities) {
+        List ids =new ArrayList();
+        for(EAMDocument entity : entities){
+            Serializable id=entity.getEamdocumentid();
+            if(!ObjectUtils.isEmpty(id)){
+                ids.add(id);
+            }
+        }
+        if(ids.size()>0)
+           return this.listByIds(ids);
+        else
+           return entities;
+    }
+
+}
+
+
+

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/asset/service/impl/EAMDocumentTypeServiceImpl.java

+package cn.ibizlab.assetmanagement.core.asset.service.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.math.BigInteger;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.ObjectUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Lazy;
+import cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType;
+import cn.ibizlab.assetmanagement.core.asset.filter.EAMDocumentTypeSearchContext;
+import cn.ibizlab.assetmanagement.core.asset.service.IEAMDocumentTypeService;
+
+import cn.ibizlab.assetmanagement.util.helper.CachedBeanCopier;
+import cn.ibizlab.assetmanagement.util.helper.DEFieldCacheMap;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.ibizlab.assetmanagement.core.asset.mapper.EAMDocumentTypeMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.util.StringUtils;
+
+/**
+ * 实体[文档类型] 服务对象接口实现
+ */
+@Slf4j
+@Service("EAMDocumentTypeServiceImpl")
+public class EAMDocumentTypeServiceImpl extends ServiceImpl<EAMDocumentTypeMapper, EAMDocumentType> implements IEAMDocumentTypeService {
+
+
+    protected cn.ibizlab.assetmanagement.core.asset.service.IEAMDocumentTypeService eamdocumenttypeService = this;
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.assetmanagement.core.asset.service.IEAMDocumentService eamdocumentService;
+
+    protected int batchSize = 500;
+
+    @Override
+    @Transactional
+    public boolean create(EAMDocumentType et) {
+        fillParentData(et);
+        if(!this.retBool(this.baseMapper.insert(et)))
+            return false;
+        CachedBeanCopier.copy(get(et.getEamdocumenttypeid()),et);
+        return true;
+    }
+
+    @Override
+    public void createBatch(List<EAMDocumentType> list) {
+        list.forEach(item->fillParentData(item));
+        this.saveBatch(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean update(EAMDocumentType et) {
+        fillParentData(et);
+        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("eamdocumenttypeid",et.getEamdocumenttypeid())))
+            return false;
+        CachedBeanCopier.copy(get(et.getEamdocumenttypeid()),et);
+        return true;
+    }
+
+    @Override
+    public void updateBatch(List<EAMDocumentType> list) {
+        list.forEach(item->fillParentData(item));
+        updateBatchById(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean remove(String key) {
+        boolean result=removeById(key);
+        return result ;
+    }
+
+    @Override
+    public void removeBatch(Collection<String> idList) {
+        removeByIds(idList);
+    }
+
+    @Override
+    @Transactional
+    public EAMDocumentType get(String key) {
+        EAMDocumentType et = getById(key);
+        if(et==null){
+            et=new EAMDocumentType();
+            et.setEamdocumenttypeid(key);
+        }
+        else{
+        }
+        return et;
+    }
+
+    @Override
+    public EAMDocumentType getDraft(EAMDocumentType et) {
+        fillParentData(et);
+        return et;
+    }
+
+    @Override
+    public boolean checkKey(EAMDocumentType et) {
+        return (!ObjectUtils.isEmpty(et.getEamdocumenttypeid()))&&(!Objects.isNull(this.getById(et.getEamdocumenttypeid())));
+    }
+    @Override
+    @Transactional
+    public boolean save(EAMDocumentType et) {
+        if(!saveOrUpdate(et))
+            return false;
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public boolean saveOrUpdate(EAMDocumentType et) {
+        if (null == et) {
+            return false;
+        } else {
+            return checkKey(et) ? this.update(et) : this.create(et);
+        }
+    }
+
+    @Override
+    public boolean saveBatch(Collection<EAMDocumentType> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+        return true;
+    }
+
+    @Override
+    public void saveBatch(List<EAMDocumentType> list) {
+        list.forEach(item->fillParentData(item));
+        saveOrUpdateBatch(list,batchSize);
+    }
+
+
+	@Override
+    public List<EAMDocumentType> selectByPeamdocumenttypeid(String eamdocumenttypeid) {
+        return baseMapper.selectByPeamdocumenttypeid(eamdocumenttypeid);
+    }
+
+    @Override
+    public void removeByPeamdocumenttypeid(String eamdocumenttypeid) {
+        this.remove(new QueryWrapper<EAMDocumentType>().eq("peamdocumenttypeid",eamdocumenttypeid));
+    }
+
+
+    /**
+     * 查询集合 DEFAULT
+     */
+    @Override
+    public Page<EAMDocumentType> searchDefault(EAMDocumentTypeSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<EAMDocumentType> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<EAMDocumentType>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+    /**
+     * 查询集合 顶级文档类型
+     */
+    @Override
+    public Page<EAMDocumentType> searchTop(EAMDocumentTypeSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<EAMDocumentType> pages=baseMapper.searchTop(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<EAMDocumentType>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+
+
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(EAMDocumentType et){
+        //实体关系[DER1N_EAMDOCUMENTTYPE_EAMDOCUMENTTYPE_PEAMDOCUMENTTYPEID]
+        if(!ObjectUtils.isEmpty(et.getPeamdocumenttypeid())){
+            cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType peamdocumenttype=et.getPeamdocumenttype();
+            if(ObjectUtils.isEmpty(peamdocumenttype)){
+                cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType majorEntity=eamdocumenttypeService.get(et.getPeamdocumenttypeid());
+                et.setPeamdocumenttype(majorEntity);
+                peamdocumenttype=majorEntity;
+            }
+            et.setPeamdocumenttypename(peamdocumenttype.getEamdocumenttypename());
+        }
+    }
+
+
+
+
+    @Override
+    public List<JSONObject> select(String sql, Map param){
+        return this.baseMapper.selectBySQL(sql,param);
+    }
+
+    @Override
+    @Transactional
+    public boolean execute(String sql , Map param){
+        if (sql == null || sql.isEmpty()) {
+            return false;
+        }
+        if (sql.toLowerCase().trim().startsWith("insert")) {
+            return this.baseMapper.insertBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("update")) {
+            return this.baseMapper.updateBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("delete")) {
+            return this.baseMapper.deleteBySQL(sql,param);
+        }
+        log.warn("暂未支持的SQL语法");
+        return true;
+    }
+
+    @Override
+    public List<EAMDocumentType> getEamdocumenttypeByIds(List<String> ids) {
+         return this.listByIds(ids);
+    }
+
+    @Override
+    public List<EAMDocumentType> getEamdocumenttypeByEntities(List<EAMDocumentType> entities) {
+        List ids =new ArrayList();
+        for(EAMDocumentType entity : entities){
+            Serializable id=entity.getEamdocumenttypeid();
+            if(!ObjectUtils.isEmpty(id)){
+                ids.add(id);
+            }
+        }
+        if(ids.size()>0)
+           return this.listByIds(ids);
+        else
+           return entities;
+    }
+
+}
+
+
+

assetmanagement-core/src/main/resources/mapper/asset/eamasset/EAMAssetMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="EAMAssetResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  ) t1 where assetid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  ) t1 where assetid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -76,24 +76,24 @@
 
     <!--数据查询[ChildAsset]-->
     <sql id="ChildAsset" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
+		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
 					 WHERE 	( t1.`PASSETID` =  #{srf.datacontext.srfparentkey} )
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
+		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
 			]]>
     </sql>
     <!--数据查询[LocationAsset]-->
     <sql id="LocationAsset" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
+		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
 					 WHERE 	( t1.`EAMLOCATIONID` =  #{srf.datacontext.eamlocationid} )
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
+		<![CDATA[ SELECT t1.`ASSETID`, t1.`ASSETNAME`, t1.`ASSETNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMASSETSTATEID`, t31.`EAMASSETSTATENAME`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`PASSETID`, t41.`ASSETNAME` AS `PASSETNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `ASSET` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMASSETSTATE t31 ON t1.EAMASSETSTATEID = t31.EAMASSETSTATEID  LEFT JOIN ASSET t41 ON t1.PASSETID = t41.ASSETID  
 			]]>
     </sql>
 </mapper>

assetmanagement-core/src/main/resources/mapper/asset/eamassettype/EAMAssetTypeMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="EAMAssetTypeResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ASSETTYPENUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEMODELID`, t11.`EAMASSETSTATEMODELNAME`, t1.`EAMASSETTYPEID`, t1.`EAMASSETTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETTYPE` t1  LEFT JOIN EAMASSETSTATEMODEL t11 ON t1.EAMASSETSTATEMODELID = t11.EAMASSETSTATEMODELID  ) t1 where eamassettypeid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ASSETTYPENUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMASSETSTATEMODELID`, t11.`EAMASSETSTATEMODELNAME`, t1.`EAMASSETTYPEID`, t1.`EAMASSETTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETTYPE` t1  LEFT JOIN EAMASSETSTATEMODEL t11 ON t1.EAMASSETSTATEMODELID = t11.EAMASSETSTATEMODELID  ) t1 where eamassettypeid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETTYPENUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEMODELID`, t11.`EAMASSETSTATEMODELNAME`, t1.`EAMASSETTYPEID`, t1.`EAMASSETTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETTYPE` t1  LEFT JOIN EAMASSETSTATEMODEL t11 ON t1.EAMASSETSTATEMODELID = t11.EAMASSETSTATEMODELID  
+		<![CDATA[ SELECT t1.`ASSETTYPENUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMASSETSTATEMODELID`, t11.`EAMASSETSTATEMODELNAME`, t1.`EAMASSETTYPEID`, t1.`EAMASSETTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETTYPE` t1  LEFT JOIN EAMASSETSTATEMODEL t11 ON t1.EAMASSETSTATEMODELID = t11.EAMASSETSTATEMODELID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETTYPENUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMASSETSTATEMODELID`, t11.`EAMASSETSTATEMODELNAME`, t1.`EAMASSETTYPEID`, t1.`EAMASSETTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETTYPE` t1  LEFT JOIN EAMASSETSTATEMODEL t11 ON t1.EAMASSETSTATEMODELID = t11.EAMASSETSTATEMODELID  
+		<![CDATA[ SELECT t1.`ASSETTYPENUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMASSETSTATEMODELID`, t11.`EAMASSETSTATEMODELNAME`, t1.`EAMASSETTYPEID`, t1.`EAMASSETTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMASSETTYPE` t1  LEFT JOIN EAMASSETSTATEMODEL t11 ON t1.EAMASSETSTATEMODELID = t11.EAMASSETSTATEMODELID  
 			]]>
     </sql>
 </mapper>

assetmanagement-core/src/main/resources/mapper/asset/eamdocument/EAMDocumentMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper	namespace="cn.ibizlab.assetmanagement.core.asset.mapper.EAMDocumentMapper">
+
+    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
+	<select id="selectById"  resultMap="EAMDocumentResultMap" databaseId="mysql">
+        <![CDATA[select t1.* from (SELECT t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DOCFILE`, t1.`DOCUMENTNUMBER`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMDOCUMENTID`, t1.`EAMDOCUMENTNAME`, t1.`EAMDOCUMENTTYPEID`, t21.`EAMDOCUMENTTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMDOCUMENT` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMDOCUMENTTYPE t21 ON t1.EAMDOCUMENTTYPEID = t21.EAMDOCUMENTTYPEID  ) t1 where eamdocumentid=#{id}]]>
+    </select>
+
+    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
+    <resultMap id="EAMDocumentResultMap" type="cn.ibizlab.assetmanagement.core.asset.domain.EAMDocument" autoMapping="true">
+        <id property="eamdocumentid" column="eamdocumentid" /><!--主键字段映射-->
+		<result property="eamassettypeid" column="eamassettypeid" />
+		<result property="eamdocumenttypeid" column="eamdocumenttypeid" />
+            
+		
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="eamassettype" javaType="cn.ibizlab.assetmanagement.core.asset.domain.EAMAssetType" column="eamassettypeid" select="cn.ibizlab.assetmanagement.core.asset.mapper.EAMAssetTypeMapper.selectById" fetchType="lazy"></association>
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="eamdocumenttype" javaType="cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType" column="eamdocumenttypeid" select="cn.ibizlab.assetmanagement.core.asset.mapper.EAMDocumentTypeMapper.selectById" fetchType="lazy"></association>
+    </resultMap>
+
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_EAMDOCUMENT_EAMASSETTYPE_EAMASSETTYPEID] -->
+	 <select id="selectByEamassettypeid" resultMap="EAMDocumentResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  eamassettypeid=#{eamassettypeid}
+     </select>
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_EAMDOCUMENT_EAMDOCUMENTTYPE_EAMDOCUMENTTYPEID] -->
+	 <select id="selectByEamdocumenttypeid" resultMap="EAMDocumentResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  eamdocumenttypeid=#{eamdocumenttypeid}
+     </select>
+
+    <!--数据集合[Default]-->
+	 <select id="searchDefault"  parameterType="cn.ibizlab.assetmanagement.core.asset.filter.EAMDocumentSearchContext"  resultMap="EAMDocumentResultMap">
+         select t1.* from (
+                <include refid="Default" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DOCFILE`, t1.`DOCUMENTNUMBER`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMDOCUMENTID`, t1.`EAMDOCUMENTNAME`, t1.`EAMDOCUMENTTYPEID`, t21.`EAMDOCUMENTTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMDOCUMENT` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMDOCUMENTTYPE t21 ON t1.EAMDOCUMENTTYPEID = t21.EAMDOCUMENTTYPEID  
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DOCFILE`, t1.`DOCUMENTNUMBER`, t1.`EAMASSETTYPEID`, t11.`EAMASSETTYPENAME`, t1.`EAMDOCUMENTID`, t1.`EAMDOCUMENTNAME`, t1.`EAMDOCUMENTTYPEID`, t21.`EAMDOCUMENTTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMDOCUMENT` t1  LEFT JOIN EAMASSETTYPE t11 ON t1.EAMASSETTYPEID = t11.EAMASSETTYPEID  LEFT JOIN EAMDOCUMENTTYPE t21 ON t1.EAMDOCUMENTTYPEID = t21.EAMDOCUMENTTYPEID  
+			]]>
+    </sql>
+</mapper>
+

assetmanagement-core/src/main/resources/mapper/asset/eamdocumenttype/EAMDocumentTypeMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper	namespace="cn.ibizlab.assetmanagement.core.asset.mapper.EAMDocumentTypeMapper">
+
+    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
+	<select id="selectById"  resultMap="EAMDocumentTypeResultMap" databaseId="mysql">
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMDOCUMENTTYPEID`, t1.`EAMDOCUMENTTYPENAME`, t1.`PEAMDOCUMENTTYPEID`, t11.`EAMDOCUMENTTYPENAME` AS `PEAMDOCUMENTTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMDOCUMENTTYPE` t1  LEFT JOIN EAMDOCUMENTTYPE t11 ON t1.PEAMDOCUMENTTYPEID = t11.EAMDOCUMENTTYPEID  ) t1 where eamdocumenttypeid=#{id}]]>
+    </select>
+
+    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
+    <resultMap id="EAMDocumentTypeResultMap" type="cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType" autoMapping="true">
+        <id property="eamdocumenttypeid" column="eamdocumenttypeid" /><!--主键字段映射-->
+		<result property="peamdocumenttypeid" column="peamdocumenttypeid" />
+            
+		
+		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
+		<association property="peamdocumenttype" javaType="cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType" column="peamdocumenttypeid" select="cn.ibizlab.assetmanagement.core.asset.mapper.EAMDocumentTypeMapper.selectById" fetchType="lazy"></association>
+    </resultMap>
+
+	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_EAMDOCUMENTTYPE_EAMDOCUMENTTYPE_PEAMDOCUMENTTYPEID] -->
+	 <select id="selectByPeamdocumenttypeid" resultMap="EAMDocumentTypeResultMap">
+         select t1.* from (
+                <include refid="Default" />
+			 ) t1
+			 where  peamdocumenttypeid=#{eamdocumenttypeid}
+     </select>
+
+    <!--数据集合[Default]-->
+	 <select id="searchDefault"  parameterType="cn.ibizlab.assetmanagement.core.asset.filter.EAMDocumentTypeSearchContext"  resultMap="EAMDocumentTypeResultMap">
+         select t1.* from (
+                <include refid="Default" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据集合[Top]-->
+	 <select id="searchTop"  parameterType="cn.ibizlab.assetmanagement.core.asset.filter.EAMDocumentTypeSearchContext"  resultMap="EAMDocumentTypeResultMap">
+         select t1.* from (
+                <include refid="Top" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMDOCUMENTTYPEID`, t1.`EAMDOCUMENTTYPENAME`, t1.`PEAMDOCUMENTTYPEID`, t11.`EAMDOCUMENTTYPENAME` AS `PEAMDOCUMENTTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMDOCUMENTTYPE` t1  LEFT JOIN EAMDOCUMENTTYPE t11 ON t1.PEAMDOCUMENTTYPEID = t11.EAMDOCUMENTTYPEID  
+			]]>
+    </sql>
+    <!--数据查询[Top]-->
+    <sql id="Top" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMDOCUMENTTYPEID`, t1.`EAMDOCUMENTTYPENAME`, t1.`PEAMDOCUMENTTYPEID`, t11.`EAMDOCUMENTTYPENAME` AS `PEAMDOCUMENTTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMDOCUMENTTYPE` t1  LEFT JOIN EAMDOCUMENTTYPE t11 ON t1.PEAMDOCUMENTTYPEID = t11.EAMDOCUMENTTYPEID  
+					 WHERE 	( t1.`PEAMDOCUMENTTYPEID` IS NULL )
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EAMDOCUMENTTYPEID`, t1.`EAMDOCUMENTTYPENAME`, t1.`PEAMDOCUMENTTYPEID`, t11.`EAMDOCUMENTTYPENAME` AS `PEAMDOCUMENTTYPENAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EAMDOCUMENTTYPE` t1  LEFT JOIN EAMDOCUMENTTYPE t11 ON t1.PEAMDOCUMENTTYPEID = t11.EAMDOCUMENTTYPEID  
+			]]>
+    </sql>
+</mapper>
+

assetmanagement-core/src/main/resources/permission/systemResource.json

@@ -4,6 +4,14 @@
     ],
     "entities":[
     {
+    "dename":"EAMDocument",
+    "delogicname":"文档",
+    "sysmoudle":{"id":"ASSET","name":"资产管理"},
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
+    "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
+     }
+    ,    {
     "dename":"EAMLocationStateModel",
     "delogicname":"功能位置状态模型",
     "sysmoudle":{"id":"LOCATION","name":"功能位置"},
@@ -212,6 +220,14 @@
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }
     ,    {
+    "dename":"EAMDocumentType",
+    "delogicname":"文档类型",
+    "sysmoudle":{"id":"ASSET","name":"资产管理"},
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"},{"id":"Top" , "name":"顶级文档类型"}],
+    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
+    "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
+     }
+    ,    {
     "dename":"EAMAssetStateModel",
     "delogicname":"资产状态模型",
     "sysmoudle":{"id":"ASSET","name":"资产管理"},
@@ -233,7 +249,7 @@
             {
                "appid":"AssetManagement",
                "appname":"资产管理",
-               "appmenu":[{"menuid":"AppIndexView", "menuname":"AppIndexView", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" },{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem15" , "name":"系统设置" , "items":[{ "id":"menuitem16" , "name":"服务等级" },{ "id":"menuitem17" , "name":"维护申请类型" },{ "id":"menuitem19" , "name":"工单类型" }]}]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem1" , "name":"功能位置" , "items":[{ "id":"menuitem6" , "name":"功能位置状态" },{ "id":"menuitem7" , "name":"功能位置状态模型" },{ "id":"menuitem8" , "name":"功能位置类型" },{ "id":"menuitem9" , "name":"功能位置" }]},{ "id":"menuitem2" , "name":"资产管理" , "items":[{ "id":"menuitem10" , "name":"资产状态" },{ "id":"menuitem11" , "name":"资产状态模型" },{ "id":"menuitem12" , "name":"资产类型" },{ "id":"menuitem13" , "name":"资产管理" },{ "id":"menuitem14" , "name":"备件包" }]},{ "id":"menuitem4" , "name":"工单管理" , "items":[{ "id":"menuitem3" , "name":"维护申请" },{ "id":"menuitem18" , "name":"工单" }]},{ "id":"menuitem5" , "name":"维护计划" , "items":[{ "id":"menuitem20" , "name":"维护计划" }]}]}] }]
+               "appmenu":[{"menuid":"AppIndexView", "menuname":"AppIndexView", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" },{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem15" , "name":"系统设置" , "items":[{ "id":"menuitem21" , "name":"文档类型" },{ "id":"menuitem16" , "name":"服务等级" },{ "id":"menuitem17" , "name":"维护申请类型" },{ "id":"menuitem19" , "name":"工单类型" }]}]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem1" , "name":"功能位置" , "items":[{ "id":"menuitem6" , "name":"功能位置状态" },{ "id":"menuitem7" , "name":"功能位置状态模型" },{ "id":"menuitem8" , "name":"功能位置类型" },{ "id":"menuitem9" , "name":"功能位置" }]},{ "id":"menuitem2" , "name":"资产管理" , "items":[{ "id":"menuitem10" , "name":"资产状态" },{ "id":"menuitem11" , "name":"资产状态模型" },{ "id":"menuitem12" , "name":"资产类型" },{ "id":"menuitem13" , "name":"资产管理" },{ "id":"menuitem22" , "name":"文档" },{ "id":"menuitem14" , "name":"备件包" }]},{ "id":"menuitem4" , "name":"工单管理" , "items":[{ "id":"menuitem3" , "name":"维护申请" },{ "id":"menuitem18" , "name":"工单" }]},{ "id":"menuitem5" , "name":"维护计划" , "items":[{ "id":"menuitem20" , "name":"维护计划" }]}]}] }]
             }
             ]
     }

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /assetmanagement-provider-assetapi.jar
 
-EXPOSE 8081
+EXPOSE 10315
 
 ADD assetmanagement-provider-assetapi.jar /assetmanagement-provider-assetapi.jar

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/docker/assetmanagement-provider-assetapi.yaml

@@ -3,9 +3,25 @@ services:
   assetmanagement-provider-assetapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-provider-assetapi:latest
     ports:
-      - "8081:8081"
+      - "10315:10315"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10315
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMAssetDTO.java

@@ -146,6 +146,14 @@ public class EAMAssetDTO extends DTOBase implements Serializable {
     @JsonProperty("assetnumber")
     private String assetnumber;
 
+    /**
+     * 属性 [DESCRIPTION]
+     *
+     */
+    @JSONField(name = "description")
+    @JsonProperty("description")
+    private String description;
+
 
     /**
      * 设置 [ASSETNAME]
@@ -195,6 +203,14 @@ public class EAMAssetDTO extends DTOBase implements Serializable {
         this.modify("assetnumber",assetnumber);
     }
 
+    /**
+     * 设置 [DESCRIPTION]
+     */
+    public void setDescription(String  description){
+        this.description = description ;
+        this.modify("description",description);
+    }
+
 
 }
 

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMAssetTypeDTO.java

@@ -98,6 +98,14 @@ public class EAMAssetTypeDTO extends DTOBase implements Serializable {
     @JsonProperty("assettypenumber")
     private String assettypenumber;
 
+    /**
+     * 属性 [DESCRIPTION]
+     *
+     */
+    @JSONField(name = "description")
+    @JsonProperty("description")
+    private String description;
+
 
     /**
      * 设置 [EAMASSETTYPENAME]
@@ -123,6 +131,14 @@ public class EAMAssetTypeDTO extends DTOBase implements Serializable {
         this.modify("assettypenumber",assettypenumber);
     }
 
+    /**
+     * 设置 [DESCRIPTION]
+     */
+    public void setDescription(String  description){
+        this.description = description ;
+        this.modify("description",description);
+    }
+
 
 }
 

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMDocumentDTO.java

+package cn.ibizlab.assetmanagement.assetapi.dto;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import cn.ibizlab.assetmanagement.util.domain.DTOBase;
+import cn.ibizlab.assetmanagement.util.domain.DTOClient;
+import lombok.Data;
+
+/**
+ * 服务DTO对象[EAMDocumentDTO]
+ */
+@Data
+public class EAMDocumentDTO extends DTOBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性 [CREATEDATE]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("createdate")
+    private Timestamp createdate;
+
+    /**
+     * 属性 [EAMDOCUMENTNAME]
+     *
+     */
+    @JSONField(name = "eamdocumentname")
+    @JsonProperty("eamdocumentname")
+    private String eamdocumentname;
+
+    /**
+     * 属性 [CREATEMAN]
+     *
+     */
+    @JSONField(name = "createman")
+    @JsonProperty("createman")
+    private String createman;
+
+    /**
+     * 属性 [EAMDOCUMENTID]
+     *
+     */
+    @JSONField(name = "eamdocumentid")
+    @JsonProperty("eamdocumentid")
+    private String eamdocumentid;
+
+    /**
+     * 属性 [UPDATEDATE]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("updatedate")
+    private Timestamp updatedate;
+
+    /**
+     * 属性 [UPDATEMAN]
+     *
+     */
+    @JSONField(name = "updateman")
+    @JsonProperty("updateman")
+    private String updateman;
+
+    /**
+     * 属性 [EAMASSETTYPEID]
+     *
+     */
+    @JSONField(name = "eamassettypeid")
+    @JsonProperty("eamassettypeid")
+    private String eamassettypeid;
+
+    /**
+     * 属性 [EAMASSETTYPENAME]
+     *
+     */
+    @JSONField(name = "eamassettypename")
+    @JsonProperty("eamassettypename")
+    private String eamassettypename;
+
+    /**
+     * 属性 [DOCUMENTNUMBER]
+     *
+     */
+    @JSONField(name = "documentnumber")
+    @JsonProperty("documentnumber")
+    private String documentnumber;
+
+    /**
+     * 属性 [EAMDOCUMENTTYPEID]
+     *
+     */
+    @JSONField(name = "eamdocumenttypeid")
+    @JsonProperty("eamdocumenttypeid")
+    private String eamdocumenttypeid;
+
+    /**
+     * 属性 [EAMDOCUMENTTYPENAME]
+     *
+     */
+    @JSONField(name = "eamdocumenttypename")
+    @JsonProperty("eamdocumenttypename")
+    private String eamdocumenttypename;
+
+    /**
+     * 属性 [CONTENT]
+     *
+     */
+    @JSONField(name = "content")
+    @JsonProperty("content")
+    private String content;
+
+    /**
+     * 属性 [DOCFILE]
+     *
+     */
+    @JSONField(name = "docfile")
+    @JsonProperty("docfile")
+    private String docfile;
+
+
+    /**
+     * 设置 [EAMDOCUMENTNAME]
+     */
+    public void setEamdocumentname(String  eamdocumentname){
+        this.eamdocumentname = eamdocumentname ;
+        this.modify("eamdocumentname",eamdocumentname);
+    }
+
+    /**
+     * 设置 [EAMASSETTYPEID]
+     */
+    public void setEamassettypeid(String  eamassettypeid){
+        this.eamassettypeid = eamassettypeid ;
+        this.modify("eamassettypeid",eamassettypeid);
+    }
+
+    /**
+     * 设置 [DOCUMENTNUMBER]
+     */
+    public void setDocumentnumber(String  documentnumber){
+        this.documentnumber = documentnumber ;
+        this.modify("documentnumber",documentnumber);
+    }
+
+    /**
+     * 设置 [EAMDOCUMENTTYPEID]
+     */
+    public void setEamdocumenttypeid(String  eamdocumenttypeid){
+        this.eamdocumenttypeid = eamdocumenttypeid ;
+        this.modify("eamdocumenttypeid",eamdocumenttypeid);
+    }
+
+    /**
+     * 设置 [CONTENT]
+     */
+    public void setContent(String  content){
+        this.content = content ;
+        this.modify("content",content);
+    }
+
+    /**
+     * 设置 [DOCFILE]
+     */
+    public void setDocfile(String  docfile){
+        this.docfile = docfile ;
+        this.modify("docfile",docfile);
+    }
+
+
+}
+

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMDocumentTypeDTO.java

+package cn.ibizlab.assetmanagement.assetapi.dto;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import cn.ibizlab.assetmanagement.util.domain.DTOBase;
+import cn.ibizlab.assetmanagement.util.domain.DTOClient;
+import lombok.Data;
+
+/**
+ * 服务DTO对象[EAMDocumentTypeDTO]
+ */
+@Data
+public class EAMDocumentTypeDTO extends DTOBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性 [EAMDOCUMENTTYPENAME]
+     *
+     */
+    @JSONField(name = "eamdocumenttypename")
+    @JsonProperty("eamdocumenttypename")
+    private String eamdocumenttypename;
+
+    /**
+     * 属性 [EAMDOCUMENTTYPEID]
+     *
+     */
+    @JSONField(name = "eamdocumenttypeid")
+    @JsonProperty("eamdocumenttypeid")
+    private String eamdocumenttypeid;
+
+    /**
+     * 属性 [CREATEDATE]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("createdate")
+    private Timestamp createdate;
+
+    /**
+     * 属性 [UPDATEMAN]
+     *
+     */
+    @JSONField(name = "updateman")
+    @JsonProperty("updateman")
+    private String updateman;
+
+    /**
+     * 属性 [UPDATEDATE]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
+    @JsonProperty("updatedate")
+    private Timestamp updatedate;
+
+    /**
+     * 属性 [CREATEMAN]
+     *
+     */
+    @JSONField(name = "createman")
+    @JsonProperty("createman")
+    private String createman;
+
+    /**
+     * 属性 [PEAMDOCUMENTTYPEID]
+     *
+     */
+    @JSONField(name = "peamdocumenttypeid")
+    @JsonProperty("peamdocumenttypeid")
+    private String peamdocumenttypeid;
+
+    /**
+     * 属性 [PEAMDOCUMENTTYPENAME]
+     *
+     */
+    @JSONField(name = "peamdocumenttypename")
+    @JsonProperty("peamdocumenttypename")
+    private String peamdocumenttypename;
+
+
+    /**
+     * 设置 [EAMDOCUMENTTYPENAME]
+     */
+    public void setEamdocumenttypename(String  eamdocumenttypename){
+        this.eamdocumenttypename = eamdocumenttypename ;
+        this.modify("eamdocumenttypename",eamdocumenttypename);
+    }
+
+    /**
+     * 设置 [PEAMDOCUMENTTYPEID]
+     */
+    public void setPeamdocumenttypeid(String  peamdocumenttypeid){
+        this.peamdocumenttypeid = peamdocumenttypeid ;
+        this.modify("peamdocumenttypeid",peamdocumenttypeid);
+    }
+
+
+}
+

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/iBizAssetManagementAssetApiApplication.java

@@ -15,6 +15,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import cn.ibizlab.assetmanagement.util.web.SearchContextHandlerMethodArgumentResolver;
+import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
 
 @Slf4j
@@ -40,6 +42,9 @@ import java.util.List;
 @EnableScheduling
 public class iBizAssetManagementAssetApiApplication extends WebMvcConfigurerAdapter{
 
+    @Autowired
+    SearchContextHandlerMethodArgumentResolver resolver;
+
     public static void main(String[] args) {
         SpringApplication.run(iBizAssetManagementAssetApiApplication.class, args);
     }
@@ -47,6 +52,6 @@ public class iBizAssetManagementAssetApiApplication extends WebMvcConfigurerAdap
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
         super.addArgumentResolvers(argumentResolvers);
-        argumentResolvers.add(new cn.ibizlab.assetmanagement.util.web.SearchContextHandlerMethodArgumentResolver());
+        argumentResolvers.add(resolver);
     }
 }

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/mapping/EAMDocumentMapping.java

+package cn.ibizlab.assetmanagement.assetapi.mapping;
+
+import org.mapstruct.*;
+import cn.ibizlab.assetmanagement.core.asset.domain.EAMDocument;
+import cn.ibizlab.assetmanagement.assetapi.dto.EAMDocumentDTO;
+import cn.ibizlab.assetmanagement.util.domain.MappingBase;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = {},implementationName="AssetApiEAMDocumentMapping",
+    nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface EAMDocumentMapping extends MappingBase<EAMDocumentDTO, EAMDocument> {
+
+
+}
+

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/mapping/EAMDocumentTypeMapping.java

+package cn.ibizlab.assetmanagement.assetapi.mapping;
+
+import org.mapstruct.*;
+import cn.ibizlab.assetmanagement.core.asset.domain.EAMDocumentType;
+import cn.ibizlab.assetmanagement.assetapi.dto.EAMDocumentTypeDTO;
+import cn.ibizlab.assetmanagement.util.domain.MappingBase;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = {},implementationName="AssetApiEAMDocumentTypeMapping",
+    nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface EAMDocumentTypeMapping extends MappingBase<EAMDocumentTypeDTO, EAMDocumentType> {
+
+
+}
+

assetmanagement-util/src/main/java/cn/ibizlab/assetmanagement/util/web/SearchContextHandlerMethodArgumentResolver.java

@@ -10,10 +10,16 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
 
 @Slf4j
+@Configuration
 public class SearchContextHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Value("${ibiz.pageLimit:1000}")
+	private int pageLimit=1000;
+
     private static ObjectMapper objectMapper=new ObjectMapper();
 
 	@Override
@@ -29,6 +35,9 @@ public class SearchContextHandlerMethodArgumentResolver implements HandlerMethod
 		for (String key : params.keySet()) {
 			set.put(key,params.get(key)[0]);
 		}
+		if((!set.containsKey("size")) ){
+			set.put("size",pageLimit);
+		}
 		String json=objectMapper.writeValueAsString(set);
 		return objectMapper.readValue(json,parameter.getParameterType());
 	}

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizassetmanagement/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizassetmanagement/
-      mvn clean package -Passetmanagement
-      cd assetmanagement-app/assetmanagement-app-assetmanagement
-      mvn -Passetmanagement docker:build
-      mvn -Passetmanagement docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-app-assetmanagement.yaml iBizEE --with-registry-auth
+      mvn clean package -Passetapi
+      cd assetmanagement-provider/assetmanagement-provider-assetapi
+      mvn -Passetapi docker:build
+      mvn -Passetapi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-provider-assetapi.yaml iBizEE --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>