From b3beace06675528732afc250a74a7a34fc696178 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期三, 19 十一月 2025 10:05:51 +0800
Subject: [PATCH] 调整代码，配置数据库，正常启动

---
 fzzy-igdss-web/src/main/java/com/fzzy/Application.java                    |    1 
 /dev/null                                                                 | 1145 ---------------------------------------------------------
 fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java        |    2 
 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/BaseResp.java            |    2 
 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ConfigData.java          |    2 
 fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java            |    5 
 fzzy-igdss-web/src/main/resources/application-dev.yml                     |    2 
 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/FileData.java            |    2 
 fzzy-igdss-core/src/main/java/com/fzzy/igds/config/MyBatisPlusConfig.java |    2 
 fzzy-igdss-view/pom.xml                                                   |    4 
 pom.xml                                                                   |   17 
 11 files changed, 27 insertions(+), 1,157 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/config/MyBatisPlusConfig.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/config/MyBatisPlusConfig.java
index d10e4d4..afe1d59 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/config/MyBatisPlusConfig.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/config/MyBatisPlusConfig.java
@@ -1,4 +1,4 @@
-package com.fzzy.eoms.config;
+package com.fzzy.igds.config;
 
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/BaseResp.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/BaseResp.java
index 9bc901d..81f8137 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/BaseResp.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/BaseResp.java
@@ -1,4 +1,4 @@
-package com.fzzy.eoms.data;
+package com.fzzy.igds.data;
 
 import lombok.Data;
 
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ConfigData.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ConfigData.java
index e4e42b3..8413206 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ConfigData.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/ConfigData.java
@@ -1,4 +1,4 @@
-package com.fzzy.eoms.data;
+package com.fzzy.igds.data;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/FileData.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/FileData.java
index d0505ed..2d4391f 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/FileData.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/FileData.java
@@ -1,4 +1,4 @@
-package com.fzzy.eoms.data;
+package com.fzzy.igds.data;
 
 import lombok.Data;
 
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/CoreFileService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/CoreFileService.java
deleted file mode 100644
index af2b430..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/CoreFileService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.fzzy.eoms.file;
-
-
-import com.fzzy.eoms.models.FileInfo;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 绯荤粺闄勪欢鎺ュ彛
- */
-public interface CoreFileService {
-
-
-    /**
-     * 鏍规嵁鏉′欢鑾峰彇闄勪欢淇℃伅
-     *
-     * @param companyId
-     * @param bizId
-     * @return
-     */
-    List<FileInfo> listFile(String companyId, String bizId);
-
-    /**
-     * 鏍规嵁鏉′欢鑾峰彇闄勪欢淇℃伅
-     *
-     * @param companyId
-     * @param bizId
-     * @return
-     */
-    List<FileInfo> listFile(String companyId, String bizId,String bizTag);
-
-
-    /**
-     * 鏍规嵁鏃堕棿鑾峰彇绯荤粺閰嶇疆鐨勯檮浠惰矾寰勫湴鍧�
-     * 绯荤粺闄勪欢璺緞浠yyyMM涓虹洰褰曡繘琛屽垝鍒�
-     *
-     * @param date
-     * @return
-     */
-    public String getStoragePath(Date date);
-
-
-    /**
-     * 涓存椂鐩綍
-     * 绯荤粺闄勪欢璺緞浠yyyMM涓虹洰褰曡繘琛屽垝鍒�
-     *
-     * @return
-     */
-    public String getTempFilePath(Date date);
-
-    /**
-     * 鏂板闄勪欢淇℃伅锛屽彧淇濆瓨淇℃伅涓嶅鐞嗛檮浠�
-     *
-     * @param fileData
-     */
-    void addRecord(FileInfo fileData);
-
-    /**
-     * 鏂板闄勪欢锛屾敞鎰忥細bizId宸茬粡鏈夊�肩殑鏁版嵁涓嶆墽琛屾柊澧�
-     *
-     * @param files
-     * @param bizId
-     * @param bizTag
-     * @param companyId
-     */
-    void addRecords(List<FileInfo> files, String bizId, String bizTag, String companyId);
-
-    /**
-     * 鍒犻櫎闄勪欢
-     * @param fileId
-     */
-    void delFile(String fileId);
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/CoreFileServiceImpl.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/CoreFileServiceImpl.java
deleted file mode 100644
index 2f6e6d6..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/CoreFileServiceImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.fzzy.eoms.file;
-
-import com.fzzy.eoms.data.ConfigData;
-import com.fzzy.eoms.file.mapper.FileServiceMapper;
-import com.fzzy.eoms.models.FileInfo;
-import com.fzzy.eoms.utils.ContextUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class CoreFileServiceImpl implements CoreFileService {
-
-    @Resource
-    private FileServiceMapper fileServiceMapper;
-    @Resource
-    private ConfigData configData;
-
-
-    @Override
-    public String getStoragePath(Date date) {
-        if (null == date)
-            date = new Date();
-        String basePath = configData.getProfile() + "/" + DateFormatUtils.format(date, "yyyyMM") + "/";
-        File file = new File(basePath);
-        if (!file.exists()) {
-            file.mkdirs();
-        }
-        return basePath;
-    }
-
-
-    @Override
-    public String getTempFilePath(Date date) {
-        String basePath = configData.getProfile() + "TEMP/" + DateFormatUtils.format(date, "yyyyMM") + "/";
-        File file = new File(basePath);
-        if (!file.exists()) {
-            file.mkdirs();
-        }
-        return basePath;
-    }
-
-    @Override
-    public void addRecord(FileInfo fileData) {
-        fileServiceMapper.addFile(fileData);
-    }
-
-
-    @Override
-    public List<FileInfo> listFile(String companyId, String bizId) {
-        if (StringUtils.isEmpty(companyId)) {
-            companyId = ContextUtil.getDefaultCompanyId();
-        }
-
-        if (StringUtils.isEmpty(bizId))
-            return null;
-
-        return fileServiceMapper.listFile(companyId, bizId);
-    }
-
-    @Override
-    public List<FileInfo> listFile(String companyId, String bizId, String bizTag) {
-        if (StringUtils.isEmpty(companyId)) {
-            companyId = ContextUtil.getDefaultCompanyId();
-        }
-
-        if (StringUtils.isEmpty(bizId)) return null;
-
-        if (StringUtils.isEmpty(bizTag)) return fileServiceMapper.listFile(companyId, bizId);
-
-        return fileServiceMapper.listFile2(companyId, bizId, bizTag);
-    }
-
-    @Override
-    public void delFile(String fileId) {
-        fileServiceMapper.delFile(fileId);
-    }
-
-
-    @Override
-    public void addRecords(List<FileInfo> files, String bizId, String bizTag, String companyId) {
-        if (null == files || files.isEmpty()) {
-            return;
-        }
-
-        if (null == companyId) {
-            companyId = ContextUtil.getDefaultCompanyId();
-        }
-
-        FileInfo fileData;
-        for (FileInfo data : files) {
-            if (StringUtils.isEmpty(data.getFileName())) {
-                continue;
-            }
-            //濡傛湁涓氬姟ID鍒欎笉澶勭悊
-            if (StringUtils.isNotEmpty(data.getBizId())) {
-                continue;
-            }
-            if (StringUtils.isEmpty(data.getCompanyId())) {
-                data.setCompanyId(companyId);
-            }
-
-            if (null == data.getCreateTime()) {
-                data.setCreateTime(new Date());
-            }
-            if (null == data.getBizTag()) {
-                data.setBizTag(bizTag);
-            }
-            data.setBizId(bizId);
-            if (null == data.getFileId()) {
-                data.setFileId(ContextUtil.getUUID());
-            }
-            fileData = new FileInfo();
-            fileData.setFileId(data.getFileId());
-            fileData.setBizId(data.getBizId());
-            fileData.setBizTag(data.getBizTag());
-            fileData.setFileName(data.getFileName());
-            fileData.setCreateTime(data.getCreateTime());
-            fileData.setCompanyId(data.getCompanyId());
-            fileServiceMapper.addFile(fileData);
-        }
-    }
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/controller/FileController.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/controller/FileController.java
deleted file mode 100644
index 04bc487..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/controller/FileController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.fzzy.eoms.file.controller;
-
-import com.fzzy.eoms.file.CoreFileService;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLEncoder;
-import java.util.Date;
-
-/**
- * @program: eoms
- * @description: 鏂囦欢鎿嶄綔
- * @author: 0range
- * @create: 2021-01-05 17:05
- **/
-@Slf4j
-@RestController
-@RequestMapping("/file")
-public class FileController {
-
-
-    @Resource
-    private CoreFileService fileService;
-
-    /**
-     * 闄勪欢涓嬭浇
-     * @param fileId
-     * @param fileDate
-     * @return
-     * @throws Exception
-     */
-    @GetMapping("/download")
-    public void download(@RequestParam(value = "id", required = true) String fileId,
-                         @RequestParam(value = "date", required = true) String fileDate,
-                         HttpServletResponse response) throws Exception {
-
-        log.info("-----download-----fileId={},fileDate={}", fileId, fileDate);
-
-        // 灏嗗瓧绗︿覆杞崲涓� long
-        long timestamp = Long.parseLong(fileDate);
-        Date date = new Date(timestamp);
-
-        String storePath = fileService.getStoragePath(date);
-
-        String filePath = storePath + fileId;
-        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-        FileUtils.setAttachmentResponseHeader(response, fileId);
-        FileUtils.writeBytes(filePath, response.getOutputStream());
-    }
-
-    /**
-     * 闄勪欢棰勮锛屼粎鍥剧墖鍜孭DF绫绘敮鎸侀瑙�
-     * @param fileId
-     * @param fileDate
-     * @return
-     * @throws Exception
-     */
-    @GetMapping("/preview")
-    public void preview(@RequestParam(value = "id", required = true) String fileId,
-                        @RequestParam(value = "date", required = true) String fileDate,
-                        HttpServletResponse response){
-
-        log.info("-----preview-----fileId={},fileDate={}", fileId, fileDate);
-
-        // 灏嗗瓧绗︿覆杞崲涓� long
-        long timestamp = Long.parseLong(fileDate);
-        Date date = new Date(timestamp);
-
-        String storePath = fileService.getStoragePath(date);
-
-        String filePath = storePath + fileId;
-
-        File file = new File(filePath);
-        response.setHeader("Content-Disposition", "inline; filename*=UTF-8''" + fileId);
-        ServletOutputStream os = null;
-        try {
-            os = response.getOutputStream();
-            os.write(org.apache.commons.io.FileUtils.readFileToByteArray(file));
-            os.flush();
-        } catch (Exception e) {
-            log.error("-----preview-----fileId={},fileDate={},error={}", fileId, fileDate, e.getMessage());
-            log.error("preview error ",e);
-        } finally {
-            if (os != null) {
-                try {
-                    os.close();
-                } catch (Exception e) {
-                    log.error("-----preview-----fileId={},fileDate={},error={}", fileId, fileDate, e.getMessage());
-                    log.error("preview error ",e);
-                }
-            }
-        }
-    }
-
-
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/mapper/FileServiceMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/mapper/FileServiceMapper.java
deleted file mode 100644
index dbe4117..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/file/mapper/FileServiceMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.fzzy.eoms.file.mapper;
-
-import com.fzzy.eoms.models.FileInfo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface FileServiceMapper {
-
-    /**
-     * 鏂板
-     *
-     * @param file
-     */
-    void addFile(@Param("data") FileInfo file);
-
-    int updateFile(@Param("data") FileInfo file);
-
-    /**
-     * 鏍规嵁鏉′欢鑾峰彇闄勪欢淇℃伅
-     *
-     * @param companyId
-     * @param bizId
-     * @return
-     */
-    List<FileInfo> listFile(@Param("companyId") String companyId,
-                            @Param("bizId") String bizId);
-
-    List<FileInfo> listFile2(@Param("companyId") String companyId,
-                            @Param("bizId") String bizId,@Param("bizTag") String bizTag);
-
-    /**
-     * 鍒犻櫎鏂囦欢
-     *
-     * @param fileId
-     */
-    void delFile(@Param("fileId") String fileId);
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
index 5794b9f..b4f16db 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
@@ -1,6 +1,6 @@
 package com.fzzy.eoms.utils;
 
-import com.fzzy.eoms.data.ConfigData;
+import com.fzzy.igds.data.ConfigData;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
diff --git a/fzzy-igdss-view/pom.xml b/fzzy-igdss-view/pom.xml
index a67f59a..4626602 100644
--- a/fzzy-igdss-view/pom.xml
+++ b/fzzy-igdss-view/pom.xml
@@ -121,8 +121,8 @@
 
     <repositories>
         <repository>
-            <id>bsdn-repository</id>
-            <url>http://nexus.bsdn.org/content/groups/public/</url>
+            <id>aliyunmaven</id>
+            <url>https://maven.aliyun.com/repository/public</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java b/fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java
index 935d7a4..70b6e56 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java
@@ -2,7 +2,6 @@
 
 import com.bstek.dorado.web.servlet.DoradoServlet;
 
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -12,7 +11,7 @@
 //@Configuration
 public class DoradoConfigure {
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+/*    @SuppressWarnings({ "rawtypes", "unchecked" })
 	@Bean
     public ServletRegistrationBean doradoServlet() {
         ServletRegistrationBean servlet = new ServletRegistrationBean(new DoradoServlet());
@@ -23,6 +22,6 @@
         servlet.addUrlMappings("*.dpkg");
         servlet.addUrlMappings("/dorado/*");
         return servlet;
-    }
+    }*/
 
 }
diff --git a/fzzy-igdss-view/src/main/java/models/eoms.model.xml b/fzzy-igdss-view/src/main/java/models/eoms.model.xml
deleted file mode 100644
index b4fc572..0000000
--- a/fzzy-igdss-view/src/main/java/models/eoms.model.xml
+++ /dev/null
@@ -1,1145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Model>
-  <DataType name="dtCommonParam">
-    <Property name="creationType">com.fzzy.eoms.param.CommonParam</Property>
-    <PropertyDef name="pageSize">
-      <Property name="dataType">int</Property>
-    </PropertyDef>
-    <PropertyDef name="pageNo">
-      <Property name="dataType">int</Property>
-    </PropertyDef>
-    <PropertyDef name="start">
-      <Property name="dataType">DateTime</Property>
-      <Property name="label">寮�濮嬫椂闂�</Property>
-    </PropertyDef>
-    <PropertyDef name="end">
-      <Property name="dataType">DateTime</Property>
-      <Property name="label">鎴鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="companyId">
-      <Property></Property>
-      <Property name="label">缁勭粐缂栧彿</Property>
-    </PropertyDef>
-    <PropertyDef name="deptId">
-      <Property></Property>
-      <Property name="label">鎵�灞為儴闂�</Property>
-    </PropertyDef>
-  </DataType>
-  <DataType name="dtFiles">
-    <Property name="creationType">com.fzzy.eoms.models.FileInfo</Property>
-    <PropertyDef name="fileId">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="fileName">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="bizId">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="bizTag">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="bizTag2">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">DateTime</Property>
-    </PropertyDef>
-    <PropertyDef name="companyId">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="image">
-      <Property></Property>
-    </PropertyDef>
-  </DataType>
-  <DataType name="sysDept">
-    <Property name="creationType">com.ruoyi.common.core.domain.entity.SysDept</Property>
-    <PropertyDef name="deptId">
-      <Property name="dataType">Long</Property>
-      <Property name="label">閮ㄩ棬缂栧彿</Property>
-    </PropertyDef>
-    <PropertyDef name="parentId">
-      <Property name="dataType">Long</Property>
-    </PropertyDef>
-    <PropertyDef name="ancestors">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="deptName">
-      <Property></Property>
-      <Property name="label">閮ㄩ棬鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="orderNum">
-      <Property name="dataType">Integer</Property>
-    </PropertyDef>
-    <PropertyDef name="leader">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="type">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="phone">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="email">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="status">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="delFlag">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="parentName">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="excludeId">
-      <Property name="dataType">Long</Property>
-    </PropertyDef>
-    <PropertyDef name="companyId">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="searchValue">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞</Property>
-    </PropertyDef>
-    <Reference name="children">
-      <Property name="dataType">[SELF]</Property>
-      <Property name="parameter">$${this.deptId}</Property>
-      <Property name="dataProvider">sysDeptPR#getByParentId</Property>
-    </Reference>
-  </DataType>
-  <DataType name="dtAsset">
-    <Property name="creationType">com.fzzy.eoms.models.Asset</Property>
-    <PropertyDef name="companyId">
-      <Property></Property>
-      <Property name="label">缁勭粐缂栧彿</Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-      <Property name="label">鍒涘缓浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">DateTime</Property>
-      <Property name="label">鍒涘缓鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-      <Property name="label">鏇存柊浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">DateTime</Property>
-      <Property name="label">鏇存柊鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="assetCode">
-      <Property></Property>
-      <Property name="label">璧勪骇缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="categoryCode">
-      <Property></Property>
-      <Property name="label">璧勪骇绫诲瀷</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;assetCategoryPR#listAll&quot;).getResult()}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="name">
-      <Property></Property>
-      <Property name="label">璧勪骇鍚嶇О</Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="model">
-      <Property></Property>
-      <Property name="label">瑙勬牸鍨嬪彿</Property>
-    </PropertyDef>
-    <PropertyDef name="deleted">
-      <Property name="dataType">Boolean</Property>
-      <Property name="label">鏄惁宸插垹闄�</Property>
-    </PropertyDef>
-    <PropertyDef name="deleteBy">
-      <Property></Property>
-      <Property name="label">鍒犻櫎浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="deleteTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍒犻櫎鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="assetStatus">
-      <Property></Property>
-      <Property name="label">璧勪骇鐘舵��</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#assetStatusTrigger&quot;).getResult()}</Property>
-        <Property name="valueProperty">dictLabel</Property>
-        <Property name="keyProperty">dictValue</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="businessType">
-      <Property></Property>
-      <Property name="label">涓氬姟绫诲瀷</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#assetBusinessTypeTrigger&quot;).getResult()}</Property>
-        <Property name="keyProperty">dictValue</Property>
-        <Property name="valueProperty">dictLabel</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="manufacturerId">
-      <Property></Property>
-      <Property name="label">璧勪骇鍘傚晢</Property>
-    </PropertyDef>
-    <PropertyDef name="brandId">
-      <Property></Property>
-      <Property name="label">璧勪骇鍝佺墝</Property>
-    </PropertyDef>
-    <PropertyDef name="price">
-      <Property></Property>
-      <Property name="label">璧勪骇浠峰��</Property>
-    </PropertyDef>
-    <PropertyDef name="pictureId">
-      <Property></Property>
-      <Property name="label">璧勪骇鍥剧墖</Property>
-    </PropertyDef>
-    <PropertyDef name="unit">
-      <Property></Property>
-      <Property name="label">璁￠噺鍗曚綅</Property>
-    </PropertyDef>
-    <PropertyDef name="sn">
-      <Property></Property>
-      <Property name="label">搴忓垪鍙�</Property>
-    </PropertyDef>
-    <PropertyDef name="deptId">
-      <Property></Property>
-      <Property name="label">鎵�灞為儴闂�</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;sysDeptPR#listAll&quot;).getResult()}</Property>
-        <Property name="keyProperty">deptId</Property>
-        <Property name="valueProperty">deptName</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="useUserId">
-      <Property></Property>
-      <Property name="label">鎵�灞炰汉鍛�</Property>
-    </PropertyDef>
-    <PropertyDef name="positionId">
-      <Property></Property>
-      <Property name="label">瀛樻斁浣嶇疆</Property>
-      <Property name="mapping">
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-        <Property name="mapValues">${dorado.getDataProvider(&quot;assetPositionPR#listAll&quot;).getResult()}</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="positionDesc">
-      <Property></Property>
-      <Property name="label">浣嶇疆璇︾粏</Property>
-    </PropertyDef>
-    <PropertyDef name="sourceId">
-      <Property></Property>
-      <Property name="label">鏉ユ簮</Property>
-      <Property name="mapping">
-        <Property name="keyProperty">dictValue</Property>
-        <Property name="valueProperty">dictLabel</Property>
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#getDicTriggerByType&quot;).getResult(&quot;es_asset_source&quot;)}</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="purchaseDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">閲囪喘鏃ユ湡</Property>
-    </PropertyDef>
-    <PropertyDef name="productionDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鐢熶骇鏃ユ湡</Property>
-    </PropertyDef>
-    <PropertyDef name="maintainPlanId">
-      <Property></Property>
-      <Property name="label">缁翠繚鏂规</Property>
-    </PropertyDef>
-    <PropertyDef name="maintainCycle">
-      <Property></Property>
-      <Property name="label">淇濆吇鍛ㄦ湡</Property>
-      <Property name="displayFormat">#澶�/娆�</Property>
-      <Property name="dataType">Integer</Property>
-    </PropertyDef>
-    <PropertyDef name="maintainNextTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">涓嬫鎵ц鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="maintainLastTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">涓婃鎵ц鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="businessCode">
-      <Property></Property>
-      <Property name="label">涓氬姟缂栧彿</Property>
-    </PropertyDef>
-    <PropertyDef name="deletedDesc">
-      <Property></Property>
-      <Property name="label">鍒犻櫎璇存槑</Property>
-    </PropertyDef>
-  </DataType>
-  <DataType name="dtAssetPurchase">
-    <Property name="creationType">com.fzzy.eoms.models.AssetPurchase</Property>
-    <PropertyDef name="companyId">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-      <Property name="label">鐢宠浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">DateTime</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="id">
-      <Property></Property>
-      <Property name="label">閲囪喘缂栧彿</Property>
-    </PropertyDef>
-    <PropertyDef name="applyContent">
-      <Property></Property>
-      <Property name="label">鐢宠璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="flowStatus">
-      <Property></Property>
-      <Property name="label">鍔炵悊鐘舵��</Property>
-    </PropertyDef>
-    <PropertyDef name="status">
-      <Property></Property>
-      <Property name="label">涓氬姟鐘舵��</Property>
-    </PropertyDef>
-    <PropertyDef name="applyDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鐢宠鏃ユ湡</Property>
-    </PropertyDef>
-    <PropertyDef name="purchaseUserId">
-      <Property></Property>
-      <Property name="label">閲囪喘浜哄憳</Property>
-    </PropertyDef>
-    <PropertyDef name="purchaseContent">
-      <Property></Property>
-      <Property name="label">閲囪喘璇存槑</Property>
-    </PropertyDef>
-    <Reference name="assetList">
-      <Property name="dataProvider">assetProOrderPR#getListByPurchaseId</Property>
-      <Property name="dataType">[dtAssetProOrder]</Property>
-      <Property name="parameter">$${this.id}</Property>
-    </Reference>
-  </DataType>
-  <DataType name="dtAssetProOrder">
-    <Property name="creationType">com.fzzy.eoms.models.AssetProOrder</Property>
-    <PropertyDef name="id">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="purchaseId">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="categoryId">
-      <Property></Property>
-      <Property name="label">璁惧鍒嗙被</Property>
-    </PropertyDef>
-    <PropertyDef name="categoryName">
-      <Property></Property>
-      <Property name="label">璁惧鍒嗙被</Property>
-    </PropertyDef>
-    <PropertyDef name="purchaseNum">
-      <Property name="dataType">Integer</Property>
-      <Property name="label">閲囪喘鏁伴噺</Property>
-    </PropertyDef>
-    <PropertyDef name="purchasePrice">
-      <Property name="dataType">Double</Property>
-      <Property name="label">閲囪喘浠锋牸</Property>
-      <Property name="displayFormat">#.00鍏�</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞璇存槑</Property>
-    </PropertyDef>
-  </DataType>
-  <DataType name="dtAssetCategory">
-    <Property name="creationType">com.fzzy.eoms.models.AssetCategory</Property>
-    <PropertyDef name="companyId">
-      <Property></Property>
-      <Property name="label">缁勭粐缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-      <Property name="label">鍒涘缓浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍒涘缓鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-      <Property name="label">鏇存柊浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鏇存柊鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞</Property>
-    </PropertyDef>
-    <PropertyDef name="code">
-      <Property></Property>
-      <Property name="label">缂栧彿</Property>
-    </PropertyDef>
-    <PropertyDef name="name">
-      <Property></Property>
-      <Property name="label">鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="enabled">
-      <Property></Property>
-      <Property name="label">鏄惁鍙敤</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#triggerYN&quot;).getResult()}</Property>
-        <Property name="keyProperty">dictValue</Property>
-        <Property name="valueProperty">dictLabel</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="parentCode">
-      <Property></Property>
-      <Property name="label">鐖剁骇缂栧彿</Property>
-    </PropertyDef>
-    <Reference name="children">
-      <Property name="dataType">[SELF]</Property>
-      <Property name="dataProvider">assetCategoryPR#listByParentCode</Property>
-      <Property name="parameter">$${this.code}</Property>
-    </Reference>
-  </DataType>
-  <DataType name="dtAssetCategoryTrigger">
-    <Property name="creationType">com.fzzy.eoms.models.AssetCategory</Property>
-    <PropertyDef name="companyId">
-      <Property></Property>
-      <Property name="label">缁勭粐缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-      <Property name="label">鍒涘缓浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍒涘缓鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-      <Property name="label">鏇存柊浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鏇存柊鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞</Property>
-    </PropertyDef>
-    <PropertyDef name="code">
-      <Property></Property>
-      <Property name="label">缂栧彿</Property>
-    </PropertyDef>
-    <PropertyDef name="name">
-      <Property></Property>
-      <Property name="label">鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="enabled">
-      <Property></Property>
-      <Property name="label">鏄惁鍙敤</Property>
-    </PropertyDef>
-    <PropertyDef name="parentCode">
-      <Property></Property>
-      <Property name="label">鐖剁骇缂栧彿</Property>
-    </PropertyDef>
-    <Reference name="children">
-      <Property name="dataType">[SELF]</Property>
-      <Property name="dataProvider">assetCategoryPR#listByParentCodeTrigger</Property>
-      <Property name="parameter">$${this.code}</Property>
-    </Reference>
-  </DataType>
-  <DataType name="dtMaintainPlan">
-    <Property name="creationType">com.fzzy.eoms.models.MaintainPlan</Property>
-    <PropertyDef name="id">
-      <Property></Property>
-      <Property name="label">鏂规缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="name">
-      <Property></Property>
-      <Property name="label">鏂规鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="customerName">
-      <Property></Property>
-      <Property name="label">缁翠繚鍏徃</Property>
-    </PropertyDef>
-    <PropertyDef name="customerType">
-      <Property></Property>
-      <Property name="label">鍏徃绫诲瀷</Property>
-    </PropertyDef>
-    <PropertyDef name="customerId">
-      <Property></Property>
-      <Property name="label">缁熶竴淇＄敤鐮�</Property>
-    </PropertyDef>
-    <PropertyDef name="customerLegalRep">
-      <Property></Property>
-      <Property name="label">娉曞畾浠ｈ〃浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="customerAddress">
-      <Property></Property>
-      <Property name="label">閫氳鍦板潃</Property>
-    </PropertyDef>
-    <PropertyDef name="customerContactUser">
-      <Property></Property>
-      <Property name="label">鑱旂郴浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="customerContactPhone">
-      <Property></Property>
-      <Property name="label">鑱旂郴鐢佃瘽</Property>
-    </PropertyDef>
-    <PropertyDef name="customerEmail">
-      <Property></Property>
-      <Property name="label">鐢靛瓙閭</Property>
-    </PropertyDef>
-    <PropertyDef name="customerBank">
-      <Property></Property>
-      <Property name="label">寮�鎴烽摱琛�</Property>
-    </PropertyDef>
-    <PropertyDef name="customerBankNum">
-      <Property></Property>
-      <Property name="label">閾惰璐﹀彿</Property>
-    </PropertyDef>
-    <PropertyDef name="price">
-      <Property name="dataType">BigDecimal</Property>
-      <Property name="label">缁翠繚璐圭敤</Property>
-      <Property name="displayFormat">#.00鍏�</Property>
-    </PropertyDef>
-    <PropertyDef name="status">
-      <Property></Property>
-      <Property name="label">缁翠繚鐘舵��</Property>
-    </PropertyDef>
-    <PropertyDef name="method">
-      <Property></Property>
-      <Property name="label">缁翠繚鏂瑰紡</Property>
-    </PropertyDef>
-    <PropertyDef name="startDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">缁翠繚寮�濮嬫椂闂�</Property>
-    </PropertyDef>
-    <PropertyDef name="endDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">缁翠繚鍒版湡鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="companyId">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="deleted">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="deletedDesc">
-      <Property></Property>
-    </PropertyDef>
-    <Reference name="files">
-      <Property name="dataType">[dtFiles]</Property>
-      <Property name="label">鍚堝悓闄勪欢</Property>
-    </Reference>
-  </DataType>
-  <DataType name="dtAssetMaintain">
-    <Property name="creationType">com.fzzy.eoms.models.AssetMaintain</Property>
-    <PropertyDef name="id">
-      <Property></Property>
-      <Property name="label">鍗曟嵁缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="name">
-      <Property></Property>
-      <Property name="label">璁板綍鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="maintainPlan">
-      <Property></Property>
-      <Property name="label">鍏宠仈缁翠繚鏂规</Property>
-    </PropertyDef>
-    <PropertyDef name="customerId">
-      <Property></Property>
-      <Property name="label">缁翠繚鍏徃</Property>
-    </PropertyDef>
-    <PropertyDef name="customerName">
-      <Property></Property>
-      <Property name="label">缁翠繚鍏徃</Property>
-    </PropertyDef>
-    <PropertyDef name="price">
-      <Property name="dataType">BigDecimal</Property>
-      <Property name="label">缁翠繚璐圭敤</Property>
-      <Property name="displayFormat">#.00 鍏�</Property>
-    </PropertyDef>
-    <PropertyDef name="contactUser">
-      <Property></Property>
-      <Property name="label">缁翠繚鑱旂郴浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="contactPhone">
-      <Property></Property>
-      <Property name="label">鑱旂郴鐢佃瘽</Property>
-    </PropertyDef>
-    <PropertyDef name="deleted">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="deletedDesc">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="companyId">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-      <Property name="label">鍒跺崟浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍒跺崟鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">杩愮淮璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="status">
-      <Property></Property>
-      <Property name="label">鍗曟嵁鐘舵��</Property>
-    </PropertyDef>
-    <Reference name="orderFiles">
-      <Property name="dataType">[dtFiles]</Property>
-      <Property name="dataProvider">fileUploadManage#listFile</Property>
-      <Property name="parameter">$${this.id}</Property>
-    </Reference>
-  </DataType>
-  <DataType name="dtAssetMaiItem">
-    <Property name="creationType">com.fzzy.eoms.models.AssetMaiItem</Property>
-    <PropertyDef name="id">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="amId">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="assetCode">
-      <Property></Property>
-      <Property name="label">璁惧缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="assetName">
-      <Property></Property>
-      <Property name="label">璁惧鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞</Property>
-    </PropertyDef>
-  </DataType>
-  <DataType name="dtAssetHistory" creationType="com.fzzy.eoms.models.AssetHistory">
-    <PropertyDef name="id" label="ID"/>
-    <PropertyDef name="assetId" label="璧勪骇缂栫爜"/>
-    <PropertyDef name="businessType" label="涓氬姟绫诲瀷"/>
-    <PropertyDef name="content" label="鎿嶄綔鍐呭"/>
-    <PropertyDef name="companyId">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="processUserId" label="鎿嶄綔浜哄憳"/>
-    <PropertyDef name="processTime" dataType="Date" label="鎿嶄綔鏃堕棿"/>
-  </DataType>
-  <DataType name="dtAssetParam">
-    <Property name="creationType">com.fzzy.eoms.param.AssetParam</Property>
-    <PropertyDef name="name">
-      <Property></Property>
-      <Property name="label">璧勪骇鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="categoryCode">
-      <Property></Property>
-      <Property name="label">璧勪骇绫诲瀷</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;assetCategoryPR#listAll&quot;).getResult()}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="assetStatus">
-      <Property></Property>
-      <Property name="label">璧勪骇鐘舵��</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#assetStatusTrigger&quot;).getResult()}</Property>
-        <Property name="keyProperty">dictValue</Property>
-        <Property name="valueProperty">dictLabel</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="businessType">
-      <Property></Property>
-      <Property name="label">涓氬姟绫诲瀷</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#assetBusinessTypeTrigger&quot;).getResult()}</Property>
-        <Property name="keyProperty">dictValue</Property>
-        <Property name="valueProperty">dictLabel</Property>
-      </Property>
-    </PropertyDef>
-  </DataType>
-  <DataType name="dtAssetBorrow">
-    <Property name="creationType">com.fzzy.eoms.models.AssetBorrow</Property>
-    <PropertyDef name="companyId">
-      <Property></Property>
-      <Property name="label">缁勭粐缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-      <Property name="label">鍒涘缓浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍒涘缓鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-      <Property name="label">鏇存柊浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鏇存柊鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property></Property>
-      <Property name="label">澶囨敞璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="id">
-      <Property></Property>
-      <Property name="label">鍗曟嵁缂栧彿</Property>
-    </PropertyDef>
-    <PropertyDef name="flowStatus">
-      <Property></Property>
-      <Property name="label">娴佺▼鐘舵��</Property>
-    </PropertyDef>
-    <PropertyDef name="status">
-      <Property></Property>
-      <Property name="label">涓氬姟鐘舵��</Property>
-    </PropertyDef>
-    <PropertyDef name="name">
-      <Property></Property>
-      <Property name="label">涓氬姟鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="assetCode">
-      <Property></Property>
-      <Property name="label">璁惧缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="assetName">
-      <Property></Property>
-      <Property name="label">璁惧鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="assetPositionId">
-      <Property></Property>
-      <Property name="label">瀛樻斁浣嶇疆</Property>
-      <Property name="mapping">
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-        <Property name="mapValues">${dorado.getDataProvider(&quot;assetPositionPR#listAll&quot;).getResult()}</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="assetPositionDesc">
-      <Property></Property>
-      <Property name="label">浣嶇疆璇︾粏</Property>
-    </PropertyDef>
-    <PropertyDef name="borrowerUserName">
-      <Property></Property>
-      <Property name="label">鍊熺敤浜哄憳</Property>
-    </PropertyDef>
-    <PropertyDef name="borrowerUserPhone">
-      <Property></Property>
-      <Property name="label">鑱旂郴鐢佃瘽</Property>
-    </PropertyDef>
-    <PropertyDef name="borrowTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍊熷嚭鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="planingTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">璁″垝褰掕繕鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="returnDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">褰掕繕鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="returnContent">
-      <Property></Property>
-      <Property name="label">褰掕繕璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="returnHandler">
-      <Property></Property>
-      <Property name="label">缁忓姙浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="returnPositionId">
-      <Property></Property>
-      <Property name="label">褰掕繕鍚庝綅缃�</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;assetPositionPR#listAll&quot;).getResult()}</Property>
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-    </PropertyDef>
-    <Reference name="borrowFiles">
-      <Property name="dataType">[dtFiles]</Property>
-      <Property name="parameter">
-        <Entity>
-          <Property name="bizId">$${this.id}</Property>
-          <Property name="bizTag">borrowFiles</Property>
-        </Entity>
-      </Property>
-      <Property name="dataProvider">fileUploadManage#listFileByTag</Property>
-    </Reference>
-    <Reference name="returnFiles">
-      <Property name="dataType">[dtFiles]</Property>
-      <Property name="parameter">
-        <Entity>
-          <Property name="bizId">$${this.id}</Property>
-          <Property name="bizTag">returnFiles</Property>
-        </Entity>
-      </Property>
-      <Property name="dataProvider">fileUploadManage#listFileByTag</Property>
-    </Reference>
-  </DataType>
-  <DataType name="dtCustomer">
-    <Property name="creationType">com.fzzy.eoms.models.Customer</Property>
-    <PropertyDef name="customerId">
-      <Property></Property>
-      <Property name="label">瀹㈡埛缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="customerName">
-      <Property></Property>
-      <Property name="label">瀹㈡埛鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="customerType">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="customerLegalRep">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="customerAddress">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="customerContactUser">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="customerContactPhone">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="customerEmail">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="customerBank">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="customerBankNum">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="companyId">
-      <Property></Property>
-    </PropertyDef>
-  </DataType>
-  <DataType name="dtAssetHandle">
-    <Property name="creationType">com.fzzy.eoms.models.AssetHandle</Property>
-    <PropertyDef name="id">
-      <Property></Property>
-      <Property name="label">鍗曟嵁缂栧彿</Property>
-    </PropertyDef>
-    <PropertyDef name="flowStatus">
-      <Property name="label">鍔炵悊鐘舵��</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#flowStatusTrigger&quot;).getResult()}</Property>
-        <Property name="keyProperty">dictValue</Property>
-        <Property name="valueProperty">dictLabel</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="name">
-      <Property></Property>
-      <Property name="label">涓氬姟鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="assetCode">
-      <Property></Property>
-      <Property name="label">璧勪骇缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="assetName">
-      <Property></Property>
-      <Property name="label">璧勪骇缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="type">
-      <Property></Property>
-      <Property name="label">澶勭疆绫诲瀷</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#getDicTriggerByType&quot;).getResult(&quot;es_asset_handle_type&quot;)}</Property>
-        <Property name="keyProperty">dictValue</Property>
-        <Property name="valueProperty">dictLabel</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="status">
-      <Property></Property>
-      <Property name="label">涓氬姟鐘舵��</Property>
-    </PropertyDef>
-    <PropertyDef name="handleDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">澶勭疆鏃ユ湡</Property>
-    </PropertyDef>
-    <PropertyDef name="handleUser">
-      <Property></Property>
-      <Property name="label">澶勭疆鎵ц浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="content">
-      <Property></Property>
-      <Property name="label">鍐呭鎻忚堪</Property>
-    </PropertyDef>
-    <PropertyDef name="companyId">
-      <Property></Property>
-      <Property name="label">缁勭粐缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-      <Property name="label">鍒涘缓浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">DateTime</Property>
-      <Property name="label">鍒涘缓鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-      <Property name="label">鏇存柊浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鏇存柊鏃堕棿</Property>
-    </PropertyDef>
-    <Reference name="files">
-      <Property name="dataType">[dtFiles]</Property>
-      <Property name="dataProvider">fileUploadManage#listFile</Property>
-      <Property name="parameter">$${this.id}</Property>
-    </Reference>
-  </DataType>
-  <DataType name="dtRepairOrder" creationType="com.fzzy.eoms.models.RepairOrder">
-        <PropertyDef name="id" label="宸ュ崟缂栧彿"/>
-        <PropertyDef name="companyId" label="缁勭粐缂栫爜"/>
-        <PropertyDef name="createBy" label="鍒涘缓浜�"/>
-        <PropertyDef name="createTime" dataType="Date" label="鍒涘缓鏃堕棿"/>
-        <PropertyDef name="updateBy" label="鏇存柊浜�"/>
-        <PropertyDef name="updateTime" dataType="Date" label="鏇存柊鏃堕棿"/>
-        <PropertyDef name="name" label="涓氬姟鍚嶇О"/>
-        <PropertyDef name="status" label="宸ュ崟鐘舵��">
-            <Property name="mapping">
-                <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#orderStatusTrigger&quot;).getResult()}</Property>
-                <Property name="keyProperty">dictValue</Property>
-                <Property name="valueProperty">dictLabel</Property>
-            </Property>
-        </PropertyDef>
-        <PropertyDef name="remark" label="鎶ヤ慨璇存槑"/>
-        <PropertyDef name="urgency" label="绱ф�ョ▼搴�">
-            <Property name="mapping">
-                <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#urgencyTrigger&quot;).getResult()}</Property>
-                <Property name="keyProperty">dictValue</Property>
-                <Property name="valueProperty">dictLabel</Property>
-            </Property>
-        </PropertyDef>
-        <PropertyDef name="dept_id" label="鎶ヤ慨閮ㄩ棬ID"/>
-        <PropertyDef name="businessDate" dataType="Date" label="鏁呴殰鍙戠幇鏃ユ湡"/>
-        <PropertyDef name="planFinishDate" dataType="Date" label="鏈熸湜瑙ｅ喅鏃堕棿"/>
-        <PropertyDef name="assetCode" label="璁惧缂栧彿" required="true"/>
-        <PropertyDef name="assetName" label="璁惧鍚嶇О"/>
-        <PropertyDef name="assetCategoryCode" label="璁惧绫诲瀷"/>
-        <PropertyDef name="assetPositionId" label="瀛樻斁浣嶇疆">
-            <Property name="mapping">
-                <Property name="keyProperty">id</Property>
-                <Property name="valueProperty">name</Property>
-                <Property name="mapValues">${dorado.getDataProvider(&quot;assetPositionPR#listAll&quot;).getResult()}</Property>
-            </Property>
-        </PropertyDef>
-        <PropertyDef name="assetPositionDesc" label="璇︾粏浣嶇疆"/>
-        <PropertyDef name="customerId" label="杩愮淮鍏徃ID"/>
-        <PropertyDef name="customerName" label="杩愮淮鍏徃"/>
-        <PropertyDef name="repairUserName" label="缁翠慨浜哄憳"/>
-        <PropertyDef name="repairUserPhone" label="缁翠慨浜哄憳鐢佃瘽"/>
-        <PropertyDef name="repairCompleteDate" label="缁翠慨瀹屾垚鏃堕棿"/>
-        <PropertyDef name="repairContent" label="缁翠慨璇存槑"/>
-        <PropertyDef name="repairCost" dataType="BigDecimal" label="缁翠慨璐圭敤"/>
-        <PropertyDef name="operation" label="鎿嶄綔" submittable="false"/>
-        <Reference name="infoFiles" dataType="[dtFiles]" dataProvider="fileUploadManage#listFileByTag">
-            <Property name="parameter">
-                <Entity>
-                    <Property name="bizId">$${this.id}</Property>
-                    <Property name="bizTag">infoFiles</Property>
-                </Entity>
-            </Property>
-        </Reference>
-        <Reference name="repairFiles" dataType="[dtFiles]" dataProvider="fileUploadManage#listFileByTag">
-            <Property name="parameter">
-                <Entity>
-                    <Property name="bizId">$${this.id}</Property>
-                    <Property name="bizTag">repairFiles</Property>
-                </Entity>
-            </Property>
-        </Reference>
-    </DataType>
-  <DataType name="dtAssetCollection">
-    <Property name="creationType">com.fzzy.eoms.models.AssetCollection</Property>
-    <PropertyDef name="companyId">
-      <Property/>
-      <Property name="label">缁勭粐缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property/>
-      <Property name="label">鍒涘缓浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍒涘缓鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property/>
-      <Property name="label">鏇存柊浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鏇存柊鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="remark">
-      <Property/>
-      <Property name="label">澶囨敞</Property>
-    </PropertyDef>
-    <PropertyDef name="id">
-      <Property/>
-      <Property name="label">鍗曟嵁缂栧彿</Property>
-    </PropertyDef>
-    <PropertyDef name="flowStatus">
-      <Property/>
-      <Property name="label">娴佺▼鐘舵��</Property>
-    </PropertyDef>
-    <PropertyDef name="status">
-      <Property/>
-      <Property name="label">涓氬姟鐘舵��</Property>
-    </PropertyDef>
-    <PropertyDef name="name">
-      <Property/>
-      <Property name="label">涓氬姟鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="assetCode">
-      <Property/>
-      <Property name="label">璧勪骇缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="useUserId">
-      <Property/>
-      <Property name="label">浣跨敤浜哄憳</Property>
-    </PropertyDef>
-    <PropertyDef name="positionId">
-      <Property name="mapping">
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-        <Property name="mapValues">${dorado.getDataProvider(&quot;assetPositionPR#listAll&quot;).getResult()}</Property>
-      </Property>
-      <Property name="label">瀛樻斁浣嶇疆</Property>
-    </PropertyDef>
-    <PropertyDef name="positionDesc">
-      <Property/>
-      <Property name="label">瀛樻斁璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="collectionDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">棰嗙敤鏃ユ湡</Property>
-    </PropertyDef>
-    <PropertyDef name="collectionContent">
-      <Property/>
-      <Property name="label">棰嗙敤璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="returnDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">杩旇繕鏃ユ湡</Property>
-    </PropertyDef>
-    <PropertyDef name="returnContent">
-      <Property/>
-      <Property name="label">杩旇繕璇存槑</Property>
-    </PropertyDef>
-    <PropertyDef name="returnPositionId">
-      <Property/>
-      <Property name="label">杩斿簱浣嶇疆</Property>
-    </PropertyDef>
-    <PropertyDef name="returnPositionDesc">
-      <Property/>
-      <Property name="label">杩斿簱璇︾粏浣嶇疆</Property>
-    </PropertyDef>
-    <Reference name="collectionFiles">
-      <Property name="dataType">[dtFiles]</Property>
-      <Property name="parameter">
-        <Entity>
-          <Property name="bizId">$${this.id}</Property>
-          <Property name="bizTag">collectionFiles</Property>
-        </Entity>
-      </Property>
-      <Property name="dataProvider">fileUploadManage#listFileByTag</Property>
-    </Reference>
-    <Reference name="returnFiles">
-      <Property name="dataType">[dtFiles]</Property>
-      <Property name="parameter">
-        <Entity>
-          <Property name="bizId">$${this.id}</Property>
-          <Property name="bizTag">returnFiles</Property>
-        </Entity>
-      </Property>
-      <Property name="dataProvider">fileUploadManage#listFileByTag</Property>
-    </Reference>
-  </DataType>
-</Model>
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/Application.java b/fzzy-igdss-web/src/main/java/com/fzzy/Application.java
index c12ff28..ccb9ee6 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/Application.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/Application.java
@@ -35,7 +35,6 @@
 
         System.setProperty("spring.devtools.restart.enabled", "false");
 
-
         System.setProperty("doradoHome", "classpath:dorado-home/");
 
         SpringApplication app = new SpringApplication(Application.class);
diff --git a/fzzy-igdss-web/src/main/resources/application-dev.yml b/fzzy-igdss-web/src/main/resources/application-dev.yml
index e37fd74..41d85b4 100644
--- a/fzzy-igdss-web/src/main/resources/application-dev.yml
+++ b/fzzy-igdss-web/src/main/resources/application-dev.yml
@@ -6,7 +6,7 @@
     druid:
       # 涓诲簱鏁版嵁婧�
       master:
-        url: jdbc:mysql://192.168.1.91:3306/fzzy_igdss_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.1.91:3306/igdss_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: ENC(54r4E0zmacpDLmIdPXh3tlJVT+8nvaqG)
       # 浠庡簱鏁版嵁婧�
diff --git a/pom.xml b/pom.xml
index aca482f..b5d2091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,4 +20,21 @@
         <module>fzzy-igdss-doc</module>
     </modules>
 
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
 </project>
\ No newline at end of file

--
Gitblit v1.9.3