Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	.idea/workspace.xml

.idea/workspace.xml

@@ -2,16 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="645e93b8-0ad6-4d6f-a066-61732e27367b" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/FactoryController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/Factory.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/mapper/FactoryMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/FactoryService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/FactoryServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/model/cloud-model/src/main/resources/mapper/FactoryMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/assets/user.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/http.js" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/http.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/main.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/port.js" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/port.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/routes.js" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/routes.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/views/Home.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/views/Home.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/views/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/views/Login.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ys_vue/src/views/nav1/Form.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ys_vue/src/views/nav1/Form.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/CompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/CompanyService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/model/cloud-model/target/" />
     <ignored path="$PROJECT_DIR$/model/target/" />
@@ -27,20 +29,68 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="CloudModelApplication.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java">
+      <file leaf-file-name="SysUserController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="221">
-              <caret line="16" selection-start-line="16" selection-end-line="16" />
+            <state relative-caret-position="-187">
+              <caret line="18" column="20" lean-forward="true" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SysUserController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java">
+      <file leaf-file-name="RoleServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/RoleServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="263">
+              <caret line="37" column="31" lean-forward="true" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="RoleController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="203">
+              <caret line="39" column="33" lean-forward="true" selection-start-line="39" selection-start-column="33" selection-end-line="39" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CodeGenerator.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="381">
-              <caret line="35" column="19" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="19" />
+            <state relative-caret-position="330">
+              <caret line="25" column="17" lean-forward="true" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="17" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FactoryServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/FactoryServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="173">
+              <caret line="23" column="14" lean-forward="true" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Factory.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/Factory.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="397">
+              <caret line="29" column="29" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="29" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FactoryController.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/FactoryController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="203">
+              <caret line="37" column="42" lean-forward="true" selection-start-line="37" selection-start-column="42" selection-end-line="37" selection-end-column="42" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -48,20 +98,23 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="RoleController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java">
+      <file leaf-file-name="FactoryService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/FactoryService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="218">
-              <caret line="44" column="25" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="25" />
+            <state relative-caret-position="323">
+              <caret line="16" column="64" lean-forward="true" selection-start-line="16" selection-start-column="64" selection-end-line="16" selection-end-column="64" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SysUser.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/SysUser.java">
+      <file leaf-file-name="CompanyController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="35" column="27" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="27" />
+            <state relative-caret-position="480">
+              <caret line="80" column="5" lean-forward="true" selection-start-line="65" selection-start-column="3" selection-end-line="80" selection-end-column="5" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -99,8 +152,14 @@
         <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/RoleService.java" />
         <option value="$PROJECT_DIR$/model/cloud-model/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/RoleServiceImpl.java" />
-        <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java" />
+        <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/CompanyService.java" />
         <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java" />
+        <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java" />
+        <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java" />
+        <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/FactoryService.java" />
+        <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java" />
+        <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/FactoryServiceImpl.java" />
+        <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/FactoryController.java" />
       </list>
     </option>
   </component>
@@ -127,10 +186,20 @@
           <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
           <item name="cloud-model" type="9519ce18:MavenProjectsStructure$ProjectNode" />
         </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="cloud-model" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+          <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" />
+        </path>
         <path>
           <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
           <item name="model" type="9519ce18:MavenProjectsStructure$ProjectNode" />
         </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="model" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+          <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" />
+        </path>
       </expand>
       <select />
     </treeState>
@@ -154,8 +223,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -206,13 +273,65 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="cloudmodel" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="yunsu" type="b2602c69:ProjectViewProjectNode" />
+              <item name="yunsu" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="cloud-model" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="cloudmodel" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="yunsu" type="b2602c69:ProjectViewProjectNode" />
+              <item name="yunsu" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="cloud-model" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="cloudmodel" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="yunsu" type="b2602c69:ProjectViewProjectNode" />
+              <item name="yunsu" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="cloud-model" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="cloudmodel" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="yunsu" type="b2602c69:ProjectViewProjectNode" />
+              <item name="yunsu" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="cloud-model" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="cloudmodel" type="462c0819:PsiDirectoryNode" />
+              <item name="util" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="yunsu" type="b2602c69:ProjectViewProjectNode" />
+              <item name="yunsu" type="462c0819:PsiDirectoryNode" />
+              <item name="ys_vue" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="AndroidView" />
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -243,7 +362,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.CodeGenerator">
+  <component name="RunManager" selected="Spring Boot.CloudModelApplication">
     <configuration name="CodeGenerator" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.hssx.cloudmodel.util.CodeGenerator" />
       <module name="cloud-model" />
@@ -350,7 +469,7 @@
       <workItem from="1564060637670" duration="152000" />
       <workItem from="1564060843983" duration="5575000" />
       <workItem from="1564103473387" duration="587000" />
-      <workItem from="1564105171770" duration="4892000" />
+      <workItem from="1564105171770" duration="8299000" />
     </task>
     <task id="LOCAL-00001" summary="云塑网前端代码">
       <created>1563771143548</created>
@@ -415,20 +534,28 @@
       <option name="project" value="LOCAL" />
       <updated>1564108773850</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu&#10;&#10;# Conflicts:&#10;#&#9;.gitignore">
+      <created>1564110083264</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1564110083264</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="23940000" />
+    <option name="totallyTimeSpent" value="25558000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5010661" side_tool="true" weight="0.32792208" />
+      <window_info anchor="bottom" id="FindBugs-IDEA" order="7" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5010672" side_tool="true" weight="0.5863192" />
       <window_info anchor="bottom" id="JRebel Console" order="7" side_tool="true" />
-      <window_info anchor="right" id="Maven Projects" order="3" weight="0.10714286" />
+      <window_info anchor="right" id="Maven Projects" order="3" weight="0.1072572" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="JRebel Executor" order="7" />
       <window_info id="Capture Tool" order="2" />
@@ -437,61 +564,30 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49893278" weight="0.42532468" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49893278" weight="0.29207385" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Messages" order="7" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.4989339" visible="true" weight="0.32792208" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4994664" weight="0.32792208" />
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32899022" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4994664" visible="true" weight="0.32899022" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="7" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18123667" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2945571" />
       <window_info anchor="bottom" id="Problems" order="8" />
       <window_info anchor="right" id="Bean Validation" order="4" />
-      <window_info id="JRebel" order="2" side_tool="true" />
       <window_info id="Web" order="2" side_tool="true" />
-      <window_info anchor="right" id="Theme Preview" order="3" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info anchor="bottom" id="Terminal" order="7" />
-      <window_info id="UI Designer" order="2" />
       <window_info id="JRebel" order="2" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2945571" />
-      <window_info anchor="right" id="Palette&#9;" order="3" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="JRebel Executor" order="7" />
-      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.1072572" />
       <window_info anchor="right" id="Theme Preview" order="3" />
-      <window_info anchor="right" id="Bean Validation" order="4" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info id="Image Layers" order="2" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5010672" side_tool="true" weight="0.5863192" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Problems" order="8" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info id="Designer" order="2" />
-      <window_info anchor="bottom" id="Java Enterprise" order="7" />
-      <window_info anchor="bottom" id="JRebel Console" 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" weight="0.32899022" />
-      <window_info id="Web" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4994664" visible="true" weight="0.32899022" />
-      <window_info id="Capture Tool" order="2" />
-      <window_info anchor="bottom" id="Messages" order="7" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49893278" weight="0.29207385" />
-      <window_info anchor="bottom" id="FindBugs-IDEA" order="7" />
+      <window_info anchor="bottom" id="Message" order="0" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -509,58 +605,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu&#10;&#10;# Conflicts:&#10;#&#9;.gitignore" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="840">
-          <caret line="39" column="68" selection-start-line="39" selection-start-column="68" selection-end-line="39" selection-end-column="68" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
-          <caret line="35" column="41" selection-start-line="35" selection-start-column="41" selection-end-line="35" selection-end-column="41" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="16" column="33" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/SysUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="720">
-          <caret line="29" column="27" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2220">
-          <caret line="106" column="17" selection-start-line="106" selection-start-column="17" selection-end-line="106" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/MD5Util.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2460">
-          <caret line="82" column="50" selection-start-line="82" selection-start-column="50" selection-end-line="82" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="630">
@@ -661,8 +705,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/SysUser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="35" column="27" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="27" />
+        <state relative-caret-position="240">
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
         </state>
       </provider>
     </entry>
@@ -687,10 +731,34 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/DateType.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/GlobalConfig.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java" />
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/StrategyConfig.java" />
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/DateType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="660">
+          <caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/GlobalConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2460">
+          <caret line="100" column="20" selection-start-line="100" selection-start-column="20" selection-end-line="100" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="570">
+          <caret line="37" column="22" selection-start-line="37" selection-start-column="4" selection-end-line="37" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/StrategyConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3030">
+          <caret line="128" column="37" selection-start-line="128" selection-start-column="20" selection-end-line="128" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/ConstantUtil.java" />
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -734,16 +802,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="381">
-          <caret line="35" column="19" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/RoleService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="78">
@@ -786,24 +844,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/resources/application.yml">
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
-          <caret line="15" column="16" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="16" />
+          <caret line="14" selection-start-line="14" selection-end-line="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="16" selection-start-line="16" selection-end-line="16" />
+        <state relative-caret-position="330">
+          <caret line="92" column="16" selection-start-line="92" selection-start-column="12" selection-end-line="92" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java">
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="283">
-          <caret line="57" column="16" lean-forward="true" selection-start-line="57" selection-start-column="16" selection-end-line="57" selection-end-column="16" />
+        <state relative-caret-position="270">
+          <caret line="15" column="16" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="16" />
         </state>
       </provider>
     </entry>
@@ -816,29 +874,94 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/RoleServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="326">
-          <caret line="30" column="51" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="30" selection-end-column="51" />
+        <state relative-caret-position="263">
+          <caret line="37" column="31" lean-forward="true" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/Company.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/CompanyService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="143">
+          <caret line="10" column="2" lean-forward="true" selection-start-line="10" selection-start-column="2" selection-end-line="10" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="653">
+          <caret line="38" column="31" lean-forward="true" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/FactoryService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="16" column="64" lean-forward="true" selection-start-line="16" selection-start-column="64" selection-end-line="16" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
-          <caret line="92" column="16" selection-start-line="92" selection-start-column="12" selection-end-line="92" selection-end-column="16" />
+          <caret line="25" column="17" lean-forward="true" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="203">
+          <caret line="39" column="33" lean-forward="true" selection-start-line="39" selection-start-column="33" selection-end-line="39" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/FactoryServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="173">
+          <caret line="23" column="14" lean-forward="true" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-187">
+          <caret line="18" column="20" lean-forward="true" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="32" lean-forward="true" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
+        <state relative-caret-position="480">
+          <caret line="80" column="5" lean-forward="true" selection-start-line="65" selection-start-column="3" selection-end-line="80" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/Factory.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="397">
+          <caret line="29" column="29" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java">
+    <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/FactoryController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="218">
-          <caret line="44" column="25" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="25" />
+        <state relative-caret-position="203">
+          <caret line="37" column="42" lean-forward="true" selection-start-line="37" selection-start-column="42" selection-end-line="37" selection-end-column="42" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java

@@ -1,21 +1,84 @@
 package com.hssx.cloudmodel.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Company;
+import com.hssx.cloudmodel.entity.Role;
+import com.hssx.cloudmodel.service.CompanyService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.web.bind.annotation.RestController;
 
 /**
- * <p>
- *  前端控制器
- * </p>
  *
  * @author 吴涛涛
  * @since 2019-07-26
  */
-@RestController
+@Controller
 @RequestMapping("/company")
+@Slf4j
 public class CompanyController {
 
+    @Autowired
+    private CompanyService companyService;
+
+    /**
+     * 添加/修改公司
+     * @param company
+     * 参数：companyName 公司名 companyAddress 公司地址
+     * @param flag 0-添加，1-修改
+     * @return
+     */
+    @ApiOperation("添加/修改公司")
+    @RequestMapping("/add")
+    @ResponseBody
+    public HttpRespMsg addAndUpdateRole(Company company, HttpServletRequest request, Integer flag,
+                                        HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = companyService.addAndUpdateRole(company,flag);
+        return msg;
+    }
+
+    /**
+     * 删除公司
+     * @param company
+     * 参数 id 公司id
+     * @return
+     */
+    @ApiOperation("删除公司")
+    @RequestMapping("/delete")
+    @ResponseBody
+    public HttpRespMsg delete(Company company, HttpServletRequest request,
+                                        HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = companyService.removeById(company.getId());
+        return msg;
+    }
+
+    /**
+     * 公司列表
+     * @param keyName 关键字查询 根据公司名称检索
+     * @return
+     */
+    @ApiOperation("公司列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg deleteRole(String keyName, HttpServletRequest request,
+                                  HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<Company> qw = new QueryWrapper<>();
+        qw.like("company_name",keyName);
+        msg.data = companyService.list(qw);
+        return msg;
+    }
+
 }
 

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/FactoryController.java

@@ -0,0 +1,89 @@
+package com.hssx.cloudmodel.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Company;
+import com.hssx.cloudmodel.entity.Factory;
+import com.hssx.cloudmodel.service.CompanyService;
+import com.hssx.cloudmodel.service.FactoryService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+@Controller
+@RequestMapping("/factory")
+@Slf4j
+public class FactoryController {
+
+
+    @Autowired
+    private FactoryService factoryService;
+
+    /**
+     * 添加/修改工厂
+     * @param factory
+     * 参数：factoryName 工厂名 factoryArea 公司地址
+     * yLng 经度  xLat 纬度
+     * @param flag 0-添加，1-修改
+     * @return
+     */
+    @ApiOperation("添加/修改工厂")
+    @RequestMapping("/add")
+    @ResponseBody
+    public HttpRespMsg addAndUpdateRole(Factory factory, HttpServletRequest request, Integer flag,
+                                        HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = factoryService.addAndUpdateRole(factory,flag);
+        return msg;
+    }
+
+    /**
+     *
+     * @param factory
+     * 参数：id 工厂id
+     * @return
+     */
+    @ApiOperation("删除公司")
+    @RequestMapping("/delete")
+    @ResponseBody
+    public HttpRespMsg delete(Factory factory, HttpServletRequest request,
+                              HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = factoryService.removeById(factory.getId());
+        return msg;
+    }
+
+    /**
+     * 工厂列表
+     * @param keyName
+     * 参数: 关键字
+     * @return
+     */
+    @ApiOperation("工厂列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg deleteRole(String keyName, HttpServletRequest request,
+                                  HttpServletResponse response) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<Factory> qw = new QueryWrapper<>();
+        qw.like("factory_name",keyName);
+        msg.data = factoryService.list(qw);
+        return msg;
+    }
+
+
+}
+

model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java

@@ -41,7 +41,7 @@ public class RoleController {
      * @param flag 0-添加，1-修改
      * @return
      */
-    @ApiOperation("添加角色")
+    @ApiOperation("添加/修改角色")
     @RequestMapping("/add")
     @ResponseBody
     public HttpRespMsg addAndUpdateRole(Role role, HttpServletRequest request,Integer flag,

model/cloud-model/src/main/java/com/hssx/cloudmodel/entity/Factory.java

@@ -0,0 +1,122 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+@TableName("tb_factory")
+public class Factory extends Model<Factory> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 工厂名称
+     */
+    @TableField("factory_name")
+    private String factoryName;
+
+    /**
+     * 工厂地址
+     */
+    @TableField("factory_area")
+    private String factoryArea;
+
+    /**
+     * 经度
+     */
+    @TableField("y_lng")
+    private String yLng;
+
+    /**
+     * 纬度
+     */
+    @TableField("x_lat")
+    private String xLat;
+
+    /**
+     * 创建时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getFactoryName() {
+        return factoryName;
+    }
+
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
+    }
+
+    public String getFactoryArea() {
+        return factoryArea;
+    }
+
+    public void setFactoryArea(String factoryArea) {
+        this.factoryArea = factoryArea;
+    }
+
+    public String getyLng() {
+        return yLng;
+    }
+
+    public void setyLng(String yLng) {
+        this.yLng = yLng;
+    }
+
+    public String getxLat() {
+        return xLat;
+    }
+
+    public void setxLat(String xLat) {
+        this.xLat = xLat;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Factory{" +
+        "id=" + id +
+        ", factoryName=" + factoryName +
+        ", factoryArea=" + factoryArea +
+        ", yLng=" + yLng +
+        ", xLat=" + xLat +
+        ", indate=" + indate +
+        "}";
+    }
+}

model/cloud-model/src/main/java/com/hssx/cloudmodel/mapper/FactoryMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.Factory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+public interface FactoryMapper extends BaseMapper<Factory> {
+
+}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/CompanyService.java

@@ -2,6 +2,7 @@ package com.hssx.cloudmodel.service;
 
 import com.hssx.cloudmodel.entity.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface CompanyService extends IService<Company> {
 
+    HttpRespMsg addAndUpdateRole(Company company, Integer flag);
 }

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/FactoryService.java

@@ -0,0 +1,18 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.Factory;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+public interface FactoryService extends IService<Factory> {
+
+    HttpRespMsg addAndUpdateRole(Factory factory, Integer flag);
+}

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -1,9 +1,13 @@
 package com.hssx.cloudmodel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Company;
+import com.hssx.cloudmodel.entity.Role;
 import com.hssx.cloudmodel.mapper.CompanyMapper;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +20,26 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
+    @Autowired
+    CompanyMapper companyMapper;
 
+    @Override
+    public HttpRespMsg addAndUpdateRole(Company company, Integer flag) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if (flag == 0) {
+            //添加公司
+            QueryWrapper<Company> qw = new QueryWrapper<>();
+            qw.eq("company_name", company.getCompanyName());
+            int count = companyMapper.selectCount(qw);
+            if (count > 0) {
+                msg.setError("公司已存在，请勿重复添加");
+            } else {
+                companyMapper.insert(company);
+            }
+        } else if (flag == 1) {
+            //更新公司信息
+            companyMapper.updateById(company);
+        }
+        return msg;
+    }
 }

model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/FactoryServiceImpl.java

@@ -0,0 +1,45 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.Company;
+import com.hssx.cloudmodel.entity.Factory;
+import com.hssx.cloudmodel.mapper.FactoryMapper;
+import com.hssx.cloudmodel.service.FactoryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-07-26
+ */
+@Service
+public class FactoryServiceImpl extends ServiceImpl<FactoryMapper, Factory> implements FactoryService {
+
+    @Autowired
+    FactoryMapper factoryMapper;
+    @Override
+    public HttpRespMsg addAndUpdateRole(Factory factory, Integer flag) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if (flag == 0) {
+            //添加公司
+            QueryWrapper<Factory> qw = new QueryWrapper<>();
+            qw.eq("factory_name", factory.getFactoryName());
+            int count = factoryMapper.selectCount(qw);
+            if (count > 0) {
+                msg.setError("工厂已存在，请勿重复添加");
+            } else {
+                factoryMapper.insert(factory);
+            }
+        } else if (flag == 1) {
+            //更新公司信息
+            factoryMapper.updateById(factory);
+        }
+        return msg;
+    }
+}

model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_company");
+        strategy.setInclude("tb_factory");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

model/cloud-model/src/main/resources/mapper/FactoryMapper.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.hssx.cloudmodel.mapper.FactoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Factory">
+        <id column="id" property="id" />
+        <result column="factory_name" property="factoryName" />
+        <result column="factory_area" property="factoryArea" />
+        <result column="y_lng" property="yLng" />
+        <result column="x_lat" property="xLat" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, factory_name, factory_area, y_lng, x_lat, indate
+    </sql>
+
+</mapper>