workflow commit 1

.idea/encodings.xml

@@ -3,7 +3,7 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/biz-base/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/biz-base/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/biz-base/src/main/resources/ftl/land/risk.ftl" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/biz-base/src/main/resources/ftl/land/risk1.ftl" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/biz-base/src/main/resources/ftl/office.ftl" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/biz-base/src/main/resources/ftl/test.ftl" charset="GBK" />
     <file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />

.idea/libraries/Maven__com_github_fommil_jniloader_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil:jniloader:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/jniloader/1.1/jniloader-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/jniloader/1.1/jniloader-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/jniloader/1.1/jniloader-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_core_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:core:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/core/1.1/core-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/core/1.1/core-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/core/1.1/core-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_native_ref_java_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:native_ref-java:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/native_ref-java/1.1/native_ref-java-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/native_ref-java/1.1/native_ref-java-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/native_ref-java/1.1/native_ref-java-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_native_system_java_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:native_system-java:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/native_system-java/1.1/native_system-java-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/native_system-java/1.1/native_system-java-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/native_system-java/1.1/native_system-java-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_ref_linux_armhf_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_ref-linux-armhf:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-linux-armhf/1.1/netlib-native_ref-linux-armhf-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-linux-armhf/1.1/netlib-native_ref-linux-armhf-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-linux-armhf/1.1/netlib-native_ref-linux-armhf-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_ref_linux_i686_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_ref-linux-i686:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-linux-i686/1.1/netlib-native_ref-linux-i686-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-linux-i686/1.1/netlib-native_ref-linux-i686-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-linux-i686/1.1/netlib-native_ref-linux-i686-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_ref_linux_x86_64_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_ref-linux-x86_64:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-linux-x86_64/1.1/netlib-native_ref-linux-x86_64-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-linux-x86_64/1.1/netlib-native_ref-linux-x86_64-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-linux-x86_64/1.1/netlib-native_ref-linux-x86_64-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_ref_osx_x86_64_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_ref-osx-x86_64:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-osx-x86_64/1.1/netlib-native_ref-osx-x86_64-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-osx-x86_64/1.1/netlib-native_ref-osx-x86_64-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-osx-x86_64/1.1/netlib-native_ref-osx-x86_64-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_ref_win_i686_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_ref-win-i686:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-win-i686/1.1/netlib-native_ref-win-i686-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-win-i686/1.1/netlib-native_ref-win-i686-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-win-i686/1.1/netlib-native_ref-win-i686-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_ref_win_x86_64_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_ref-win-x86_64:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-win-x86_64/1.1/netlib-native_ref-win-x86_64-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-win-x86_64/1.1/netlib-native_ref-win-x86_64-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_ref-win-x86_64/1.1/netlib-native_ref-win-x86_64-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_system_linux_armhf_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_system-linux-armhf:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-linux-armhf/1.1/netlib-native_system-linux-armhf-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-linux-armhf/1.1/netlib-native_system-linux-armhf-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-linux-armhf/1.1/netlib-native_system-linux-armhf-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_system_linux_i686_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_system-linux-i686:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-linux-i686/1.1/netlib-native_system-linux-i686-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-linux-i686/1.1/netlib-native_system-linux-i686-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-linux-i686/1.1/netlib-native_system-linux-i686-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_system_linux_x86_64_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_system-linux-x86_64:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-linux-x86_64/1.1/netlib-native_system-linux-x86_64-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-linux-x86_64/1.1/netlib-native_system-linux-x86_64-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-linux-x86_64/1.1/netlib-native_system-linux-x86_64-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_system_osx_x86_64_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_system-osx-x86_64:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-osx-x86_64/1.1/netlib-native_system-osx-x86_64-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-osx-x86_64/1.1/netlib-native_system-osx-x86_64-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-osx-x86_64/1.1/netlib-native_system-osx-x86_64-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_system_win_i686_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_system-win-i686:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-win-i686/1.1/netlib-native_system-win-i686-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-win-i686/1.1/netlib-native_system-win-i686-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-win-i686/1.1/netlib-native_system-win-i686-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fommil_netlib_netlib_native_system_win_x86_64_natives_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fommil.netlib:netlib-native_system-win-x86_64:natives:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-win-x86_64/1.1/netlib-native_system-win-x86_64-1.1-natives.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-win-x86_64/1.1/netlib-native_system-win-x86_64-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fommil/netlib/netlib-native_system-win-x86_64/1.1/netlib-native_system-win-x86_64-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fracpete_jclipboardhelper_0_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fracpete:jclipboardhelper:0.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fracpete/jclipboardhelper/0.1.0/jclipboardhelper-0.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fracpete/jclipboardhelper/0.1.0/jclipboardhelper-0.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fracpete/jclipboardhelper/0.1.0/jclipboardhelper-0.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_fracpete_jfilechooser_bookmarks_0_1_6.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.fracpete:jfilechooser-bookmarks:0.1.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fracpete/jfilechooser-bookmarks/0.1.6/jfilechooser-bookmarks-0.1.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fracpete/jfilechooser-bookmarks/0.1.6/jfilechooser-bookmarks-0.1.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/fracpete/jfilechooser-bookmarks/0.1.6/jfilechooser-bookmarks-0.1.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_vbmacher_java_cup_11b_20160615.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.vbmacher:java-cup:11b-20160615">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/vbmacher/java-cup/11b-20160615/java-cup-11b-20160615.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/vbmacher/java-cup/11b-20160615/java-cup-11b-20160615-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/vbmacher/java-cup/11b-20160615/java-cup-11b-20160615-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_github_vbmacher_java_cup_runtime_11b_20160615.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.vbmacher:java-cup-runtime:11b-20160615">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/vbmacher/java-cup-runtime/11b-20160615/java-cup-runtime-11b-20160615.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/vbmacher/java-cup-runtime/11b-20160615/java-cup-runtime-11b-20160615-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/vbmacher/java-cup-runtime/11b-20160615/java-cup-runtime-11b-20160615-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_googlecode_matrix_toolkits_java_mtj_1_0_4.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.googlecode.matrix-toolkits-java:mtj:1.0.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/matrix-toolkits-java/mtj/1.0.4/mtj-1.0.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/matrix-toolkits-java/mtj/1.0.4/mtj-1.0.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/matrix-toolkits-java/mtj/1.0.4/mtj-1.0.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_googlecode_netlib_java_netlib_java_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.googlecode.netlib-java:netlib-java:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/netlib-java/netlib-java/1.1/netlib-java-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/netlib-java/netlib-java/1.1/netlib-java-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/netlib-java/netlib-java/1.1/netlib-java-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.activation:jakarta.activation:1.2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.istack:istack-commons-runtime:3.0.11">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/istack/istack-commons-runtime/3.0.11/istack-commons-runtime-3.0.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/istack/istack-commons-runtime/3.0.11/istack-commons-runtime-3.0.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/istack/istack-commons-runtime/3.0.11/istack-commons-runtime-3.0.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__net_sourceforge_f2j_arpack_combined_all_0_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.f2j:arpack_combined_all:0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/f2j/arpack_combined_all/0.1/arpack_combined_all-0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/f2j/arpack_combined_all/0.1/arpack_combined_all-0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/f2j/arpack_combined_all/0.1/arpack_combined_all-0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__nz_ac_waikato_cms_weka_thirdparty_bounce_0_18.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: nz.ac.waikato.cms.weka.thirdparty:bounce:0.18">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/nz/ac/waikato/cms/weka/thirdparty/bounce/0.18/bounce-0.18.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/nz/ac/waikato/cms/weka/thirdparty/bounce/0.18/bounce-0.18-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/nz/ac/waikato/cms/weka/thirdparty/bounce/0.18/bounce-0.18-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__nz_ac_waikato_cms_weka_weka_stable_3_8_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: nz.ac.waikato.cms.weka:weka-stable:3.8.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/nz/ac/waikato/cms/weka/weka-stable/3.8.5/weka-stable-3.8.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/nz/ac/waikato/cms/weka/weka-stable/3.8.5/weka-stable-3.8.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/nz/ac/waikato/cms/weka/weka-stable/3.8.5/weka-stable-3.8.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/jaxb-runtime/2.3.3/jaxb-runtime-2.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/jaxb-runtime/2.3.3/jaxb-runtime-2.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/jaxb-runtime/2.3.3/jaxb-runtime-2.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.glassfish.jaxb:txw2:2.3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/txw2/2.3.3/txw2-2.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/txw2/2.3.3/txw2-2.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jaxb/txw2/2.3.3/txw2-2.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

biz-base/biz-base.iml

@@ -188,8 +188,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.16.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
@@ -222,6 +221,36 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
+    <orderEntry type="library" name="Maven: nz.ac.waikato.cms.weka:weka-stable:3.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.vbmacher:java-cup:11b-20160615" level="project" />
+    <orderEntry type="library" name="Maven: com.github.vbmacher:java-cup-runtime:11b-20160615" level="project" />
+    <orderEntry type="library" name="Maven: nz.ac.waikato.cms.weka.thirdparty:bounce:0.18" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.matrix-toolkits-java:mtj:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_ref-osx-x86_64:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:native_ref-java:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil:jniloader:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_ref-linux-x86_64:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_ref-linux-i686:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_ref-win-x86_64:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_ref-win-i686:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_ref-linux-armhf:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_system-osx-x86_64:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:native_system-java:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_system-linux-x86_64:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_system-linux-i686:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_system-linux-armhf:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_system-win-x86_64:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:netlib-native_system-win-i686:natives:1.1" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.f2j:arpack_combined_all:0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.netlib-java:netlib-java:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fommil.netlib:core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fracpete:jfilechooser-bookmarks:0.1.6" level="project" />
+    <orderEntry type="library" name="Maven: com.github.fracpete:jclipboardhelper:0.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.11" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.3.1.RELEASE" level="project" />
   </component>

biz-base/src/main/java/com/dayou/controller/BrokeragePostRatioController.java

@@ -1,28 +1,16 @@
 package com.dayou.controller;
 
 import com.dayou.vo.PostRatioVO;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.RestController;
-import com.dayou.controller.BaseController;
 import com.dayou.service.IBrokeragePostRatioService;
 import com.dayou.entity.BrokeragePostRatio;
 import com.dayou.common.RestResponse;
 import org.springframework.web.bind.annotation.*;
-import com.dayou.utils.ConvertUtil;
-import com.dayou.utils.HttpKit;
-import com.dayou.exception.ErrorCode;
-import java.util.Date;
-import java.util.List;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.springframework.http.MediaType;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.Valid;
 
 /**
  * 领导岗位抽成率

biz-base/src/main/java/com/dayou/controller/ItemBrokerageSequenceController.java

@@ -119,7 +119,7 @@ public class ItemBrokerageSequenceController extends BaseController {
     @IgnoreAuth
     @GetMapping("/settle")
     public RestResponse<Set<Long>> settle(){
-        //itemBrokerageSequenceService.doAbleItemBrokerageSettle();
+        itemBrokerageSequenceService.doAbleItemBrokerageSettle();
         Set<Long> longs = itemBrokerageSequenceService.doNonMarketerAheadSettle();
         return RestResponse.data(longs);
     }

biz-base/src/main/java/com/dayou/controller/ItemController.java

@@ -5,6 +5,7 @@ import com.dayou.annotation.OperLog;
 import com.dayou.annotation.Transfer;
 import com.dayou.brokerage.annotation.DoBrokerage;
 import com.dayou.dto.ItemDTO;
+import com.dayou.dto.ItemStateUpdateDTO;
 import com.dayou.enums.BusinessResourceEnum;
 import com.dayou.utils.LoginContext;
 import com.dayou.vo.DepartmentStatVO;
@@ -36,6 +37,7 @@ import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 
 import static com.dayou.common.Constants.MANAGER_OFFICE;
 import static com.dayou.common.Constants.MARKET_DEPARTMENT;
@@ -181,6 +183,15 @@ public class ItemController extends BaseController {
         return  RestResponse.data(result);
     }
 
+    /**
+     * 项目业务状态变更
+     * @return
+     */
+    @PutMapping("/updateState")
+    public RestResponse<Boolean> updateState(@RequestBody @Valid ItemStateUpdateDTO updateDTO){
+        Boolean result = itemService.updateState(updateDTO);
+        return  RestResponse.data(result);
+    }
 
 }
 

biz-base/src/main/java/com/dayou/controller/MajorController.java

@@ -0,0 +1,100 @@
+package com.dayou.controller;
+
+import com.dayou.dto.TaskRecordDTO;
+import com.dayou.dto.WorkNodeCommit;
+import com.dayou.vo.MajorVO;
+import com.dayou.workflow.annotation.FinishTask;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.IMajorService;
+import com.dayou.entity.Major;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.common.PullDownModel;
+import com.dayou.utils.ConvertUtil;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+/**
+ * 大中型项目
+ *
+ * @author wucl
+ * @since 2023-10-30
+ */
+@RestController
+@RequestMapping("major")
+@Slf4j
+public class MajorController extends BaseController {
+    @Autowired
+    private IMajorService majorService;
+
+    /**
+    * 大中型项目列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<MajorVO>> page(Major major, Page page){
+        Page<MajorVO> pages=majorService.selectPage(page,major);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 大中型项目详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<Major> detail(@PathVariable Long id){
+        Major xMajor =majorService.detail(id);
+        return RestResponse.data(xMajor);
+     }
+
+    /**
+     * 大中型项目新增
+     */
+    @PostMapping("")
+    public RestResponse<WorkNodeCommit> save(@RequestBody Major major) {
+        WorkNodeCommit ret = majorService.add(major);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 大中型项目更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody Major major) {
+        Boolean ret = majorService.update(major);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 大中型项目删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = majorService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+    /**
+     * 大中型项目下拉列表
+     */
+    @GetMapping("/simpleAll")
+    public RestResponse<List<PullDownModel>> simpleAll(){
+        LambdaQueryWrapper<Major> lambdaQueryWrapper = new LambdaQueryWrapper<Major>()
+        .select(Major::getId,Major::getName)
+        .eq(Major::getDeleted,false);
+        List<Major> list= majorService.list(lambdaQueryWrapper);
+        List<PullDownModel> ret=ConvertUtil.copyList(list, PullDownModel.class);
+        return RestResponse.data(ret);
+    }
+
+    @FinishTask
+    @PostMapping("/allocation")
+    public RestResponse<Boolean> allocation(@RequestBody TaskRecordDTO<MajorVO> taskRecordDTO){
+        Boolean ret = majorService.allocation(taskRecordDTO);
+        return RestResponse.data(ret);
+    }
+
+}
+

biz-base/src/main/java/com/dayou/controller/MajorTargetController.java

@@ -0,0 +1,98 @@
+package com.dayou.controller;
+
+import com.dayou.dto.TaskRecordDTO;
+import com.dayou.vo.MajorVO;
+import com.dayou.workflow.annotation.FinishTask;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.controller.BaseController;
+import com.dayou.service.IMajorTargetService;
+import com.dayou.entity.MajorTarget;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.utils.ConvertUtil;
+import com.dayou.utils.HttpKit;
+import com.dayou.exception.ErrorCode;
+import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * 大中型项目评估对象
+ *
+ * @author wucl
+ * @since 2023-11-03
+ */
+@RestController
+@RequestMapping("majorTarget")
+@Slf4j
+public class MajorTargetController extends BaseController {
+    @Autowired
+    private IMajorTargetService majorTargetService;
+
+    /**
+    * 大中型项目评估对象列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<MajorTarget>> page(MajorTarget majorTarget, Page page){
+        Page<MajorTarget> pages=majorTargetService.selectPage(page,majorTarget);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 大中型项目评估对象详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<MajorTarget> detail(@PathVariable Long id){
+        MajorTarget xMajorTarget =majorTargetService.detail(id);
+        return RestResponse.data(xMajorTarget);
+     }
+
+    /**
+     * 大中型项目评估对象新增
+     */
+    @FinishTask
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody TaskRecordDTO<MajorTarget> majorTarget) {
+        Boolean ret = majorTargetService.add(majorTarget);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 大中型项目评估对象更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody MajorTarget majorTarget) {
+        Boolean ret = majorTargetService.update(majorTarget);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 大中型项目评估对象删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = majorTargetService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 初步定价/审核报价
+     * @return
+     */
+    @FinishTask
+    @PutMapping("/task")
+    public RestResponse<Boolean> initPricing(@RequestBody TaskRecordDTO<MajorTarget> majorTarget){
+        MajorTarget taskData = majorTarget.getTaskData();
+        Boolean ret = majorTargetService.update(taskData);
+        return RestResponse.data(ret);
+    }
+
+}
+

biz-base/src/main/java/com/dayou/controller/MessageController.java

@@ -2,6 +2,7 @@ package com.dayou.controller;
 
 import com.dayou.message.MessageServerCenter;
 import com.dayou.message.handler.SystemMessageHandler;
+import com.dayou.service.IMessageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +25,9 @@ public class MessageController {
     @Autowired
     private SystemMessageHandler systemMessageHandler;
 
+    @Autowired
+    private IMessageService messageService;
+
     @GetMapping("/notRead")
     public RestResponse<List<Message>> messageRedPoint(){
         List<Message> list = systemMessageHandler.messageRedPoint();
@@ -40,5 +44,15 @@ public class MessageController {
         Boolean result = systemMessageHandler.readMessage(id);
         return RestResponse.data(result);
     }
+
+    /**
+     * 一键已读
+     * @return
+     */
+    @GetMapping("/allRead")
+    public RestResponse<Boolean> allRead(){
+        Boolean result = messageService.allRead();
+        return RestResponse.data(result);
+    }
 }
 

biz-base/src/main/java/com/dayou/controller/ReportSectionController.java

@@ -59,8 +59,8 @@ public class ReportSectionController extends BaseController {
      * 报告段落更新
      */
     @PutMapping("")
-    public RestResponse<Boolean> update(@RequestBody ReportSectionTreeVO treeVO) {
-        Boolean ret = reportSectionService.updateSection(treeVO);
+    public RestResponse<String> update(@RequestBody ReportSectionTreeVO treeVO) {
+        String ret = reportSectionService.updateSection(treeVO);
         return RestResponse.data(ret);
     }
 
@@ -79,14 +79,14 @@ public class ReportSectionController extends BaseController {
      * @return
      */
     @PostMapping("/calculate")
-    public RestResponse<Boolean> calculate(@RequestBody @Valid CalculateDataRequestDTO calculateData){
-        Boolean result = reportSectionService.calculate(calculateData);
+    public RestResponse<String> calculate(@RequestBody @Valid CalculateDataRequestDTO calculateData){
+        String result = reportSectionService.calculate(calculateData);
         return RestResponse.data(result);
     }
 
     /**
      * 计算数据 结构
-     * @param id headlineId
+     * @param id sectionId
      * @return
      */
     @GetMapping("/structure/{id}")

biz-base/src/main/java/com/dayou/controller/SortedDepartmentController.java

@@ -0,0 +1,73 @@
+package com.dayou.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.ISortedDepartmentService;
+import com.dayou.entity.SortedDepartment;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 轮单部门
+ *
+ * @author wucl
+ * @since 2023-10-31
+ */
+@RestController
+@RequestMapping("sortedDepartment")
+@Slf4j
+public class SortedDepartmentController extends BaseController {
+    @Autowired
+    private ISortedDepartmentService sortedDepartmentService;
+
+    /**
+    * 轮单部门列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<SortedDepartment>> page(SortedDepartment sortedDepartment, Page page){
+        Page<SortedDepartment> pages=sortedDepartmentService.selectPage(page,sortedDepartment);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 轮单部门详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<SortedDepartment> detail(@PathVariable Long id){
+        SortedDepartment xSortedDepartment =sortedDepartmentService.detail(id);
+        return RestResponse.data(xSortedDepartment);
+     }
+
+    /**
+     * 轮单部门新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody SortedDepartment sortedDepartment) {
+        Boolean ret = sortedDepartmentService.add(sortedDepartment);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 轮单部门更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody SortedDepartment sortedDepartment) {
+        Boolean ret = sortedDepartmentService.update(sortedDepartment);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 轮单部门删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = sortedDepartmentService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+}
+

biz-base/src/main/java/com/dayou/controller/UserController.java

@@ -278,5 +278,11 @@ public class UserController extends BaseController {
         Boolean result = userService.validSettlePassword(settlePassword);
         return RestResponse.data(result);
     }
+
+    @GetMapping("/userLeader")
+    public RestResponse<Long> getCurrentUserLeader(){
+        Long leaderByCurrentUser = userService.getLeaderByCurrentUser();
+        return RestResponse.data(leaderByCurrentUser);
+    }
 }
 

biz-base/src/main/java/com/dayou/controller/WorkFlowController.java

@@ -0,0 +1,116 @@
+package com.dayou.controller;
+
+import com.dayou.dto.WorkNodeCommit;
+import com.dayou.vo.NameCodeVO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.workflow.IWorkFlowService;
+import com.dayou.entity.WorkFlow;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.common.PullDownModel;
+import com.dayou.utils.ConvertUtil;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import javax.validation.Valid;
+
+/**
+ * 工作流
+ *
+ * @author wucl
+ * @since 2023-10-17
+ */
+@RestController
+@RequestMapping("workFlow")
+@Slf4j
+public class WorkFlowController extends BaseController {
+    @Autowired
+    private IWorkFlowService workFlowService;
+
+
+    /**
+    * 工作流列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<WorkFlow>> page(WorkFlow workFlow, Page page){
+        Page<WorkFlow> pages=workFlowService.selectPage(page,workFlow);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 工作流详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<WorkFlow> detail(@PathVariable Long id){
+        WorkFlow xWorkFlow =workFlowService.detail(id);
+        return RestResponse.data(xWorkFlow);
+     }
+
+    /**
+     * 工作流新增
+     */
+    @PostMapping("")
+    public RestResponse<Long> save(@RequestBody WorkFlow workFlow) {
+        Long id = workFlowService.add(workFlow);
+        return RestResponse.data(id);
+    }
+
+    /**
+     * 工作流更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody WorkFlow workFlow) {
+        Boolean ret = workFlowService.update(workFlow);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 工作流删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = workFlowService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+    /**
+     * 工作流下拉列表
+     */
+    @GetMapping("/simpleAll")
+    public RestResponse<List<PullDownModel>> simpleAll(){
+        LambdaQueryWrapper<WorkFlow> lambdaQueryWrapper = new LambdaQueryWrapper<WorkFlow>()
+        .select(WorkFlow::getId,WorkFlow::getName)
+        .eq(WorkFlow::getDeleted,false);
+        List<WorkFlow> list= workFlowService.list(lambdaQueryWrapper);
+        List<PullDownModel> ret=ConvertUtil.copyList(list, PullDownModel.class);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 节点枚举
+     * @return
+     */
+    @GetMapping("/enum")
+    public RestResponse<List<NameCodeVO>> flowsEnum(){
+        List<NameCodeVO> enums = workFlowService.flowsEnum();
+        return RestResponse.data(enums);
+    }
+
+    /**
+     * 节点提交
+     * @param workNodeCommit
+     * @return
+     */
+    @PostMapping("/commit")
+    public RestResponse<Boolean> commit(@RequestBody @Valid WorkNodeCommit workNodeCommit){
+        Boolean result = workFlowService.commit(workNodeCommit);
+        return RestResponse.data(result);
+    }
+}
+

biz-base/src/main/java/com/dayou/controller/WorkFlowLogController.java

@@ -0,0 +1,44 @@
+package com.dayou.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.workflow.IWorkFlowLogService;
+import com.dayou.entity.WorkFlowLog;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+/**
+ * 实例节点流水表
+ *
+ * @author wucl
+ * @since 2023-10-17
+ */
+@RestController
+@RequestMapping("workFlowLog")
+@Slf4j
+public class WorkFlowLogController extends BaseController {
+    @Autowired
+    private IWorkFlowLogService workFlowLogService;
+
+    /**
+    * 实例节点流水表列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<WorkFlowLog>> page(WorkFlowLog workFlowLog, Page page){
+        Page<WorkFlowLog> pages=workFlowLogService.selectPage(page,workFlowLog);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 实例节点流水表详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<WorkFlowLog> detail(@PathVariable Long id){
+        WorkFlowLog xWorkFlowLog =workFlowLogService.detail(id);
+        return RestResponse.data(xWorkFlowLog);
+     }
+
+}
+

biz-base/src/main/java/com/dayou/controller/WorkFlowNodeInstanceController.java

@@ -0,0 +1,74 @@
+package com.dayou.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.workflow.IWorkFlowNodeInstanceService;
+import com.dayou.entity.WorkFlowNodeInstance;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 工作流节点实例
+ *
+ * @author wucl
+ * @since 2023-10-17
+ */
+@RestController
+@RequestMapping("workFlowNodeInstance")
+@Slf4j
+public class WorkFlowNodeInstanceController extends BaseController {
+    @Autowired
+    private IWorkFlowNodeInstanceService workFlowNodeInstanceService;
+
+    /**
+    * 工作流节点实例列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<WorkFlowNodeInstance>> page(WorkFlowNodeInstance workFlowNodeInstance, Page page){
+        Page<WorkFlowNodeInstance> pages=workFlowNodeInstanceService.selectPage(page,workFlowNodeInstance);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 工作流节点实例详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<WorkFlowNodeInstance> detail(@PathVariable Long id){
+        WorkFlowNodeInstance xWorkFlowNodeInstance =workFlowNodeInstanceService.detail(id);
+        return RestResponse.data(xWorkFlowNodeInstance);
+     }
+
+    /**
+     * 工作流节点实例新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody WorkFlowNodeInstance workFlowNodeInstance) {
+        Boolean ret = workFlowNodeInstanceService.add(workFlowNodeInstance);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 工作流节点实例更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody WorkFlowNodeInstance workFlowNodeInstance) {
+        Boolean ret = workFlowNodeInstanceService.update(workFlowNodeInstance);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 工作流节点实例删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = workFlowNodeInstanceService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+
+}
+

biz-base/src/main/java/com/dayou/controller/WorkNodeController.java

@@ -0,0 +1,113 @@
+package com.dayou.controller;
+
+import com.dayou.dto.WorkNodeDTO;
+import com.dayou.vo.NameCodeVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.workflow.IWorkNodeService;
+import com.dayou.entity.WorkNode;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+import com.dayou.common.PullDownModel;
+import com.dayou.utils.ConvertUtil;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+/**
+ * 工作流节点
+ *
+ * @author wucl
+ * @since 2023-10-17
+ */
+@RestController
+@RequestMapping("workNode")
+@Slf4j
+public class WorkNodeController extends BaseController {
+    @Autowired
+    private IWorkNodeService workNodeService;
+
+    /**
+    * 工作流节点列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<WorkNode>> page(WorkNode workNode, Page page){
+        Page<WorkNode> pages=workNodeService.selectPage(page,workNode);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 工作流节点详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<WorkNode> detail(@PathVariable Long id){
+        WorkNode xWorkNode =workNodeService.detail(id);
+        return RestResponse.data(xWorkNode);
+     }
+
+    /**
+     * 工作流节点新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody WorkNodeDTO workNode) {
+        Boolean ret = workNodeService.add(workNode);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 工作流节点更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody WorkNodeDTO workNode) {
+        Boolean ret = workNodeService.update(workNode);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 工作流节点删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = workNodeService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+    /**
+     * 工作流节点下拉列表
+     */
+    @GetMapping("/simpleAll")
+    public RestResponse<List<PullDownModel>> simpleAll(){
+        LambdaQueryWrapper<WorkNode> lambdaQueryWrapper = new LambdaQueryWrapper<WorkNode>()
+        .select(WorkNode::getId,WorkNode::getName)
+        .eq(WorkNode::getDeleted,false);
+        List<WorkNode> list= workNodeService.list(lambdaQueryWrapper);
+        List<PullDownModel> ret=ConvertUtil.copyList(list, PullDownModel.class);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 节点枚举
+     * @return
+     */
+    @GetMapping("/enum")
+    public RestResponse<List<NameCodeVO>> allNode(){
+        List<NameCodeVO> enums = workNodeService.allNode();
+        return RestResponse.data(enums);
+    }
+
+    /**
+     * 单流程节点
+     * @param flowId
+     * @return
+     */
+    @GetMapping("/flow/{flowId}")
+    public RestResponse<List<WorkNodeDTO>> getFlowNodes(@PathVariable("flowId") Long flowId){
+        List<WorkNodeDTO> nodes = workNodeService.getFlowNodes(flowId);
+        return RestResponse.data(nodes);
+    }
+}
+

biz-base/src/main/java/com/dayou/controller/WorkNodeTaskController.java

@@ -0,0 +1,94 @@
+package com.dayou.controller;
+
+import com.dayou.vo.NameCodeVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.workflow.IWorkNodeTaskService;
+import com.dayou.entity.WorkNodeTask;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 工作流节点任务
+ *
+ * @author wucl
+ * @since 2023-10-17
+ */
+@RestController
+@RequestMapping("workNodeTask")
+@Slf4j
+public class WorkNodeTaskController extends BaseController {
+    @Autowired
+    private IWorkNodeTaskService workNodeTaskService;
+
+    /**
+    * 工作流节点任务列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<WorkNodeTask>> page(WorkNodeTask workNodeTask, Page page){
+        Page<WorkNodeTask> pages=workNodeTaskService.selectPage(page,workNodeTask);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 工作流节点任务详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<WorkNodeTask> detail(@PathVariable Long id){
+        WorkNodeTask xWorkNodeTask =workNodeTaskService.detail(id);
+        return RestResponse.data(xWorkNodeTask);
+     }
+
+    /**
+     * 工作流节点任务新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody WorkNodeTask workNodeTask) {
+        Boolean ret = workNodeTaskService.add(workNodeTask);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 工作流节点任务更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody WorkNodeTask workNodeTask) {
+        Boolean ret = workNodeTaskService.update(workNodeTask);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 工作流节点任务删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = workNodeTaskService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 节点任务枚举
+     * @return
+     */
+    @GetMapping("/enum")
+    public RestResponse<List<WorkNodeTask>> allNodeTask(){
+        List<WorkNodeTask> enums = workNodeTaskService.allNodeTask();
+        return RestResponse.data(enums);
+    }
+
+    /**
+     * 节点任务枚举
+     * @return
+     */
+    @GetMapping("/permission/enum")
+    public RestResponse<List<NameCodeVO>> allHandlerPermission(){
+        List<NameCodeVO> enums = workNodeTaskService.allHandlerPermission();
+        return RestResponse.data(enums);
+    }
+}
+

biz-base/src/main/java/com/dayou/controller/WorkTaskRecordController.java

@@ -0,0 +1,73 @@
+package com.dayou.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.workflow.IWorkTaskRecordService;
+import com.dayou.entity.WorkTaskRecord;
+import com.dayou.common.RestResponse;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 工作流任务记录
+ *
+ * @author wucl
+ * @since 2023-10-17
+ */
+@RestController
+@RequestMapping("workTaskRecord")
+@Slf4j
+public class WorkTaskRecordController extends BaseController {
+    @Autowired
+    private IWorkTaskRecordService workTaskRecordService;
+
+    /**
+    * 工作流任务记录列表
+    */
+    @GetMapping("")
+    public RestResponse<Page<WorkTaskRecord>> page(WorkTaskRecord workTaskRecord, Page page){
+        Page<WorkTaskRecord> pages=workTaskRecordService.selectPage(page,workTaskRecord);
+        return RestResponse.data(pages);
+    }
+
+    /**
+     * 工作流任务记录详情
+     */
+    @GetMapping("/{id}")
+    public RestResponse<WorkTaskRecord> detail(@PathVariable Long id){
+        WorkTaskRecord xWorkTaskRecord =workTaskRecordService.detail(id);
+        return RestResponse.data(xWorkTaskRecord);
+     }
+
+    /**
+     * 工作流任务记录新增
+     */
+    @PostMapping("")
+    public RestResponse<Boolean> save(@RequestBody WorkTaskRecord workTaskRecord) {
+        Boolean ret = workTaskRecordService.add(workTaskRecord);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 工作流任务记录更新
+     */
+    @PutMapping("")
+    public RestResponse<Boolean> update(@RequestBody WorkTaskRecord workTaskRecord) {
+        Boolean ret = workTaskRecordService.update(workTaskRecord);
+        return RestResponse.data(ret);
+    }
+
+    /**
+     * 工作流任务记录删除
+     */
+    @DeleteMapping("/{id}")
+    public RestResponse<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = workTaskRecordService.delete(id);
+        return RestResponse.data(ret);
+    }
+
+
+}
+

biz-base/src/test/java/BrokerageTest.java

@@ -1,7 +1,7 @@
 import com.dayou.BaseApplication;
-import com.dayou.report.calculation.cityPrice.bo.BusinessCenterBaseBO;
-import com.dayou.report.calculation.cityPrice.bo.BusinessCenterIndexWeightBO;
-import com.dayou.report.html.builder.CityBaseLandPriceBuilder;
+import com.dayou.entity.Major;
+import com.dayou.service.IMajorService;
+import com.dayou.service.IUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,10 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
 
 /**
  * 类说明：
@@ -25,42 +21,87 @@ import java.util.List;
 @SpringBootTest(classes = BaseApplication.class)
 @RunWith(SpringJUnit4ClassRunner.class)
 public class BrokerageTest {
+//
+//    @Autowired
+//    private CityBaseLandPriceBuilder cityBaseLandPriceBuilder;
+//
+//    @Autowired
+//    private CityPriceCalculateProcess cityPriceCalculateProcess;
+//    @Test
+//   public void testCalculate(){
+//       List<BusinessCenterBaseBO> baseBOS = new ArrayList<>();
+//       BusinessCenterBaseBO b1 = BusinessCenterBaseBO.builder().no(1).name("世纪摩尔购物中心").acreage(new BigDecimal("8240")).categories("服装、购物、餐饮、娱乐、通讯、家电、珠宝等")
+//               .shopNum(new BigDecimal("145")).shoppingNum(new BigDecimal("3700")).rent(new BigDecimal("1100"))
+//               .turnover(new BigDecimal("8575")).scope("文通路上段2323号").build();
+//       BusinessCenterBaseBO b2 = BusinessCenterBaseBO.builder().no(2).name("北街商服中心").acreage(new BigDecimal("25161")).categories("服装、购物、餐饮、娱乐、通讯、家电、珠宝等")
+//               .shopNum(new BigDecimal("460")).shoppingNum(new BigDecimal("9800")).rent(new BigDecimal("1200"))
+//               .turnover(new BigDecimal("26502")).scope("东街、西街、南街、北街两侧区域").build();
+//       BusinessCenterBaseBO b3 = BusinessCenterBaseBO.builder().no(3).name("外滩休闲广场").acreage(new BigDecimal("10289")).categories("购物中心超市、百货店、文化娱乐、餐饮等")
+//               .shopNum(new BigDecimal("175")).shoppingNum(new BigDecimal("2300")).rent(new BigDecimal("900"))
+//               .turnover(new BigDecimal("5350")).scope("文通路上段2323号").build();
+//       baseBOS.add(b1);
+//       baseBOS.add(b2);
+//       baseBOS.add(b3);
+//
+//       List<BusinessCenterIndexWeightBO> weightBOS = new ArrayList<>();
+//        BusinessCenterIndexWeightBO w1 = BusinessCenterIndexWeightBO.builder().name("占地面积V1").shopNum(new BigDecimal("0.45")).shoppingNum(new BigDecimal("0.35"))
+//                .turnover(new BigDecimal("0.30")).rent(new BigDecimal("0.30")).acreage(BigDecimal.ZERO).v6(BigDecimal.ONE).build();
+//        BusinessCenterIndexWeightBO w2 = BusinessCenterIndexWeightBO.builder().name("店铺数量V2").acreage(new BigDecimal("0.55")).shoppingNum(new BigDecimal("0.50"))
+//                .turnover(new BigDecimal("0.35")).rent(new BigDecimal("0.35")).shopNum(BigDecimal.ZERO).v6(BigDecimal.ONE).build();
+//        BusinessCenterIndexWeightBO w3 = BusinessCenterIndexWeightBO.builder().name("购物人次V3").acreage(new BigDecimal("0.65")).shopNum(new BigDecimal("0.50"))
+//                .turnover(new BigDecimal("0.40")).rent(new BigDecimal("0.45")).shoppingNum(BigDecimal.ZERO).v6(BigDecimal.ONE).build();
+//        BusinessCenterIndexWeightBO w4 = BusinessCenterIndexWeightBO.builder().name("营业额V4").acreage(new BigDecimal("0.70")).shopNum(new BigDecimal("0.65"))
+//                .shoppingNum(new BigDecimal("0.60")).turnover(BigDecimal.ZERO).v6(BigDecimal.ONE)
+//                .rent(new BigDecimal("0.60")).build();
+//        BusinessCenterIndexWeightBO w5 = BusinessCenterIndexWeightBO.builder().name("平均租金V5").acreage(new BigDecimal("0.70")).shopNum(new BigDecimal("0.65")).shoppingNum(new BigDecimal("0.55"))
+//                .turnover(new BigDecimal("0.40")).rent(BigDecimal.ZERO).v6(BigDecimal.ONE).build();
+//        weightBOS.add(w1);
+//        weightBOS.add(w2);
+//        weightBOS.add(w3);
+//        weightBOS.add(w4);
+//        weightBOS.add(w5);
+//        //cityBaseLandPriceBuilder.businessCenter54(baseBOS,weightBOS,634L,null);
+//   }
+//
+//   @Test
+//   public void test1(){
+//       Map<String,BigDecimal> comprehensive = new HashMap<>();
+//       comprehensive.put("北街商服中心",BigDecimal.valueOf(100.00));
+//       comprehensive.put("世纪摩尔购物广场",BigDecimal.valueOf(46.40));
+//       comprehensive.put("外滩休闲广场",BigDecimal.valueOf(39.43));
+//       List<BusinessCenterLevelBO> businessCenterLevelBOS = cityPriceCalculateProcess.businessCenterLeve(comprehensive);
+//       System.out.println(businessCenterLevelBOS);
+//   }
+
+//    @Autowired
+//    private IWorkNodeService workNodeService;
+//
+//    @Test
+//    public void testFindNextNode(){
+//        WorkflowNodeEnum[] byProduction = CallbackEnum.IgnoreNode.getByProduction(CallbackEnum.CHECK_PRODUCTION_TYPE,
+//                //产品类型有业务数据获取，下面是暂代
+//                ProductionEnum.ALL_MAJOR);
+//        WorkNodeDTO nextWorkNodeByIgnore = workNodeService.getNextWorkNodeByIgnore(3L, 36L, byProduction);
+//        System.out.println(nextWorkNodeByIgnore);
+//    }
+
+//        @Autowired
+//    private IMajorService majorService;
+//
+//        @Test
+//        public void testSortedDepartment(){
+//            Major major = new Major();
+//            major.setAllotType("轮单");
+//            majorService.add(major);
+//
+//        }
 
     @Autowired
-    private CityBaseLandPriceBuilder cityBaseLandPriceBuilder;
-    @Test
-   public void testCalculate(){
-       List<BusinessCenterBaseBO> baseBOS = new ArrayList<>();
-       BusinessCenterBaseBO b1 = BusinessCenterBaseBO.builder().no(1).name("世纪摩尔购物中心").acreage(new BigDecimal("8240")).categories("服装、购物、餐饮、娱乐、通讯、家电、珠宝等")
-               .shopNum(new BigDecimal("145")).shoppingNum(new BigDecimal("3700")).rent(new BigDecimal("1100"))
-               .turnover(new BigDecimal("8575")).scope("文通路上段2323号").build();
-       BusinessCenterBaseBO b2 = BusinessCenterBaseBO.builder().no(2).name("北街商服中心").acreage(new BigDecimal("25161")).categories("服装、购物、餐饮、娱乐、通讯、家电、珠宝等")
-               .shopNum(new BigDecimal("460")).shoppingNum(new BigDecimal("9800")).rent(new BigDecimal("1200"))
-               .turnover(new BigDecimal("26502")).scope("东街、西街、南街、北街两侧区域").build();
-       BusinessCenterBaseBO b3 = BusinessCenterBaseBO.builder().no(3).name("外滩休闲广场").acreage(new BigDecimal("10289")).categories("购物中心超市、百货店、文化娱乐、餐饮等")
-               .shopNum(new BigDecimal("175")).shoppingNum(new BigDecimal("2300")).rent(new BigDecimal("900"))
-               .turnover(new BigDecimal("5350")).scope("文通路上段2323号").build();
-       baseBOS.add(b1);
-       baseBOS.add(b2);
-       baseBOS.add(b3);
+     private IUserService userService;
 
-       List<BusinessCenterIndexWeightBO> weightBOS = new ArrayList<>();
-        BusinessCenterIndexWeightBO w1 = BusinessCenterIndexWeightBO.builder().name("占地面积V1").shopNum(new BigDecimal("0.45")).shoppingNum(new BigDecimal("0.35"))
-                .turnover(new BigDecimal("0.30")).rent(new BigDecimal("0.30")).acreage(BigDecimal.ZERO).V6(BigDecimal.ONE).build();
-        BusinessCenterIndexWeightBO w2 = BusinessCenterIndexWeightBO.builder().name("店铺数量V2").acreage(new BigDecimal("0.55")).shoppingNum(new BigDecimal("0.50"))
-                .turnover(new BigDecimal("0.35")).rent(new BigDecimal("0.35")).shopNum(BigDecimal.ZERO).V6(BigDecimal.ONE).build();
-        BusinessCenterIndexWeightBO w3 = BusinessCenterIndexWeightBO.builder().name("购物人次V3").acreage(new BigDecimal("0.65")).shopNum(new BigDecimal("0.50"))
-                .turnover(new BigDecimal("0.40")).rent(new BigDecimal("0.45")).shoppingNum(BigDecimal.ZERO).V6(BigDecimal.ONE).build();
-        BusinessCenterIndexWeightBO w4 = BusinessCenterIndexWeightBO.builder().name("营业额V4").acreage(new BigDecimal("0.70")).shopNum(new BigDecimal("0.65"))
-                .shoppingNum(new BigDecimal("0.60")).turnover(BigDecimal.ZERO).V6(BigDecimal.ONE)
-                .rent(new BigDecimal("0.60")).build();
-        BusinessCenterIndexWeightBO w5 = BusinessCenterIndexWeightBO.builder().name("平均租金V5").acreage(new BigDecimal("0.70")).shopNum(new BigDecimal("0.65")).shoppingNum(new BigDecimal("0.55"))
-                .turnover(new BigDecimal("0.40")).rent(BigDecimal.ZERO).V6(BigDecimal.ONE).build();
-        weightBOS.add(w1);
-        weightBOS.add(w2);
-        weightBOS.add(w3);
-        weightBOS.add(w4);
-        weightBOS.add(w5);
-        cityBaseLandPriceBuilder.businessCenter54(baseBOS,weightBOS,634L,null);
-   }
+    @Test
+    public void testSearchLeader(){
+        Long leaderByCurrentUser = userService.getLeaderByCurrentUser();
+        System.out.println(leaderByCurrentUser);
+    }
 }

biz-base/src/test/java/KMeans.java

@@ -0,0 +1,145 @@
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Random;
+//
+//public class KMeans {
+//
+//    public static void main(String[] args) {
+//        int k = 3; // 设置簇的数量
+//        int maxIterations = 1000000; // 最大迭代次数
+//        List<Point> dataPoints = generateData(); // 生成示例数据集
+//
+//        // 随机初始化簇中心
+//        List<Point> clusterCenters = initializeClusterCenters(dataPoints, k);
+//
+//        for (int i = 0; i < maxIterations; i++) {
+//            // 分配数据点到最近的簇
+//            assignDataPointsToClusters(dataPoints, clusterCenters);
+//
+//            // 计算新的簇中心
+//            List<Point> newClusterCenters = calculateClusterCenters(dataPoints, k);
+//
+//            // 如果簇中心不再改变，结束迭代
+//            if (clusterCenters.equals(newClusterCenters)) {
+//                System.out.println("i=" + i);
+//                break;
+//            }
+//
+//            clusterCenters = newClusterCenters;
+//        }
+//
+//        // 打印簇中心和簇中的数据点
+//        for (int i = 0; i < k; i++) {
+//            System.out.println("Cluster " + i + " center: " + clusterCenters.get(i));
+//            System.out.println("Cluster " + i + " points: ");
+//            for (Point point : dataPoints) {
+//                if (point.getCluster() == i) {
+//                    System.out.println(point);
+//                }
+//            }
+//            System.out.println();
+//        }
+//    }
+//
+//    // 生成示例数据集
+//    private static List<Point> generateData() {
+//        List<Point> dataPoints = new ArrayList<>();
+//        Random random = new Random();
+//        for (int i = 0; i < 10; i++) {
+//            double x = random.nextDouble() * 100;
+//            double y = random.nextDouble() * 100;
+//            dataPoints.add(new Point(x, y));
+//        }
+//        return dataPoints;
+//    }
+//
+//    // 随机初始化簇中心
+//    private static List<Point> initializeClusterCenters(List<Point> dataPoints, int k) {
+//        List<Point> clusterCenters = new ArrayList<>();
+//        Random random = new Random();
+//        for (int i = 0; i < k; i++) {
+//            Point randomPoint = dataPoints.get(random.nextInt(dataPoints.size()));
+//            clusterCenters.add(new Point(randomPoint.getX(), randomPoint.getY()));
+//        }
+//        return clusterCenters;
+//    }
+//
+//    // 将数据点分配到最近的簇
+//    private static void assignDataPointsToClusters(List<Point> dataPoints, List<Point> clusterCenters) {
+//        for (Point point : dataPoints) {
+//            double minDistance = Double.MAX_VALUE;
+//            int closestCluster = -1;
+//            for (int i = 0; i < clusterCenters.size(); i++) {
+//                double distance = point.distanceTo(clusterCenters.get(i));
+//                if (distance < minDistance) {
+//                    minDistance = distance;
+//                    closestCluster = i;
+//                }
+//            }
+//            point.setCluster(closestCluster);
+//        }
+//    }
+//
+//    // 计算新的簇中心
+//    private static List<Point> calculateClusterCenters(List<Point> dataPoints, int k) {
+//        List<Point> newClusterCenters = new ArrayList<>();
+//        for (int i = 0; i < k; i++) {
+//            double sumX = 0;
+//            double sumY = 0;
+//            int clusterSize = 0;
+//            for (Point point : dataPoints) {
+//                if (point.getCluster() == i) {
+//                    sumX += point.getX();
+//                    sumY += point.getY();
+//                    clusterSize++;
+//                }
+//            }
+//            if (clusterSize > 0) {
+//                double centerX = sumX / clusterSize;
+//                double centerY = sumY / clusterSize;
+//                newClusterCenters.add(new Point(centerX, centerY));
+//            }
+//        }
+//        return newClusterCenters;
+//    }
+//}
+//
+//class Point {
+//    private double x;
+//    private double y;
+//    private int cluster;
+//
+//    public Point(double x, double y) {
+//        this.x = x;
+//        this.y = y;
+//        this.cluster = -1; // 初始化为无簇
+//    }
+//
+//    public double getX() {
+//        return x;
+//    }
+//
+//    public double getY() {
+//        return y;
+//    }
+//
+//    public int getCluster() {
+//        return cluster;
+//    }
+//
+//    public void setCluster(int cluster) {
+//        this.cluster = cluster;
+//    }
+//
+//    public double distanceTo(Point other) {
+//        double dx = this.x - other.x;
+//        double dy = this.y - other.y;
+//        return Math.sqrt(dx * dx + dy * dy);
+//    }
+//
+//    @Override
+//    public String toString() {
+//        return "(" + x + ", " + y + ")";
+//    }
+//}

biz-base/src/test/java/KMeansLine.java

@@ -0,0 +1,60 @@
+//import com.baomidou.mybatisplus.extension.api.R;
+//
+//import java.math.BigDecimal;
+//import java.math.RoundingMode;
+//import java.util.*;
+//
+///**
+// * 类说明： 聚类分析线性测试类
+// *
+// * @author: wucl
+// * @since: 2023/10/7
+// * created with IntelliJ IDEA.
+// */
+//public class KMeansLine {
+//
+//    public static void main(String[] args) {
+//        //initOriginData();
+//        Set<Integer> picked = new HashSet<>();
+//        Random random = new Random();
+//        for (int i=0 ; i<3 ; i++){
+//            int r = random.nextInt(10);
+//            while (picked.contains(r)){
+//              r = random.nextInt(10);
+//            }
+//            picked.add(r);
+//            System.out.println(r);
+//        }
+//
+//    }
+//
+//    public static List<BigDecimal> initOriginData(){
+//        Random random = new Random();
+//        for (int i=0; i<10; i++){
+//            double v = random.nextDouble()*100;
+//            BigDecimal bigDecimal = BigDecimal.valueOf(v).setScale(2, RoundingMode.HALF_UP);
+//            System.out.println(bigDecimal);
+//        }
+//        return null;
+//
+//    }
+//
+//    /**
+//     * 随机获取中心
+//     * @param originData
+//     * @param k
+//     * @return
+//     */
+//    public static Set<BigDecimal> randomCenter( List<BigDecimal> originData, int k){
+//        Set<BigDecimal> collect = new HashSet<>();
+//        Random random = new Random();
+//        for (int i =0 ; i<k; i++){
+//            BigDecimal bigDecimal = originData.get(random.nextInt(originData.size()));
+//            while (collect.contains(bigDecimal)){
+//                bigDecimal = originData.get(random.nextInt(originData.size()));
+//            }
+//            collect.add(bigDecimal);
+//        }
+//        return collect;
+//    }
+//}

biz-base/src/test/java/k/Cluster.java

@@ -0,0 +1,20 @@
+package k;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class Cluster {
+    private Point corePoint;
+    private List<Point> sameList = new ArrayList<>();
+
+    public Cluster(){}
+
+    public Cluster(Point cp){
+        corePoint = cp;
+    }
+}
+
+

biz-base/src/test/java/k/KMeansX.java

@@ -0,0 +1,313 @@
+//package k;
+//
+//
+//import java.math.BigDecimal;
+//import java.math.RoundingMode;
+//import java.util.*;
+//import java.util.stream.Collectors;
+//
+//public class KMeansX {
+//    //定义初始数据集
+//    public static List<Point> dataList = new ArrayList<>();
+//    //定义簇的数目
+//    public static Integer k = 4;
+//
+//    public static void main(String[] args) {
+//        //初始化数据集和初始簇
+//        initDataList();
+//        List<Cluster> clusterList = getInitCluster();
+//        while(true){
+//            for (int j = 0; j < k; j++) {
+//                clusterList.get(j).getSameList().clear();
+//            }
+//            for (Point point : dataList) {
+//                int index = getBelongCluster(point, clusterList); //获取point属于的那个簇在clusterList中的下标
+//                clusterList.get(index).getSameList().add(point); //把point加入到clusterList的对应簇中;
+//            }
+//            if (!calculateClusterCore(clusterList)) break;
+//        }
+//        for (Cluster cluster : clusterList) {
+//            System.out.println(cluster);
+//        }
+//    }
+//
+//    /**
+//     * 计算出新的簇中心并返回簇的点集合是否有变化
+//     * @param clusterList
+//     * @return
+//     */
+//    public static boolean calculateClusterCore(List<Cluster> clusterList){
+//        boolean flag = false;
+//        //遍历簇集合中的每一项，更新其簇中心
+//        for (Cluster cluster : clusterList) {
+//            List<Point> sameList = cluster.getSameList();
+//            if (sameList.size()==0){
+//                return true;
+//            }
+//            double sumX = 0; //存放簇中点集合所有的X坐标之和
+//           // double sumY = 0; //存放簇中点集合所有的Y坐标之和
+//            for (Point point : sameList) {
+//                sumX += point.getX();
+//               // sumY += point.getY();
+//            }
+//            BigDecimal bigDecimal = BigDecimal.valueOf(sumX).divide(BigDecimal.valueOf(sameList.size()),2,RoundingMode.HALF_UP);
+//            //更新簇的中心
+//            Point clusterCore = new Point(bigDecimal.doubleValue());
+//            if (!Point.getIsSame(clusterCore, cluster.getCorePoint())) flag = true;
+//            cluster.setCorePoint(clusterCore);
+//        }
+//        return flag;
+//    }
+//
+//    /**
+//     * 获取某个点属于哪个簇的下标
+//     * @param point
+//     * @return
+//     */
+//    public static int getBelongCluster(Point point, List<Cluster> clusterList){
+//        double closestDistance = 0.0; //存放point距离簇中心最近的距离
+//        int resultClusterIndex = 0; //存放point属于的那个簇的下标
+//        int index = 0;
+//        //遍历簇集合，计算point到簇中心的距离，找出point属于的簇
+//        for (Cluster cluster : clusterList) {
+//            double distance = Point.calculateMHDDistance(point, cluster.getCorePoint());
+//            if (index == 0) closestDistance = distance;
+//            if (distance < closestDistance){
+//                closestDistance = distance;
+//                resultClusterIndex = index;
+//            }
+//            index++;
+//        }
+//        return resultClusterIndex;
+//    }
+//
+//    /**
+//     * 获取任意k个对象作为初始簇中心，将含有k个簇的集合返回
+//     * @return
+//     */
+//    public static List<Cluster> getInitCluster(){
+//        List<Cluster> clusterList = new ArrayList<>();
+//        List<Integer> randomArray = getRandomList();
+//        //任意选取k个对象作为初始簇中心，数据集中k个对象的下标存放在randomArray中
+//        for (int i = 0; i < randomArray.size(); i++) {
+//            Point point = dataList.get(randomArray.get(i));
+//            Cluster cluster = new Cluster(point);
+//            clusterList.add(cluster);
+//        }
+//        return clusterList;
+//    }
+//
+////    /**
+////     * 获取含有k个不重复随机数的数组
+////     * @return
+////     */
+////    public static int[] getRandomArray(){
+////        Random random = new Random();
+////        int[] randomArray = new int[k];
+////        for (int i = 0; i < k; i++) {
+////            int randomItem = random.nextInt(5);
+////            //为保证randomArray中存放的随机数不重复
+////            while (Arrays.binarySearch(randomArray, randomItem) >= 0) randomItem = random.nextInt(5);
+////            randomArray[i] = randomItem;
+////        }
+////        return randomArray;
+////    }
+//
+//    /**
+//     * 随机获取中心
+//     * @return
+//     */
+//    public static List<Integer> getRandomList(){
+//        List<Integer> collect = new ArrayList<>();
+//        Random random = new Random();
+//        for (int i =0 ; i<k; i++){
+//            int r = random.nextInt(dataList.size());
+//            while (collect.contains(r)){
+//                r = random.nextInt(dataList.size());
+//            }
+//            collect.add(r);
+//        }
+//        return collect;
+//    }
+//
+//    /**
+//     * 初始化数据集
+//     */
+//    public static void initDataList(){
+//        Point p1 = new Point(13.77);
+//        Point p2 = new Point(13.77);
+//        Point p3 = new Point(13.77);
+//        Point p4 = new Point(13.77);
+//        Point p5 = new Point(13.77);
+//        Point p6 = new Point(15.46);
+//        Point p7 = new Point(13.77);
+//        Point p8 = new Point(13.77);
+//        Point p9 = new Point(13.77);
+//        Point p10 = new Point(15.46);
+//        Point p11 = new Point(13.77);
+//        Point p12 = new Point(13.77);
+//        Point p13 = new Point(29.21);
+//        Point p14 = new Point(29.21);
+//        Point p15 = new Point(15.46);
+//        Point p16 = new Point(13.77);
+//        Point p17 = new Point(12.64);
+//        Point p18 = new Point(12.64);
+//        Point p19 = new Point(15.64);
+//        Point p20 = new Point(31.19);
+//        Point p21 = new Point(12.64);
+//        Point p22 = new Point(31.19);
+//        Point p23 = new Point(31.19);
+//        Point p24 = new Point(43.84);
+//        Point p25 = new Point(15.46);
+//        Point p26 = new Point(31.19);
+//        Point p27 = new Point(80.72);
+//        Point p28 = new Point(28.72);
+//        Point p29 = new Point(15.64);
+//        Point p30 = new Point(15.64);
+//        Point p31 = new Point(13.77);
+//        Point p32 = new Point(34.52);
+//        Point p33 = new Point(13.77);
+//        Point p34 = new Point(38.18);
+//        Point p35 = new Point(42.49);
+//        Point p36 = new Point(34.52);
+//        Point p37 = new Point(31.19);
+//        Point p38 = new Point(42.49);
+//        Point p39 = new Point(12.92);
+//        Point p40 = new Point(50.39);
+//        Point p41 = new Point(52.93);
+//        Point p42 = new Point(12.64);
+//        Point p43 = new Point(43.48);
+//        Point p44 = new Point(43.48);
+//        Point p45 = new Point(31.19);
+//        Point p46 = new Point(31.19);
+//        Point p47 = new Point(31.19);
+//        Point p48 = new Point(56.60);
+//        Point p49 = new Point(31.19);
+//        Point p50 = new Point(64.93);
+//        Point p51 = new Point(64.93);
+//        Point p52 = new Point(31.19);
+//        Point p53 = new Point(91.60);
+//        Point p54 = new Point(91.60);
+//        Point p55 = new Point(31.19);
+//        Point p56 = new Point(31.19);
+//        Point p57 = new Point(91.60);
+//        Point p58 = new Point(50.88);
+//        Point p59 = new Point(91.60);
+//        Point p60 = new Point(10.66);
+//        Point p61 = new Point(50.88);
+//        Point p62 = new Point(100.00);
+//        Point p63 = new Point(13.77);
+//        Point p64 = new Point(30.34);
+//        Point p65 = new Point(30.34);
+//        Point p66 = new Point(28.93);
+//        Point p67 = new Point(28.93);
+//        Point p68 = new Point(20.75);
+//        Point p69 = new Point(11.79);
+//        Point p70 = new Point(12.07);
+//        Point p71 = new Point(52.93);
+//        Point p72 = new Point(19.69);
+//        Point p73 = new Point(42.13);
+//        Point p74 = new Point(69.37);
+//        Point p75 = new Point(10.66);
+//        Point p76 = new Point(12.64);
+//        Point p77 = new Point(17.43);
+//        Point p78 = new Point(17.43);
+//        Point p79 = new Point(12.64);
+//        Point p80 = new Point(12.64);
+//        Point p81 = new Point(12.64);
+//        Point p82 = new Point(17.43);
+//        Point p83 = new Point(12.64);
+//        Point p84 = new Point(17.43);
+//        Point p85 = new Point(17.43);
+//        Point p86 = new Point(28.93);
+//
+//        dataList.add(p1);
+//        dataList.add(p2);
+//        dataList.add(p3);
+//        dataList.add(p4);
+//        dataList.add(p5);
+//        dataList.add(p6);
+//        dataList.add(p7);
+//        dataList.add(p8);
+//        dataList.add(p9);
+//        dataList.add(p10);
+//        dataList.add(p11);
+//        dataList.add(p12);
+//        dataList.add(p13);
+//        dataList.add(p14);
+//        dataList.add(p15);
+//        dataList.add(p16);
+//        dataList.add(p17);
+//        dataList.add(p18);
+//        dataList.add(p19);
+//        dataList.add(p20);
+//        dataList.add(p21);
+//        dataList.add(p22);
+//        dataList.add(p23);
+//        dataList.add(p24);
+//        dataList.add(p25);
+//        dataList.add(p26);
+//        dataList.add(p27);
+//        dataList.add(p28);
+//        dataList.add(p29);
+//        dataList.add(p30);
+//        dataList.add(p31);
+//        dataList.add(p32);
+//        dataList.add(p33);
+//        dataList.add(p34);
+//        dataList.add(p35);
+//        dataList.add(p36);
+//        dataList.add(p37);
+//        dataList.add(p38);
+//        dataList.add(p39);
+//        dataList.add(p40);
+//        dataList.add(p41);
+//        dataList.add(p42);
+//        dataList.add(p43);
+//        dataList.add(p44);
+//        dataList.add(p45);
+//        dataList.add(p46);
+//        dataList.add(p47);
+//        dataList.add(p48);
+//        dataList.add(p49);
+//        dataList.add(p50);
+//        dataList.add(p51);
+//        dataList.add(p52);
+//        dataList.add(p53);
+//        dataList.add(p54);
+//        dataList.add(p55);
+//        dataList.add(p56);
+//        dataList.add(p57);
+//        dataList.add(p58);
+//        dataList.add(p59);
+//        dataList.add(p60);
+//        dataList.add(p61);
+//        dataList.add(p62);
+//        dataList.add(p63);
+//        dataList.add(p64);
+//        dataList.add(p65);
+//        dataList.add(p66);
+//        dataList.add(p67);
+//        dataList.add(p68);
+//        dataList.add(p69);
+//        dataList.add(p70);
+//        dataList.add(p71);
+//        dataList.add(p72);
+//        dataList.add(p73);
+//        dataList.add(p74);
+//        dataList.add(p75);
+//        dataList.add(p76);
+//        dataList.add(p77);
+//        dataList.add(p78);
+//        dataList.add(p79);
+//        dataList.add(p80);
+//        dataList.add(p81);
+//        dataList.add(p82);
+//        dataList.add(p83);
+//        dataList.add(p84);
+//        dataList.add(p85);
+//        dataList.add(p86);
+//    }
+//}
+//
+//

biz-base/src/test/java/k/Point.java

@@ -0,0 +1,34 @@
+package k;
+
+import lombok.Data;
+
+@Data
+public class Point {
+    private double x;
+//    private double y;
+
+    public Point(){}
+
+    public Point(double x){
+        this.x = x;
+        //this.y = y;
+    }
+
+    public static boolean getIsSame(Point p1, Point p2){
+        if (p1.getX() == p2.getX()) return true;
+        return false;
+    }
+
+    public static double calculateDistance(Point p1, Point p2){
+        double xDistance = p1.getX() - p2.getX();
+        //double yDistance = p1.getY() - p2.getY();
+        double tmp = xDistance * xDistance;
+        return Math.sqrt(tmp);
+    }
+
+    public static double calculateMHDDistance(Point p1, Point p2){
+        return Math.abs(p1.getX() - p2.getX());
+    }
+
+}
+

biz-base/src/test/java/rich/TestMainSimple.java

@@ -87,7 +87,7 @@
 //
 //    @Test
 //    public void testDoWord() throws Exception {
-//        Boolean aBoolean = reportMainService.generateReport(18L);
+//        Boolean aBoolean = reportMainService.generateReport(28L);
 //
 //    }
 //