|
|
@@ -12,7 +12,6 @@ import org.apache.commons.compress.utils.Lists;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -38,67 +37,28 @@ public class LogisticsService {
|
|
|
" \"msg\": \"操作成功\",\n" +
|
|
|
" \"data\": [\n" +
|
|
|
" {\n" +
|
|
|
- " \"orgId\": \"10001\",\n" +
|
|
|
- " \"orgName\": \"三亚电力公司\",\n" +
|
|
|
- " \"parentOrgId\": \"12001\",\n" +
|
|
|
- " \"parentOrgName\": \"\",\n" +
|
|
|
- " \"codedNum\": 10,\n" +
|
|
|
- " \"labelNum\": 10,\n" +
|
|
|
- " \"assetNum\": 20,\n" +
|
|
|
- " \"officeAssetNum\": 110,\n" +
|
|
|
- " \"stockOfficeAssetNum\": 22,\n" +
|
|
|
- " \"newOfficeAssetNum\": 34,\n" +
|
|
|
- " \"scrapOfficeAssetNum\": 56,\n" +
|
|
|
- " \"buildingAssetNum\": 77,\n" +
|
|
|
- " \"stockBuildingAssetNum\": 35,\n" +
|
|
|
+ " \"orgId\": \"O0405001000\",\n" +
|
|
|
+ " \"orgName\": \"国网太原供电公司\",\n" +
|
|
|
+ " \"parentOrgId\": \"O0405000000\",\n" +
|
|
|
+ " \"parentOrgName\": \"国网山西电力\",\n" +
|
|
|
+ " \"codedNum\": 20880,\n" +
|
|
|
+ " \"labelNum\": 22956,\n" +
|
|
|
+ " \"assetNum\": 22957,\n" +
|
|
|
+ " \"officeAssetNum\": 17572,\n" +
|
|
|
+ " \"stockOfficeAssetNum\": 17572,\n" +
|
|
|
+ " \"newOfficeAssetNum\": 0,\n" +
|
|
|
+ " \"scrapOfficeAssetNum\": 0,\n" +
|
|
|
+ " \"buildingAssetNum\": 4932,\n" +
|
|
|
+ " \"stockBuildingAssetNum\": 4932,\n" +
|
|
|
" \"newBuildingAssetNum\": 3,\n" +
|
|
|
- " \"scrapBuildingAssetNum\": 6,\n" +
|
|
|
+ " \"scrapBuildingAssetNum\": 453,\n" +
|
|
|
" \"serviceAssetNum\": 88,\n" +
|
|
|
" \"stockServiceAssetNum\": 34,\n" +
|
|
|
" \"newServiceAssetNum\": 99,\n" +
|
|
|
" \"scrapServiceAssetNum\": 1,\n" +
|
|
|
- " \"officeAssetDistrs\": [\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"电梯电气\",\n" +
|
|
|
- " \"assetNum\": 12\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"供热采暖\",\n" +
|
|
|
- " \"assetNum\": 42\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"消防\",\n" +
|
|
|
- " \"assetNum\": 20\n" +
|
|
|
- " }\n" +
|
|
|
- " ],\n" +
|
|
|
- " \"buildingAssetDistrs\": [\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"电梯电气\",\n" +
|
|
|
- " \"assetNum\": 12\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"供热采暖\",\n" +
|
|
|
- " \"assetNum\": 42\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"消防\",\n" +
|
|
|
- " \"assetNum\": 20\n" +
|
|
|
- " }\n" +
|
|
|
- " ],\n" +
|
|
|
- " \"serviceAssetDistrs\": [\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"电梯电气\",\n" +
|
|
|
- " \"assetNum\": 12\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"供热采暖\",\n" +
|
|
|
- " \"assetNum\": 42\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"消防\",\n" +
|
|
|
- " \"assetNum\": 20\n" +
|
|
|
- " }\n" +
|
|
|
- " ],\n" +
|
|
|
+ " \"officeAssetDistrs\": [{\"assetNum\": 0, \"categoryName\": \"普通低值易耗品\"}, {\"assetNum\": 857, \"categoryName\": \"重点低值易耗品\"}, {\"assetNum\": 110, \"categoryName\": \"办公固定资产\"}]" +
|
|
|
+ " \"buildingAssetDistrs\":[{\"assetNum\": 0, \"categoryName\": \"楼宇智能化\"}, {\"assetNum\": 2, \"categoryName\": \"给排水\"}, {\"assetNum\": 0, \"categoryName\": \"消防\"}, {\"assetNum\": 0, \"categoryName\": \"供热采暖\"}, {\"assetNum\": 0, \"categoryName\": \"空调通风\"}, {\"assetNum\": 0, \"categoryName\": \"电气\"}, {\"assetNum\": 0, \"categoryName\": \"电梯\"}]" +
|
|
|
+ " \"serviceAssetDistrs\": [{\"assetNum\": 51, \"categoryName\": \"食堂设备\"}, {\"assetNum\": 0, \"categoryName\": \"物业设备\"}]" +
|
|
|
" \"sceneRate\": 85.55,\n" +
|
|
|
" \"inspectionSchemeNum\": 12,\n" +
|
|
|
" \"importantDeviceTypeInspectionExecuteRate\": 66.33,\n" +
|
|
|
@@ -107,73 +67,64 @@ public class LogisticsService {
|
|
|
" \"maintenanceRecordNum\": 56\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
- " \"orgId\": \"10444\",\n" +
|
|
|
- " \"orgName\": \"济南电力公司\",\n" +
|
|
|
- " \"parentOrgId\": \"13401\",\n" +
|
|
|
- " \"parentOrgName\": \"\",\n" +
|
|
|
- " \"codedNum\": 110,\n" +
|
|
|
- " \"labelNum\": 120,\n" +
|
|
|
- " \"assetNum\": 70,\n" +
|
|
|
- " \"officeAssetNum\": 69,\n" +
|
|
|
- " \"stockOfficeAssetNum\": 53,\n" +
|
|
|
- " \"newOfficeAssetNum\": 9,\n" +
|
|
|
- " \"scrapOfficeAssetNum\": 17,\n" +
|
|
|
- " \"buildingAssetNum\": 36,\n" +
|
|
|
- " \"stockBuildingAssetNum\": 8,\n" +
|
|
|
- " \"newBuildingAssetNum\": 95,\n" +
|
|
|
- " \"scrapBuildingAssetNum\": 71,\n" +
|
|
|
- " \"serviceAssetNum\": 103,\n" +
|
|
|
- " \"stockServiceAssetNum\": 0,\n" +
|
|
|
- " \"newServiceAssetNum\": 2,\n" +
|
|
|
+ " \"orgId\": \"1775047831401271298\",\n" +
|
|
|
+ " \"orgName\": \"山西省超高压输电公司\",\n" +
|
|
|
+ " \"parentOrgId\": \"O0405000000\",\n" +
|
|
|
+ " \"parentOrgName\": \"国网山西电力\",\n" +
|
|
|
+ " \"codedNum\": 20880,\n" +
|
|
|
+ " \"labelNum\": 22956,\n" +
|
|
|
+ " \"assetNum\": 22957,\n" +
|
|
|
+ " \"officeAssetNum\": 17572,\n" +
|
|
|
+ " \"stockOfficeAssetNum\": 17572,\n" +
|
|
|
+ " \"newOfficeAssetNum\": 0,\n" +
|
|
|
+ " \"scrapOfficeAssetNum\": 0,\n" +
|
|
|
+ " \"buildingAssetNum\": 4932,\n" +
|
|
|
+ " \"stockBuildingAssetNum\": 4932,\n" +
|
|
|
+ " \"newBuildingAssetNum\": 3,\n" +
|
|
|
+ " \"scrapBuildingAssetNum\": 453,\n" +
|
|
|
+ " \"serviceAssetNum\": 88,\n" +
|
|
|
+ " \"stockServiceAssetNum\": 34,\n" +
|
|
|
+ " \"newServiceAssetNum\": 99,\n" +
|
|
|
" \"scrapServiceAssetNum\": 1,\n" +
|
|
|
- " \"officeAssetDistrs\": [\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"消防\",\n" +
|
|
|
- " \"assetNum\": 12\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"排水\",\n" +
|
|
|
- " \"assetNum\": 42\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"楼宇通风\",\n" +
|
|
|
- " \"assetNum\": 20\n" +
|
|
|
- " }\n" +
|
|
|
- " ],\n" +
|
|
|
- " \"buildingAssetDistrs\": [\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"电梯电气\",\n" +
|
|
|
- " \"assetNum\": 12\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"楼宇通风\",\n" +
|
|
|
- " \"assetNum\": 42\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"消防\",\n" +
|
|
|
- " \"assetNum\": 20\n" +
|
|
|
- " }\n" +
|
|
|
- " ],\n" +
|
|
|
- " \"serviceAssetDistrs\": [\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"排水\",\n" +
|
|
|
- " \"assetNum\": 12\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"供热采暖\",\n" +
|
|
|
- " \"assetNum\": 42\n" +
|
|
|
- " },\n" +
|
|
|
- " {\n" +
|
|
|
- " \"categoryName\": \"楼宇通风\",\n" +
|
|
|
- " \"assetNum\": 20\n" +
|
|
|
- " }\n" +
|
|
|
- " ],\n" +
|
|
|
- " \"sceneRate\": 88.99,\n" +
|
|
|
- " \"inspectionSchemeNum\": 21,\n" +
|
|
|
- " \"importantDeviceTypeInspectionExecuteRate\": 56.65,\n" +
|
|
|
- " \"inspectionAnomalyRecordNum\": 19,\n" +
|
|
|
- " \"repairRecordNum\": 23,\n" +
|
|
|
- " \"maintenanceRecordNum\": 200\n" +
|
|
|
+ " \"officeAssetDistrs\": [{\"assetNum\": 0, \"categoryName\": \"普通低值易耗品\"}, {\"assetNum\": 857, \"categoryName\": \"重点低值易耗品\"}, {\"assetNum\": 110, \"categoryName\": \"办公固定资产\"}]" +
|
|
|
+ " \"buildingAssetDistrs\":[{\"assetNum\": 0, \"categoryName\": \"楼宇智能化\"}, {\"assetNum\": 2, \"categoryName\": \"给排水\"}, {\"assetNum\": 0, \"categoryName\": \"消防\"}, {\"assetNum\": 0, \"categoryName\": \"供热采暖\"}, {\"assetNum\": 0, \"categoryName\": \"空调通风\"}, {\"assetNum\": 0, \"categoryName\": \"电气\"}, {\"assetNum\": 0, \"categoryName\": \"电梯\"}]" +
|
|
|
+ " \"serviceAssetDistrs\": [{\"assetNum\": 51, \"categoryName\": \"食堂设备\"}, {\"assetNum\": 0, \"categoryName\": \"物业设备\"}]" +
|
|
|
+ " \"sceneRate\": 85.55,\n" +
|
|
|
+ " \"inspectionSchemeNum\": 12,\n" +
|
|
|
+ " \"importantDeviceTypeInspectionExecuteRate\": 66.33,\n" +
|
|
|
+ " \"inspectionAnomalyRecordNum\": 13,\n" +
|
|
|
+ " \"repairRecordNum\": 44,\n" +
|
|
|
+ " \"maintenanceRecordNum\": 56\n" +
|
|
|
+ " },\n" +
|
|
|
+ " {\n" +
|
|
|
+ " \"orgId\": \"O0405002000\",\n" +
|
|
|
+ " \"orgName\": \"国网大同供电公司\",\n" +
|
|
|
+ " \"parentOrgId\": \"O0405000000\",\n" +
|
|
|
+ " \"parentOrgName\": \"国网山西电力\",\n" +
|
|
|
+ " \"codedNum\": 20880,\n" +
|
|
|
+ " \"labelNum\": 22956,\n" +
|
|
|
+ " \"assetNum\": 22957,\n" +
|
|
|
+ " \"officeAssetNum\": 17572,\n" +
|
|
|
+ " \"stockOfficeAssetNum\": 17572,\n" +
|
|
|
+ " \"newOfficeAssetNum\": 0,\n" +
|
|
|
+ " \"scrapOfficeAssetNum\": 0,\n" +
|
|
|
+ " \"buildingAssetNum\": 4932,\n" +
|
|
|
+ " \"stockBuildingAssetNum\": 4932,\n" +
|
|
|
+ " \"newBuildingAssetNum\": 3,\n" +
|
|
|
+ " \"scrapBuildingAssetNum\": 453,\n" +
|
|
|
+ " \"serviceAssetNum\": 88,\n" +
|
|
|
+ " \"stockServiceAssetNum\": 34,\n" +
|
|
|
+ " \"newServiceAssetNum\": 99,\n" +
|
|
|
+ " \"scrapServiceAssetNum\": 1,\n" +
|
|
|
+ " \"officeAssetDistrs\": [{\"assetNum\": 0, \"categoryName\": \"普通低值易耗品\"}, {\"assetNum\": 857, \"categoryName\": \"重点低值易耗品\"}, {\"assetNum\": 110, \"categoryName\": \"办公固定资产\"}]" +
|
|
|
+ " \"buildingAssetDistrs\":[{\"assetNum\": 0, \"categoryName\": \"楼宇智能化\"}, {\"assetNum\": 2, \"categoryName\": \"给排水\"}, {\"assetNum\": 0, \"categoryName\": \"消防\"}, {\"assetNum\": 0, \"categoryName\": \"供热采暖\"}, {\"assetNum\": 0, \"categoryName\": \"空调通风\"}, {\"assetNum\": 0, \"categoryName\": \"电气\"}, {\"assetNum\": 0, \"categoryName\": \"电梯\"}]" +
|
|
|
+ " \"serviceAssetDistrs\": [{\"assetNum\": 51, \"categoryName\": \"食堂设备\"}, {\"assetNum\": 0, \"categoryName\": \"物业设备\"}]" +
|
|
|
+ " \"sceneRate\": 85.55,\n" +
|
|
|
+ " \"inspectionSchemeNum\": 12,\n" +
|
|
|
+ " \"importantDeviceTypeInspectionExecuteRate\": 66.33,\n" +
|
|
|
+ " \"inspectionAnomalyRecordNum\": 13,\n" +
|
|
|
+ " \"repairRecordNum\": 44,\n" +
|
|
|
+ " \"maintenanceRecordNum\": 56\n" +
|
|
|
" }\n" +
|
|
|
" ]\n" +
|
|
|
"}";
|
|
|
@@ -193,7 +144,7 @@ public class LogisticsService {
|
|
|
LargeLogistics largeLogistics = JSON.parseObject(dataItem.toString(), LargeLogistics.class);
|
|
|
// 业务方提供的数据包含一些不需要的部门数据进行过滤
|
|
|
if ( !orgMap.containsKey(largeLogistics.getOrgId())){
|
|
|
- break;
|
|
|
+ continue;
|
|
|
}
|
|
|
|
|
|
// 资产列表数据提取
|
