wms / wms2_xinyi · Commits

Commit bb09b4d0c785742567d566ab54d4aa1b6c915414

Authored by pengcheng
2 parents 11b43ff9 33c97ed1

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 14 changed files with 396 additions and 509 deletions
.idea/compiler.xml
  View file @bb09b4d
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <sourceOutputDir name="target/generated-sources/annotations" /> 6 <sourceOutputDir name="target/generated-sources/annotations" />
7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 <outputRelativeToContentRoot value="true" /> 8 <outputRelativeToContentRoot value="true" />
9 - <module name="WMSV1" /> 9 + <module name="wms2" />
10 <module name="huaheng" /> 10 <module name="huaheng" />
11 </profile> 11 </profile>
12 </annotationProcessing> 12 </annotationProcessing>
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <option name="ADDITIONAL_OPTIONS_OVERRIDE"> 15 <option name="ADDITIONAL_OPTIONS_OVERRIDE">
16 <module name="WMSV1" options="-parameters" /> 16 <module name="WMSV1" options="-parameters" />
17 <module name="huaheng" options="-parameters" /> 17 <module name="huaheng" options="-parameters" />
  18 + <module name="wms2" options="-parameters" />
18 </option> 19 </option>
19 </component> 20 </component>
20 </project> 21 </project>
21 \ No newline at end of file 22 \ No newline at end of file
.idea/encodings.xml
  View file @bb09b4d
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 - <component name="Encoding"> 3 + <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
4 <file url="file://$PROJECT_DIR$" charset="UTF-8" /> 4 <file url="file://$PROJECT_DIR$" charset="UTF-8" />
  5 + <file url="PROJECT" charset="UTF-8" />
5 </component> 6 </component>
6 </project> 7 </project>
7 \ No newline at end of file 8 \ No newline at end of file
.idea/misc.xml
  View file @bb09b4d
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ExternalStorageConfigurationManager" enabled="true" /> 3 <component name="ExternalStorageConfigurationManager" enabled="true" />
  4 + <component name="JavaScriptSettings">
  5 + <option name="languageLevel" value="ES6" />
  6 + </component>
4 <component name="MavenProjectsManager"> 7 <component name="MavenProjectsManager">
5 <option name="originalFiles"> 8 <option name="originalFiles">
6 <list> 9 <list>
.idea/workspace.xml
  View file @bb09b4d
@@ -2,15 +2,10 @@ @@ -2,15 +2,10 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment=""> 4 <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
5 - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/domain/SysUserWarehouse.java" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/mapper/SysUserWarehouseMapper.java" afterDir="false" />  
7 - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/service/SysUserWarehouseService.java" afterDir="false" />  
8 - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/service/SysUserWarehouseServiceImpl.java" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />  
10 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
11 - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" afterDir="false" />  
12 - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/material/material.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/material/material.html" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
13 </list> 7 </list>
  8 + <ignored path="$PROJECT_DIR$/target/" />
14 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
15 <option name="SHOW_DIALOG" value="false" /> 10 <option name="SHOW_DIALOG" value="false" />
16 <option name="HIGHLIGHT_CONFLICTS" value="true" /> 11 <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -28,32 +23,41 @@ @@ -28,32 +23,41 @@
28 <option name="HIDDEN_KINDS"> 23 <option name="HIDDEN_KINDS">
29 <set /> 24 <set />
30 </option> 25 </option>
31 - <expand>  
32 - <path>  
33 - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />  
34 - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />  
35 - </path>  
36 - <path>  
37 - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />  
38 - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />  
39 - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />  
40 - </path>  
41 - <path>  
42 - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />  
43 - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />  
44 - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />  
45 - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />  
46 - </path>  
47 - <path>  
48 - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />  
49 - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />  
50 - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />  
51 - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />  
52 - <item name="material: table" type="285a2a93:MysqlImplModel$Table" />  
53 - </path>  
54 - </expand> 26 + <expand />
55 <select /> 27 <select />
56 </component> 28 </component>
  29 + <component name="FileEditorManager">
  30 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  31 + <file pinned="false" current-in-tab="true">
  32 + <entry file="file://$PROJECT_DIR$/pom.xml">
  33 + <provider selected="true" editor-type-id="text-editor">
  34 + <state relative-caret-position="152">
  35 + <caret line="31" column="68" selection-start-line="31" selection-start-column="68" selection-end-line="31" selection-end-column="68" />
  36 + </state>
  37 + </provider>
  38 + <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
  39 + </entry>
  40 + </file>
  41 + <file pinned="false" current-in-tab="false">
  42 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
  43 + <provider selected="true" editor-type-id="text-editor">
  44 + <state relative-caret-position="88">
  45 + <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
  46 + </state>
  47 + </provider>
  48 + </entry>
  49 + </file>
  50 + <file pinned="false" current-in-tab="false">
  51 + <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
  52 + <provider selected="true" editor-type-id="text-editor">
  53 + <state relative-caret-position="140">
  54 + <caret line="7" selection-start-line="7" selection-end-line="7" />
  55 + </state>
  56 + </provider>
  57 + </entry>
  58 + </file>
  59 + </leaf>
  60 + </component>
57 <component name="FileTemplateManagerImpl"> 61 <component name="FileTemplateManagerImpl">
58 <option name="RECENT_TEMPLATES"> 62 <option name="RECENT_TEMPLATES">
59 <list> 63 <list>
@@ -69,6 +73,18 @@ @@ -69,6 +73,18 @@
69 </map> 73 </map>
70 </option> 74 </option>
71 </component> 75 </component>
  76 + <component name="IdeDocumentHistory">
  77 + <option name="CHANGED_PATHS">
  78 + <list>
  79 + <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
  80 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
  81 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
  82 + <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" />
  83 + <option value="$PROJECT_DIR$/src/main/resources/application-druid.properties" />
  84 + <option value="$PROJECT_DIR$/pom.xml" />
  85 + </list>
  86 + </option>
  87 + </component>
72 <component name="IgnoredFileRootStore"> 88 <component name="IgnoredFileRootStore">
73 <option name="generatedRoots"> 89 <option name="generatedRoots">
74 <set> 90 <set>
@@ -76,15 +92,152 @@ @@ -76,15 +92,152 @@
76 </set> 92 </set>
77 </option> 93 </option>
78 </component> 94 </component>
  95 + <component name="MavenImportPreferences">
  96 + <option name="importingSettings">
  97 + <MavenImportingSettings>
  98 + <option name="importAutomatically" value="true" />
  99 + </MavenImportingSettings>
  100 + </option>
  101 + </component>
  102 + <component name="MavenProjectNavigator">
  103 + <treeState>
  104 + <expand>
  105 + <path>
  106 + <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
  107 + <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
  108 + </path>
  109 + <path>
  110 + <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
  111 + <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
  112 + <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
  113 + </path>
  114 + </expand>
  115 + <select />
  116 + </treeState>
  117 + </component>
  118 + <component name="MavenRunner">
  119 + <option name="skipTests" value="true" />
  120 + </component>
79 <component name="ProjectFrameBounds" extendedState="6"> 121 <component name="ProjectFrameBounds" extendedState="6">
80 - <option name="x" value="470" />  
81 - <option name="width" value="980" />  
82 - <option name="height" value="1030" /> 122 + <option name="x" value="-1928" />
  123 + <option name="y" value="-8" />
  124 + <option name="width" value="1936" />
  125 + <option name="height" value="1056" />
83 </component> 126 </component>
84 <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" /> 127 <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
85 <component name="ProjectLevelVcsManager"> 128 <component name="ProjectLevelVcsManager">
86 <ConfirmationsSetting value="2" id="Add" /> 129 <ConfirmationsSetting value="2" id="Add" />
87 </component> 130 </component>
  131 + <component name="ProjectView">
  132 + <navigator proportions="" version="1">
  133 + <foldersAlwaysOnTop value="true" />
  134 + </navigator>
  135 + <panes>
  136 + <pane id="ProjectPane">
  137 + <subPane>
  138 + <expand>
  139 + <path>
  140 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  141 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  142 + </path>
  143 + <path>
  144 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  145 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  146 + <item name="src" type="462c0819:PsiDirectoryNode" />
  147 + </path>
  148 + <path>
  149 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  150 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  151 + <item name="src" type="462c0819:PsiDirectoryNode" />
  152 + <item name="main" type="462c0819:PsiDirectoryNode" />
  153 + </path>
  154 + <path>
  155 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  156 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  157 + <item name="src" type="462c0819:PsiDirectoryNode" />
  158 + <item name="main" type="462c0819:PsiDirectoryNode" />
  159 + <item name="java" type="462c0819:PsiDirectoryNode" />
  160 + </path>
  161 + <path>
  162 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  163 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  164 + <item name="src" type="462c0819:PsiDirectoryNode" />
  165 + <item name="main" type="462c0819:PsiDirectoryNode" />
  166 + <item name="java" type="462c0819:PsiDirectoryNode" />
  167 + <item name="com" type="462c0819:PsiDirectoryNode" />
  168 + </path>
  169 + <path>
  170 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  171 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  172 + <item name="src" type="462c0819:PsiDirectoryNode" />
  173 + <item name="main" type="462c0819:PsiDirectoryNode" />
  174 + <item name="java" type="462c0819:PsiDirectoryNode" />
  175 + <item name="com" type="462c0819:PsiDirectoryNode" />
  176 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  177 + </path>
  178 + <path>
  179 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  180 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  181 + <item name="src" type="462c0819:PsiDirectoryNode" />
  182 + <item name="main" type="462c0819:PsiDirectoryNode" />
  183 + <item name="java" type="462c0819:PsiDirectoryNode" />
  184 + <item name="com" type="462c0819:PsiDirectoryNode" />
  185 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  186 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  187 + </path>
  188 + <path>
  189 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  190 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  191 + <item name="src" type="462c0819:PsiDirectoryNode" />
  192 + <item name="main" type="462c0819:PsiDirectoryNode" />
  193 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  194 + </path>
  195 + <path>
  196 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  197 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  198 + <item name="src" type="462c0819:PsiDirectoryNode" />
  199 + <item name="main" type="462c0819:PsiDirectoryNode" />
  200 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  201 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  202 + </path>
  203 + <path>
  204 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  205 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  206 + <item name="src" type="462c0819:PsiDirectoryNode" />
  207 + <item name="main" type="462c0819:PsiDirectoryNode" />
  208 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  209 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  210 + <item name="system" type="462c0819:PsiDirectoryNode" />
  211 + </path>
  212 + <path>
  213 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  214 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  215 + <item name="src" type="462c0819:PsiDirectoryNode" />
  216 + <item name="main" type="462c0819:PsiDirectoryNode" />
  217 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  218 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  219 + <item name="system" type="462c0819:PsiDirectoryNode" />
  220 + <item name="dict" type="462c0819:PsiDirectoryNode" />
  221 + </path>
  222 + <path>
  223 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  224 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  225 + <item name="src" type="462c0819:PsiDirectoryNode" />
  226 + <item name="main" type="462c0819:PsiDirectoryNode" />
  227 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  228 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  229 + <item name="system" type="462c0819:PsiDirectoryNode" />
  230 + <item name="dict" type="462c0819:PsiDirectoryNode" />
  231 + <item name="data" type="462c0819:PsiDirectoryNode" />
  232 + </path>
  233 + </expand>
  234 + <select />
  235 + </subPane>
  236 + </pane>
  237 + <pane id="Scope" />
  238 + <pane id="PackagesPane" />
  239 + </panes>
  240 + </component>
88 <component name="PropertiesComponent"> 241 <component name="PropertiesComponent">
89 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> 242 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
90 <property name="DatabaseDriversLRU" value="mysql" /> 243 <property name="DatabaseDriversLRU" value="mysql" />
@@ -125,9 +278,10 @@ @@ -125,9 +278,10 @@
125 </component> 278 </component>
126 <component name="RunManager"> 279 <component name="RunManager">
127 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> 280 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
128 - <module name="huaheng" /> 281 + <module name="wms2" />
129 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> 282 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
130 - <option name="ALTERNATIVE_JRE_PATH" /> 283 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
  284 + <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
131 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> 285 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
132 <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> 286 <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
133 <method v="2"> 287 <method v="2">
@@ -203,6 +357,46 @@ @@ -203,6 +357,46 @@
203 <option name="localTasksCounter" value="5" /> 357 <option name="localTasksCounter" value="5" />
204 <servers /> 358 <servers />
205 </component> 359 </component>
  360 + <component name="ToolWindowManager">
  361 + <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" />
  362 + <editor active="true" />
  363 + <layout>
  364 + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4967462" visible="true" weight="0.16897655" />
  365 + <window_info id="Structure" order="1" sideWeight="0.5032538" side_tool="true" weight="0.1673774" />
  366 + <window_info id="Designer" order="2" />
  367 + <window_info id="UI Designer" order="3" />
  368 + <window_info id="Favorites" order="4" side_tool="true" />
  369 + <window_info id="Capture Tool" order="5" />
  370 + <window_info id="Web" order="6" side_tool="true" />
  371 + <window_info id="Image Layers" order="7" />
  372 + <window_info anchor="bottom" id="Message" order="0" />
  373 + <window_info anchor="bottom" id="Find" order="1" />
  374 + <window_info anchor="bottom" id="Run" order="2" />
  375 + <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.54989153" />
  376 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  377 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  378 + <window_info anchor="bottom" id="TODO" order="6" />
  379 + <window_info anchor="bottom" id="Spring" order="7" />
  380 + <window_info anchor="bottom" id="Terminal" order="8" />
  381 + <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
  382 + <window_info anchor="bottom" id="Java Enterprise" order="10" />
  383 + <window_info anchor="bottom" id="Database Changes" order="11" />
  384 + <window_info anchor="bottom" id="Version Control" order="12" weight="0.1637744" />
  385 + <window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
  386 + <window_info anchor="bottom" id="Messages" order="14" weight="0.329718" />
  387 + <window_info anchor="bottom" id="MyBatis Log" order="15" />
  388 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  389 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  390 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  391 + <window_info anchor="right" id="Maven" order="3" weight="0.22334754" />
  392 + <window_info anchor="right" id="Palette" order="4" />
  393 + <window_info anchor="right" id="Capture Analysis" order="5" />
  394 + <window_info anchor="right" id="Database" order="6" weight="0.32995737" />
  395 + <window_info anchor="right" id="Palette&#9;" order="7" />
  396 + <window_info anchor="right" id="Theme Preview" order="8" />
  397 + <window_info anchor="right" id="Bean Validation" order="9" weight="0.32995737" />
  398 + </layout>
  399 + </component>
206 <component name="TypeScriptGeneratedFilesManager"> 400 <component name="TypeScriptGeneratedFilesManager">
207 <option name="version" value="1" /> 401 <option name="version" value="1" />
208 </component> 402 </component>
@@ -212,7 +406,20 @@ @@ -212,7 +406,20 @@
212 <entry key="MAIN"> 406 <entry key="MAIN">
213 <value> 407 <value>
214 <State> 408 <State>
215 - <option name="COLUMN_ORDER" /> 409 + <option name="RECENTLY_FILTERED_USER_GROUPS">
  410 + <collection />
  411 + </option>
  412 + <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
  413 + <collection />
  414 + </option>
  415 + <option name="COLUMN_ORDER">
  416 + <list>
  417 + <option value="0" />
  418 + <option value="1" />
  419 + <option value="2" />
  420 + <option value="3" />
  421 + </list>
  422 + </option>
216 </State> 423 </State>
217 </value> 424 </value>
218 </entry> 425 </entry>
@@ -238,7 +445,9 @@ @@ -238,7 +445,9 @@
238 <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" /> 445 <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
239 <MESSAGE value="修改库区service" /> 446 <MESSAGE value="修改库区service" />
240 <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" /> 447 <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
241 - <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" /> 448 + <MESSAGE value="配置文件更新修改" />
  449 + <MESSAGE value="修复页面字典明细报错" />
  450 + <option name="LAST_COMMIT_MESSAGE" value="修复页面字典明细报错" />
242 </component> 451 </component>
243 <component name="XDebuggerManager"> 452 <component name="XDebuggerManager">
244 <breakpoint-manager> 453 <breakpoint-manager>
@@ -246,9 +455,81 @@ @@ -246,9 +455,81 @@
246 <line-breakpoint enabled="true" type="java-line"> 455 <line-breakpoint enabled="true" type="java-line">
247 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url> 456 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
248 <line>78</line> 457 <line>78</line>
  458 + <properties />
249 <option name="timeStamp" value="1" /> 459 <option name="timeStamp" value="1" />
250 </line-breakpoint> 460 </line-breakpoint>
251 </breakpoints> 461 </breakpoints>
252 </breakpoint-manager> 462 </breakpoint-manager>
253 </component> 463 </component>
  464 + <component name="editorHistoryManager">
  465 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/RedisConfig.java" />
  466 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengServletInitializer.java">
  467 + <provider selected="true" editor-type-id="text-editor">
  468 + <state relative-caret-position="180">
  469 + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
  470 + </state>
  471 + </provider>
  472 + </entry>
  473 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java" />
  474 + <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
  475 + <provider selected="true" editor-type-id="text-editor">
  476 + <state relative-caret-position="-272">
  477 + <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
  478 + </state>
  479 + </provider>
  480 + </entry>
  481 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/service/ExcelReportService.java">
  482 + <provider selected="true" editor-type-id="text-editor" />
  483 + </entry>
  484 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
  485 + <provider selected="true" editor-type-id="text-editor">
  486 + <state relative-caret-position="113">
  487 + <caret line="147" column="39" selection-start-line="147" selection-start-column="39" selection-end-line="147" selection-end-column="39" />
  488 + <folding>
  489 + <element signature="e#3376#3377#0" expanded="true" />
  490 + <element signature="e#3415#3416#0" expanded="true" />
  491 + </folding>
  492 + </state>
  493 + </provider>
  494 + </entry>
  495 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
  496 + <provider selected="true" editor-type-id="text-editor">
  497 + <state relative-caret-position="372">
  498 + <caret line="311" column="16" selection-start-line="311" selection-start-column="16" selection-end-line="311" selection-end-column="16" />
  499 + <folding>
  500 + <element signature="imports" expanded="true" />
  501 + </folding>
  502 + </state>
  503 + </provider>
  504 + </entry>
  505 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
  506 + <provider selected="true" editor-type-id="text-editor">
  507 + <state relative-caret-position="2980">
  508 + <caret line="149" column="10" selection-start-line="149" selection-start-column="10" selection-end-line="149" selection-end-column="10" />
  509 + </state>
  510 + </provider>
  511 + </entry>
  512 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
  513 + <provider selected="true" editor-type-id="text-editor">
  514 + <state relative-caret-position="88">
  515 + <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
  516 + </state>
  517 + </provider>
  518 + </entry>
  519 + <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
  520 + <provider selected="true" editor-type-id="text-editor">
  521 + <state relative-caret-position="140">
  522 + <caret line="7" selection-start-line="7" selection-end-line="7" />
  523 + </state>
  524 + </provider>
  525 + </entry>
  526 + <entry file="file://$PROJECT_DIR$/pom.xml">
  527 + <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
  528 + <provider selected="true" editor-type-id="text-editor">
  529 + <state relative-caret-position="152">
  530 + <caret line="31" column="68" selection-start-line="31" selection-start-column="68" selection-end-line="31" selection-end-column="68" />
  531 + </state>
  532 + </provider>
  533 + </entry>
  534 + </component>
254 </project> 535 </project>
255 \ No newline at end of file 536 \ No newline at end of file
@@ -5,16 +5,16 @@ @@ -5,16 +5,16 @@
5 5
6 <groupId>com.huaheng</groupId> 6 <groupId>com.huaheng</groupId>
7 <artifactId>huaheng</artifactId> 7 <artifactId>huaheng</artifactId>
8 - <version>2.3.0</version> 8 + <version>4.0.0</version>
9 <packaging>jar</packaging> 9 <packaging>jar</packaging>
10 10
11 <name>huaheng</name> 11 <name>huaheng</name>
12 - <description>华恒管理系统</description> 12 + <description>华恒WMS管理系统</description>
13 13
14 <parent> 14 <parent>
15 <groupId>org.springframework.boot</groupId> 15 <groupId>org.springframework.boot</groupId>
16 <artifactId>spring-boot-starter-parent</artifactId> 16 <artifactId>spring-boot-starter-parent</artifactId>
17 - <version>2.0.3.RELEASE</version> 17 + <version>2.1.3.RELEASE</version>
18 <relativePath /> 18 <relativePath />
19 </parent> 19 </parent>
20 20
@@ -22,20 +22,20 @@ @@ -22,20 +22,20 @@
22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> 23 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24 <java.version>1.8</java.version> 24 <java.version>1.8</java.version>
25 - <shiro.version>1.4.0</shiro.version> 25 + <shiro.version>1.4.1</shiro.version>
26 <thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version> 26 <thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
27 <!--<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>--> 27 <!--<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>-->
28 <pagehelper.spring.boot.starter.version>1.2.12</pagehelper.spring.boot.starter.version> 28 <pagehelper.spring.boot.starter.version>1.2.12</pagehelper.spring.boot.starter.version>
29 - <fastjson.version>1.2.47</fastjson.version>  
30 - <druid.version>1.1.10</druid.version>  
31 - <commons.io.version>2.2</commons.io.version> 29 + <fastjson.version>1.2.59</fastjson.version>
  30 + <druid.version>1.1.18</druid.version>
  31 + <commons.io.version>2.5</commons.io.version>
32 <commons.fileupload.version>1.4</commons.fileupload.version> 32 <commons.fileupload.version>1.4</commons.fileupload.version>
33 - <bitwalker.version>1.19</bitwalker.version> 33 + <bitwalker.version>1.21</bitwalker.version>
34 <lombok.version>1.18.8</lombok.version> 34 <lombok.version>1.18.8</lombok.version>
35 <velocity.version>1.7</velocity.version> 35 <velocity.version>1.7</velocity.version>
36 <kaptcha.version>2.3.2</kaptcha.version> 36 <kaptcha.version>2.3.2</kaptcha.version>
37 - <swagger.version>2.7.0</swagger.version>  
38 - <jsoup.version>1.11.3</jsoup.version> 37 + <swagger.version>2.9.2</swagger.version>
  38 + <jsoup.version>1.12.1</jsoup.version>
39 <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format> 39 <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
40 </properties> 40 </properties>
41 41
@@ -114,16 +114,10 @@ @@ -114,16 +114,10 @@
114 </dependency> 114 </dependency>
115 115
116 <!--阿里数据库连接池 --> 116 <!--阿里数据库连接池 -->
117 -<!-- <dependency>  
118 - <groupId>com.alibaba</groupId>  
119 - <artifactId>druid-spring-boot-starter</artifactId>  
120 - <version>${druid.version}</version>  
121 - </dependency>-->  
122 -  
123 <dependency> 117 <dependency>
124 <groupId>com.alibaba</groupId> 118 <groupId>com.alibaba</groupId>
125 <artifactId>druid-spring-boot-starter</artifactId> 119 <artifactId>druid-spring-boot-starter</artifactId>
126 - <version>1.1.17</version> 120 + <version>${druid.version}</version>
127 </dependency> 121 </dependency>
128 122
129 <!--常用工具类 --> 123 <!--常用工具类 -->
@@ -199,12 +193,12 @@ @@ -199,12 +193,12 @@
199 <groupId>org.quartz-scheduler</groupId> 193 <groupId>org.quartz-scheduler</groupId>
200 <artifactId>quartz</artifactId> 194 <artifactId>quartz</artifactId>
201 <version>2.3.1</version> 195 <version>2.3.1</version>
202 - <exclusions> 196 + <!--<exclusions>
203 <exclusion> 197 <exclusion>
204 <groupId>com.mchange</groupId> 198 <groupId>com.mchange</groupId>
205 <artifactId>c3p0</artifactId> 199 <artifactId>c3p0</artifactId>
206 </exclusion> 200 </exclusion>
207 - </exclusions> 201 + </exclusions>-->
208 </dependency> 202 </dependency>
209 203
210 <!--velocity代码生成使用模板 --> 204 <!--velocity代码生成使用模板 -->
@@ -262,51 +256,13 @@ @@ -262,51 +256,13 @@
262 <!--<version>6.0.0</version>--> 256 <!--<version>6.0.0</version>-->
263 <!--</dependency>--> 257 <!--</dependency>-->
264 258
265 - <!--共享Session-spring-session-data-redis分布式系统中-->  
266 - <dependency>  
267 - <groupId>org.springframework.session</groupId>  
268 - <artifactId>spring-session-data-redis</artifactId>  
269 - </dependency>  
270 - <!-- Spring Boot Redis依赖 -->  
271 - <dependency>  
272 - <groupId>org.springframework.boot</groupId>  
273 - <artifactId>spring-boot-starter-data-redis</artifactId>  
274 - <!-- 1.5的版本默认采用的连接池技术是jedis 2.0以上版本默认连接池是lettuce, 在这里采用jedis，所以需要排除lettuce的jar -->  
275 - <exclusions>  
276 - <exclusion>  
277 - <groupId>redis.clients</groupId>  
278 - <artifactId>jedis</artifactId>  
279 - </exclusion>  
280 - <exclusion>  
281 - <groupId>io.lettuce</groupId>  
282 - <artifactId>lettuce-core</artifactId>  
283 - </exclusion>  
284 - </exclusions>  
285 - </dependency>  
286 -  
287 - <!-- 添加jedis客户端 -->  
288 - <dependency>  
289 - <groupId>redis.clients</groupId>  
290 - <artifactId>jedis</artifactId>  
291 - </dependency>  
292 -  
293 - <!--spring2.0集成redis所需common-pool2-->  
294 - <!-- 必须加上，jedis依赖此 -->  
295 - <dependency>  
296 - <groupId>org.apache.commons</groupId>  
297 - <artifactId>commons-pool2</artifactId>  
298 - <version>2.5.0</version>  
299 - </dependency>  
300 -  
301 - <!-- 将作为Redis对象序列化器 --> 259 + <!--json库-->
302 <dependency> 260 <dependency>
303 <groupId>com.alibaba</groupId> 261 <groupId>com.alibaba</groupId>
304 <artifactId>fastjson</artifactId> 262 <artifactId>fastjson</artifactId>
305 - <version>1.2.47</version> 263 + <version>${fastjson.version}</version>
306 </dependency> 264 </dependency>
307 265
308 -  
309 -  
310 <dependency> 266 <dependency>
311 <groupId>org.apache.httpcomponents</groupId> 267 <groupId>org.apache.httpcomponents</groupId>
312 <artifactId>httpclient</artifactId> 268 <artifactId>httpclient</artifactId>
@@ -317,25 +273,29 @@ @@ -317,25 +273,29 @@
317 <artifactId>httpcore</artifactId> 273 <artifactId>httpcore</artifactId>
318 </dependency> 274 </dependency>
319 275
320 -  
321 <dependency> 276 <dependency>
322 <groupId>org.springframework.boot</groupId> 277 <groupId>org.springframework.boot</groupId>
323 <artifactId>spring-boot-starter-mail</artifactId> 278 <artifactId>spring-boot-starter-mail</artifactId>
324 </dependency> 279 </dependency>
325 280
326 -  
327 -  
328 <dependency> 281 <dependency>
329 <groupId>com.google.code.gson</groupId> 282 <groupId>com.google.code.gson</groupId>
330 <artifactId>gson</artifactId> 283 <artifactId>gson</artifactId>
331 <version>2.8.2</version> 284 <version>2.8.2</version>
332 </dependency> 285 </dependency>
333 286
334 - <dependency> 287 +<!-- <dependency>
335 <groupId>com.huaheng.soft</groupId> 288 <groupId>com.huaheng.soft</groupId>
336 <artifactId>echarts</artifactId> 289 <artifactId>echarts</artifactId>
337 <version>1.1</version> 290 <version>1.1</version>
338 - </dependency> 291 + </dependency>-->
  292 +
  293 + <dependency>
  294 + <groupId>com.github.abel533</groupId>
  295 + <artifactId>ECharts</artifactId>
  296 + <version>3.0.0.5</version>
  297 + </dependency>
  298 +
339 <dependency> 299 <dependency>
340 <groupId>org.junit.jupiter</groupId> 300 <groupId>org.junit.jupiter</groupId>
341 <artifactId>junit-jupiter-api</artifactId> 301 <artifactId>junit-jupiter-api</artifactId>
@@ -392,6 +352,38 @@ @@ -392,6 +352,38 @@
392 </plugins> 352 </plugins>
393 </build> 353 </build>
394 354
  355 + <!--阿里maven地址-->
  356 + <!--<repositories>
  357 + <repository>
  358 + <id>nexus-aliyun</id>
  359 + <name>Nexus aliyun</name>
  360 + <layout>default</layout>
  361 + <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
  362 + <snapshots>
  363 + <enabled>false</enabled>
  364 + </snapshots>
  365 + <releases>
  366 + <enabled>true</enabled>
  367 + </releases>
  368 + </repository>
  369 + </repositories>
  370 +
  371 + <pluginRepositories>
  372 + <pluginRepository>
  373 + <id>nexus-aliyun</id>
  374 + <name>Nexus aliyun</name>
  375 + <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
  376 + <snapshots>
  377 + <enabled>false</enabled>
  378 + </snapshots>
  379 + <releases>
  380 + <enabled>true</enabled>
  381 + </releases>
  382 + </pluginRepository>
  383 + </pluginRepositories>-->
  384 +
  385 + <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
  386 +
395 <repositories> 387 <repositories>
396 <repository> 388 <repository>
397 <id>nexus</id> 389 <id>nexus</id>
src/main/java/com/huaheng/HuaHengApplication.java
  View file @bb09b4d
@@ -10,8 +10,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -10,8 +10,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
10 * 10 *
11 * @author huaheng 11 * @author huaheng
12 */ 12 */
13 -//@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })  
14 -@MapperScan("com.huaheng.pc.**.**.mapper") 13 +@MapperScan({"com.huaheng.pc.**.**.mapper","com.huaheng.common.**.**.mapper"})
15 //添加SecurityAutoConfiguration.class，防止报java.lang.ArrayStoreException错 14 //添加SecurityAutoConfiguration.class，防止报java.lang.ArrayStoreException错
16 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) 15 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
17 public class HuaHengApplication 16 public class HuaHengApplication
@@ -20,7 +19,7 @@ public class HuaHengApplication @@ -20,7 +19,7 @@ public class HuaHengApplication
20 { 19 {
21 // System.setProperty("spring.devtools.restart.enabled", "false"); 20 // System.setProperty("spring.devtools.restart.enabled", "false");
22 SpringApplication.run(HuaHengApplication.class, args); 21 SpringApplication.run(HuaHengApplication.class, args);
23 - System.out.println("(♥◠‿◠)ﾉﾞ 华恒启动成功 ლ(´ڡ`ლ)ﾞ \n" + 22 + System.out.println("*************** 华恒WMS启动成功 ***************\n" +
24 " .-------. ____ __ \n" + 23 " .-------. ____ __ \n" +
25 " | _ _ \\ \\ \\ / / \n" + 24 " | _ _ \\ \\ \\ / / \n" +
26 " | ( ' ) | \\ _. / ' \n" + 25 " | ( ' ) | \\ _. / ' \n" +
src/main/java/com/huaheng/common/redis/RedisConfig.java deleted
View file @11b43ff
1 -package com.huaheng.common.redis;  
2 -  
3 -import org.springframework.beans.factory.annotation.Autowired;  
4 -import org.springframework.context.annotation.Bean;  
5 -import org.springframework.context.annotation.Configuration;  
6 -import org.springframework.data.redis.connection.RedisConnectionFactory;  
7 -import org.springframework.data.redis.core.*;  
8 -import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;  
9 -import org.springframework.data.redis.serializer.StringRedisSerializer;  
10 -  
11 -@Configuration  
12 -public class RedisConfig {  
13 -  
14 - /**  
15 - * 注入 RedisConnectionFactory  
16 - */  
17 - @Autowired  
18 - RedisConnectionFactory redisConnectionFactory;  
19 -  
20 - /**  
21 - * 实例化 RedisTemplate 对象  
22 - *  
23 - * @return  
24 - */  
25 - @Bean  
26 - public RedisTemplate<String, Object> functionDomainRedisTemplate() {  
27 - RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();  
28 - initDomainRedisTemplate(redisTemplate, redisConnectionFactory);  
29 - return redisTemplate;  
30 - }  
31 -  
32 - /**  
33 - * 设置数据存入 redis 的序列化方式  
34 - *  
35 - * @param redisTemplate  
36 - * @param factory  
37 - */  
38 - private void initDomainRedisTemplate(RedisTemplate<String, Object> redisTemplate, RedisConnectionFactory factory) {  
39 - redisTemplate.setKeySerializer(new StringRedisSerializer());  
40 - redisTemplate.setHashKeySerializer(new StringRedisSerializer());  
41 - redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());  
42 - redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());  
43 - redisTemplate.setConnectionFactory(factory);  
44 - }  
45 -  
46 - /**  
47 - * 实例化 HashOperations 对象,可以使用 Hash 类型操作  
48 - *  
49 - * @param redisTemplate  
50 - * @return  
51 - */  
52 - @Bean  
53 - public HashOperations<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {  
54 - return redisTemplate.opsForHash();  
55 - }  
56 -  
57 - /**  
58 - * 实例化 ValueOperations 对象,可以使用 String 操作  
59 - *  
60 - * @param redisTemplate  
61 - * @return  
62 - */  
63 - @Bean  
64 - public ValueOperations<String, Object> valueOperations(RedisTemplate<String, Object> redisTemplate) {  
65 - return redisTemplate.opsForValue();  
66 - }  
67 -  
68 - /**  
69 - * 实例化 ListOperations 对象,可以使用 List 操作  
70 - *  
71 - * @param redisTemplate  
72 - * @return  
73 - */  
74 - @Bean  
75 - public ListOperations<String, Object> listOperations(RedisTemplate<String, Object> redisTemplate) {  
76 - return redisTemplate.opsForList();  
77 - }  
78 -  
79 - /**  
80 - * 实例化 SetOperations 对象,可以使用 Set 操作  
81 - *  
82 - * @param redisTemplate  
83 - * @return  
84 - */  
85 - @Bean  
86 - public SetOperations<String, Object> setOperations(RedisTemplate<String, Object> redisTemplate) {  
87 - return redisTemplate.opsForSet();  
88 - }  
89 -  
90 - /**  
91 - * 实例化 ZSetOperations 对象,可以使用 ZSet 操作  
92 - *  
93 - * @param redisTemplate  
94 - * @return  
95 - */  
96 - @Bean  
97 - public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {  
98 - return redisTemplate.opsForZSet();  
99 - }  
100 -}  
101 \ No newline at end of file 0 \ No newline at end of file
src/main/java/com/huaheng/common/redis/controller/RedisController.java deleted
View file @11b43ff
1 -package com.huaheng.common.redis.controller;  
2 -  
3 -import com.huaheng.common.redis.model.RedisModel;  
4 -import com.huaheng.common.redis.serviceimpl.RedisServiceImpl;  
5 -import org.springframework.beans.factory.annotation.Autowired;  
6 -import org.springframework.stereotype.Controller;  
7 -import org.springframework.web.bind.annotation.RequestMapping;  
8 -import org.springframework.web.bind.annotation.RequestMethod;  
9 -import org.springframework.web.bind.annotation.ResponseBody;  
10 -import org.springframework.web.bind.annotation.RestController;  
11 -  
12 -@Controller  
13 -public class RedisController {  
14 -  
15 - @Autowired  
16 - private RedisServiceImpl service;  
17 -  
18 - //添加  
19 -// @RequestMapping(value = "/add", method = RequestMethod.GET)  
20 - public void test() {  
21 - System.out.println("start.....");  
22 - RedisModel m = new RedisModel();  
23 - m.setName("张三");  
24 - m.setTel("1111");  
25 - m.setAddress("长沙");  
26 - m.setRedisKey("zhangsanKey01");  
27 - service.put(m.getRedisKey(), m, -1);  
28 -  
29 - RedisModel m2 = new RedisModel();  
30 - m2.setName("张三2");  
31 - m2.setTel("2222");  
32 - m2.setAddress("长沙2");  
33 - m2.setRedisKey("zhangsanKey02");  
34 - service.put(m2.getRedisKey(), m2, -1);  
35 -  
36 - RedisModel m3 = new RedisModel();  
37 - m3.setName("张三3");  
38 - m3.setTel("2222");  
39 - m3.setAddress("长沙3");  
40 - m3.setRedisKey("zhangsanKey03");  
41 - service.put(m3.getRedisKey(), m3, -1);  
42 -  
43 - System.out.println("add success end...");  
44 - }  
45 -  
46 - //查询所有对象  
47 -// @RequestMapping(value = "/getAll", method = RequestMethod.GET)  
48 -// @ResponseBody  
49 - public Object getAll() {  
50 - return service.getAll();  
51 - }  
52 -  
53 - //查询所有key  
54 -// @RequestMapping(value = "/getKeys", method = RequestMethod.GET)  
55 -// @ResponseBody  
56 - public Object getKeys() {  
57 - return service.getKeys();  
58 - }  
59 -  
60 - //根据key查询  
61 -// @RequestMapping(value = "/get", method = RequestMethod.GET)  
62 - public Object get(String key) {  
63 - RedisModel m = new RedisModel();  
64 - m.setRedisKey(key);  
65 - return service.get(m.getRedisKey());  
66 - }  
67 -  
68 - //删除  
69 -// @RequestMapping(value = "/remove", method = RequestMethod.GET)  
70 -// @ResponseBody  
71 - public void remove() {  
72 - RedisModel m = new RedisModel();  
73 - m.setRedisKey("zhangsanKey01");  
74 - service.remove(m.getRedisKey());  
75 - }  
76 -  
77 - //判断key是否存在  
78 -// @RequestMapping(value = "/isKeyExists", method = RequestMethod.GET)  
79 -// @ResponseBody  
80 - public void isKeyExists() {  
81 - RedisModel m = new RedisModel();  
82 - m.setRedisKey("zhangsanKey01");  
83 - boolean flag = service.isKeyExists(m.getRedisKey());  
84 - System.out.println("zhangsanKey01 是否存在: "+flag);  
85 - }  
86 -  
87 - //查询当前缓存的数量  
88 -// @RequestMapping(value = "/count", method = RequestMethod.GET)  
89 -// @ResponseBody  
90 - public Object count() {  
91 - return service.count();  
92 - }  
93 -  
94 - //清空所有key  
95 -// @RequestMapping(value = "/empty", method = RequestMethod.GET)  
96 -// @ResponseBody  
97 - public void empty() {  
98 - service.empty();  
99 - }  
100 -}  
101 \ No newline at end of file 0 \ No newline at end of file
src/main/java/com/huaheng/common/redis/model/RedisModel.java deleted
View file @11b43ff
1 -package com.huaheng.common.redis.model;  
2 -  
3 -import java.io.Serializable;  
4 -  
5 -public class RedisModel implements Serializable {  
6 -  
7 -  
8 - private String redisKey;//redis中的key  
9 - private String name;//姓名  
10 - private String tel;//电话  
11 - private String address;//住址  
12 -  
13 - public String getRedisKey() {  
14 - return redisKey;  
15 - }  
16 -  
17 - public void setRedisKey(String redisKey) {  
18 - this.redisKey = redisKey;  
19 - }  
20 -  
21 - public String getName() {  
22 - return name;  
23 - }  
24 -  
25 - public void setName(String name) {  
26 - this.name = name;  
27 - }  
28 -  
29 - public String getTel() {  
30 - return tel;  
31 - }  
32 -  
33 - public void setTel(String tel) {  
34 - this.tel = tel;  
35 - }  
36 -  
37 - public String getAddress() {  
38 - return address;  
39 - }  
40 -  
41 - public void setAddress(String address) {  
42 - this.address = address;  
43 - }  
44 -  
45 -}  
46 \ No newline at end of file 0 \ No newline at end of file
src/main/java/com/huaheng/common/redis/service/IRedisService.java deleted
View file @11b43ff
1 -package com.huaheng.common.redis.service;  
2 -  
3 -import org.springframework.beans.factory.annotation.Autowired;  
4 -import org.springframework.data.redis.core.HashOperations;  
5 -import org.springframework.data.redis.core.RedisTemplate;  
6 -  
7 -import javax.annotation.Resource;  
8 -import java.util.List;  
9 -import java.util.Set;  
10 -import java.util.concurrent.TimeUnit;  
11 -  
12 -public abstract class IRedisService<T> {  
13 -  
14 -  
15 - @Autowired  
16 - protected RedisTemplate<String, Object> redisTemplate;  
17 - @Resource  
18 - protected HashOperations<String, String, T> hashOperations;  
19 -  
20 - /**  
21 - * 存入redis中的key  
22 - *  
23 - * @return  
24 - */  
25 - protected abstract String getRedisKey();  
26 -  
27 -  
28 - /**  
29 - * 添加  
30 - *  
31 - * @param key key  
32 - * @param doamin 对象  
33 - * @param expire 过期时间(单位:秒),传入 -1 时表示不设置过期时间  
34 - */  
35 - public void put(String key, T doamin, long expire) {  
36 - hashOperations.put(getRedisKey(), key, doamin);  
37 - if (expire != -1) {  
38 - redisTemplate.expire(getRedisKey(), expire, TimeUnit.SECONDS);  
39 - }  
40 - }  
41 -  
42 - /**  
43 - * 删除  
44 - *  
45 - * @param key 传入key的名称  
46 - */  
47 - public void remove(String key) {  
48 - hashOperations.delete(getRedisKey(), key);  
49 - }  
50 -  
51 - /**  
52 - * 查询  
53 - *  
54 - * @param key 查询的key  
55 - * @return  
56 - */  
57 - public T get(String key) {  
58 - return hashOperations.get(getRedisKey(), key);  
59 - }  
60 -  
61 - /**  
62 - * 获取当前redis库下所有对象  
63 - *  
64 - * @return  
65 - */  
66 - public List<T> getAll() {  
67 - return hashOperations.values(getRedisKey());  
68 - }  
69 -  
70 - /**  
71 - * 查询查询当前redis库下所有key  
72 - *  
73 - * @return  
74 - */  
75 - public Set<String> getKeys() {  
76 - return hashOperations.keys(getRedisKey());  
77 - }  
78 -  
79 - /**  
80 - * 判断key是否存在redis中  
81 - *  
82 - * @param key 传入key的名称  
83 - * @return  
84 - */  
85 - public boolean isKeyExists(String key) {  
86 - return hashOperations.hasKey(getRedisKey(), key);  
87 - }  
88 -  
89 - /**  
90 - * 查询当前key下缓存数量  
91 - *  
92 - * @return  
93 - */  
94 - public long count() {  
95 - return hashOperations.size(getRedisKey());  
96 - }  
97 -  
98 - /**  
99 - * 清空redis  
100 - */  
101 - public void empty() {  
102 - Set<String> set = hashOperations.keys(getRedisKey());  
103 - set.stream().forEach(key -> hashOperations.delete(getRedisKey(), key));  
104 - }  
105 -}  
106 \ No newline at end of file 0 \ No newline at end of file
src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java deleted
View file @11b43ff
1 -package com.huaheng.common.redis.serviceimpl;  
2 -  
3 -import com.huaheng.common.redis.model.RedisModel;  
4 -import com.huaheng.common.redis.service.IRedisService;  
5 -import org.springframework.stereotype.Service;  
6 -  
7 -@Service  
8 -public class RedisServiceImpl extends IRedisService<RedisModel> {  
9 -  
10 - private static final String REDIS_KEY = "TEST_REDIS_KEY";  
11 -  
12 - @Override  
13 - protected String getRedisKey() {  
14 -  
15 -  
16 - return this.REDIS_KEY;  
17 - }  
18 -}  
src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
  View file @bb09b4d
@@ -6,10 +6,7 @@ import com.github.abel533.echarts.Option; @@ -6,10 +6,7 @@ import com.github.abel533.echarts.Option;
6 import com.github.abel533.echarts.axis.Axis; 6 import com.github.abel533.echarts.axis.Axis;
7 import com.github.abel533.echarts.axis.CategoryAxis; 7 import com.github.abel533.echarts.axis.CategoryAxis;
8 import com.github.abel533.echarts.axis.ValueAxis; 8 import com.github.abel533.echarts.axis.ValueAxis;
9 -import com.github.abel533.echarts.code.Orient;  
10 -import com.github.abel533.echarts.code.PointerType;  
11 -import com.github.abel533.echarts.code.SeriesType;  
12 -import com.github.abel533.echarts.code.Trigger; 9 +import com.github.abel533.echarts.code.*;
13 import com.github.abel533.echarts.json.GsonUtil; 10 import com.github.abel533.echarts.json.GsonUtil;
14 import com.github.abel533.echarts.series.Line; 11 import com.github.abel533.echarts.series.Line;
15 import com.github.abel533.echarts.series.Pie; 12 import com.github.abel533.echarts.series.Pie;
@@ -76,7 +73,7 @@ public class IndexController extends BaseController @@ -76,7 +73,7 @@ public class IndexController extends BaseController
76 pie.itemStyle().emphasis().setShadowBlur(10); 73 pie.itemStyle().emphasis().setShadowBlur(10);
77 pie.itemStyle().emphasis().setShadowOffsetX(0); 74 pie.itemStyle().emphasis().setShadowOffsetX(0);
78 pie.itemStyle().emphasis().setShadowColor("rgba(0, 0, 0, 0.4)"); 75 pie.itemStyle().emphasis().setShadowColor("rgba(0, 0, 0, 0.4)");
79 - String sql = "SELECT d.dictLabel '状态', i.qty '库存' FROM (SELECT status ,SUM(qty) qty FROM inventory WHERE warehouseCode = " + ShiroUtils.getWarehouseCode() + " GROUP BY status) i INNER JOIN sys_dict_data d ON i.status= d.dictValue AND d.warehouseCode = '" + ShiroUtils.getWarehouseCode()+"'"; 76 + String sql = "SELECT d.dictLabel '状态', i.qty '库存' FROM (SELECT status ,SUM(qty) qty FROM inventory WHERE warehouseCode = " + ShiroUtils.getWarehouseCode() + " GROUP BY status) i INNER JOIN sys_dict_data d ON i.status= d.dictValue AND d.warehouseCode = ' " + ShiroUtils.getWarehouseCode()+"' ;";
80 List<LinkedHashMap<String, Object>> results = mapper.selectCommon(sql); 77 List<LinkedHashMap<String, Object>> results = mapper.selectCommon(sql);
81 for(LinkedHashMap<String, Object> item : results){ 78 for(LinkedHashMap<String, Object> item : results){
82 ChartData chartData = new ChartData(); 79 ChartData chartData = new ChartData();
@@ -226,7 +223,8 @@ public class IndexController extends BaseController @@ -226,7 +223,8 @@ public class IndexController extends BaseController
226 option.legend().setTop(10); 223 option.legend().setTop(10);
227 option.legend().setBottom(10); 224 option.legend().setBottom(10);
228 option.legend().setData(new ArrayList<String>()); 225 option.legend().setData(new ArrayList<String>());
229 - option.legend().setType("scroll"); 226 + option.legend().setType(LegendType.scroll);
  227 + // option.legend().setType("scroll");
230 228
231 Pie pie = new Pie(); 229 Pie pie = new Pie();
232 pie.setName("库存"); 230 pie.setName("库存");
src/main/resources/application.properties
  View file @bb09b4d
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 #\u540D\u79F0 2 #\u540D\u79F0
3 huaheng.name=huaheng 3 huaheng.name=huaheng
4 #\u7248\u672C 4 #\u7248\u672C
5 -huaheng.version=2.6.0 5 +huaheng.version=4.0.0
6 #\u7248\u6743\u5E74\u4EFD 6 #\u7248\u6743\u5E74\u4EFD
7 huaheng.copyrightYear=2018 7 huaheng.copyrightYear=2018
8 #\u5934\u50CF\u4E0A\u4F20\u8DEF\u5F84 8 #\u5934\u50CF\u4E0A\u4F20\u8DEF\u5F84
@@ -107,31 +107,5 @@ gen.autoRemovePre=false @@ -107,31 +107,5 @@ gen.autoRemovePre=false
107 # \u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00) 107 # \u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00)
108 gen.tablePrefix=sys_ 108 gen.tablePrefix=sys_
109 109
110 -# default-store in spring session. it will be set in redis only outside.  
111 -spring.session.store-type=none  
112 -# REDIS (RedisProperties)  
113 -# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09  
114 -spring.redis.database=0  
115 -# Redis\u670D\u52A1\u5668\u5730\u5740  
116 -spring.redis.host=127.0.0.1  
117 -# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3  
118 -spring.redis.port=6379  
119 -# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09  
120 -spring.redis.password=  
121 -# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09  
122 -#spring.redis.pool.max-active=8  
123 -spring.redis.jedis.pool.max-active=8  
124 -# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09  
125 -#spring.redis.pool.max-wait=-1  
126 -spring.redis.jedis.pool.max-wait=-1ms  
127 -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5  
128 -#spring.redis.pool.max-idle=8  
129 -spring.redis.jedis.pool.max-idle=8  
130 -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5  
131 -#spring.redis.pool.min-idle=0  
132 -spring.redis.jedis.pool.min-idle= 0  
133 -# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09  
134 -spring.redis.timeout= 0  
135 -spring.redis.lettuce.shutdown-timeout=0ms  
136 110
137 111
src/main/resources/templates/system/dict/data/data.html
  View file @bb09b4d
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 <!--</div>--> 54 <!--</div>-->
55 55
56 <div class="btn-group hidden-xs" id="toolbar" role="group"> 56 <div class="btn-group hidden-xs" id="toolbar" role="group">
57 - <a class="btn btn-outline btn-success btn-rounded" th:onclick="'javascript:$.operate.add(\''+${dict.dictType}+'\')'" 57 + <a class="btn btn-outline btn-success btn-rounded" th:value="${dict.dictType}" onclick="add()" id="add"
58 shiro:hasPermission="system:dict:add"> 58 shiro:hasPermission="system:dict:add">
59 <i class="fa fa-plus"></i> 新增 59 <i class="fa fa-plus"></i> 新增
60 </a> 60 </a>
@@ -149,6 +149,12 @@ @@ -149,6 +149,12 @@
149 dictType: $("#dictType").val() 149 dictType: $("#dictType").val()
150 }; 150 };
151 } 151 }
  152 +
  153 + function add() {
  154 + let id=$("#add").attr('value');
  155 + $.operate.add(id);
  156 + }
  157 +
152 </script> 158 </script>
153 </body> 159 </body>
154 </html> 160 </html>
155 \ No newline at end of file 161 \ No newline at end of file