Commit 27862e94 by 赵剑炜

Merge branch 'develop-zhaojw' into develop

parents 8b682a3f b373d4fb
...@@ -40,3 +40,4 @@ Icon? ...@@ -40,3 +40,4 @@ Icon?
ehthumbs.db ehthumbs.db
Thumbs.db Thumbs.db
/*/target/* /*/target/*
/.idea/misc.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="19" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\ProductBatchServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\PackageInformationServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\SupplierServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Shelf.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\PackageInformation.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\InventorySummary.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\PublicController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\PoliceController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\EquipmentType.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\PackageInformation.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\EquipmentTypeController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\ProductService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\doc\ProductSkuDoc.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\EquipmentSizeMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Package.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\PubOrgServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\CabinetMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\utils\RequestParam.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\config\MybatisPlusConfig.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\PoliceFingerService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\EquipmentSize.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\SupplierEquipmentService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\ShelfService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Inventory.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\CabinetController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\PolicemanService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\CabinetBox.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\PubOrgService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\PubOrgController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Supplier.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\ProductController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\WarehouseService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\PubOrgService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\YearReport.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\doc\LoginDoc.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\SupplierMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\PackageInformationService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\CabinetBoxMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\InventorySummary.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\WarehouseServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\InventoryServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\LogSummaryService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\ProductTagMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\LogSummary.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\doc\ProductTagDoc.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\ProductBatchController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Supplier.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\LoginController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\entity\ProductBatch.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\ProductBatchServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\HistoryMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\InventorySummaryService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\PubOrgMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\EquipmentTypeServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\SupplierMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\doc\ProductDoc.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\ProductSkuController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\WarehouseAreaMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\CabinetBoxMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\ProductServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\WarehouseMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\doc\ProductBatchDoc.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\InventoryService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\entity\Company.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\WarehouseArea.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\doc\LoginDoc.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\YearReport.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\PubOrg.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\SupplierTypeServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\LogDetailService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\ProductBatchController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\YearReportMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\ShelfServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\config\MybatisPlusConfig.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\EquipmentSizeService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\PolicemanServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\ProductTagServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Package.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\PolicemanService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\CompanyController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\PolicemanMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\ProductTagServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\PackageInformationServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\YearReportServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\WarehouseAreaMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\LogDetail.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\SupplierEquipmentMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\ProductSkuService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\entity\ProductTag.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\YearReportService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\CabinetServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\TestController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\YearReportServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\CabinetServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\LogSummaryService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\LogSummaryServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\doc\CompanyDoc.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\WarehouseAreaServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\ProductTagController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\SupplierTypeMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\PubOrg.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\InventorySummaryServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Policeman.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\EquipmentType.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\ProductBatchService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\ProductTagController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\SupplierService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\PublicController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\EquipmentSizeMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\utils\ResponseResult.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Inventory.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\ProductTagService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\HistoryServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\CabinetBoxService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\utils\ReturnMsg.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\PackageService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\LogDetailMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\utils\ReturnData.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\LogDetail.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\PubOrgController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\PoliceFingerService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\HistoryService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\PackageMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\InventoryService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\PubOrgServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\HistoryServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\doc\ProductBatchDoc.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\ProductSkuMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\CompanyController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\PackageServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\utils\ReturnData.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\ProductBatchService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\PolicemanServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\entity\Product.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\PackageServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\ProductBatchMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\WarehouseAreaServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\PoliceFinger.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\LogSummary.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\ShelfServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\PoliceFinger.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\CompanyService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\entity\ProductSku.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\doc\ProductTagDoc.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\utils\HttpStatus.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\EquipmentSizeController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\History.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\LogSummaryMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\ProductSkuMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\PackageInformationService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\PoliceFingerServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\EquipmentTypeMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\ProductSkuServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\WarehouseArea.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\EquipmentSizeController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\SupplierServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\InventorySummaryServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\HistoryMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\doc\ProductDoc.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\WarehouseMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Shelf.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\WarehouseAreaService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\PoliceFingerMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\SupplierController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\LogSummaryServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\SupplierEquipment.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\ProductService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\entity\ProductBatch.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\cache\GoldRedisCache.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\PoliceFingerMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\WarehouseAreaService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\PubOrgMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\InventorySummaryService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\EquipmentSizeService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Warehouse.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\SupplierTypeServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\LogDetailServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\SupplierTypeService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\CabinetService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Warehouse.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\SupplierEquipmentService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\CabinetMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\PoliceController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\ProductSkuServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\WarehouseController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\ProductMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\CompanyMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\InventoryMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\ProductServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\EquipmentSize.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\LogSummaryMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\SupplierEquipmentMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\SupplierType.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\ProductSkuController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\utils\ResponseResult.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\ShelfService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\InventoryMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\SupplierEquipmentServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\PackageService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Policeman.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\utils\RedisUtils.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\entity\ProductTag.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\LoginController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Cabinet.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\SupplierController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\CabinetBox.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\SupplierEquipment.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\utils\DateTimeUtil.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\ProductMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\History.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\PackageInformationMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\PackageMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\EquipmentTypeMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\cache\GoldRedisCache.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\CompanyServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\EquipmentTypeService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\controller\TestController.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\utils\CheckBlank.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\EquipmentSizeServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\CompanyMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\HistoryService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\ProductTagMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\YearReportService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\doc\ProductSkuDoc.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\CompanyService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\InventorySummaryMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\domain\Cabinet.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\PackageInformationMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\entity\Product.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\utils\ObjectToMap.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\utils\DateTimeUtil.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\WarehouseController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\WarehouseService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\CompanyServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\YearReportMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\CabinetService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\EquipmentTypeService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\InventoryServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\ProductSkuService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\ProductController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\CabinetBoxService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\entity\ProductSku.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\SupplierTypeMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\CabinetBoxServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\ProductTagService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\utils\HttpStatus.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\ShelfMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\PolicemanMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\entity\Company.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\ShelfMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\SupplierEquipmentServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\utils\RedisUtils.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\CabinetBoxServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\EquipmentSizeServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\utils\RequestParam.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\LogDetailMapper.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\utils\CheckBlank.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\utils\ReturnMsg.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\LogDetailService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\LogDetailServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\EquipmentTypeServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\CabinetController.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\WarehouseServiceImpl.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\impl\PoliceFingerServiceImpl.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\InventorySummaryMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\service\SupplierService.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\service\SupplierTypeService.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\domain\SupplierType.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\utils\ObjectToMap.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\doc\CompanyDoc.java
D:\java-project\jyzb\jyzb-platform\jyzb-biz\src\main\java\com\junmp\jyzb\mapper\ProductBatchMapper.java C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-biz\src\main\java\com\junmp\jyzb\controller\EquipmentTypeController.java
...@@ -33,19 +33,24 @@ ...@@ -33,19 +33,24 @@
<artifactId>amqp-client</artifactId> <artifactId>amqp-client</artifactId>
<version>5.9.0</version> <version>5.9.0</version>
</dependency> </dependency>
<!--引入rabbitmq的相关依赖-->
<!-- <dependency>-->
<!-- <groupId>com.rabbitmq</groupId>-->
<!-- <artifactId>amqp-client</artifactId>-->
<!-- <version>5.7.2</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.3.2</version> <version>3.3.2</version>
</dependency> </dependency>
<!-- 整合到spring项目需要导入此依赖 --> <!-- &lt;!&ndash; 整合到spring项目需要导入此依赖 &ndash;&gt;-->
<dependency> <!-- <dependency>-->
<groupId>org.springframework.amqp</groupId> <!-- <groupId>org.springframework.amqp</groupId>-->
<artifactId>spring-rabbit</artifactId> <!-- <artifactId>spring-rabbit</artifactId>-->
<version>2.3.10</version> <!-- <version>2.3.10</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
......
...@@ -51,7 +51,6 @@ import java.util.HashMap; ...@@ -51,7 +51,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static com.junmp.junmpProcess.common.CommonConstants.*;
@Slf4j @Slf4j
@RestController @RestController
......
...@@ -27,7 +27,6 @@ import java.util.HashMap; ...@@ -27,7 +27,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static com.junmp.junmpProcess.common.CommonConstants.START_USER_INFO;
import static com.junmp.junmpProcess.utils.BpmnModelUtils.getChildNode; import static com.junmp.junmpProcess.utils.BpmnModelUtils.getChildNode;
/** /**
......
package com.junmp.junmpProcess.listener; package com.junmp.junmpProcess.listener;
import com.junmp.junmpProcess.utils.RabbitMQUtils2; import com.junmp.junmpProcess.utils.RabbitMQUtils2;
//import com.rabbitmq.client.Channel;
//import com.rabbitmq.client.Connection;
import com.rabbitmq.client.Channel; import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection; import com.rabbitmq.client.Connection;
import com.rabbitmq.client.MessageProperties;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType; import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
...@@ -41,8 +44,8 @@ public class GlobalEndListener extends AbstractFlowableEngineEventListener { ...@@ -41,8 +44,8 @@ public class GlobalEndListener extends AbstractFlowableEngineEventListener {
Connection connection = RabbitMQUtils2.getConnection(); Connection connection = RabbitMQUtils2.getConnection();
Channel channel = connection.createChannel(); Channel channel = connection.createChannel();
channel.queueDeclare("info",false,false,false,null);
channel.basicPublish("", "info",null,null); channel.basicPublish("", "info", MessageProperties.PERSISTENT_TEXT_PLAIN,("publish").getBytes());
RabbitMQUtils2.closeChannelAndConnection(connection,channel); RabbitMQUtils2.closeChannelAndConnection(connection,channel);
} }
......
...@@ -12,11 +12,11 @@ public class RabbitMQUtils { ...@@ -12,11 +12,11 @@ public class RabbitMQUtils {
static{ static{
//重量级资源 类加载执行之执行一次 //重量级资源 类加载执行之执行一次
connectionFactory = new ConnectionFactory(); connectionFactory = new ConnectionFactory();
connectionFactory.setHost("124.222.235.52"); connectionFactory.setHost("192.168.3.188");
connectionFactory.setPort(5672); connectionFactory.setPort(5672);
connectionFactory.setVirtualHost("/"); connectionFactory.setVirtualHost("/");
connectionFactory.setUsername("guest"); connectionFactory.setUsername("root");
connectionFactory.setPassword("guest"); connectionFactory.setPassword("123456");
} }
......
...@@ -6,12 +6,18 @@ ...@@ -6,12 +6,18 @@
<!--@Table base_cabinet--> <!--@Table base_cabinet-->
<result column="user_id" jdbcType="VARCHAR" property="userID" /> <result column="user_id" jdbcType="VARCHAR" property="userID" />
<result column="real_name" jdbcType="VARCHAR" property="realName" /> <result column="real_name" jdbcType="VARCHAR" property="realName" />
<result column="role_name" jdbcType="VARCHAR" property="roleName" />
<result column="role_id" jdbcType="VARCHAR" property="roleID" />
</resultMap> </resultMap>
<select id="QueryUserByRoleId" resultMap="UserListDTO"> <select id="QueryUserByRoleId" resultMap="UserListDTO">
SELECT su.user_id,su.real_name,sr.role_name,sr.role_id FROM `sys_role` sr left join sys_user_role sur on sr.role_id=sur.role_id LEFT JOIN sys_user su on sur.user_id=su.user_id SELECT su.user_id,su.real_name FROM `sys_role` sr join sys_user_role sur on sr.role_id=sur.role_id JOIN sys_user su on sur.user_id=su.user_id
where sr.role_id=#{roleId} where sr.role_id in ${roleId}
GROUP BY su.user_id,su.real_name
</select>
<select id="QueryUserByRoleIdAndOrg" resultMap="UserListDTO">
SELECT su.user_id,su.real_name FROM `sys_role` sr join sys_user_role sur on sr.role_id=sur.role_id JOIN sys_user su on sur.user_id=su.user_id
join sys_user_org suo on suo.user_id=su.user_id join pub_org po on po.org_id=suo.org_id
where sr.role_id in ${roleId} and po.org_id in ${orgId}
GROUP BY su.user_id,su.real_name
</select> </select>
</mapper> </mapper>
\ No newline at end of file
com\junmp\junmpProcess\dto\PageDTO.class com\junmp\junmpProcess\dto\PageDTO.class
com\junmp\junmpProcess\utils\RabbitMQUtils.class
com\junmp\junmpProcess\entity\Process.class com\junmp\junmpProcess\entity\Process.class
com\junmp\junmpProcess\dto\json\flowJson\FlowConditionNodes.class com\junmp\junmpProcess\dto\json\flowJson\FlowConditionNodes.class
com\junmp\junmpProcess\dto\json\FormItemProps.class com\junmp\junmpProcess\dto\json\FormItemProps.class
...@@ -24,6 +25,7 @@ com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$2.class ...@@ -24,6 +25,7 @@ com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$2.class
com\junmp\junmpProcess\service\Repository\impl\TemplateGroupServiceImpl.class com\junmp\junmpProcess\service\Repository\impl\TemplateGroupServiceImpl.class
com\junmp\junmpProcess\dto\json\FormOperates.class com\junmp\junmpProcess\dto\json\FormOperates.class
com\junmp\junmpProcess\mapper\TemplateGroupMapper.class com\junmp\junmpProcess\mapper\TemplateGroupMapper.class
com\junmp\junmpProcess\common\RabbitMqProducer.class
com\junmp\junmpProcess\mapper\FormGroupsMapper.class com\junmp\junmpProcess\mapper\FormGroupsMapper.class
com\junmp\junmpProcess\service\Repository\WorkspaceProcessService.class com\junmp\junmpProcess\service\Repository\WorkspaceProcessService.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$13.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$13.class
...@@ -56,21 +58,29 @@ com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl.class ...@@ -56,21 +58,29 @@ com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl.class
com\junmp\junmpProcess\utils\ExUtils$2.class com\junmp\junmpProcess\utils\ExUtils$2.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$1.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$1.class
com\junmp\junmpProcess\vo\MultiVO.class com\junmp\junmpProcess\vo\MultiVO.class
com\junmp\junmpProcess\dto\json\ApproverGroups.class
com\junmp\junmpProcess\service\Repository\impl\UserServiceImpl.class com\junmp\junmpProcess\service\Repository\impl\UserServiceImpl.class
com\junmp\junmpProcess\dto\json\flowJson\FlowNode.class com\junmp\junmpProcess\dto\json\flowJson\FlowNode.class
com\junmp\junmpProcess\utils\DateUtils$5.class com\junmp\junmpProcess\utils\DateUtils$5.class
com\junmp\junmpProcess\utils\JsonToELConverter.class
com\junmp\junmpProcess\dto\json\JunmpUserInfo.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$7.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$7.class
com\junmp\junmpProcess\entity\FormGroups.class com\junmp\junmpProcess\entity\FormGroups.class
com\junmp\junmpProcess\listener\ProcessListener.class com\junmp\junmpProcess\listener\ProcessListener.class
com\junmp\junmpProcess\dto\json\FormItem.class com\junmp\junmpProcess\dto\json\FormItem.class
com\junmp\junmpProcess\dto\FlowDTO.class com\junmp\junmpProcess\dto\FlowDTO.class
com\junmp\junmpProcess\dto\UserListDTO.class
com\junmp\junmpProcess\config\FlowableGlobListenerConfig.class
com\junmp\junmpProcess\dto\json\flowJson\FlowApproverGroups.class com\junmp\junmpProcess\dto\json\flowJson\FlowApproverGroups.class
com\junmp\junmpProcess\dto\json\GroupsInfo.class com\junmp\junmpProcess\dto\json\GroupsInfo.class
com\junmp\junmpProcess\listener\GlobalEndListener.class
com\junmp\junmpProcess\utils\IdWorker.class com\junmp\junmpProcess\utils\IdWorker.class
com\junmp\junmpProcess\entity\TemplateGroup$TemplateGroupBuilder.class com\junmp\junmpProcess\entity\TemplateGroup$TemplateGroupBuilder.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$11.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$11.class
com\junmp\junmpProcess\service\Bussiness\impl\OrgUserServicelmpl.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$12.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$12.class
com\junmp\junmpProcess\utils\DateUtils$4.class com\junmp\junmpProcess\utils\DateUtils$4.class
com\junmp\junmpProcess\utils\BpmnConvert.class
com\junmp\junmpProcess\doc\BpmnDoc.class com\junmp\junmpProcess\doc\BpmnDoc.class
com\junmp\junmpProcess\utils\SpringContextHolder.class com\junmp\junmpProcess\utils\SpringContextHolder.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$3.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$3.class
...@@ -79,11 +89,13 @@ com\junmp\junmpProcess\service\Bussiness\OrgUserAndDeptService.class ...@@ -79,11 +89,13 @@ com\junmp\junmpProcess\service\Bussiness\OrgUserAndDeptService.class
com\junmp\junmpProcess\utils\DateUtils$1.class com\junmp\junmpProcess\utils\DateUtils$1.class
com\junmp\junmpProcess\entity\Departments.class com\junmp\junmpProcess\entity\Departments.class
com\junmp\junmpProcess\utils\DateUtils$7.class com\junmp\junmpProcess\utils\DateUtils$7.class
com\junmp\junmpProcess\mapper\OrgUserMapper.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$6.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$6.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$9.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$9.class
com\junmp\junmpProcess\service\Repository\FormGroupService.class com\junmp\junmpProcess\service\Repository\FormGroupService.class
com\junmp\junmpProcess\entity\ProcessTemplates$ProcessTemplatesBuilder.class com\junmp\junmpProcess\entity\ProcessTemplates$ProcessTemplatesBuilder.class
com\junmp\junmpProcess\service\Repository\impl\DepartmentsServiceImpl.class com\junmp\junmpProcess\service\Repository\impl\DepartmentsServiceImpl.class
com\junmp\junmpProcess\utils\RabbitMQUtils2.class
com\junmp\junmpProcess\listener\TimerListener.class com\junmp\junmpProcess\listener\TimerListener.class
com\junmp\junmpProcess\service\Repository\impl\WorkspaceProcessServiceImpl.class com\junmp\junmpProcess\service\Repository\impl\WorkspaceProcessServiceImpl.class
com\junmp\junmpProcess\job\CustomJobCmd.class com\junmp\junmpProcess\job\CustomJobCmd.class
...@@ -99,6 +111,7 @@ com\junmp\junmpProcess\vo\OrgTreeVo$OrgTreeVoBuilder.class ...@@ -99,6 +111,7 @@ com\junmp\junmpProcess\vo\OrgTreeVo$OrgTreeVoBuilder.class
com\junmp\junmpProcess\dto\TaskDTO.class com\junmp\junmpProcess\dto\TaskDTO.class
com\junmp\junmpProcess\utils\BpmnModelUtils$Type.class com\junmp\junmpProcess\utils\BpmnModelUtils$Type.class
com\junmp\junmpProcess\dto\json\flowJson\FlowChildNode.class com\junmp\junmpProcess\dto\json\flowJson\FlowChildNode.class
com\junmp\junmpProcess\vo\UpdateProcessVO.class
com\junmp\junmpProcess\entity\ProcessTemplates.class com\junmp\junmpProcess\entity\ProcessTemplates.class
com\junmp\junmpProcess\dto\json\SettingsInfo.class com\junmp\junmpProcess\dto\json\SettingsInfo.class
com\junmp\junmpProcess\utils\DateUtils$2.class com\junmp\junmpProcess\utils\DateUtils$2.class
......
...@@ -131,17 +131,13 @@ ...@@ -131,17 +131,13 @@
<artifactId>v2-log-boot-starter</artifactId> <artifactId>v2-log-boot-starter</artifactId>
<version>${junmp.v2.version}</version> <version>${junmp.v2.version}</version>
</dependency> </dependency>
<!--引入rabbitmq的相关依赖--> <!-- &lt;!&ndash;引入rabbitmq的相关依赖&ndash;&gt;-->
<dependency> <!-- <dependency>-->
<groupId>com.rabbitmq</groupId> <!-- <groupId>com.rabbitmq</groupId>-->
<artifactId>amqp-client</artifactId> <!-- <artifactId>amqp-client</artifactId>-->
<version>5.7.2</version> <!-- <version>5.7.2</version>-->
</dependency> <!-- </dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
<version>1.5.10.RELEASE</version>
</dependency>
<dependency> <dependency>
<groupId>com.junmp.v2</groupId> <groupId>com.junmp.v2</groupId>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论