From 8033eea1502d4cb0a91aa4b86c848ccb00ba8dc0 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期五, 13 三月 2020 09:31:46 +0800
Subject: [PATCH] no message
---
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbMapper.xml | 22 +
src/main/java/com/highdatas/mdm/service/impl/MasterDataServiceImpl.java | 2
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbdriverMapper.xml | 13
out/production/main/com/highdatas/mdm/mapper/xml/DeletedTableLogMapper.xml | 12
out/production/main/com/highdatas/mdm/mapper/xml/TUserMapper.xml | 13
src/main/resources/mapping/MaintainMapper.xml | 4
src/main/resources/mapping/MenuMappingMapper.xml | 2
src/main/resources/application-prod.yml | 8
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleCommonparamsMapper.xml | 17 +
src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java | 38 -
out/production/main/com/highdatas/mdm/mapper/xml/SysDatacategoryMapper.xml | 12
src/main/java/com/highdatas/mdm/util/MpGenerator.java | 4
out/production/main/com/highdatas/mdm/mapper/xml/MenuMappingMapper.xml | 21 +
src/main/java/com/highdatas/mdm/mapper/xml/MasterModifiedMapper.xml | 19 +
src/main/java/com/highdatas/mdm/mapper/MasterModifiedMapper.java | 15
out/production/main/com/highdatas/mdm/mapper/xml/SysBusinessOperateMapper.xml | 15
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleMapper.xml | 18 +
src/main/java/com/highdatas/mdm/service/impl/MasterModifiedServiceImpl.java | 60 +++
src/main/java/com/highdatas/mdm/controller/SysFieldController.java | 56 +++
src/main/resources/mapping/MasterModifiedMapper.xml | 10
out/production/main/com/highdatas/mdm/mapper/xml/MdCityMapper.xml | 12
src/main/java/com/highdatas/mdm/service/IMasterModifiedService.java | 22 +
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleRuleMapper.xml | 14
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDetailMapper.xml | 13
out/production/main/com/highdatas/mdm/mapper/xml/TUserRoleMapper.xml | 14
out/production/main/com/highdatas/mdm/mapper/xml/SysMenuMapper.xml | 16 +
src/main/java/com/highdatas/mdm/entity/SysMenu.java | 11
out/production/main/com/highdatas/mdm/mapper/xml/AttentionMapper.xml | 19 +
out/production/main/com/highdatas/mdm/mapper/xml/MaintainDetailMapper.xml | 13
out/production/main/com/highdatas/mdm/mapper/xml/MaintainFieldMapper.xml | 17 +
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbDetailMapper.xml | 18 +
out/production/main/com/highdatas/mdm/mapper/xml/UserMapper.xml | 31 +
out/production/main/com/highdatas/mdm/mapper/xml/TRoleMapper.xml | 13
src/main/java/com/highdatas/mdm/util/Constant.java | 1
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleParamsMapper.xml | 18 +
out/production/main/com/highdatas/mdm/mapper/xml/MdIndustryMapper.xml | 13
out/production/main/com/highdatas/mdm/mapper/xml/SysOperateLogMapper.xml | 15
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleApiMapper.xml | 17 +
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbFieldMapper.xml | 15
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbTableMapper.xml | 19 +
out/production/main/com/highdatas/mdm/mapper/xml/SysDbtypeMapper.xml | 13
out/production/main/com/highdatas/mdm/mapper/xml/TQualityRuleMapper.xml | 20 +
out/production/main/com/highdatas/mdm/mapper/xml/FlowsMapper.xml | 16 +
src/main/java/com/highdatas/mdm/entity/Maintain.java | 2
out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleLogMapper.xml | 14
src/main/java/com/highdatas/mdm/controller/MaintainController.java | 31 +
out/production/main/com/highdatas/mdm/mapper/xml/MaintainMapper.xml | 17 +
/dev/null | 27 -
src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java | 7
out/production/main/com/highdatas/mdm/mapper/xml/DictionaryMapper.xml | 13
out/production/main/com/highdatas/mdm/mapper/xml/CustomerMapper.xml | 14
out/production/main/com/highdatas/mdm/mapper/xml/RuleMappingMapper.xml | 15
out/production/main/com/highdatas/mdm/mapper/xml/SysFieldMapper.xml | 24 +
src/main/java/com/highdatas/mdm/controller/SysMenuController.java | 46 +-
54 files changed, 824 insertions(+), 107 deletions(-)
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/AttentionMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/AttentionMapper.xml
new file mode 100644
index 0000000..53e5c0c
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/AttentionMapper.xml
@@ -0,0 +1,19 @@
+<?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="com.highdatas.mdm.mapper.AttentionMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.Attention">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="peroid" property="peroid" />
+ <result column="dimension" property="dimension" />
+ <result column="name" property="name" />
+ <result column="cnt" property="cnt" />
+ <result column="amt" property="amt" />
+ <result column="changedcnt" property="changedcnt" />
+ <result column="changedamt" property="changedamt" />
+ <result column="rate" property="rate" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/CustomerMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/CustomerMapper.xml
new file mode 100644
index 0000000..e177b49
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/CustomerMapper.xml
@@ -0,0 +1,14 @@
+<?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="com.highdatas.mdm.mapper.CustomerMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.Customer">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="name" property="name" />
+ <result column="channelcode" property="channelcode" />
+ <result column="channelname" property="channelname" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/DeletedTableLogMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/DeletedTableLogMapper.xml
new file mode 100644
index 0000000..8c1744c
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/DeletedTableLogMapper.xml
@@ -0,0 +1,12 @@
+<?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="com.highdatas.mdm.mapper.DeletedTableLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.DeletedTableLog">
+ <id column="id" property="id" />
+ <result column="table_name" property="tableName" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/DictionaryMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/DictionaryMapper.xml
new file mode 100644
index 0000000..4830cdd
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/DictionaryMapper.xml
@@ -0,0 +1,13 @@
+<?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="com.highdatas.mdm.mapper.DictionaryMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.Dictionary">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="code" property="code" />
+ <result column="name" property="name" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/FlowsMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/FlowsMapper.xml
new file mode 100644
index 0000000..3d85dda
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/FlowsMapper.xml
@@ -0,0 +1,16 @@
+<?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="com.highdatas.mdm.mapper.FlowsMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.Flows">
+ <id column="id" property="id" />
+ <result column="user_id" property="userId" />
+ <result column="maintain_id" property="maintainFieldId" />
+ <result column="workflow_id" property="workflowId" />
+ <result column="status" property="status" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/MaintainDetailMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/MaintainDetailMapper.xml
new file mode 100644
index 0000000..55b8bdd
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/MaintainDetailMapper.xml
@@ -0,0 +1,13 @@
+<?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="com.highdatas.mdm.mapper.MaintainDetailMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.MaintainDetail">
+ <id column="id" property="id" />
+ <result column="parent_id" property="parentId" />
+ <result column="pre_merge_id" property="preMergeId" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/MaintainFieldMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/MaintainFieldMapper.xml
new file mode 100644
index 0000000..693cd4c
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/MaintainFieldMapper.xml
@@ -0,0 +1,17 @@
+<?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="com.highdatas.mdm.mapper.MaintainFieldMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.MaintainField">
+ <id column="id" property="id" />
+ <result column="table_name" property="tableName" />
+ <result column="flow_id" property="flowId" />
+ <result column="charge_id" property="chargeId" />
+ <result column="desp" property="desp" />
+ <result column="version" property="version" />
+ <result column="create_time" property="createTime" />
+ <result column="order_no" property="orderNo" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/MaintainMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/MaintainMapper.xml
new file mode 100644
index 0000000..d87fe5e
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/MaintainMapper.xml
@@ -0,0 +1,17 @@
+<?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="com.highdatas.mdm.mapper.MaintainMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.Maintain">
+ <id column="id" property="id" />
+ <result column="operate" property="operate" />
+ <result column="table_name" property="tableName" />
+ <result column="flow_id" property="flowId" />
+ <result column="charge_id" property="chargeId" />
+ <result column="desp" property="desp" />
+ <result column="version" property="version" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/MdCityMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/MdCityMapper.xml
new file mode 100644
index 0000000..13b9054
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/MdCityMapper.xml
@@ -0,0 +1,12 @@
+<?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="com.highdatas.mdm.mapper.MdCityMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.MdCity">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="name" property="name" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/MdIndustryMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/MdIndustryMapper.xml
new file mode 100644
index 0000000..ba1760f
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/MdIndustryMapper.xml
@@ -0,0 +1,13 @@
+<?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="com.highdatas.mdm.mapper.MdIndustryMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.MdIndustry">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="name" property="name" />
+ <result column="deal" property="deal" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/MenuMappingMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/MenuMappingMapper.xml
new file mode 100644
index 0000000..a3818e5
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/MenuMappingMapper.xml
@@ -0,0 +1,21 @@
+<?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="com.highdatas.mdm.mapper.MenuMappingMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.MenuMapping">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="name" property="name" />
+ <result column="charge_id" property="chargeId" />
+ <result column="system_id" property="systemId" />
+ <result column="menu_id" property="menuId" />
+ <result column="data_type" property="dataType" />
+ <result column="maintain_id" property="maintainFieldId" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/RuleMappingMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/RuleMappingMapper.xml
new file mode 100644
index 0000000..ce54f86
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/RuleMappingMapper.xml
@@ -0,0 +1,15 @@
+<?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="com.highdatas.mdm.mapper.RuleMappingMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.RuleMapping">
+ <id column="id" property="id" />
+ <result column="rule_name" property="ruleName" />
+ <result column="table_name" property="tableName" />
+ <result column="field_name" property="fieldName" />
+ <result column="create_time" property="createTime" />
+ <result column="content" property="content" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleApiMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleApiMapper.xml
new file mode 100644
index 0000000..3f9af28
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleApiMapper.xml
@@ -0,0 +1,17 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleApiMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleApi">
+ <id column="id" property="id" />
+ <result column="parent_id" property="parentId" />
+ <result column="url" property="url" />
+ <result column="headers" property="headers" />
+ <result column="pagination" property="pagination" />
+ <result column="size" property="size" />
+ <result column="pageurl" property="pageurl" />
+ <result column="resultfield" property="resultfield" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleCommonparamsMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleCommonparamsMapper.xml
new file mode 100644
index 0000000..31c424e
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleCommonparamsMapper.xml
@@ -0,0 +1,17 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleCommonparamsMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleCommonparams">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="name" property="name" />
+ <result column="val" property="val" />
+ <result column="init_sql" property="initSql" />
+ <result column="update_sql" property="updateSql" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbDetailMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbDetailMapper.xml
new file mode 100644
index 0000000..e3f21cf
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbDetailMapper.xml
@@ -0,0 +1,18 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleDbDetailMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleDbDetail">
+ <id column="id" property="id" />
+ <result column="assemble_db_id" property="assembleDbId" />
+ <result column="name" property="name" />
+ <result column="field" property="field" />
+ <result column="extra" property="extra" />
+ <result column="val" property="val" />
+ <result column="update_sql" property="updateSql" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbFieldMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbFieldMapper.xml
new file mode 100644
index 0000000..9d95c3e
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbFieldMapper.xml
@@ -0,0 +1,15 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleDbFieldMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleDbField">
+ <id column="id" property="id" />
+ <result column="parent_id" property="parentId" />
+ <result column="name" property="name" />
+ <result column="field" property="field" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbMapper.xml
new file mode 100644
index 0000000..294e408
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbMapper.xml
@@ -0,0 +1,22 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleDbMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleDb">
+ <id column="id" property="id" />
+ <result column="parent_id" property="parentId" />
+ <result column="datasource_type" property="datasourceType" />
+ <result column="datasource_name" property="datasourceName" />
+ <result column="ipaddress_port" property="ipaddressPort" />
+ <result column="database_name" property="databaseName" />
+ <result column="datasource_url" property="datasourceUrl" />
+ <result column="datasource_user" property="datasourceUser" />
+ <result column="datasource_pass" property="datasourcePass" />
+ <result column="orderby" property="orderby" />
+ <result column="active" property="active" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbTableMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbTableMapper.xml
new file mode 100644
index 0000000..3a0d29b
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbTableMapper.xml
@@ -0,0 +1,19 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleDbTableMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleDbTable">
+ <id column="id" property="id" />
+ <result column="parent_id" property="parentId" />
+ <result column="type" property="type" />
+ <result column="table_name" property="tableName" />
+ <result column="sql" property="sql" />
+ <result column="filter" property="filter" />
+ <result column="orderby" property="orderby" />
+ <result column="active" property="active" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbdriverMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbdriverMapper.xml
new file mode 100644
index 0000000..77232a9
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDbdriverMapper.xml
@@ -0,0 +1,13 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleDbdriverMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleDbdriver">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="driver" property="driver" />
+ <result column="active" property="active" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDetailMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDetailMapper.xml
new file mode 100644
index 0000000..4d2d6f0
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleDetailMapper.xml
@@ -0,0 +1,13 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleDetailMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleDetail">
+ <id column="id" property="id" />
+ <result column="assemble_id" property="assembleId" />
+ <result column="field" property="field" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleLogMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleLogMapper.xml
new file mode 100644
index 0000000..fcdd9d4
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleLogMapper.xml
@@ -0,0 +1,14 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleLog">
+ <id column="id" property="id" />
+ <result column="assemble_id" property="assembleId" />
+ <result column="cnt" property="cnt" />
+ <result column="status" property="status" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleMapper.xml
new file mode 100644
index 0000000..72d47b0
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleMapper.xml
@@ -0,0 +1,18 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssemble">
+ <id column="id" property="id" />
+ <result column="menu_id" property="menuId" />
+ <result column="user_id" property="userId" />
+ <result column="job_id" property="jobId" />
+ <result column="cron" property="cron" />
+ <result column="bigdata" property="bigdata" />
+ <result column="status" property="status" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleParamsMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleParamsMapper.xml
new file mode 100644
index 0000000..5e5b9f6
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleParamsMapper.xml
@@ -0,0 +1,18 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleParamsMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleParams">
+ <id column="id" property="id" />
+ <result column="parent_id" property="parentId" />
+ <result column="code" property="code" />
+ <result column="name" property="name" />
+ <result column="val" property="val" />
+ <result column="init_sql" property="initSql" />
+ <result column="update_sql" property="updateSql" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleRuleMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleRuleMapper.xml
new file mode 100644
index 0000000..6f67a7c
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysAssembleRuleMapper.xml
@@ -0,0 +1,14 @@
+<?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="com.highdatas.mdm.mapper.SysAssembleRuleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysAssembleRule">
+ <id column="id" property="id" />
+ <result column="parent_id" property="parentId" />
+ <result column="rule_id" property="ruleId" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysBusinessOperateMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysBusinessOperateMapper.xml
new file mode 100644
index 0000000..884afa7
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysBusinessOperateMapper.xml
@@ -0,0 +1,15 @@
+<?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="com.highdatas.mdm.mapper.SysBusinessOperateMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysBusinessOperate">
+ <id column="id" property="id" />
+ <result column="model_id" property="modelId" />
+ <result column="business_type" property="businessType" />
+ <result column="chage_id" property="chageId" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysDatacategoryMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysDatacategoryMapper.xml
new file mode 100644
index 0000000..c98c73d
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysDatacategoryMapper.xml
@@ -0,0 +1,12 @@
+<?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="com.highdatas.mdm.mapper.SysDatacategoryMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysDatacategory">
+ <id column="id" property="id" />
+ <result column="parentid" property="parentid" />
+ <result column="name" property="name" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysDbtypeMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysDbtypeMapper.xml
new file mode 100644
index 0000000..a2d353b
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysDbtypeMapper.xml
@@ -0,0 +1,13 @@
+<?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="com.highdatas.mdm.mapper.SysDbtypeMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysDbtype">
+ <result column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="name" property="name" />
+ <result column="active" property="active" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysFieldMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysFieldMapper.xml
new file mode 100644
index 0000000..66c0f92
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysFieldMapper.xml
@@ -0,0 +1,24 @@
+<?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="com.highdatas.mdm.mapper.SysFieldMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysField">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="table_name" property="tableName" />
+ <result column="field" property="field" />
+ <result column="alias" property="alias" />
+ <result column="format" property="format" />
+ <result column="width" property="width" />
+ <result column="visible" property="visible" />
+ <result column="editble" property="editble" />
+ <result column="align" property="align" />
+ <result column="order" property="order" />
+ <result column="field_type" property="fieldType" />
+ <result column="desp" property="desp" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysMenuMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysMenuMapper.xml
new file mode 100644
index 0000000..de12388
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysMenuMapper.xml
@@ -0,0 +1,16 @@
+<?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="com.highdatas.mdm.mapper.SysMenuMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysMenu">
+ <id column="id" property="id" />
+ <result column="parent_id" property="parentId" />
+ <result column="name" property="name" />
+ <result column="icon" property="icon" />
+ <result column="order_no" property="orderNo" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/SysOperateLogMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/SysOperateLogMapper.xml
new file mode 100644
index 0000000..e9bbc8e
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/SysOperateLogMapper.xml
@@ -0,0 +1,15 @@
+<?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="com.highdatas.mdm.mapper.SysOperateLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.SysOperateLog">
+ <id column="id" property="id" />
+ <result column="charge_id" property="chargeId" />
+ <result column="operate" property="operate" />
+ <result column="desp" property="desp" />
+ <result column="maintain_id" property="maintainFieldId" />
+ <result column="menu_id" property="menuId" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/TQualityRuleMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/TQualityRuleMapper.xml
new file mode 100644
index 0000000..11b4b3f
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/TQualityRuleMapper.xml
@@ -0,0 +1,20 @@
+<?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="com.highdatas.mdm.mapper.TQualityRuleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.TQualityRule">
+ <id column="rule_id" property="ruleId" />
+ <result column="rule_name" property="ruleName" />
+ <result column="code_type" property="codeType" />
+ <result column="rule_type" property="ruleType" />
+ <result column="rule_style" property="ruleStyle" />
+ <result column="user_id" property="userId" />
+ <result column="code_content" property="codeContent" />
+ <result column="rule_state" property="ruleState" />
+ <result column="desc_info" property="descInfo" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/TRoleMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/TRoleMapper.xml
new file mode 100644
index 0000000..09c879b
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/TRoleMapper.xml
@@ -0,0 +1,13 @@
+<?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="com.highdatas.mdm.mapper.TRoleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.TRole">
+ <id column="role_id" property="roleId" />
+ <result column="role_name" property="roleName" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/TUserMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/TUserMapper.xml
new file mode 100644
index 0000000..bf844af
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/TUserMapper.xml
@@ -0,0 +1,13 @@
+<?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="com.highdatas.mdm.mapper.TUserMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.TUser">
+ <id column="user_id" property="userId" />
+ <result column="user_name" property="userName" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/TUserRoleMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/TUserRoleMapper.xml
new file mode 100644
index 0000000..edbe237
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/TUserRoleMapper.xml
@@ -0,0 +1,14 @@
+<?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="com.highdatas.mdm.mapper.TUserRoleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.TUserRole">
+ <id column="releation_id" property="releationId" />
+ <result column="user_id" property="userId" />
+ <result column="role_id" property="roleId" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/out/production/main/com/highdatas/mdm/mapper/xml/UserMapper.xml b/out/production/main/com/highdatas/mdm/mapper/xml/UserMapper.xml
new file mode 100644
index 0000000..73f047a
--- /dev/null
+++ b/out/production/main/com/highdatas/mdm/mapper/xml/UserMapper.xml
@@ -0,0 +1,31 @@
+<?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="com.highdatas.mdm.mapper.UserMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.User">
+ <id column="user_pkid" property="userPkid" />
+ <result column="login_name" property="loginName" />
+ <result column="user_id" property="userId" />
+ <result column="user_password" property="userPassword" />
+ <result column="user_clname" property="userClname" />
+ <result column="lastmodifytime_pwd" property="lastmodifytimePwd" />
+ <result column="sys_type" property="sysType" />
+ <result column="user_email" property="userEmail" />
+ <result column="user_orgid" property="userOrgid" />
+ <result column="is_boeuser" property="isBoeuser" />
+ <result column="user_i18nlang" property="userI18nlang" />
+ <result column="description" property="description" />
+ <result column="create_time" property="createTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="status" property="status" />
+ <result column="islicenflag" property="islicenflag" />
+ <result column="login_type" property="loginType" />
+ <result column="user_org" property="userOrg" />
+ <result column="expiry_id" property="expiryId" />
+ <result column="expiry_time" property="expiryTime" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/java/com/highdatas/mdm/controller/MaintainController.java b/src/main/java/com/highdatas/mdm/controller/MaintainController.java
index 0867cf4..295918f 100644
--- a/src/main/java/com/highdatas/mdm/controller/MaintainController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MaintainController.java
@@ -28,7 +28,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.stream.Collectors;
/**
* <p>
@@ -91,23 +90,35 @@
}
}
- @RequestMapping(value = "/history/{tableName}", method = RequestMethod.GET)
+ @RequestMapping(value = "/version/{tableName}", method = RequestMethod.GET)
public Result getHistory(@PathVariable String tableName) {
Maintain nowVersion = maintainService.getNowVersion(tableName);
if (nowVersion == null) {
return Result.error(new CodeMsg(100001,"鏃犲綋鍓嶇増鏈�"));
}
- List<Maintain> maintainList = maintainService.selectList(new EntityWrapper<Maintain>().eq("table_name", tableName).le("order_no",nowVersion.getOrderNo() - 1).orderBy("order_no",false));
+ List<Maintain> maintainList = maintainService.selectList(new EntityWrapper<Maintain>().eq("table_name", tableName).orderBy("order_no",false));
+ List<Maintain> result = new ArrayList<>();
+ for (Maintain maintain : maintainList) {
+ String flowId = maintain.getFlowId();
+ if (StringUtils.isEmpty(flowId)) {
+ continue;
+ }
- if (maintainList == null) {
- return Result.error(CodeMsg.SELECT_ERROR_NOTFOUND);
+ Flows flows = flowsService.selectById(maintain.getFlowId());
+ if (flows.getStatus().equals(ActivitiStatus.close)) {
+ continue;
+ }
+ if (flows.getStatus().equals(ActivitiStatus.working) || flows.getStatus().equals(ActivitiStatus.refuse)) {
+ maintain.setMaintainType(-1);
+ }else if(flows.getStatus().equals(ActivitiStatus.open)){
+ maintain.setMaintainType(1);
+ }
+ if (maintain.getId().equalsIgnoreCase(nowVersion.getId())) {
+ maintain.setMaintainType(0);
+ }
+ result.add(maintain);
}
-
- List<Maintain> result = maintainList.stream()
- .filter(maintain -> !StringUtils.isEmpty(maintain.getFlowId()))
- .filter(maintain -> flowsService.selectById(maintain.getFlowId()).getStatus().equals(ActivitiStatus.open))
- .collect(Collectors.toList());
return Result.success(result);
}
diff --git a/src/main/java/com/highdatas/mdm/controller/SysFieldController.java b/src/main/java/com/highdatas/mdm/controller/SysFieldController.java
index 570a0a1..cecb399 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysFieldController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysFieldController.java
@@ -87,8 +87,7 @@
if (StringUtils.isEmpty(tableName)) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
}
- List<SysField> fieldList = fieldService.selectList(new EntityWrapper<SysField>().eq("table_name", tableName).orderBy("order_no"));
-
+ List<SysField> fieldList = fieldService.getFieldByTable(tableName);
return Result.success(fieldList);
}
@@ -160,6 +159,59 @@
}
}
+ @RequestMapping(value = "/loadFields", method = RequestMethod.POST)
+ public Result loadFields(@RequestBody String fieldListStr, HttpServletRequest request) {
+ List<SysField> fieldList = JSONObject.parseArray(fieldListStr,SysField.class);
+ if (fieldList.size() == 0) {
+ return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
+ }
+ String tableName = fieldList.get(0).getTableName();
+ if (StringUtils.isEmpty(tableName)) {
+ return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
+ }
+ String maintainId = null;
+ MaintainField maxVersion = maintainFieldService.getMaxVersion(tableName);
+ if (maxVersion != null) {
+ maintainId = maxVersion.getId();
+ }
+
+ MaintainField nowMaintain = null;
+ HttpSession session = request.getSession();
+ TUser user = (TUser) session.getAttribute("user");
+ String userId = user.getUserId();
+
+ if (StringUtils.isEmpty(maintainId)) {
+ //鍒涘缓鏂扮増鏈殑瀛楁
+ nowMaintain = flowsService.createNowVerion(tableName, maintainId, userId);
+ if (nowMaintain == null) {
+ return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
+ }
+
+ }else {
+ Flows flows = flowsService.selectOne(new EntityWrapper<Flows>().eq("business_id", maintainId));
+ if (flows != null){
+ //褰撳墠宸插鎵�
+ ActivitiStatus status = flows.getStatus();
+ if (status.equals(ActivitiStatus.open) || status.equals(ActivitiStatus.close)) {
+ nowMaintain = flowsService.createNowVerion(tableName, maintainId, userId);
+ }else {
+ return Result.error(new CodeMsg(7002, "褰撳墠瀛楁鐗堟湰姝ｅ湪瀹℃壒,璇峰緟瀹℃壒閫氳繃鍚庡啀淇敼"));
+ }
+
+ }else {
+ //delete
+ fieldService.delete(new EntityWrapper<SysField>().eq("maintain_field_id",maintainId));
+ nowMaintain = maintainFieldService.selectById(maintainId);
+ }
+ }
+ for (int i = 0; i < fieldList.size(); i++) {
+ SysField sysField = fieldList.get(i);
+ sysField.setCreateTime(new Date()).setId(DbUtils.getUUID()).setOperate(Operate.create).setMaintainFieldId(nowMaintain.getId()).setOrderNo(i).insert();
+ }
+ nowMaintain.insertOrUpdate();
+ return Result.success(null);
+ }
+
@RequestMapping(value = "/change", method = RequestMethod.POST)
public Result addOrUpdate(@RequestBody SysField sysField, HttpServletRequest request) {
Operate operate = sysField.getOperate();
diff --git a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
index d11a05f..005208c 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.highdatas.mdm.entity.DeletedTableLog;
import com.highdatas.mdm.entity.MenuMapping;
+import com.highdatas.mdm.entity.SysField;
import com.highdatas.mdm.entity.SysMenu;
import com.highdatas.mdm.pojo.CodeMsg;
-import com.highdatas.mdm.pojo.MaintainDataType;
import com.highdatas.mdm.pojo.Result;
import com.highdatas.mdm.service.IDeletedTableLogService;
import com.highdatas.mdm.service.IMenuMappingService;
+import com.highdatas.mdm.service.ISysFieldService;
import com.highdatas.mdm.service.ISysMenuService;
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
@@ -37,7 +38,8 @@
@Autowired
IMenuMappingService menuMappingService;
-
+ @Autowired
+ ISysFieldService fieldService;
@Autowired
IDeletedTableLogService deletedTableLogService;
@@ -52,13 +54,21 @@
@RequestMapping(value = "/list", method = RequestMethod.GET)
public Result<List<SysMenu>> getMenuList() {
EntityWrapper<SysMenu> sysMenuEntityWrapper = new EntityWrapper<>();
- sysMenuEntityWrapper.eq("data_type","currentData");
- sysMenuEntityWrapper.orderBy(" parent_id, order_no");
+ sysMenuEntityWrapper.eq("DataMenu", "DataMenu");
+ sysMenuEntityWrapper.orderBy("parent_id, order_no");
List<SysMenu> sysMenus = menuService.selectList(sysMenuEntityWrapper);
LinkedHashSet<String> parentIdSet = new LinkedHashSet<>();
for (SysMenu sysMenu : sysMenus) {
- String parentId = sysMenu.getParentId();
- parentIdSet.add(parentId);
+ MenuMapping menuMapping = menuMappingService.selectOne(new EntityWrapper<MenuMapping>().eq("menu_id", sysMenu.getId()));
+ if (menuMapping == null) {
+ continue;
+ }
+ String tableName = menuMapping.getTableName();
+ List<SysField> fieldByTable = fieldService.getFieldByTable(tableName);
+ if (fieldByTable == null) {
+ continue;
+ }
+ parentIdSet.add(sysMenu.getId());
}
Set<String> byParentId = menuService.getByParentId(parentIdSet);
List<SysMenu> parentList = menuService.selectBatchIds(byParentId);
@@ -71,7 +81,7 @@
@RequestMapping(value = "/allTheme", method = RequestMethod.GET)
public Result<List<SysMenu>> getAllTheme() {
EntityWrapper<SysMenu> sysMenuEntityWrapper = new EntityWrapper<>();
- sysMenuEntityWrapper.eq("menu_type",Constant.StructureMenu).orderBy("parent_id desc ");
+ sysMenuEntityWrapper.eq("menu_type",Constant.StructureMenu).orderBy("parent_id desc");
return Result.success(menuService.selectList(sysMenuEntityWrapper)) ;
}
@@ -126,7 +136,6 @@
menu.setId(uuid);
menu.setParentId(parentId);
menu.setOrderNo(orderno);
- menu.setDataType(MaintainDataType.parse(dataType));
menu.setMenuType(menuType);
boolean inserted = menuService.insert(menu);
if (inserted) {
@@ -174,17 +183,14 @@
menu.insert();
}
- if (menu.getMenuType().equalsIgnoreCase(Constant.DataMenu)) {
- Result<List<SysMenu>> listResult = menuByParentId(id);
- List<SysMenu> data = listResult.getData();
- long count = data.stream().filter(sysMenu -> sysMenu.getDataType().equals(MaintainDataType.unkonwn)).count();
- if (count != data.size()) {
- return Result.error(CodeMsg.SELECT_ERROR);
- }
- }
- new SysMenu().setParentId(id).setId(DbUtils.getUUID()).setName(Constant.UnMatched).setOrderNo(1).setCreateTime(new Date()).setDataType(MaintainDataType.afterData).insert();
- new SysMenu().setParentId(id).setId(DbUtils.getUUID()).setName(Constant.Current).setOrderNo(2).setCreateTime(new Date()).setDataType(MaintainDataType.currentData).insert();
- new SysMenu().setParentId(id).setId(DbUtils.getUUID()).setName(Constant.History).setOrderNo(3).setCreateTime(new Date()).setDataType(MaintainDataType.beforeData).insert();
+// if (menu.getMenuType().equalsIgnoreCase(Constant.DataMenu)) {
+// Result<List<SysMenu>> listResult = menuByParentId(id);
+// List<SysMenu> data = listResult.getData();
+// long count = data.stream().filter(sysMenu -> sysMenu.getDataType().equals(MaintainDataType.unkonwn)).count();
+// if (count != data.size()) {
+// return Result.error(CodeMsg.SELECT_ERROR);
+// }
+// }
return Result.success(CodeMsg.SUCCESS);
}
@@ -243,7 +249,7 @@
for (SysMenu sysMenu : sysMenus) {
List<MenuMapping> menuMappingList = menuMappingService.selectList(new EntityWrapper<MenuMapping>().eq("menu_id", sysMenu.getId()));
for (MenuMapping menuMapping : menuMappingList) {
- // 娣诲姞寰呭垹闄よ〃鐨勬棩蹇�
+ //todo 娣诲姞寰呭垹闄よ〃鐨勬棩蹇�
DeletedTableLog deletedTableLog = new DeletedTableLog();
deletedTableLog.setId(DbUtils.getUUID()).setTableName(menuMapping.getTableName()).setCreateTime(new Date());
deletedTableLog.insert();
diff --git a/src/main/java/com/highdatas/mdm/entity/Maintain.java b/src/main/java/com/highdatas/mdm/entity/Maintain.java
index 81b3a6e..d9ac5e2 100644
--- a/src/main/java/com/highdatas/mdm/entity/Maintain.java
+++ b/src/main/java/com/highdatas/mdm/entity/Maintain.java
@@ -44,6 +44,8 @@
@TableField("create_time")
private Date createTime;
+ private transient Integer maintainType;
+
@Override
protected Serializable pkVal() {
diff --git a/src/main/java/com/highdatas/mdm/entity/SysMenu.java b/src/main/java/com/highdatas/mdm/entity/SysMenu.java
index afa50d0..29e57cc 100644
--- a/src/main/java/com/highdatas/mdm/entity/SysMenu.java
+++ b/src/main/java/com/highdatas/mdm/entity/SysMenu.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
-import com.highdatas.mdm.pojo.MaintainDataType;
import java.io.Serializable;
import java.util.Date;
@@ -47,21 +46,11 @@
@TableField("update_time")
private Date updateTime;
- @TableField("data_type")
- private MaintainDataType dataType;
@TableField("menu_type")
private String menuType;
- public MaintainDataType getDataType() {
- return dataType;
- }
-
- public SysMenu setDataType(MaintainDataType dataType) {
- this.dataType = dataType;
- return this;
- }
public String getMenuType() {
return menuType;
diff --git a/src/main/java/com/highdatas/mdm/mapper/MasterModifiedMapper.java b/src/main/java/com/highdatas/mdm/mapper/MasterModifiedMapper.java
new file mode 100644
index 0000000..f507eb4
--- /dev/null
+++ b/src/main/java/com/highdatas/mdm/mapper/MasterModifiedMapper.java
@@ -0,0 +1,15 @@
+package com.highdatas.mdm.mapper;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author kimi
+ * @since 2020-03-11
+ */
+public interface MasterModifiedMapper {
+ Map<String,String> selectByTableMasterId(String tableName, String masterId);
+}
diff --git a/src/main/java/com/highdatas/mdm/mapper/xml/MasterModifiedMapper.xml b/src/main/java/com/highdatas/mdm/mapper/xml/MasterModifiedMapper.xml
new file mode 100644
index 0000000..48a52f1
--- /dev/null
+++ b/src/main/java/com/highdatas/mdm/mapper/xml/MasterModifiedMapper.xml
@@ -0,0 +1,19 @@
+<?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="com.highdatas.mdm.mapper.MasterModifiedMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.highdatas.mdm.entity.MasterModified">
+ <id column="id" property="id" />
+ <result column="master_id" property="masterId" />
+ <result column="table_name" property="tableName" />
+ <result column="pre_record" property="preRecord" />
+ <result column="U001" property="u001" />
+ <result column="U002" property="u002" />
+ <result column="U003" property="u003" />
+ <result column="U004" property="u004" />
+ <result column="U005" property="u005" />
+ <result column="U006" property="u006" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/java/com/highdatas/mdm/pojo/MaintainDataType.java b/src/main/java/com/highdatas/mdm/pojo/MaintainDataType.java
deleted file mode 100644
index 9a89d9e..0000000
--- a/src/main/java/com/highdatas/mdm/pojo/MaintainDataType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.highdatas.mdm.pojo;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * @author kimi
- * @description
- * @date 2019-12-31 16:27
- */
-
-
-public enum MaintainDataType {
- afterData,beforeData,currentData,unkonwn;
-
- public static MaintainDataType parse(String dataType) {
- if (StringUtils.isEmpty(dataType)) {
- return unkonwn;
- }
- try
- {
- return MaintainDataType.valueOf(dataType);
- }
- catch (Exception e) {
- return unkonwn;
- }
- }
-}
diff --git a/src/main/java/com/highdatas/mdm/service/IMasterModifiedService.java b/src/main/java/com/highdatas/mdm/service/IMasterModifiedService.java
new file mode 100644
index 0000000..4b440e3
--- /dev/null
+++ b/src/main/java/com/highdatas/mdm/service/IMasterModifiedService.java
@@ -0,0 +1,22 @@
+package com.highdatas.mdm.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author kimi
+ * @since 2020-03-11
+ */
+public interface IMasterModifiedService {
+
+ Map<String,String> getModifiedUserById(String maintainId, String masterId);
+
+ List<Map<String,String>> getModifiedUserByIds(String maintainId, List<String> masterId);
+
+ boolean updateModifiedUserById(String maintainId, String masterId, List<String> modifiedFieldList);
+
+}
diff --git a/src/main/java/com/highdatas/mdm/service/impl/MasterDataServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/MasterDataServiceImpl.java
index ebca626..98e53f6 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/MasterDataServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/MasterDataServiceImpl.java
@@ -259,7 +259,7 @@
@Override
public String getTempFields(String tableName) {
- return getTempFields(tableName, Constant.EMPTY);
+ return getTempFields(tableName, Constant.EMPTY_Str);
}
@Override
public String getTempFields(String tableName, String alias) {
diff --git a/src/main/java/com/highdatas/mdm/service/impl/MasterModifiedServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/MasterModifiedServiceImpl.java
new file mode 100644
index 0000000..0769405
--- /dev/null
+++ b/src/main/java/com/highdatas/mdm/service/impl/MasterModifiedServiceImpl.java
@@ -0,0 +1,60 @@
+package com.highdatas.mdm.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.highdatas.mdm.entity.Maintain;
+import com.highdatas.mdm.entity.SysField;
+import com.highdatas.mdm.mapper.MasterModifiedMapper;
+import com.highdatas.mdm.service.IMaintainService;
+import com.highdatas.mdm.service.IMasterModifiedService;
+import com.highdatas.mdm.service.ISysFieldService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author kimi
+ * @since 2020-03-11
+ */
+@Service
+public class MasterModifiedServiceImpl implements IMasterModifiedService {
+ @Autowired
+ IMaintainService maintainService;
+ @Autowired
+ ISysFieldService fieldService;
+ @Autowired
+ MasterModifiedMapper masterModifiedMapper;
+ public static final String master_id = "master_id";
+ public static final String pre_record = "pre_record";
+ public static final String table_name = "table_name";
+ @Override
+ public Map<String, String> getModifiedUserById(String maintainId, String masterId) {
+ return null;
+ }
+
+ @Override
+ public List<Map<String, String>> getModifiedUserByIds(String maintainId, List<String> masterId) {
+ return null;
+ }
+
+ @Override
+ public boolean updateModifiedUserById(String maintainId, String masterId, List<String> modifiedFieldList) {
+ if (StringUtils.isEmpty(maintainId)) {
+ return false;
+ }
+ Maintain nowMaintain = maintainService.selectById(maintainId);
+ List<SysField> fieldByMaintain = fieldService.getFieldByMaintain(maintainId);
+ Map<String, String> masterModifiedMap = masterModifiedMapper.selectByTableMasterId(nowMaintain.getTableName(), masterId);
+ String preRecordStr = masterModifiedMap.get(pre_record);
+ JSONObject preRecordJSON = JSONObject.parseObject(preRecordStr);
+
+ return false;
+ }
+
+}
diff --git a/src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java
index 25b44b0..766dd09 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java
@@ -14,7 +14,6 @@
import com.highdatas.mdm.mapper.MenuMappingMapper;
import com.highdatas.mdm.mapper.TableInfoMapper;
import com.highdatas.mdm.pojo.CodeMsg;
-import com.highdatas.mdm.pojo.MaintainDataType;
import com.highdatas.mdm.pojo.Result;
import com.highdatas.mdm.service.ActivitiService;
import com.highdatas.mdm.service.IMaintainService;
@@ -149,42 +148,33 @@
@Override
public Result getMapping(HttpSession session, String id) {
SysMenu sysMenu = menuService.selectById(id);
- MaintainDataType dataType = sysMenu.getDataType();
String menuType = sysMenu.getMenuType();
- if (!StringUtils.isEmpty(menuType) && menuType.equalsIgnoreCase("DataMenu")) {
- Map mapping = menuMappingMapper.getMapping(id);
- return Result.success(mapping);
- }else if (!StringUtils.isEmpty(menuType) && menuType.equalsIgnoreCase("StructureMenu")) {
+ if (StringUtils.isEmpty(menuType)) {
+ return Result.error(CodeMsg.SELECT_ERROR);
+ }
+
+ if (menuType.equalsIgnoreCase("StructureMenu")) {
return Result.success(null);
}
- Wrapper<MenuMapping> menuWrapper = new EntityWrapper<MenuMapping>().eq("menu_id", sysMenu.getParentId());
+
+ Map mapping = menuMappingMapper.getMapping(id);
+
+ Wrapper<MenuMapping> menuWrapper = new EntityWrapper<MenuMapping>().eq("menu_id", sysMenu.getId());
MenuMapping menuMapping = selectOne(menuWrapper);
if (menuMapping == null) {
return Result.error(new CodeMsg(10008,"褰撳墠涓婚鏃犵増鏈暟鎹�"));
}
- String tableName = menuMapping.getTableName();
- Maintain resultMaintain = null;
- switch (dataType) {
- case beforeData:
- resultMaintain = maintainService.getRecentHistoryVersion(tableName);
- break;
- case afterData:
- break;
- case currentData:
- resultMaintain = maintainService.getNowVersion(tableName);
- break;
- default:
- Result.error(new CodeMsg(10008,"褰撳墠涓婚鏃犵増鏈暟鎹�"));
- break;
- }
- Map<String, Object> mapping = menuMappingMapper.getMapping(sysMenu.getParentId());
+ String tableName = menuMapping.getTableName();
+ Maintain resultMaintain = maintainService.getNowVersion(tableName);
if (resultMaintain != null) {
mapping.put("version", resultMaintain.getVersion());
mapping.put("maintainId", resultMaintain.getId());
}
- mapping.put("dataType", sysMenu.getDataType());
+
return Result.success(mapping);
+
+
}
}
diff --git a/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
index 1d31b43..85f6e48 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.highdatas.mdm.entity.Flows;
import com.highdatas.mdm.entity.Maintain;
import com.highdatas.mdm.entity.MaintainField;
@@ -15,14 +16,11 @@
import com.highdatas.mdm.service.IMaintainFieldService;
import com.highdatas.mdm.service.IMaintainService;
import com.highdatas.mdm.service.ISysFieldService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.highdatas.mdm.util.DbUtils;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -108,6 +106,9 @@
@Override
public List<SysField> getFieldByTable(String tableName) {
Maintain nowVersion = maintainService.getNowVersion(tableName);
+ if (nowVersion == null) {
+ return null;
+ }
return getFieldByMaintain(nowVersion.getId());
}
diff --git a/src/main/java/com/highdatas/mdm/util/Constant.java b/src/main/java/com/highdatas/mdm/util/Constant.java
index d3e6de3..f154c21 100644
--- a/src/main/java/com/highdatas/mdm/util/Constant.java
+++ b/src/main/java/com/highdatas/mdm/util/Constant.java
@@ -14,6 +14,7 @@
public static final String EQUAL = " = ";
public static final String LIKE = " like ";
public static final String EMPTY = " ";
+ public static final String EMPTY_Str = "";
public static final String SEMICOLON = ";";
public static final String colon = ":";
public static final String UnderLine = "_";
diff --git a/src/main/java/com/highdatas/mdm/util/MpGenerator.java b/src/main/java/com/highdatas/mdm/util/MpGenerator.java
index 8cbb6fc..408f054 100644
--- a/src/main/java/com/highdatas/mdm/util/MpGenerator.java
+++ b/src/main/java/com/highdatas/mdm/util/MpGenerator.java
@@ -28,7 +28,7 @@
// 鍏ㄥ眬閰嶇疆
GlobalConfig gc = new GlobalConfig();
gc.setAuthor("kimi");
- gc.setOutputDir("H://workspace/workspace_idea/mdm/src/main/java");
+ gc.setOutputDir("D://workspace/workspace_idea/mdm_new/src/main/java");
gc.setFileOverride(true);// 鏄惁瑕嗙洊鍚屽悕鏂囦欢锛岄粯璁ゆ槸false
gc.setActiveRecord(true);// 涓嶉渶瑕丄ctiveRecord鐗规�х殑璇锋敼涓篺alse
gc.setEnableCache(false);// XML 浜岀骇缂撳瓨
@@ -65,7 +65,7 @@
// strategy.setCapitalMode(true);// 鍏ㄥ眬澶у啓鍛藉悕 ORACLE 娉ㄦ剰
strategy.setTablePrefix(new String[]{""});// 姝ゅ鍙互淇敼涓烘偍鐨勮〃鍓嶇紑
strategy.setNaming(NamingStrategy.underline_to_camel);// 琛ㄥ悕鐢熸垚绛栫暐
- strategy.setInclude(new String[]{"maintain_field",}); // 闇�瑕佺敓鎴愮殑琛�
+ strategy.setInclude(new String[]{"master_modified",}); // 闇�瑕佺敓鎴愮殑琛�
// strategy.setExclude(new String[]{"test"}); // 鎺掗櫎鐢熸垚鐨勮〃
// 鑷畾涔夊疄浣撶埗绫�
// strategy.setSuperEntityClass("com.baomidou.demo.TestEntity");
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 75741a9..104cfb5 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -61,10 +61,10 @@
accessToken:
executor:
ip:
- port: 9909
- logpath: /data/applogs/xxl-job/jobhandler
- logretentiondays: 1
- appname: assemble
+ port: 9909
+ logpath: /data/applogs/xxl-job/jobhandler
+ logretentiondays: 1
+ appname: assemble
admin:
addresses: http://192.168.2.68:8090/xxl-job-admin
diff --git a/src/main/resources/mapping/MaintainMapper.xml b/src/main/resources/mapping/MaintainMapper.xml
index 2f6688a..2b09b01 100644
--- a/src/main/resources/mapping/MaintainMapper.xml
+++ b/src/main/resources/mapping/MaintainMapper.xml
@@ -125,14 +125,14 @@
<select id="countUnSubmitData" resultType="java.lang.Long">
SELECT count(1) from ${tableTempName} mt
LEFT JOIN maintain_detail mad on mad.pre_merge_id = mt.id
- WHERE mad.parent_id = ${maintainFieldId}
+ WHERE mad.parent_id = ${maintainId}
AND ${where}
</select>
<select id="selectUnSubmitData" resultType="java.util.Map">
SELECT ${fields}, mad.operate from ${tableTempName} mt
LEFT JOIN maintain_detail mad on mad.pre_merge_id = mt.id
- WHERE mad.parent_id = ${maintainFieldId}
+ WHERE mad.parent_id = ${maintainId}
AND ${where} ${limit}
</select>
</mapper>
diff --git a/src/main/resources/mapping/MasterModifiedMapper.xml b/src/main/resources/mapping/MasterModifiedMapper.xml
new file mode 100644
index 0000000..97387b4
--- /dev/null
+++ b/src/main/resources/mapping/MasterModifiedMapper.xml
@@ -0,0 +1,10 @@
+<?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="com.highdatas.mdm.mapper.MasterModifiedMapper">
+
+
+ <select id="selectByTableMasterId" resultType="java.util.Map" statementType="STATEMENT" >
+ select * from master_modified where table_name = #{tableName} and master_id = #{fields}
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapping/MenuMappingMapper.xml b/src/main/resources/mapping/MenuMappingMapper.xml
index beb04ec..b6664fc 100644
--- a/src/main/resources/mapping/MenuMappingMapper.xml
+++ b/src/main/resources/mapping/MenuMappingMapper.xml
@@ -21,7 +21,7 @@
<select id="getMapping" resultType="java.util.Map">
SELECT
m.id,m.code, m.name, u.user_name as userName,system_id as systemId, m.audit as audit,
- sm.data_type as dataType,
+
c2.name as cname1, c2.id as cid1, c1.name as cname2, c1.id as cid2, c.name as cname3, c.id as cid3,
start_time as startTime, end_time as endTime, m.create_time as createTime, m.update_time as updateTime,
table_name as tableName, sm.name as theme, m.theme_id as themeId, m.charge_id as chargeId
--
Gitblit v1.8.0