Skip to content

Q
quick_generator
Commit 1b2386f8 by xxlv
Options

Fix typo

parent 9bcbcb29
Showing with 140 additions and 167 deletions
.gitignore 0 → 100644
tmp
.idea
\ No newline at end of file
.idea/workspace.xml
......@@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="1abc04e8-e167-42cd-98ea-074bbb2150ed" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gen.py" beforeDir="false" afterPath="$PROJECT_DIR$/gen.py" afterDir="false" />
</list>
......@@ -16,24 +17,12 @@
<SUITE FILE_PATH="coverage/quick_tpl$gen.coverage" NAME="gen Coverage Results" MODIFIED="1528859310664" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="gen.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/gen.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="461">
<caret line="176" lean-forward="true" selection-start-line="176" selection-end-line="176" />
<folding>
<element signature="e#42#51#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="generatorConfig.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tmp/generatorConfig.xml">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="29" lean-forward="true" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" />
<state relative-caret-position="15">
<caret line="1" column="5" selection-start-line="1" selection-start-column="5" selection-end-line="1" selection-end-column="5" />
</state>
</provider>
</entry>
......@@ -43,6 +32,10 @@
<component name="FindInProjectRecents">
<findStrings>
<find>systemlogZt</find>
<find>{}/dat</find>
<find>clean_tmp</find>
<find>gen_po</find>
<find>config_mybatis</find>
</findStrings>
<replaceStrings>
<replace>${PLACE}</replace>
......@@ -59,7 +52,9 @@
<option value="$PROJECT_DIR$/template/${PLACE}FacadeImpl.java" />
<option value="$PROJECT_DIR$/template/${PLACE}Biz.java" />
<option value="$PROJECT_DIR$/heml.py" />
<option value="$PROJECT_DIR$/tmp/generatorConfig.xml" />
<option value="$PROJECT_DIR$/gen.py" />
<option value="$PROJECT_DIR$/.gitignore" />
</list>
</option>
</component>
......@@ -93,16 +88,6 @@
<item name="quick_tpl" type="b2602c69:ProjectViewProjectNode" />
<item name="quick_tpl" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="quick_tpl" type="b2602c69:ProjectViewProjectNode" />
<item name="quick_tpl" type="462c0819:PsiDirectoryNode" />
<item name="jar" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="quick_tpl" type="b2602c69:ProjectViewProjectNode" />
<item name="quick_tpl" type="462c0819:PsiDirectoryNode" />
<item name="tmp" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -217,60 +202,45 @@
<frame x="67" y="25" width="1853" height="1055" extended-state="6" />
<editor active="true" />
<layout>
<window_info anchor="bottom" id="TODO" order="13" />
<window_info anchor="bottom" id="Event Log" order="20" side_tool="true" />
<window_info anchor="bottom" id="Database Changes" order="5" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="0" weight="0.329718" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Python Console" order="10" />
<window_info active="true" anchor="bottom" id="Terminal" order="6" visible="true" weight="0.329718" />
<window_info content_ui="combo" id="Project" order="0" weight="0.24958494" />
<window_info anchor="bottom" id="Docker" order="12" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="11" />
<window_info anchor="right" id="SciView" order="8" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Python Console" order="9" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.329718" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25235197" />
<window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="right" id="SciView" order="5" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="9" side_tool="true" />
<window_info anchor="bottom" id="FindBugs-IDEA" order="15" />
<window_info id="Designer" order="4" />
<window_info anchor="bottom" id="FindBugs-IDEA" order="7" />
<window_info id="Designer" order="2" />
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="bottom" id="Python Console" order="21" />
<window_info anchor="bottom" id="Run" order="4" />
<window_info id="Image Layers" order="5" />
<window_info id="Image Layers" order="2" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="Capture Tool" order="6" />
<window_info id="UI Designer" order="7" />
<window_info id="Favorites" order="8" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="16" />
<window_info anchor="bottom" id="Docker" order="22" show_stripe_button="false" />
<window_info anchor="right" id="Capture Analysis" order="4" />
<window_info anchor="bottom" id="Event Log" order="17" side_tool="true" />
<window_info id="Capture Tool" order="2" />
<window_info id="UI Designer" order="2" />
<window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info content_ui="combo" id="Project" order="1" weight="0.25" />
<window_info anchor="bottom" id="Database Changes" order="18" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="19" />
<window_info anchor="right" id="Maven Projects" order="5" />
<window_info anchor="bottom" id="Inspection" order="11" weight="0.4" />
<window_info anchor="right" id="SciView" order="10" />
<window_info anchor="right" id="Database" order="6" />
<window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="TODO" order="14" />
<window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Theme Preview" order="9" />
<window_info id="Structure" order="3" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Find" order="2" />
<window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
<window_info anchor="right" id="Maven Projects" order="3" />
<window_info anchor="bottom" id="Find" order="1" weight="0.329718" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="right" id="Palette&#9;" order="3" />
<window_info anchor="right" id="Theme Preview" order="3" />
</layout>
<layout-to-restore>
<window_info anchor="bottom" id="FindBugs-IDEA" order="7" />
<window_info id="Designer" order="2" />
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="bottom" id="Python Console" order="12" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info id="Image Layers" order="3" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="Capture Tool" order="4" />
......@@ -279,13 +249,13 @@
<window_info anchor="bottom" id="Terminal" order="8" />
<window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
<window_info anchor="right" id="Capture Analysis" order="4" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="11" />
<window_info anchor="right" id="Maven Projects" order="5" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info content_ui="combo" id="Project" order="0" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24958494" />
<window_info anchor="right" id="SciView" order="9" />
<window_info anchor="right" id="Database" order="6" />
<window_info anchor="bottom" id="Message" order="0" />
......@@ -294,6 +264,7 @@
<window_info anchor="right" id="Theme Preview" order="8" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="Find" order="1" weight="0.329718" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
</layout-to-restore>
</component>
......@@ -304,62 +275,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/template/${PLACE}FacadeImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="86" selection-start-line="19" selection-start-column="86" selection-end-line="19" selection-end-column="86" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gen.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/template/${PLACE}Facade.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/template/${PLACE}FacadeImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="23" column="79" selection-start-line="23" selection-start-column="79" selection-end-line="23" selection-end-column="79" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gen.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/template/${PLACE}Facade.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/template/${PLACE}FacadeImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gen.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gen.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
......@@ -556,13 +471,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/template/${PLACE}Facade.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/template/${PLACE}Biz.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
......@@ -573,9 +481,7 @@
<entry file="file://$PROJECT_DIR$/template/${PLACE}BizImpl.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/heml.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/heml.py" />
<entry file="file://$PROJECT_DIR$/template/${PLACE}Mapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
......@@ -583,46 +489,75 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tmp/SystemlogMapper.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tmp/SystemlogFacade.java">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/tmp/SystemlogMapper.java" />
<entry file="file://$PROJECT_DIR$/tmp/SystemlogFacade.java" />
<entry file="file://$PROJECT_DIR$/tmp/SystemlogBiz.java" />
<entry file="file://$PROJECT_DIR$/tmp/Systemlog.java" />
<entry file="file://$PROJECT_DIR$/tmp/SystemlogFacadeImpl.java" />
<entry file="file://$PROJECT_DIR$/tmp/SystemlogMapper.xml" />
<entry file="file://$PROJECT_DIR$/tmp/SystemlogRespDto.java" />
<entry file="file://$PROJECT_DIR$/tmp/DemoBiz.java" />
<entry file="file://$PROJECT_DIR$/template/${PLACE}ReqDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="9" lean-forward="true" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tmp/SystemlogBiz.java">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/template/${PLACE}Facade.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tmp/Systemlog.java">
<entry file="file://$PROJECT_DIR$/template/${PLACE}Mapper.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tmp/SystemlogFacadeImpl.java">
<entry file="file://$PROJECT_DIR$/ydl-login-intf/src/main/java/com/ydl/login/intf/po/DoctorModify.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tmp/SystemlogMapper.xml">
<entry file="file://$PROJECT_DIR$/ydl-login-intf/src/main/java/com/ydl/login/intf/po/Fans.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tmp/SystemlogRespDto.java">
<entry file="file://$PROJECT_DIR$/ydl-login-intf/src/main/java/com/ydl/login/intf/po/Queue.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tmp/DemoBiz.java">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/ydl-login-intf/src/main/java/com/ydl/login/intf/po/About.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-135" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tmp/generatorConfig.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="29" lean-forward="true" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" />
<state relative-caret-position="285">
<caret line="19" column="91" lean-forward="true" selection-start-line="19" selection-start-column="91" selection-end-line="19" selection-end-column="91" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gen.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="461">
<caret line="176" lean-forward="true" selection-start-line="176" selection-end-line="176" />
<state relative-caret-position="373">
<caret line="207" column="21" selection-start-line="207" selection-start-column="21" selection-end-line="207" selection-end-column="21" />
<folding>
<element signature="e#42#51#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tmp/About.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="5" selection-start-line="1" selection-start-column="5" selection-end-line="1" selection-end-column="5" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
gen.py
......@@ -9,6 +9,7 @@ import xml.etree.ElementTree as ET
DIR = "./template"
TMP = "./tmp"
JAR_PATH = "./jar"
MYBATIS_GEN_JAVA_PATH = "{}/java".format(TMP)
def parse_ydl_project(path):
......@@ -74,6 +75,14 @@ def parse_ydl_project(path):
# cp文件
def safe_cpfile(f, target_path_map, res_name):
"""
cp文件到project path
:param f:
:param target_path_map:
:param res_name:
:return:
"""
res_name = res_name[0].upper() + res_name[1:]
if f is None:
......@@ -113,6 +122,13 @@ def safe_cpfile(f, target_path_map, res_name):
def is_po(res_name, identity):
"""
检测是否是po
:param res_name:
:param identity:
:return:
"""
print("检测po {} {}".format(res_name, identity.split("/")[-1]))
return "{}.java".format(res_name) == identity.split("/")[-1]
......@@ -143,10 +159,20 @@ def config_mybatis(res_name, table_name, mybatis_config_path):
context = root.find("context")
context.append(e)
po_path = context.find("javaModelGenerator").get("targetPackage")
java_model_generator = context.find("javaModelGenerator")
java_model_generator.set("targetProject", "{}/java/".format(TMP))
tmp_mybatis_path = os.path.join(TMP, "generatorConfig.xml")
root.write(tmp_mybatis_path,encoding="utf-8")
root.write(tmp_mybatis_path, encoding="utf-8")
with open(tmp_mybatis_path, "r+") as f:
content = f.read()
f.seek(0, 0)
f.write(head + content)
return tmp_mybatis_path
return {"tmp_mybatis_path": tmp_mybatis_path, "po_path": po_path}
def gen_po(res_name, project_target_path):
......@@ -165,23 +191,28 @@ def gen_po(res_name, project_target_path):
tables_name = res_name
local_mybatis_config=config_mybatis(res_name, tables_name, mybatis_config_path)
local_mybatis_config = config_mybatis(res_name, tables_name, mybatis_config_path)
local_mybatis_config_path = local_mybatis_config["tmp_mybatis_path"]
po_path = "{}/{}".format(MYBATIS_GEN_JAVA_PATH,"/".join(local_mybatis_config["po_path"].split(".")))
print(po_path)
gen_po_cmd = """
java -jar {}/mybatis-generator-core-1.3.6.jar -configfile {} -overwrite
""".format(JAR_PATH, local_mybatis_config)
""".format(JAR_PATH, local_mybatis_config_path)
print("----------------------------------------")
print(gen_po_cmd)
print("----------------------------------------")
os.system(gen_po_cmd)
# os.system(gen_po_cmd)
with open("{}/{}.java".format(po_path,res_name), "r+") as f:
po = f.read()
return "PO"
def rewrite_mybatis_config():
pass
return po
# 编译内容
......@@ -236,9 +267,12 @@ def clean_tmp():
:return:
"""
for root, dirs, files in os.walk(TMP, False):
for file in files:
os.remove(os.path.join(root, file))
if (os.path.isdir(TMP)):
shutil.rmtree(TMP)
os.mkdir(TMP)
os.mkdir(MYBATIS_GEN_JAVA_PATH)
print("清空目录 {}".format(TMP))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment