admin
2021-06-29 9577602ea5616f34688f57ce9fd4d601ee3502d8
mybatis mapper.xml文件生成规则修改
3个文件已修改
166 ■■■■ 已修改文件
.idea/workspace.xml 148 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/yeshi/utils/generater/mybatis/ColumnUtil.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/org/yeshi/utils/generater/mybatis/MyBatisMapperUtil.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/workspace.xml
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ChangeListManager">
    <list default="true" id="3f964990-dec9-4832-b130-9445376d74e4" name="Default Changelist" comment="" />
    <list default="true" id="3f964990-dec9-4832-b130-9445376d74e4" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/ColumnUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/ColumnUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/MyBatisMapperUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/MyBatisMapperUtil.java" afterDir="false" />
    </list>
    <ignored path="$PROJECT_DIR$/out/" />
    <ignored path="$PROJECT_DIR$/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -18,7 +22,7 @@
          <entry key="project.open.time.11" value="1" />
          <entry key="project.open.time.13" value="2" />
          <entry key="project.open.time.17" value="1" />
          <entry key="project.open.time.2" value="4" />
          <entry key="project.open.time.2" value="5" />
          <entry key="project.open.time.21" value="1" />
          <entry key="project.open.time.29" value="1" />
          <entry key="project.open.time.3" value="4" />
@@ -27,12 +31,12 @@
          <entry key="project.open.time.4" value="1" />
          <entry key="project.open.time.5" value="1" />
          <entry key="project.open.time.6" value="1" />
          <entry key="project.opened" value="19" />
          <entry key="project.opened" value="20" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.edit">
        <counts>
          <entry key="java" value="1695" />
          <entry key="java" value="1724" />
          <entry key="template" value="796" />
          <entry key="txt" value="5" />
          <entry key="xml" value="295" />
@@ -40,7 +44,7 @@
      </usages-collector>
      <usages-collector id="statistics.file.types.edit">
        <counts>
          <entry key="JAVA" value="1695" />
          <entry key="JAVA" value="1724" />
          <entry key="PLAIN_TEXT" value="801" />
          <entry key="XML" value="295" />
        </counts>
@@ -49,7 +53,7 @@
        <counts>
          <entry key="2-SNAPSHOT" value="1" />
          <entry key="class" value="9" />
          <entry key="java" value="58" />
          <entry key="java" value="61" />
          <entry key="template" value="2" />
          <entry key="xml" value="7" />
        </counts>
@@ -57,7 +61,7 @@
      <usages-collector id="statistics.file.types.open">
        <counts>
          <entry key="CLASS" value="9" />
          <entry key="JAVA" value="58" />
          <entry key="JAVA" value="61" />
          <entry key="PLAIN_TEXT" value="2" />
          <entry key="UML" value="1" />
          <entry key="XML" value="7" />
@@ -66,7 +70,35 @@
    </session>
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
    <leaf>
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/MyBatisMapperUtil.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="660">
              <caret line="169" column="93" lean-forward="true" selection-start-line="169" selection-start-column="93" selection-end-line="169" selection-end-column="93" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/ColumnParseUtil.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="385">
              <caret line="63" column="36" lean-forward="true" selection-start-line="63" selection-start-column="36" selection-end-line="63" selection-end-column="36" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/ColumnUtil.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="-1199">
              <caret line="112" column="60" selection-start-line="112" selection-start-column="56" selection-end-line="112" selection-end-column="60" />
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
@@ -105,6 +137,9 @@
      <find>baseDaoClass</find>
    </findStrings>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
@@ -129,6 +164,8 @@
        <option value="$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/entity/MongoDBDaoData.java" />
        <option value="$PROJECT_DIR$/src/main/resources/mongoDBDao.template" />
        <option value="$PROJECT_DIR$/src/test/java/com/generater/result/EntityDao.java" />
        <option value="$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/ColumnUtil.java" />
        <option value="$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/MyBatisMapperUtil.java" />
      </list>
    </option>
  </component>
@@ -176,12 +213,14 @@
    <option name="width" value="1936" />
    <option name="height" value="1056" />
  </component>
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="PackagesPane" />
      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
@@ -192,65 +231,18 @@
            <path>
              <item name="utils" type="b2602c69:ProjectViewProjectNode" />
              <item name="utils" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="utils" type="b2602c69:ProjectViewProjectNode" />
              <item name="utils" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="utils" type="b2602c69:ProjectViewProjectNode" />
              <item name="utils" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="utils" type="b2602c69:ProjectViewProjectNode" />
              <item name="utils" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="utils" type="b2602c69:ProjectViewProjectNode" />
              <item name="utils" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="test" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="utils" type="b2602c69:ProjectViewProjectNode" />
              <item name="utils" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="test" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="utils" type="b2602c69:ProjectViewProjectNode" />
              <item name="utils" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="test" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="generater" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="utils" type="b2602c69:ProjectViewProjectNode" />
              <item name="utils" type="462c0819:PsiDirectoryNode" />
              <item name="target" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1624963863327" />
    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1624966242906" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../fanli/service" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -393,17 +385,18 @@
      <workItem from="1624606433078" duration="596000" />
      <workItem from="1624612312052" duration="1109000" />
      <workItem from="1624865884453" duration="12279000" />
      <workItem from="1624963799655" duration="2122000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="69981000" />
    <option name="totallyTimeSpent" value="72103000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
    <editor active="true" />
    <layout>
      <window_info content_ui="combo" id="Project" order="0" weight="0.13965885" />
      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20735608" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info id="Designer" order="2" />
      <window_info id="JRebel" order="3" side_tool="true" />
@@ -549,13 +542,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="100">
          <caret line="24" column="25" selection-start-line="24" selection-start-column="25" selection-end-line="24" selection-end-column="25" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/ColumnUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="416">
          <caret line="28" column="22" selection-start-line="28" selection-start-column="22" selection-end-line="28" selection-end-column="22" />
        </state>
      </provider>
    </entry>
@@ -957,16 +943,7 @@
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/test/java/com/generater/result/EntityDao.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="332">
          <caret line="75" column="9" lean-forward="true" selection-start-line="75" selection-start-column="9" selection-end-line="75" selection-end-column="9" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/test/java/com/generater/result/EntityDao.java" />
    <entry file="file://$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/entity/ColumnData.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="110">
@@ -1033,6 +1010,27 @@
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/ColumnParseUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="385">
          <caret line="63" column="36" lean-forward="true" selection-start-line="63" selection-start-column="36" selection-end-line="63" selection-end-column="36" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/ColumnUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-1199">
          <caret line="112" column="60" selection-start-line="112" selection-start-column="56" selection-end-line="112" selection-end-column="60" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/org/yeshi/utils/generater/mybatis/MyBatisMapperUtil.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="660">
          <caret line="169" column="93" lean-forward="true" selection-start-line="169" selection-start-column="93" selection-end-line="169" selection-end-column="93" />
        </state>
      </provider>
    </entry>
  </component>
  <component name="masterDetails">
    <states>
src/main/java/org/yeshi/utils/generater/mybatis/ColumnUtil.java
@@ -143,11 +143,11 @@
                            int wpos = value.indexOf("where ");
                            if (value.substring(0, wpos).trim().endsWith(","))
                                value = value.substring(0, wpos)
                                        + String.format("%s =#{%s,jdbcType=%s}", columnName, property, type) + " "
                                        + String.format("%s =#{%s,jdbcType=%s},", columnName, property, type) + " "
                                        + value.substring(wpos);
                            else
                                value = value.substring(0, wpos) + ","
                                        + String.format("%s =#{%s,jdbcType=%s}", columnName, property, type) + " "
                                        + String.format("%s =#{%s,jdbcType=%s},", columnName, property, type) + " "
                                        + value.substring(wpos);
                            e.setText(value);
src/main/java/org/yeshi/utils/generater/mybatis/MyBatisMapperUtil.java
@@ -159,6 +159,20 @@
            select.addText(String.format("from %s where %s = #{%s,jdbcType=BIGINT}", tableName, idKeys.column,
                    idKeys.attribute));
            select = root.addElement("select");
            select.addAttribute("id", "selectByPrimaryKeyForUpdate");
            select.addAttribute("resultMap", "BaseResultMap");
            select.addAttribute("parameterType", "java.lang.Long");
            select.addText("select");
             include = select.addElement("include");
            include.addAttribute("refid", "Base_Column_List");
            select.addText(String.format("from %s where %s = #{%s,jdbcType=BIGINT} for update", tableName, idKeys.column,
                    idKeys.attribute));
            org.dom4j.Element delete = root.addElement("delete");
            delete.addAttribute("id", "deleteByPrimaryKey");
            delete.addAttribute("parameterType", "java.lang.Long");