no message

BIZ/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +1 @@
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java

BIZ/jeecg-boot-base/jeecg-boot-base-tools/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,16 +1,16 @@
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\SpringContextHolder.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\listener\JeecgRedisListener.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\annotation\RabbitComponent.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\UserTokenContext.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\exception\JeecgCloudException.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\enums\SentinelErrorInfoEnum.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\receiver\RedisReceiver.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\TransmitUserTokenFilter.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\CacheConstant.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\config\RedisConfig.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\writer\JeecgRedisCacheWriter.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\base\BaseMap.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\GlobalConstants.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\RedisUtil.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\client\JeecgRedisClient.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\CommonConfig.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\annotation\RabbitComponent.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\RedisUtil.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\CacheConstant.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\base\BaseMap.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\SpringContextHolder.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\TransmitUserTokenFilter.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\listener\JeecgRedisListener.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\writer\JeecgRedisCacheWriter.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\enums\SentinelErrorInfoEnum.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\exception\JeecgCloudException.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\receiver\RedisReceiver.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\config\RedisConfig.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\UserTokenContext.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\GlobalConstants.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\client\JeecgRedisClient.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\CommonConfig.java

BIZ/jeecg-boot-module-gis/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,69 +1,69 @@
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\commonQueryConfig\controller\CommonQueryConfigController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\commonQueryConfig\entity\CommonQueryConfig.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\catalog\entity\Rescatalog.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\roleMaptool\controller\RoleMaptoolController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\roleRescatalog\entity\RoleRescatalog.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\toolManage\service\impl\ToolmanageServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\entity\DetailsResult.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\mapper\GeoAnalysisMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\bussMapQuery\controller\BussMapQueryConrtroller.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\gis\lochistory\service\ILocHistoryService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\service\IGeoAnlysisService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\querymanage\service\IQuerymanageService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\categories\mapper\LayercategoriesMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\toolManage\service\IToolmanageService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\bussMapQuery\controller\QueryRecord.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\commonQueryConfig\mapper\CommonQueryConfigMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\gis\lochistory\service\impl\LocHistoryServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\toolManage\mapper\ToolmanageMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\catalog\mapper\RescatalogMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\roleRescatalog\service\impl\RoleRescatalogServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\topicManage\controller\TopicsConfigController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\entity\Fldalias.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\fields\service\impl\LayerfieldsServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\gis\lochistory\controller\LocHistoryController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\bussMapQuery\controller\QueryResult.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\gis\lochistory\entity\LocHistory.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\roleMaptool\mapper\RoleMaptoolMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\roleRescatalog\mapper\RoleRescatalogMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\controller\GeoAnalysisController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\catalog\controller\RescatalogController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\toolManage\controller\ToolmanageController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\Geoanalysisconfig\service\impl\GeoanalysisconfigServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\commonQueryConfig\service\ICommonQueryConfigService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\Geoanalysisconfig\service\IGeoanalysisconfigService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\roleMaptool\service\impl\RoleMaptoolServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\topicManage\service\ITopicsConfigService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\topicManage\mapper\TopicsConfigMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\querymanage\controller\QuerymanageController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\querymanage\mapper\QuerymanageMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\catalog\service\impl\RescatalogServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\Geoanalysisconfig\controller\GeoanalysisconfigController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\Geoanalysisconfig\entity\Geoanalysisconfig.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\querymanage\service\impl\QuerymanageServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\categories\entity\Layercategories.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\entity\ZYFXPZB.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\fields\mapper\LayerfieldsMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\roleRescatalog\controller\RoleRescatalogController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\fields\controller\LayerfieldsController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\entity\Result.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\categories\service\impl\LayercategoriesServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\service\impl\GeoAnalysisServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\gis\lochistory\mapper\LocHistoryMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\commonQueryConfig\service\impl\CommonQueryConfigServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\categories\controller\LayercategoriesController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\Geoanalysisconfig\mapper\GeoanalysisconfigMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\querymanage\entity\Querymanage.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\topicManage\entity\TopicsConfig.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\fields\entity\Layerfields.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\topicManage\service\impl\TopicsConfigServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\fields\service\ILayerfieldsService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\base\model\TreeModel.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\util\ZipUtils.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\categories\service\ILayercategoriesService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\roleMaptool\entity\RoleMaptool.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\entity\GeoAnalysis.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\toolManage\entity\Toolmanage.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\catalog\service\IRescatalogService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\roleMaptool\service\IRoleMaptoolService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\roleRescatalog\service\IRoleRescatalogService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\roleMaptool\controller\RoleMaptoolController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\topicManage\service\impl\TopicsConfigServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\catalog\mapper\RescatalogMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\gis\lochistory\mapper\LocHistoryMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\categories\service\impl\LayercategoriesServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\controller\GeoAnalysisController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\gis\lochistory\entity\LocHistory.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\roleMaptool\service\impl\RoleMaptoolServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\toolManage\mapper\ToolmanageMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\topicManage\mapper\TopicsConfigMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\topicManage\service\ITopicsConfigService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\commonQueryConfig\service\ICommonQueryConfigService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\Geoanalysisconfig\controller\GeoanalysisconfigController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\categories\controller\LayercategoriesController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\entity\DetailsResult.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\Geoanalysisconfig\service\impl\GeoanalysisconfigServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\bussMapQuery\controller\QueryResult.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\Geoanalysisconfig\service\IGeoanalysisconfigService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\categories\service\ILayercategoriesService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\querymanage\service\impl\QuerymanageServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\topicManage\controller\TopicsConfigController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\topicManage\entity\TopicsConfig.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\base\model\TreeModel.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\mapper\GeoAnalysisMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\Geoanalysisconfig\entity\Geoanalysisconfig.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\gis\lochistory\controller\LocHistoryController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\toolManage\entity\Toolmanage.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\commonQueryConfig\mapper\CommonQueryConfigMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\roleRescatalog\service\IRoleRescatalogService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\toolManage\service\IToolmanageService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\fields\mapper\LayerfieldsMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\util\ZipUtils.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\catalog\controller\RescatalogController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\Geoanalysisconfig\mapper\GeoanalysisconfigMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\toolManage\service\impl\ToolmanageServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\querymanage\controller\QuerymanageController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\entity\ZYFXPZB.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\categories\entity\Layercategories.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\categories\mapper\LayercategoriesMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\roleRescatalog\entity\RoleRescatalog.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\roleMaptool\mapper\RoleMaptoolMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\bussMapQuery\controller\BussMapQueryConrtroller.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\catalog\service\impl\RescatalogServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\querymanage\service\IQuerymanageService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\fields\entity\Layerfields.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\gis\lochistory\service\ILocHistoryService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\catalog\service\IRescatalogService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\entity\Result.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\commonQueryConfig\service\impl\CommonQueryConfigServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\querymanage\entity\Querymanage.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\fields\service\ILayerfieldsService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\fields\service\impl\LayerfieldsServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\fields\controller\LayerfieldsController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\toolManage\controller\ToolmanageController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\querymanage\mapper\QuerymanageMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\roleMaptool\service\IRoleMaptoolService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\entity\Fldalias.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\commonQueryConfig\controller\CommonQueryConfigController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\bussMapQuery\controller\QueryRecord.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\service\IGeoAnlysisService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\gis\lochistory\service\impl\LocHistoryServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\roleRescatalog\mapper\RoleRescatalogMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\commonQueryConfig\entity\CommonQueryConfig.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\roleRescatalog\service\impl\RoleRescatalogServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\service\impl\GeoAnalysisServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\roleRescatalog\controller\RoleRescatalogController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\roleMaptool\entity\RoleMaptool.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\geoAnalysis\entity\GeoAnalysis.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-gis\src\main\java\org\jeecg\modules\resManager\catalog\entity\Rescatalog.java

BIZ/jeecg-boot-module-system/target/jeecg-boot-module-system-3.2.0/WEB-INF/classes/application-prod.yml

@@ -42,9 +42,9 @@ spring:
     #延迟1秒启动定时任务
     startup-delay: 1s
     #定时任务启动开关，true-开  false-关
-    auto-startup: false
+    auto-startup: true
     #启动时更新己存在的Job
-    overwrite-existing-jobs: false
+    overwrite-existing-jobs: true
     properties:
       org:
         quartz:

BIZ/jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/controller/QcSsgqzysytdqkController.java

@@ -1248,16 +1248,16 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
     }
 
 
-   /* *//**
+   /**
      * 更新图片
      *
      * @param qcSsgqzysytdqk
      * @param req
      * @return
-     *//*
-    *//**
+     */
+    /**
      * @AutoLog(value = "更新图片)
-     *//*
+     */
     @ApiOperation(value = "更新图片", notes = "更新图片")
     @GetMapping(value = "/updateImages")
     public Result<?> updateImages() {
@@ -1278,12 +1278,12 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
         return Result.OK("成功");
     }
 
-    *//**
+    /**
      * 遍历文件夹（递归）
      *
      * @param dir
      * @param level
-     *//*
+     */
     public  void printDirByRecursive(File dir, int level,List<QcSsgqzysytdqk> qcSsgqzysytdqks) {
         //System.out.println(dir.getAbsolutePath());
         //输出层次数
@@ -1328,7 +1328,7 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
             }
 
         }
-    }*/
+    }
 
 
 

BIZ/jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/entity/QcSsgqzysytdqk.java

@@ -137,13 +137,13 @@ public class QcSsgqzysytdqk implements Serializable {
     /**
      * 实际使用建筑面积单位
      */
-    @Excel(name = "实际使用建筑面积单位", width = 15,dicCode = "dw")
+    @Excel(name = "实际使用建筑面积单位", width = 15, dicCode = "dw")
     @ApiModelProperty(value = "实际使用建筑面积单位")
     private java.lang.String sjsyjzmjdw;
     /**
      * 其中批准使用建筑面积
      */
-   // @Excel(name = "其中批准使用建筑面积", width = 15)
+    // @Excel(name = "其中批准使用建筑面积", width = 15)
     @ApiModelProperty(value = "其中批准使用建筑面积")
     private java.lang.Double qzpzsymj2;
     /**
@@ -162,7 +162,7 @@ public class QcSsgqzysytdqk implements Serializable {
     /**
      * 行政区划
      */
-    @Excel(name = "行政区划", width = 15,dicCode = "xzqh")
+    @Excel(name = "行政区划", width = 15, dicCode = "xzqh")
     @Dict(dicCode = "xzqh")
     @ApiModelProperty(value = "行政区划")
     private java.lang.String xzqh;
@@ -231,7 +231,7 @@ public class QcSsgqzysytdqk implements Serializable {
     /**
      * 实际占用土地面积单位
      */
-   // @Excel(name = "实际占用土地面积单位", width = 15)
+    // @Excel(name = "实际占用土地面积单位", width = 15)
     @Dict(dicCode = "dw")
     @ApiModelProperty(value = "实际占用土地面积单位")
     private java.lang.String sjzytdmjdw;
@@ -398,7 +398,7 @@ public class QcSsgqzysytdqk implements Serializable {
     /**
      * 证书持有情况
      */
-    @Excel(name = "证书持有情况", width = 15,dicCode = "sfgyz")
+    @Excel(name = "证书持有情况", width = 15, dicCode = "sfgyz")
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "证书持有情况")
     private java.lang.Integer zscyqk;
@@ -677,7 +677,7 @@ public class QcSsgqzysytdqk implements Serializable {
     /**
      * 是否存在产权纠纷
      */
-    @Excel(name = "是否存在产权纠纷", width = 15 ,dicCode="sfgyz")
+    @Excel(name = "是否存在产权纠纷", width = 15, dicCode = "sfgyz")
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "是否存在产权纠纷")
     private java.lang.Integer sfczjf;
@@ -692,7 +692,7 @@ public class QcSsgqzysytdqk implements Serializable {
     /**
      * 是否需要缴纳土地使用税
      */
-    @Excel(name = "是否需要缴纳土地使用税", width = 15,dicCode="sfgyz")
+    @Excel(name = "是否需要缴纳土地使用税", width = 15, dicCode = "sfgyz")
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "是否需要缴纳土地使用税")
     private java.lang.Integer sfxyjntdsys;
@@ -736,7 +736,7 @@ public class QcSsgqzysytdqk implements Serializable {
     /**
      * 是否有盘活意愿
      */
-    @Excel(name = "是否有盘活意愿", width = 15,dicCode="sfgyz")
+    @Excel(name = "是否有盘活意愿", width = 15, dicCode = "sfgyz")
     @Dict(dicCode = "sfgyz")
     @ApiModelProperty(value = "是否有盘活意愿")
     private java.lang.Integer sfyphyy;
@@ -751,7 +751,7 @@ public class QcSsgqzysytdqk implements Serializable {
     /**
      * 政府规划用途是否与实际用途一致
      */
-    @Excel(name = "政府规划用途是否与实际用途一致", width = 15,dicCode="sfgyz")
+    @Excel(name = "政府规划用途是否与实际用途一致", width = 15, dicCode = "sfgyz")
     @ApiModelProperty(value = "政府规划用途是否与实际用途一致")
     private java.lang.Integer zfghsfyz;
 
@@ -766,5 +766,10 @@ public class QcSsgqzysytdqk implements Serializable {
      */
     @ApiModelProperty(value = "VR全景")
     private java.lang.String vr;
+    /**
+     * 是否存在矢量
+     */
+    @ApiModelProperty(value = "VR全景")
+    private java.lang.String sfczslsj;
 
 }

BIZ/jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/controller/QcQyxxController.java

@@ -937,31 +937,40 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     @ApiOperation(value = "统计-上报地块面积", notes = "统计-上报地块面积")
     @GetMapping(value = "/sbdkmj")
     public Result<?> sbdkmj() {
-
+        //省属地块面积
         QueryWrapper queryWrapper = new QueryWrapper<>();
+        //省直地块面积
         QueryWrapper queryWrapperBysz = new QueryWrapper<>();
+        //省属闲置低效面积
         QueryWrapper queryWrapperBydxss = new QueryWrapper<>();
+        //省直闲置低效面积
         QueryWrapper queryWrapperBydxsz = new QueryWrapper<>();
 
-        queryWrapper.select("sum(SJZYTDMJ_M) as  \"SUMSS\"");
+
+        queryWrapper.select("sum(SJZYTDMJ_M) as  \"SUMSS\",count(SJZYTDMJ_M) as  \"COUNTDK\"");
         queryWrapper.eq("SFSB", 3);
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
-        queryWrapperBysz.select("sum(SJZYTDMJ) as  \"sumsz\"").likeRight("SYS_ORG_CODE", "A03");
+
+
+        queryWrapperBysz.select("sum(SJZYTDMJ) as  \"sumsz\",count(SJZYTDMJ) as  \"countdk\"").likeRight("SYS_ORG_CODE", "A03");
         queryWrapperBysz.eq("SFSB", 3);
 
-        queryWrapperBydxss.select("sum(SJZYTDMJ_M) as \"sumssxzdx\"");
+        queryWrapperBydxss.select("sum(SJZYTDMJ_M) as \"sumssxzdx\",count(SJZYTDMJ_M) as  \"countdk\"");
         queryWrapperBydxss.eq("SFSB", 3);
         queryWrapperBydxss.eq("TDSYXZ", "闲置低效土地");
         queryWrapperBydxss.likeRight("SYS_ORG_CODE", "A04");
 
-        queryWrapperBydxsz.select("sum(SJZYTDMJ) as \"sumszxzdx\"");
+        queryWrapperBydxsz.select("sum(SJZYTDMJ) as \"sumszxzdx\",count(SJZYTDMJ) as  \"countdk\"");
         queryWrapperBydxsz.eq("SFSB", 3);
         queryWrapperBydxsz.eq("TDSYXZ", "闲置低效土地");
         queryWrapperBydxsz.likeRight("SYS_ORG_CODE", "A03");
         Map<String, Object> map = qcSsgqzysytdqkService.getMap(queryWrapper);
         map.put("SUMSZ", Double.parseDouble(qcSsgqzysytdqkService.getMap(queryWrapperBysz).get("sumsz").toString()) * 0.0015);
+        map.put("COUNTDKBYSZ",qcSsgqzysytdqkService.getMap(queryWrapperBysz).get("countdk").toString());
         map.put("SUMSSXZDX", qcSsgqzysytdqkService.getMap(queryWrapperBydxss).get("sumssxzdx"));
+        map.put("COUNTDKBYSSXZDX", qcSsgqzysytdqkService.getMap(queryWrapperBydxss).get("countdk"));
         map.put("SUMSZXZDX", Double.parseDouble(qcSsgqzysytdqkService.getMap(queryWrapperBydxsz).get("sumszxzdx").toString()) * 0.0015);
+        map.put("COUNTDKBYSZXZDX", qcSsgqzysytdqkService.getMap(queryWrapperBydxsz).get("countdk").toString() );
         /*上报地块面积*/
         System.out.println(map);
         return Result.OK(map);

BIZ/jeecg-boot-module-zrzyqc/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,32 +1,32 @@
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\Constants\Enum.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\Untils\ZipAndRarTools.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\entity\QcSsgqzysytdqk.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\mapper\QcSsgqzysytdqk1Mapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\util\ShpCharset.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\impl\QcSsgqzysytdqkzcServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\controller\QcQyxxController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qywtfk\entity\QcQywtfk.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\util\SpringUtil.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\entity\QcSsgqzysytdqkzc.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\mapper\QcSsgqzysytdqkzcMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\controller\QcSsgqzysytdqkController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\impl\QcSsgqzysytdqkServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\impl\QcSsgqzysytdqk1ServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qywtfk\service\impl\QcQywtfkServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\IQcSsgqzysytdqk1Service.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qywtfk\service\IQcQywtfkService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\entity\QcQyxx.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\mapper\QcSsgqzysytdqkMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\IQcSsgqzysytdqkService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\IQcSsgqzysytdqkzcService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\service\IQcQyxxService.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\Untils\GisUtil.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qywtfk\mapper\QcQywtfkMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\service\impl\QcQyxxServiceImpl.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qywtfk\controller\QcQywtfkController.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\entity\excleTable.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\entity\QcSsgqzysytdqk1.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\Untils\Zh.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\mapper\QcQyxxMapper.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\service\qybhRule.java
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\vo\QcSsgqzysytdqkVo.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\Untils\GisUtil.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\service\impl\QcQyxxServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\entity\excleTable.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\entity\QcSsgqzysytdqk1.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qywtfk\controller\QcQywtfkController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qywtfk\service\IQcQywtfkService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\mapper\QcSsgqzysytdqk1Mapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\mapper\QcSsgqzysytdqkMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qywtfk\mapper\QcQywtfkMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\mapper\QcSsgqzysytdqkzcMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\controller\QcSsgqzysytdqkController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\impl\QcSsgqzysytdqkServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\service\IQcQyxxService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\impl\QcSsgqzysytdqk1ServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\IQcSsgqzysytdqkService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\Untils\ZipAndRarTools.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qywtfk\service\impl\QcQywtfkServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\entity\QcQyxx.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\controller\QcQyxxController.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\entity\QcSsgqzysytdqkzc.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\util\SpringUtil.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\Constants\Enum.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\service\qybhRule.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qywtfk\entity\QcQywtfk.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\IQcSsgqzysytdqk1Service.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\util\ShpCharset.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\impl\QcSsgqzysytdqkzcServiceImpl.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qyxx\mapper\QcQyxxMapper.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\entity\QcSsgqzysytdqk.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\service\IQcSsgqzysytdqkzcService.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\Untils\Zh.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\main\java\org\jeecg\modules\zrzyqc\qcsb\vo\QcSsgqzysytdqkVo.java

BIZ/jeecg-boot-module-zrzyqc/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +1 @@
-E:\JingTian\zrzyqc2\BIZ\jeecg-boot-module-zrzyqc\src\test\java\org\jeecg\modules\zrzyqc\sydwqcsb\service\impl\SydwQcSsgqzysytdqkServiceImplTest.java
+E:\JingTian\zrzyqc2\ZRZYQCSB\BIZ\jeecg-boot-module-zrzyqc\src\test\java\org\jeecg\modules\zrzyqc\sydwqcsb\service\impl\SydwQcSsgqzysytdqkServiceImplTest.java

UI2/package.json

@@ -4,9 +4,9 @@
   "private": true,
   "scripts": {
     "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
-    "serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "serve": "vue-cli-service serve",
     "build:test": "vue-cli-service build --mode test",
-    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

UI2/src/components/OneMap/BasicMap.vue

@@ -670,7 +670,7 @@ export default {
               this.$message.warn("全景图片不存在！")
 
             }else {
-              window.open('http://localhost:59196/?startscene=scene_'+this.resData.vr, '_blank')
+              window.open('http://localhost:52769/?startscene=scene_'+this.resData.vr, '_blank')
             }
 
           }else{

UI2/src/views/dashboard/IndexChart.vue

@@ -857,11 +857,13 @@
   .shbtg .ant-card{
     text-align: center;
     background-image: url('~@/assets/sytj_2.png');
+    background-size: 100% 100%;
     box-shadow: 10px 10px 15px -10px;
   }
   .dqsbs .ant-card{
     text-align: center;
     background-image: url('~@/assets/sytj_1.png');
+    background-size: 100% 100%;
     box-shadow: 10px 10px 15px -10px;
   }
 

UI2/src/views/qcsb/QcSsgqzysytdqkList_gly.vue

@@ -39,6 +39,11 @@
               <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="是否存在矢量">
+              <j-dict-select-tag placeholder="请选择是否存在矢量" v-model="queryParam.sfczslsj" dictCode="sfgyz"/>
+            </a-form-item>
+          </a-col>
 
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="土地使用现状">

UI2/src/views/qcsb/qyxx/QcQyxxList_gly.vue

@@ -100,9 +100,10 @@
         </template>
         <span slot="action" slot-scope="text, record">
                         <a-space>
-                          <a-button  @click="handleEdit(record)">编辑</a-button>
+                          <a-button  v-if="record.sfsb<3"  @click="handleEdit(record)">编辑</a-button>
+                            <a-button v-if="record.sfsb==3" @click="handleEdit(record)">重新审核</a-button>
                           <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
-                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">重新审核</a-button>
+                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">完成审核</a-button>
                           <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">
                             <a-button v-if="record.sfsb===4">恢复为已审核</a-button>
                              </a-popconfirm>

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -50,6 +50,11 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="是否存在矢量">
+              <j-dict-select-tag placeholder="请选择是否存在矢量" v-model="queryParam.sfczslsj" dictCode="sfgyz"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="是否通过审核">
               <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
             </a-form-item>

UI2/src/views/sydwqcsb/sydwxx/QcQyxxList_glyy.vue

@@ -100,9 +100,10 @@
         </template>
         <span slot="action" slot-scope="text, record">
                         <a-space>
-                          <a-button  @click="handleEdit(record)">编辑</a-button>
+                          <a-button  v-if="record.sfsb<3"  @click="handleEdit(record)">编辑</a-button>
+                            <a-button v-if="record.sfsb==3" @click="handleEdit(record)">重新审核</a-button>
                           <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
-                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">重新审核</a-button>
+                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">完成审核</a-button>
                           <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">
                             <a-button v-if="record.sfsb===4">恢复为已审核</a-button>
                              </a-popconfirm>

UI2/src/views/tj/compoent/BarData.vue

@@ -133,7 +133,7 @@ export default {
       // 使用刚指定的配置项和数据显示图表。
       var myChart = echarts.init(this.$refs.dom)
       myChart.on('click',(params)=>{
-        _this.$emit('visible',{sjyt:params.data.name});
+        _this.$emit('visible',{sysOrgCode:params.name});
 
       })
       myChart.setOption(option)

UI2/src/views/tj/sjtjModules.vue

@@ -17,42 +17,55 @@
 
           <a-col :sm="24" :md="12" :xl="4">
             <div class='tjcxcound1'>
-              <div style="color: white;padding-top: 1rem">
-                <div>已上报省直单位地块总面积</div>
-                <div>
-                  <span style="font-size: 24px">{{ SUMSZ }}</span><span style="margin-left: 5px">亩</span>
-                </div>
+              <div style="color: white;padding-top: 0.6rem">
+                <div style="width: 5rem;margin-left: 1rem;margin-top:10px;float: left; ">已审核省直单位地块</div>
+                <div style="font-size: 24px; float: right;font-weight:600;" >{{COUNTDKBYSZ}}<span style="font-size: 16px;margin-left:5px;margin-right: 5px;font-weight:400" >块</span></div>
+                  <div style="font-size: 24px; float: right;font-weight:600;">{{ SUMSZ }}<span style="font-size: 16px;margin-left:5px;margin-right: 5px;font-weight:400" >亩</span></div>
               </div>
             </div>
           </a-col>
           <a-col :sm="24" :md="12" :xl="4">
             <div class='tjcxcound2'>
-              <div style="color: white;padding-top: 1rem">
-                <div>已上报省属企业地块总面积</div>
-                <div>
-                  <span style="font-size: 24px">{{ SUMSS }}</span><span style="margin-left: 5px">亩</span>
-                </div>
+              <div style="color: white;padding-top: 0.6rem">
+                <div style="width: 5rem;margin-left: 1rem;margin-top:10px;float: left; ">已审核省属企业地块</div>
+                  <div style="font-size: 24px; float: right;font-weight:600;" >{{COUNTDK}}<span style="font-size: 16px;margin-left:5px;margin-right: 5px;font-weight:400" >块</span></div>
+                <div style="font-size: 24px; float: right;font-weight:600;">{{ SUMSS }}<span style="font-size: 16px;margin-left:5px;margin-right: 5px;font-weight:400" >亩</span></div>
               </div>
+
+<!--              <div style="color: white;padding-top: 1rem">-->
+<!--                <div>已上报省属企业地块总面积</div>-->
+<!--                <div>-->
+<!--                  <span style="font-size: 24px">{{ SUMSS }}</span><span style="margin-left: 5px">亩</span>-->
+<!--                </div>-->
+<!--              </div>-->
             </div>
           </a-col>
           <a-col :sm="24" :md="12" :xl="4">
             <div class='tjcxcound3'>
-              <div style="color: white;padding-top: 1rem">
-                <div>其中省直单位闲置低效面积</div>
-                <div>
-                  <span style="font-size: 24px">{{ SUMSZXZDX }}</span><span style="margin-left: 5px">亩</span>
+                <div style="color: white;padding-top: 0.6rem">
+                  <div style="width: 8rem;margin-left: 1rem;margin-top:10px;float: left; ">其中省直单位闲置低效地块</div>
+                  <div style="font-size: 24px; float: right;font-weight:600;" >{{COUNTDKBYSZXZDX}}<span style="font-size: 16px;margin-left:5px;margin-right: 5px;font-weight:400" >块</span></div>
+                  <div style="font-size: 24px; float: right;font-weight:600;">{{ SUMSZXZDX }}<span style="font-size: 16px;margin-left:5px;margin-right: 5px;font-weight:400" >亩</span></div>
                 </div>
-              </div>
+<!--                <div>其中省直单位闲置低效面积</div>-->
+<!--                <div>-->
+<!--                  <span style="font-size: 24px">{{ SUMSZXZDX }}</span><span style="margin-left: 5px">亩</span>-->
+<!--                </div>-->
             </div>
           </a-col>
           <a-col :sm="24" :md="12" :xl="4">
             <div class='tjcxcound4'>
-              <div style="color: white;padding-top: 1rem">
-                <div>其中省属企业闲置低效面积</div>
-                <div>
-                  <span style="font-size: 24px;">{{ SUMSSXZDX }}</span><span style="margin-left: 5px">亩</span>
-                </div>
+              <div style="color: white;padding-top: 0.6rem">
+                <div style="width: 8rem;margin-left: 1rem;margin-top:10px;float: left; ">其中省属企业闲置低效地块</div>
+                <div style="font-size: 24px; float: right;font-weight:600;" >{{COUNTDKBYSSXZDX}}<span style="font-size: 16px;margin-left:5px;margin-right: 5px;font-weight:400" >块</span></div>
+                <div style="font-size: 24px; float: right;font-weight:600;">{{ SUMSSXZDX }}<span style="font-size: 16px;margin-left:5px;margin-right: 5px;font-weight:400" >亩</span></div>
               </div>
+<!--              <div style="color: white;padding-top: 1rem">-->
+<!--                <div>其中省属企业闲置低效面积</div>-->
+<!--                <div>-->
+<!--                  <span style="font-size: 24px;">{{ SUMSSXZDX }}</span><span style="margin-left: 5px">亩</span>-->
+<!--                </div>-->
+<!--              </div>-->
             </div>
           </a-col>
 
@@ -168,7 +181,7 @@
         <a-col :sm="24" :md="12" :xl="24">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
             <BarData :titleText=this.BarTitleBysjzymjs :result-x-data="this.resYDatas" :seriesName="'地块面积（亩）'"
-                     :dw="this.dw"
+                     :dw="this.dw" @visible="visibleInfoYjdw"
                      style="width:1600px ;height:300px;"></BarData>
           </a-card>
         </a-col>
@@ -251,6 +264,10 @@ export default {
       visibleSz:false,
       sum: "",
       param:"",
+      COUNTDK:"",
+      COUNTDKBYSZ:"",
+      COUNTDKBYSSXZDX:"",
+      COUNTDKBYSZXZDX:"",
       paramSz:"",
       resData2: [],
       color: ['#4676ff', '#1ad4cb'],
@@ -334,7 +351,24 @@ export default {
 
       // this.$router.push({ name:'qcsb-qcSsgqzysytdqk-list', query:{sfsb:3} });
     },
+    visibleInfoYjdw(params) {
+      initDictOptions("yjdw").then(res=>{
+        for (const re of res.result) {
+          if(re.text==params.sysOrgCode){
+            this.param={sysOrgCode:re.value}
+            this.visible = true
+          }
+        }
+      })
+
+      // this.param=params
+      // this.visible = true
+
+      // this.$router.push({ name:'qcsb-qcSsgqzysytdqk-list', query:{sfsb:3} });
+    },
     visibleInfo(params){
+      initDictOptions("A04").then(res=>{
+      })
       this.param=params
       this.visible = true
     },
@@ -346,6 +380,10 @@ export default {
           this.SUMSSXZDX = res.result.SUMSSXZDX.toFixed(2);
           this.SUMSZXZDX = res.result.SUMSZXZDX.toFixed(2);
           this.SUMSZ = res.result.SUMSZ.toFixed(2);
+          this.COUNTDK=res.result.COUNTDK;
+          this.COUNTDKBYSZ=res.result.COUNTDKBYSZ;
+          this.COUNTDKBYSSXZDX=res.result.COUNTDKBYSSXZDX;
+          this.COUNTDKBYSZXZDX=res.result.COUNTDKBYSZXZDX;
 
         }
       })
@@ -474,46 +512,46 @@ export default {
 
 <style>
 .tjcxcound1{
-  height:5rem;
-  width: 100%;
+  height:6rem;
+  width: 18rem;
   background-image: url('~@/assets/sytj_1.png');
   background-size: 100% 100%;
   margin-left: 5rem;
   font-size:16px;
-  text-align: center ;
+  text-align: left ;
   border-radius: 10px;
   cursor:pointer
 }
 .tjcxcound2{
-  height:5rem;
-  width: 100%;
+  height:6rem;
+  width: 18rem;
   background-image: url('~@/assets/sytj_2.png');
   background-size: 100% 100%;
   margin-left: 10rem;
   font-size:16px;
-  text-align: center ;
+  text-align: left ;
   border-radius: 10px;
   cursor:pointer
 }
 .tjcxcound3{
-  height:5rem;
-  width: 100%;
+  height:6rem;
+  width: 18rem;
   background-image: url('~@/assets/sytj_3.png');
   background-size: 100% 100%;
   margin-left: 15rem;
   font-size:16px;
-  text-align: center ;
+  text-align: left ;
   border-radius: 10px;
   cursor:pointer
 }
 .tjcxcound4{
-  height:5rem;
-  width: 100%;
+  height:6rem;
+  width: 18rem;
   background-image: url('~@/assets/sytj_4.png');
   background-size: 100% 100%;
   margin-left: 20rem;
   font-size:16px;
-  text-align: center ;
+  text-align: left ;
   border-radius: 10px;
   cursor:pointer
 }