个贷报告相关

.idea/workspace.xml

@@ -5,258 +5,30 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="110ed551-3684-4dd7-92e7-37a0b14e5e87" name="Changes" comment="统计修改">
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/BusinessFileController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/MajorProductionAllotController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/PersonalCalculateController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/PersonalController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/PersonalExampleController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/PersonalProductionController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/PersonalTargetController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/fdc_jgbg.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/fdc_jgbg_gt.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/fdc_jsbg.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/fdc_jsbg_gt.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/fdc_nhxq.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/fdc_yjs.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/fdc_yjs_gt.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/gd_jh_report.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/gd_online_yjh.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/gd_simple_pre_asset.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/gd_simple_report.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/gd_yp_simple_common.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/immovable_final_report.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/immovable_nhxq.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/immovable_statement.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/immovable_technic_report.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/ChineseUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/POIWordUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/PersonalUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/BusinessFileMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/MajorProductionAllotMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/PersonalCalculateMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/PersonalExampleMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/PersonalMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/PersonalProductionMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/PersonalSceneMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/PersonalTargetMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/MajorProductionAllotMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/PersonalCalculateMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/PersonalExampleMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/PersonalMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/PersonalProductionMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/PersonalSceneMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/PersonalTargetMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/dto/ItemData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/dto/NameUrlDTO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/MajorProductionAllot.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/Personal.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/PersonalCalculate.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/PersonalExample.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/PersonalProduction.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/PersonalScene.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/PersonalTarget.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/BusinessFileEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/CertificateEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/CompareExampleItemVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/CompareExampleVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/MajorProductionPerformanceVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/PersonalBackgroundInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/PersonalEntityInfoVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/PersonalHouseCertificateVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/PersonalImmovableCertificateVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/PersonalLandCertificateVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/PersonalSellingAbilityVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/vo/PersonalVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IBusinessFileService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IMajorProductionAllotService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IPersonalCalculateService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IPersonalExampleService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IPersonalProductionService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IPersonalSceneService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IPersonalService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IPersonalTargetService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/MajorProductionAllotServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/PersonalCalculateServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/PersonalExampleServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/PersonalProductionServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/PersonalSceneServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/PersonalServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/PersonalTargetServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/workflow/handler/PersonalNodeHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/BusinessAttachmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/PersonalSceneController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/BusinessNumberController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/BusinessNumberController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/BusinessProductionPerformanceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/BusinessProductionPerformanceController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/DictDataController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/DictDataController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/MajorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/MajorController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/MajorProductionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/MajorProductionController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/MajorTargetController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/MajorTargetController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/OrderFundController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/OrderFundController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/java/com/dayou/controller/UserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/main/resources/application-local.yml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/resources/application-local.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/src/test/java/BrokerageTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/test/java/BrokerageTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/biz-base-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/biz-base-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/biz-base-1.0-SNAPSHOT.jar.original" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/application-local.yml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/application-local.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/BusinessAttachmentController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/BusinessProductionPerformanceController.class" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/BusinessProductionPerformanceController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/DictDataController.class" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/DictDataController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/MajorController.class" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/MajorController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/MajorProductionController.class" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/MajorProductionController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/OrderFundController.class" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/OrderFundController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/UserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/com/dayou/controller/UserController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/biz-base/target/test-classes/BrokerageTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/dayou/configuration/CacheConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/configuration/CacheConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/common-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/common-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/BusinessAttachmentMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/BusinessProductionPerformanceMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/BusinessProductionPerformanceMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/MajorProductionMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/MajorProductionMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/UserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/UserMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/WorkNodeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/java/com/dayou/mapper/WorkNodeMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/resources/mapper/BusinessAttachmentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/BusinessFileMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/resources/mapper/MajorMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/MajorMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/resources/mapper/MajorProductionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/MajorProductionMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/resources/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/UserMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/resources/mapper/WorkNodeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/WorkNodeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/src/main/resources/mapper/WorkTaskRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/src/main/resources/mapper/WorkTaskRecordMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/BusinessAttachmentMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/MajorProductionMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/MajorProductionMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/UserMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/UserMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/WorkNodeMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/com/dayou/mapper/WorkNodeMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/BusinessAttachmentMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/MajorMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/mapper/MajorMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/MajorProductionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/mapper/MajorProductionMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/mapper/UserMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/WorkNodeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/mapper/WorkNodeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/classes/mapper/WorkTaskRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dao/target/classes/mapper/WorkTaskRecordMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/dao-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/dao-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dao/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/doc_changelog.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/main/resources/smart-doc.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/biz-base/src/test/java/Test.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/sql/update_sql.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/immovable_technic_report.docx" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/src/main/resources/docs/personal/immovable_technic_report.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/test/java/BrokerageTest.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/test/java/KMeans.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/test/java/KMeansLine.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/test/java/k/Cluster.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/test/java/k/KMeansX.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/src/test/java/k/Point.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/biz-base/target/classes/docs/personal/immovable_technic_report.docx" beforeDir="false" afterPath="$PROJECT_DIR$/biz-base/target/classes/docs/personal/immovable_technic_report.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/dayou/utils/DateUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/common/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/common/FixedWorkNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/common/FixedWorkNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/dto/PerformanceAllotDTO.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/dto/WorkNodeCommit.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/dto/WorkNodeCommit.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/dto/WorkNodeDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/dto/WorkNodeDTO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/BusinessAttachment.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/BusinessFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/BusinessProductionPerformance.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/BusinessProductionPerformance.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/MajorTarget.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/MajorTarget.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/WorkNodeTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/WorkNodeTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/WorkTaskRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/WorkTaskRecord.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/FindBusinessBean.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/GlobalConfigEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/GlobalConfigEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/MainBusinessEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/MainBusinessEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/MergeKeyInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/MergeKeyInterface.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/ProductionEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/ProductionEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/workflow/CallbackEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/workflow/CallbackEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/workflow/HandlerPermissionEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/workflow/HandlerPermissionEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/workflow/WorkflowNodeEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/enums/workflow/WorkflowNodeEnum.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/PersonalCalculate.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/dayou/entity/PersonalCalculate.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/Constants.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/Constants.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/FixedWorkNode.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/common/FixedWorkNode.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/PerformanceAllotDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/WorkNodeCommit.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/WorkNodeCommit.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/WorkNodeDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/dto/WorkNodeDTO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/BusinessAttachment.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/BusinessProductionPerformance.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/BusinessProductionPerformance.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/MajorTarget.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/MajorTarget.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/WorkNodeTask.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/WorkNodeTask.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/WorkTaskRecord.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/WorkTaskRecord.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/FindBusinessBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum$DepartmentTurns.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/GlobalConfigEnum$DepartmentTurns.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/MainBusinessEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/MainBusinessEnum.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/ProductionEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/ProductionEnum.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/workflow/CallbackEnum$NecessaryNode.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/workflow/CallbackEnum$NecessaryNode.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/workflow/CallbackEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/workflow/CallbackEnum.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/workflow/HandlerPermissionEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/workflow/HandlerPermissionEnum.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/workflow/WorkflowNodeEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/enums/workflow/WorkflowNodeEnum.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/domain-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/domain-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/domain/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/gen-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/gen-1.0-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/gen/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IBusinessAttachmentService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IBusinessNumberService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IBusinessNumberService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IBusinessProductionPerformanceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IBusinessProductionPerformanceService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IDictDataService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IDictDataService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IMajorProductionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IMajorProductionService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IMajorTargetService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IMajorTargetService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/IUserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/BusinessAttachmentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/BusinessFileServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/BusinessNumberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/BusinessNumberServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/BusinessProductionPerformanceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/BusinessProductionPerformanceServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/DictDataServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/DictDataServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ItemBrokerageSequenceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/ItemBrokerageSequenceServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/MajorProductionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/MajorProductionServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/MajorServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/MajorServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/MajorTargetServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/MajorTargetServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/UserServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/IWorkFlowService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/IWorkFlowService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/IWorkNodeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/IWorkNodeService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/IWorkTaskRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/IWorkTaskRecordService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/WorkFlowNodeInstanceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/WorkFlowNodeInstanceServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/WorkFlowServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/WorkFlowServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/WorkNodeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/WorkNodeServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/WorkNodeTaskServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/WorkNodeTaskServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/WorkTaskRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/workflow/WorkTaskRecordServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/workflow/config/WorkNodeProcessable.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/workflow/config/WorkNodeProcessable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/workflow/config/WorkflowConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/workflow/config/WorkflowConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/workflow/config/WorkflowInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/workflow/config/WorkflowInterceptor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/workflow/handler/MajorNodeHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/workflow/handler/MajorNodeHandler.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IBusinessAttachmentService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IBusinessProductionPerformanceService.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IBusinessProductionPerformanceService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IDictDataService.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IDictDataService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IMajorProductionService.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IMajorProductionService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IMajorTargetService.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IMajorTargetService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IUserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/IUserService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BusinessAttachmentServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BusinessNumberServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BusinessNumberServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BusinessProductionPerformanceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/BusinessProductionPerformanceServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DictDataServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DictDataServiceImpl$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DictDataServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/DictDataServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemBrokerageSequenceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/ItemBrokerageSequenceServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MajorProductionServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MajorProductionServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MajorServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MajorServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MajorTargetServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/MajorTargetServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/UserServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/impl/UserServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/IWorkFlowService.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/IWorkFlowService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/IWorkNodeService.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/IWorkNodeService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/IWorkTaskRecordService.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/IWorkTaskRecordService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/WorkFlowNodeInstanceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/WorkFlowNodeInstanceServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/WorkFlowServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/WorkFlowServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/WorkNodeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/WorkNodeServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/WorkNodeTaskServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/WorkNodeTaskServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/WorkTaskRecordServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/service/workflow/WorkTaskRecordServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/config/WorkNodeProcessable$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/config/WorkNodeProcessable.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/config/WorkNodeProcessable.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/config/WorkflowConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/config/WorkflowConfig.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/config/WorkflowInterceptor$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/config/WorkflowInterceptor$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/config/WorkflowInterceptor.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/config/WorkflowInterceptor.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/handler/MajorNodeHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/classes/com/dayou/workflow/handler/MajorNodeHandler.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/service-1.0-SNAPSHOT-sources.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/target/service-1.0-SNAPSHOT.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/PersonalCalculate.class" beforeDir="false" afterPath="$PROJECT_DIR$/domain/target/classes/com/dayou/entity/PersonalCalculate.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/domain/target/classes/rebel.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/PersonalProductionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/dayou/service/impl/PersonalProductionServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sql/20230213.sql" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/sql/brokerage_about.sql" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/sql/init.sql" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/sql/menu.sql" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -393,15 +165,8 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="GetMacAddressExample" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="GetMacAddressExample" />
-      <module name="biz-base" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="QRCodeUtil" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.dayou.utils.QRCodeUtil" />
+    <configuration name="DateUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.dayou.utils.DateUtils" />
       <module name="common" />
       <extension name="coverage">
         <pattern>
@@ -413,11 +178,21 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="BrokerageTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="Test.genApiList" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="biz-base" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="Test" />
+      <option name="METHOD_NAME" value="genApiList" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="Test.genHTMLDoc" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="biz-base" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="BrokerageTest" />
-      <option name="METHOD_NAME" value="test" />
+      <option name="MAIN_CLASS_NAME" value="Test" />
+      <option name="METHOD_NAME" value="genHTMLDoc" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -437,19 +212,19 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Application.GetMacAddressExample" />
-      <item itemvalue="Application.QRCodeUtil" />
+      <item itemvalue="Application.DateUtils" />
       <item itemvalue="Application.CodeGenerator" />
-      <item itemvalue="JUnit.BrokerageTest.test" />
+      <item itemvalue="JUnit.Test.genApiList" />
+      <item itemvalue="JUnit.Test.genHTMLDoc" />
       <item itemvalue="Spring Boot.BaseApplication" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.Test.genHTMLDoc" />
         <item itemvalue="Spring Boot.BaseApplication" />
+        <item itemvalue="JUnit.Test.genApiList" />
+        <item itemvalue="Application.DateUtils" />
         <item itemvalue="Application.CodeGenerator" />
-        <item itemvalue="JUnit.BrokerageTest.test" />
-        <item itemvalue="Application.GetMacAddressExample" />
-        <item itemvalue="Application.QRCodeUtil" />
       </list>
     </recent_temporary>
   </component>
@@ -768,6 +543,7 @@
       <workItem from="1710981616218" duration="3519000" />
       <workItem from="1710990626708" duration="1985000" />
       <workItem from="1711068468611" duration="10409000" />
+      <workItem from="1711327663071" duration="19446000" />
     </task>
     <task id="LOCAL-00024" summary="数据权限调整">
       <created>1676453906178</created>

biz-base/pom.xml

@@ -122,7 +122,6 @@
                 </executions>
             </plugin>
         </plugins>
-
     </build>
 
 </project>

biz-base/src/main/resources/doc_changelog.txt

@@ -0,0 +1 @@
+1 app 相关接口

biz-base/src/main/resources/smart-doc.json

@@ -0,0 +1,8 @@
+{
+  "outPath": "./base/src/main/resources/static/doc",
+  "allInOne": true,
+  "isStrict": false,
+  "coverOld": true,
+  "serverUrl": "http://{{dy}}",
+  "projectName": "四川大友主营业务平台接口文档"
+}

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

@@ -1,240 +0,0 @@
-//import com.dayou.BaseApplication;
-//import com.dayou.service.IBusinessNumberService;
-//import com.dayou.service.workflow.IWorkTaskRecordService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * 类说明：
- *
- * @author: wucl
- * @since: 2023/3/6
- * created with IntelliJ IDEA.
- */
-//@Slf4j
-//@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;
-//
-//    @Autowired
-//    private IWorkFlowNodeInstanceService workFlowNodeInstanceService;
-//
-//    @Test
-//    public void testFindNextNode(){
-//        List<ProductionEnum> productionEnums = new ArrayList<>();
-//        productionEnums.add(ProductionEnum.STATEMENT);
-//        productionEnums.add(ProductionEnum.REPORT);
-////        Map<String, List<WorkflowNodeEnum>> byProduction = CallbackEnum.NecessaryNode.getByProduction(CallbackEnum.CHECK_PRODUCTION_TYPE,
-////                //产品类型有业务数据获取，下面是暂代
-////                productionEnums);
-////        WorkNodeDTO nextWorkNodeByIgnore = workNodeService.getNextWorkNodeByBusiness(6L,"LETTER_OUT",  byProduction);
-//        InstanceNodeDTO instanceNodeDTO = new InstanceNodeDTO();
-//        instanceNodeDTO.setBusinessId(8L);
-//        instanceNodeDTO.setMainBusiness("MAJOR_BUSINESS");
-//        instanceNodeDTO.setProduction(productionEnums);
-//        List<WorkNodeInstanceVO> workNodeInstanceVOS = workFlowNodeInstanceService.instanceQueue(instanceNodeDTO);
-//        System.out.println(workNodeInstanceVOS);
-//    }
-
-//        @Autowired
-//    private IMajorService majorService;
-//
-//        @Test
-//        public void testSortedDepartment(){
-//            Major major = new Major();
-//            major.setAllotType("轮单");
-//            majorService.add(major);
-//
-//        }
-
-//    @Autowired
-//     private IUserService userService;
-//
-//    @Test
-//    public void testSearchLeader(){
-//        Long leaderByCurrentUser = userService.getLeaderByCurrentUser();
-//        System.out.println(leaderByCurrentUser);
-//    }
-
-
-//    @Autowired
-//    private IWorkNodeService workNodeService;
-//
-//    @Test
-//    public void getNextNodeByCheck(){
-//        WorkNodeDTO check_statement = workNodeService.getNextWorkNodeByCheckState(6L, "RECHECK_STATEMENT", ReportStatus.不审.name(), ReportStatus.待审核.name());
-//        System.out.println(check_statement.getCode());
-//    }
-
-//    @Test
-//    public void takeNumber(){
-//        ExecutorService executor = Executors.newFixedThreadPool(10);
-//        for (int i=0; i<28;i++){
-//            executor.submit(new TakeNumberTest(i+44L,true,10,(i%2==0?LAND_NUMBER:REALTY_NUMBER)));
-//        }
-//        // 关闭线程池
-//        executor.shutdown();
-//
-//        // 等待任务执行完成
-//        try {
-//            executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
-//        } catch (InterruptedException e) {
-//            e.printStackTrace();
-//        }
-//
-//    }
-
-//    private TaskRecordDTO<TakeNumberDTO> buildData(Long majorId){
-//        TaskRecordDTO<TakeNumberDTO> taskRecordDTO = new TaskRecordDTO<TakeNumberDTO>();
-//        TakeNumberDTO dto = new TakeNumberDTO();
-//        dto.setTakeType(REALTY_NUMBER);
-//        dto.setBusinessType(MainBusinessEnum.MAJOR_BUSINESS);
-//        dto.setCurrentYear(Boolean.FALSE);
-//        dto.setBusinessId(majorId);
-//        List<IdNameVO> idNameVOS= new ArrayList<>();
-//        IdNameVO idNameVO1 = new IdNameVO();
-//        idNameVO1.setId(1L);
-//        IdNameVO idNameVO2 = new IdNameVO();
-//        idNameVO2.setId(2L);
-//        IdNameVO idNameVO3 = new IdNameVO();
-//        idNameVO3.setId(3L);
-//        IdNameVO idNameVO4 = new IdNameVO();
-//        idNameVO4.setId(4L);
-//        IdNameVO idNameVO5 = new IdNameVO();
-//        idNameVO5.setId(5L);
-//        IdNameVO idNameVO6 = new IdNameVO();
-//        idNameVO6.setId(6L);
-//        IdNameVO idNameVO7 = new IdNameVO();
-//        idNameVO7.setId(7L);
-//        IdNameVO idNameVO8 = new IdNameVO();
-//        idNameVO8.setId(8L);
-//        IdNameVO idNameVO9 = new IdNameVO();
-//        idNameVO9.setId(9L);
-//        IdNameVO idNameVO10 = new IdNameVO();
-//        idNameVO10.setId(10L);
-//        idNameVOS.add(idNameVO1);
-//        idNameVOS.add(idNameVO2);
-//        idNameVOS.add(idNameVO3);
-//        idNameVOS.add(idNameVO4);
-//        idNameVOS.add(idNameVO5);
-//        idNameVOS.add(idNameVO6);
-//        idNameVOS.add(idNameVO7);
-//        idNameVOS.add(idNameVO8);
-//        idNameVOS.add(idNameVO9);
-//        idNameVOS.add(idNameVO10);
-//        dto.setTargets(idNameVOS);
-//        taskRecordDTO.setTaskData(dto);
-//        return taskRecordDTO;
-//    }
-//
-//    class TakeNumberTest implements Runnable{
-//
-//
-//        public TakeNumberTest(Long majorId, boolean currentYear, int takeNum, TakeNumberEnum takeNumberEnum) {
-//            this.majorId = majorId;
-//            this.currentYear = currentYear;
-//            this.takeNum = takeNum;
-//            this.takeNumberEnum = takeNumberEnum;
-//        }
-//
-//        private TakeNumberEnum takeNumberEnum;
-//        private Long majorId;
-//
-//        private boolean currentYear;
-//
-//        private  int takeNum;
-//
-//        @Override
-//        public void run() {
-//            List<MajorTarget> list = majorTargetService.list(new LambdaQueryWrapper<MajorTarget>().eq(MajorTarget::getMajorId, majorId));
-//
-//            List<IdNameVO> collect = new ArrayList<>();
-//
-//                for (int j=0; j<takeNum; j++){
-//                    IdNameVO idNameVO = new IdNameVO();
-//                    idNameVO.setId(list.get(j).getId());
-//                    collect.add(idNameVO);
-//                }
-//
-//            TaskRecordDTO<TakeNumberDTO> taskRecordDTO = new TaskRecordDTO<TakeNumberDTO>();
-//            TakeNumberDTO dto = new TakeNumberDTO();
-//            dto.setTakeType(takeNumberEnum);
-//            dto.setBusinessType(MainBusinessEnum.MAJOR_BUSINESS);
-//            dto.setCurrentYear(currentYear);
-//            dto.setBusinessId(majorId);
-//            dto.setTargets(collect);
-//            taskRecordDTO.setTaskData(dto);
-//            Boolean aBoolean = majorTargetService.takeNumber(taskRecordDTO);
-//            System.out.println("============================================================================================>majorId" + majorId + "取号"+ aBoolean);
-//        }
-//    }
-//    @Autowired
-//    private IWorkTaskRecordService workTaskRecordService;
-//    @Autowired
-//    private IBusinessNumberService businessNumberService;
-
-//    @Test
-//    public void test(){
-//        String s = businessNumberService.takeOrderNumber();
-//        System.out.println(s);
-//    }
-
-//}

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

@@ -1,145 +0,0 @@
-//
-//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

@@ -1,60 +0,0 @@
-//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/Test.java

@@ -0,0 +1,354 @@
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.text.StrBuilder;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import com.dayou.BaseApplication;
+import com.power.doc.builder.DocBuilderTemplate;
+import com.power.doc.builder.HtmlApiDocBuilder;
+import com.power.doc.builder.ProjectDocConfigBuilder;
+import com.power.doc.model.*;
+import com.power.doc.template.IDocBuildTemplate;
+import com.power.doc.template.SpringBootDocBuildTemplate;
+import com.power.doc.utils.BeetlTemplateUtil;
+import com.thoughtworks.qdox.JavaProjectBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.beetl.core.Template;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.power.doc.constants.DocGlobalConstants.*;
+
+/**
+ * spring环境测试和用于文档生成
+ *
+ * @author lq
+ * @version 1.0
+ * @date 2020/8/21 10:15
+ */
+@Slf4j
+@SpringBootTest(classes = BaseApplication.class)
+@RunWith(SpringJUnit4ClassRunner.class)
+public class Test {
+    private static String INDEX_HTML = "index.html";
+
+    /**
+     * 生成文档
+     */
+    @org.junit.Test
+    public void genHTMLDoc() throws IOException, InterruptedException {
+        doHtmlGen();
+    }
+
+    /**
+     * 生成SDK文档
+     */
+    @org.junit.Test
+    public void genSdkDoc() throws InterruptedException {
+        // generateSdkDoc();
+    }
+
+    /**
+     * 生成API接口列表
+     */
+    @org.junit.Test
+    public void genApiList() throws IOException, InterruptedException {
+        //doHtmlGen();
+    }
+
+    private void doHtmlGen() throws IOException, InterruptedException {
+        String base = new File("").getAbsolutePath().split("\\\\biz-base")[0];
+        ApiConfig config = new ApiConfig();
+        String serverUrl = "http://127.0.0.1:8088/api";
+        config.setServerUrl(serverUrl);
+
+        //设置不为严格模式
+        config.setStrict(false);
+
+        config.setAllInOne(true);
+        config.setProjectName("DY-API");
+        RevisionLog relog = new RevisionLog();
+        relog.setAuthor("WUCL");
+        relog.setRemarks("四川大友主营业务平台接口文档");
+        relog.setRevisionTime(DateUtil.now());
+        relog.setVersion("v2_app");
+        relog.setStatus("进行中");
+
+        config.setRevisionLogs(relog);
+
+        // 源代码路径
+        config.setOutPath(base + "\\biz-base\\src\\main\\resources\\static\\doc");
+
+        // 设置接口包扫描路径过滤，如果不配置则Smart-doc默认扫描所有的接口类 配置多个报名有英文逗号隔开
+        config.setPackageFilters("com.dayou.controller");
+
+        // 多模块时源代码路径
+        SourceCodePath paths = new SourceCodePath();
+        paths.setPath(base + "\\biz-base\\src\\main\\java");
+        SourceCodePath paths1 = new SourceCodePath();
+        paths1.setPath(base + "\\common\\src\\main\\java");
+        SourceCodePath paths2 = new SourceCodePath();
+        paths2.setPath(base + "\\domain\\src\\main\\java");
+        SourceCodePath paths3 = new SourceCodePath();
+        paths3.setPath(base + "\\service\\src\\main\\java");
+
+
+        config.setSourceCodePaths(paths, paths1, paths2, paths3);
+
+        System.out.println("文档努力扫描生成中 请稍等..");
+
+        //生成HTML5文件
+        HtmlApiDocBuilder.buildApiDoc(config);
+
+        Thread.sleep(1000);
+
+        //生成变更日志
+        genChangeLog();
+
+        System.out.println("生成html5 文档成功");
+        System.out.println("生成changelog 成功");
+    }
+
+    private void generateApiList() {
+        String base = new File("").getAbsolutePath().split("\\\\biz-base")[0];
+        SourceCodePath paths = new SourceCodePath();
+        paths.setPath(base + "\\biz-base\\src\\main\\java");
+    }
+    private static void genChangeLog() throws IOException {
+        String base = new File("").getAbsolutePath().split("\\\\biz-base")[0];
+        List<String> changeList = FileUtil.readLines(new File(base + "\\biz-base\\src\\main\\resources\\doc_changelog.txt"), "utf-8");
+        String id = "changelog";
+        String temple = "<div id=\"" + id + "\" style=\"margin-left: 60px\" > <h1 >变更记录<p  style=\"color:green;font-size:15px;\">文档更新时间:%s</p></h1> <ul>%s</ul> </div>";
+        StrBuilder strBuilder = new StrBuilder();
+        for (int i = 0; i < changeList.size(); i++) {
+            String text = changeList.get(i);
+            if (StrUtil.isBlank(text) || StrUtil.isBlank(text.trim())) {
+                continue;
+            }
+            strBuilder.append("<li  style=\"color:#9f1717;font-size:22px;\" >");
+            strBuilder.append(text.trim());
+            strBuilder.append("</li>");
+        }
+
+        temple = String.format(temple, DateUtil.now(), strBuilder.toString());
+
+        String pathname = base + "\\biz-base\\src\\main\\resources\\static\\doc\\index.html";
+        File file = new File(pathname);
+        Document doc = Jsoup.parse(file, "UTF-8");
+        Element changelogDiv = doc.getElementById(id);
+        if (changelogDiv != null) {
+            changelogDiv.remove();
+        }
+        Element header = doc.getElementById("header");
+        header.before(temple);
+        String html = doc.html();
+        String[] split = html.split("</body>");
+        // 插入 debug js
+        String debugHtml = split[0] + "<script src=\"./debug.js\"></script>\n" +
+                "  <style type=\"text/css\">\n" +
+                "  </style>" + "</body> " + split[1];
+        String tmp = base + "\\doc_temp" + RandomUtil.randomString(32) + ".html";
+        File tmpFile = FileUtil.writeString(debugHtml, tmp, "utf-8");
+        FileUtil.copyFile(tmpFile, file, StandardCopyOption.REPLACE_EXISTING);
+        tmpFile.delete();
+    }
+
+
+
+    private String handlePath(String path) {
+        if (path.endsWith("/")) {
+            return StringUtils.removeEnd(path, "/");
+        }
+        return path;
+    }
+
+    private boolean checkSkip(ApiDoc doc) {
+        List<ApiMethodDoc> methodDocs = doc.getList();
+        if (methodDocs == null || methodDocs.isEmpty()) {
+            return true;
+        }
+
+        if (methodDocs.get(0).getPath().contains("/sdk")) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private String handleModuleName(String desc, String controllerName) {
+        if (StringUtils.isNotBlank(desc)) {
+            return StringUtils.deleteWhitespace(desc).replaceAll("前端控制器", "管理")
+                    .replaceAll("&lt;p&gt;", "")
+                    .replaceAll("&lt;/p&gt;", "")
+                    .replaceAll(",", "，");
+        } else {
+            return controllerName;
+        }
+    }
+
+    private String handleMethodName(String desc, String methodName) {
+        if (StringUtils.isNotBlank(desc)) {
+            return StringUtils.deleteWhitespace(desc)
+                    .replaceAll("&lt;p&gt;", "")
+                    .replaceAll("&lt;/p&gt;", "")
+                    .replaceAll(",", "，");
+        } else {
+            switch (methodName) {
+                case "page":
+                    return "分页查询";
+                case "detail":
+                    return "详情查询";
+                case "save":
+                    return "新增";
+                case "update":
+                    return "编辑";
+                case "delete":
+                    return "删除";
+                case "simpleAll":
+                    return "下拉列表";
+                case "importTemplate":
+                    return "导入模板下载";
+                case "importExcel":
+                    return "导入";
+                case "export":
+                    return "导出";
+                case "batchAdd":
+                    return "批量新增";
+                default:
+                    return methodName;
+            }
+        }
+    }
+
+    private ApiConfig getBaseConfig() {
+        String base = new File("").getAbsolutePath().split("\\\\biz-base")[0];
+        ApiConfig config = new ApiConfig();
+        String serverUrl = "http://127.0.0.1:8088/api";
+        config.setServerUrl(serverUrl);
+
+        //设置不为严格模式
+        config.setStrict(false);
+
+        config.setAllInOne(true);
+        config.setProjectName("DY-API");
+        RevisionLog relog = new RevisionLog();
+        relog.setAuthor("WUCL");
+        relog.setRemarks("四川大友主营业务平台接口文档");
+        relog.setRevisionTime(DateUtil.now());
+        relog.setVersion("v4");
+        relog.setStatus("进行中");
+
+        config.setRevisionLogs(relog);
+
+        // 源代码路径
+        config.setOutPath(base + "\\biz-base\\src\\main\\resources\\static\\doc");
+
+        // 设置接口包扫描路径过滤，如果不配置则Smart-doc默认扫描所有的接口类 配置多个报名有英文逗号隔开
+        config.setPackageFilters("com.dayou.controller");
+
+        return config;
+    }
+
+    private void generateSdkDoc() throws InterruptedException {
+        String base = new File("").getAbsolutePath().split("\\\\biz-base")[0];
+        ApiConfig config = new ApiConfig();
+        String serverUrl = "http://119.27.160.97:8534/api/sdk";
+        config.setServerUrl(serverUrl);
+
+        //设置不为严格模式
+        config.setStrict(false);
+
+        config.setAllInOne(true);
+        config.setProjectName("学校API");
+        RevisionLog relog = new RevisionLog();
+        relog.setAuthor("xysy");
+        relog.setRemarks("学校4期接口文档");
+        relog.setRevisionTime(DateUtil.now());
+        relog.setVersion("v4");
+        relog.setStatus("进行中");
+
+        config.setRevisionLogs(relog);
+
+        // 源代码路径
+        config.setOutPath(base + "\\biz-base\\src\\main\\resources\\static\\doc\\sdk");
+
+        // 设置接口包扫描路径过滤，如果不配置则Smart-doc默认扫描所有的接口类 配置多个报名有英文逗号隔开
+        config.setPackageFilters("com.dayou.controller");
+
+        // 多模块时源代码路径
+        SourceCodePath paths = new SourceCodePath();
+        paths.setPath(base + "\\biz-base\\src\\main\\java");
+        SourceCodePath paths1 = new SourceCodePath();
+        paths1.setPath(base + "\\common\\src\\main\\java");
+        SourceCodePath paths2 = new SourceCodePath();
+        paths2.setPath(base + "\\domain\\src\\main\\java");
+        SourceCodePath paths3 = new SourceCodePath();
+        paths3.setPath(base + "\\service\\src\\main\\java");
+
+        SourceCodePath pathsUis = new SourceCodePath();
+        pathsUis.setPath(base + "\\biz-custom\\biz-uis\\src\\main\\java");
+
+        config.setSourceCodePaths(paths, paths1, paths2, paths3, pathsUis);
+
+        System.out.println("文档努力扫描生成中 请稍等..");
+
+        //生成HTML5文件
+        buildSdkApiDoc(config);
+
+        Thread.sleep(1000);
+
+        System.out.println("生成html5 文档成功");
+    }
+
+    private void buildSdkApiDoc(ApiConfig config) {
+        JavaProjectBuilder javaProjectBuilder = new JavaProjectBuilder();
+        buildSdkApiDoc(config, javaProjectBuilder);
+    }
+
+    private void buildSdkApiDoc(ApiConfig config, JavaProjectBuilder javaProjectBuilder) {
+        DocBuilderTemplate builderTemplate = new DocBuilderTemplate();
+        builderTemplate.checkAndInit(config);
+        config.setParamsDataToTree(false);
+        ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
+        IDocBuildTemplate docBuildTemplate = new SpringBootDocBuildTemplate();
+        List<ApiDoc> initApiDoc = docBuildTemplate.getApiData(configBuilder);
+        //TODO: 这里可以过滤处理对外开放的api接口列表
+        List<ApiDoc> apiDocList = new ArrayList<>();
+        if (initApiDoc != null && !initApiDoc.isEmpty()) {
+            for (ApiDoc doc : initApiDoc) {
+                if (checkSkip(doc)) {
+                    continue;
+                }
+
+                doc.setDesc(handleModuleName(doc.getDesc(), doc.getName()));
+                List<ApiMethodDoc> methodDocs = doc.getList();
+                if (methodDocs != null && !methodDocs.isEmpty()) {
+                    for (ApiMethodDoc methodDoc : methodDocs) {
+                        methodDoc.setDesc(handleMethodName(methodDoc.getDesc(), methodDoc.getName()));
+                    }
+                }
+                apiDocList.add(doc);
+            }
+        }
+
+        Template indexCssTemplate = BeetlTemplateUtil.getByName(ALL_IN_ONE_CSS);
+        com.power.common.util.FileUtil.nioWriteFile(indexCssTemplate.render(), config.getOutPath() + FILE_SEPARATOR + ALL_IN_ONE_CSS);
+        if (StringUtils.isNotEmpty(config.getAllInOneDocFileName())) {
+            INDEX_HTML = config.getAllInOneDocFileName();
+        }
+        builderTemplate.buildAllInOne(apiDocList, config, javaProjectBuilder, ALL_IN_ONE_HTML_TPL, INDEX_HTML);
+    }
+}

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

@@ -1,20 +0,0 @@
-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

@@ -1,313 +0,0 @@
-//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

@@ -1,34 +0,0 @@
-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/target/classes/doc_changelog.txt

@@ -0,0 +1 @@
+1 app 相关接口

biz-base/target/classes/smart-doc.json

@@ -0,0 +1,8 @@
+{
+  "outPath": "./base/src/main/resources/static/doc",
+  "allInOne": true,
+  "isStrict": false,
+  "coverOld": true,
+  "serverUrl": "http://{{dy}}",
+  "projectName": "四川大友主营业务平台接口文档"
+}

common/src/main/java/com/dayou/utils/DateUtils.java

@@ -14,6 +14,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
+
 /**
  * 时间工具类
  *
@@ -38,6 +40,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String MM_DD_C = "MM月dd日";
     public static String YYYY_MM_DD_C = "yyyy年MM月dd日";
     public static String HH_MM_SS = "HH:mm:ss";
+    public static String TZ = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+    public static String YYYY_MM_C = "yyyy年MM月";
     private static String[] parsePatterns = {
             "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", "yyyyMMdd",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
@@ -464,24 +468,18 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         return hour+ "时" + minute + "分" + second+"秒";
     }
 
+    public static String tzTime2ChineseYM(String tzDateTime){
+        try {
+            return format(LocalDateTime.parse(tzDateTime, DateTimeFormatter.ofPattern(TZ)), YYYY_MM_C);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
 //    public static void main(String[]agrs){
-////        try {
-////            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-////            //查询时间段
-////            Date as = sdf.parse("2022-05-01 00:00:00");
-////            Date ae = sdf.parse("2022-05-31 23:59:59");
-////
-////            //请假时间段
-////            Date bs = sdf.parse("2022-05-30 00:00:00");
-////            DateTime of = DateTime.of(ae.getTime() + 1000l);
-////            Date be = sdf.parse("2022-06-02 00:00:00");
-//////            Long twoPeriodBeMixed = getTwoPeriodBeMixed(as, of, bs, be);
-////            int hour = DateUtil.hour(be, true);
-////            System.out.println(hour);
-////        } catch (ParseException e) {
-////            e.printStackTrace();
-////        }
-//        System.out.println(getTimeLong(334357329L));
+//        LocalDateTime parse = LocalDateTime.parse("2024-02-29T16:00:00.000Z", DateTimeFormatter.ofPattern(TZ));
+//        String ret = format(parse, YYYY_MM_C);
+//        System.out.println(ret);
 //    }
     /**
      * 月份差

common/target/classes/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,64 @@
+{
+  "groups": [
+    {
+      "name": "dfs",
+      "type": "com.dayou.configuration.DfsConfig",
+      "sourceType": "com.dayou.configuration.DfsConfig"
+    },
+    {
+      "name": "ueditor",
+      "type": "com.dayou.ueditor.UEditorConfig",
+      "sourceType": "com.dayou.ueditor.UEditorConfig"
+    }
+  ],
+  "properties": [
+    {
+      "name": "dfs.code",
+      "type": "java.lang.String",
+      "sourceType": "com.dayou.configuration.DfsConfig"
+    },
+    {
+      "name": "dfs.domain",
+      "type": "java.lang.String",
+      "description": "域名",
+      "sourceType": "com.dayou.configuration.DfsConfig"
+    },
+    {
+      "name": "dfs.domain-name",
+      "type": "java.lang.String",
+      "sourceType": "com.dayou.configuration.DfsConfig"
+    },
+    {
+      "name": "dfs.path",
+      "type": "java.lang.String",
+      "description": "路径",
+      "sourceType": "com.dayou.configuration.DfsConfig"
+    },
+    {
+      "name": "ueditor.config",
+      "type": "java.lang.String",
+      "description": "config.json的文件存放地址",
+      "sourceType": "com.dayou.ueditor.UEditorConfig"
+    },
+    {
+      "name": "ueditor.unified",
+      "type": "java.lang.Boolean",
+      "description": "是否同统一上传地址：图片上传地址，视频上传地址...",
+      "sourceType": "com.dayou.ueditor.UEditorConfig",
+      "defaultValue": false
+    },
+    {
+      "name": "ueditor.upload-path",
+      "type": "java.lang.String",
+      "description": "文件上传路径",
+      "sourceType": "com.dayou.ueditor.UEditorConfig"
+    },
+    {
+      "name": "ueditor.url-prefix",
+      "type": "java.lang.String",
+      "description": "文件url前缀",
+      "sourceType": "com.dayou.ueditor.UEditorConfig"
+    }
+  ],
+  "hints": []
+}