接口调整及表名称调整---

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeLogistics.java

@@ -40,16 +40,15 @@ public class LargeLogistics extends CustomBaseEntity {
     /**
      * 地区编码（后勤资产）
      */
-    @Excel(name = "地区编码")
     @ApiModelProperty("地区编码（后勤资产）")
-    private String appCode;
+    private String orgId;
 
     /**
      * 父地区编码（后勤资产）
      */
     @Excel(name = "父地区编码")
     @ApiModelProperty("父地区编码（后勤资产）")
-    private String appParentCode;
+    private String parentOrgId;
 
     /**
      * 已赋码台账数
@@ -212,30 +211,4 @@ public class LargeLogistics extends CustomBaseEntity {
      */
     @ApiModelProperty("服务设备分布列表")
     private List<LargeAssetDirs> serviceAssetList;
-
-    public LargeLogistics(String appCode, String appParentCode, Long codedNum, Long labelNum, Long assetNum, Long officeAssetNum, Long stockOfficeAssetNum, Long newOfficeAssetNum, Long scrapOfficeAssetNum, Long buildingAssetNum, Long stockBuildingAssetNum, Long newBuildingAssetNum, Long scrapBuildingAssetNum, Long serviceAssetNum, Long stockServiceAssetNum, Long newServiceAssetNum, Long scrapServiceAssetNum, BigDecimal sceneRate, Long inspectionSchemeNum, BigDecimal importantDeviceTypeInspectionExecuteRate, Long inspectionAnomalyRecordNum, Long repairRecordNum, Long maintenanceRecordNum) {
-        this.appCode = appCode;
-        this.appParentCode = appParentCode;
-        this.codedNum = codedNum;
-        this.labelNum = labelNum;
-        this.assetNum = assetNum;
-        this.officeAssetNum = officeAssetNum;
-        this.stockOfficeAssetNum = stockOfficeAssetNum;
-        this.newOfficeAssetNum = newOfficeAssetNum;
-        this.scrapOfficeAssetNum = scrapOfficeAssetNum;
-        this.buildingAssetNum = buildingAssetNum;
-        this.stockBuildingAssetNum = stockBuildingAssetNum;
-        this.newBuildingAssetNum = newBuildingAssetNum;
-        this.scrapBuildingAssetNum = scrapBuildingAssetNum;
-        this.serviceAssetNum = serviceAssetNum;
-        this.stockServiceAssetNum = stockServiceAssetNum;
-        this.newServiceAssetNum = newServiceAssetNum;
-        this.scrapServiceAssetNum = scrapServiceAssetNum;
-        this.sceneRate = sceneRate;
-        this.inspectionSchemeNum = inspectionSchemeNum;
-        this.importantDeviceTypeInspectionExecuteRate = importantDeviceTypeInspectionExecuteRate;
-        this.inspectionAnomalyRecordNum = inspectionAnomalyRecordNum;
-        this.repairRecordNum = repairRecordNum;
-        this.maintenanceRecordNum = maintenanceRecordNum;
-    }
 }

project-zcustom/src/main/java/com/project/zcustom/tools/LogisticsService.java

@@ -178,38 +178,13 @@ public class LogisticsService {
         List<LargeAssetDirs> serviceAssetList = new ArrayList<>();
         for (int i = 0; i < dataArray.size(); i++) {
             JSONObject dataItem = dataArray.getJSONObject(i);
-            LargeLogistics largeLogistics2 = JSON.parseObject(dataItem.toString(), LargeLogistics.class);
+            LargeLogistics largeLogistics = JSON.parseObject(dataItem.toString(), LargeLogistics.class);
 
-            LargeLogistics largeLogistics = new LargeLogistics(
-                    dataItem.getString("orgId"),
-                    dataItem.getString("parentOrgId"),
-                    Long.valueOf(dataItem.getString("codedNum")),
-                    Long.valueOf(dataItem.getString("labelNum")),
-                    Long.valueOf(dataItem.getString("assetNum")),
-                    Long.valueOf(dataItem.getString("officeAssetNum")),
-                    Long.valueOf(dataItem.getString("stockOfficeAssetNum")),
-                    Long.valueOf(dataItem.getString("newOfficeAssetNum")),
-                    Long.valueOf(dataItem.getString("scrapOfficeAssetNum")),
-                    Long.valueOf(dataItem.getString("buildingAssetNum")),
-                    Long.valueOf(dataItem.getString("stockBuildingAssetNum")),
-                    Long.valueOf(dataItem.getString("newBuildingAssetNum")),
-                    Long.valueOf(dataItem.getString("scrapBuildingAssetNum")),
-                    Long.valueOf(dataItem.getString("serviceAssetNum")),
-                    Long.valueOf(dataItem.getString("stockServiceAssetNum")),
-                    Long.valueOf(dataItem.getString("newServiceAssetNum")),
-                    Long.valueOf(dataItem.getString("scrapServiceAssetNum")),
-                    new BigDecimal(dataItem.getString("sceneRate")),
-                    Long.valueOf(dataItem.getString("inspectionSchemeNum")),
-                    new BigDecimal(dataItem.getString("importantDeviceTypeInspectionExecuteRate")),
-                    Long.valueOf(dataItem.getString("inspectionAnomalyRecordNum")),
-                    Long.valueOf(dataItem.getString("repairRecordNum")),
-                    Long.valueOf(dataItem.getString("maintenanceRecordNum"))
-            );
             JSONArray officeAssetArray = dataItem.getJSONArray("officeAssetDistrs");
             for (int j = 0; j < dataArray.size(); j++) {
                 LargeAssetDirs largeAssetDirs = new LargeAssetDirs();
                 JSONObject assetItem = officeAssetArray.getJSONObject(j);
-                largeAssetDirs.setAppCode(largeLogistics.getAppCode());
+                largeAssetDirs.setAppCode(largeLogistics.getOrgId());
                 largeAssetDirs.setCategoryName(assetItem.getString("categoryName"));
                 largeAssetDirs.setAssetNum(Long.valueOf(assetItem.getString("assetNum")));
                 officeAssetList.add(largeAssetDirs);
@@ -218,7 +193,7 @@ public class LogisticsService {
             for (int j = 0; j < dataArray.size(); j++) {
                 LargeAssetDirs largeAssetDirs = new LargeAssetDirs();
                 JSONObject assetItem = buildingAssetArray.getJSONObject(j);
-                largeAssetDirs.setAppCode(largeLogistics.getAppCode());
+                largeAssetDirs.setAppCode(largeLogistics.getOrgId());
                 largeAssetDirs.setCategoryName(assetItem.getString("categoryName"));
                 largeAssetDirs.setAssetNum(Long.valueOf(assetItem.getString("assetNum")));
                 buildingAssetList.add(largeAssetDirs);
@@ -227,7 +202,7 @@ public class LogisticsService {
             for (int j = 0; j < dataArray.size(); j++) {
                 LargeAssetDirs largeAssetDirs = new LargeAssetDirs();
                 JSONObject assetItem = serviceAssetArray.getJSONObject(j);
-                largeAssetDirs.setAppCode(largeLogistics.getAppCode());
+                largeAssetDirs.setAppCode(largeLogistics.getOrgId());
                 largeAssetDirs.setCategoryName(assetItem.getString("categoryName"));
                 largeAssetDirs.setAssetNum(Long.valueOf(assetItem.getString("assetNum")));
                 serviceAssetList.add(largeAssetDirs);

project-zcustom/src/main/resources/mapper/zcustom/logistics/PlatLogisticsMapper.xml

@@ -5,8 +5,8 @@
 <mapper namespace="com.project.zcustom.mapper.logistics.PlatLogisticsMapper">
     <resultMap type="com.project.zcustom.domain.addional.LargeLogistics" id="LargePlatLogisticsResult">
         <result property="id"    column="id"    />
-        <result property="appCode"    column="app_code"    />
-        <result property="appParentCode"    column="app_parent_code"    />
+        <result property="orgId"    column="app_code"    />
+        <result property="parentOrgId"    column="app_parent_code"    />
         <result property="codedNum"    column="coded_num"    />
         <result property="labelNum"    column="label_num"    />
         <result property="assetNum"    column="asset_num"    />
@@ -64,8 +64,8 @@
         values
         <foreach collection="list" item="item" separator="," close=";">
             <trim prefix="(" suffix=")" suffixOverrides=",">
-            #{item.appCode},
-            #{item.appParentCode},
+            #{item.orgId},
+            #{item.parentOrgId},
             #{item.codedNum},
             #{item.labelNum},
             #{item.assetNum},