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

project-zcustom/src/main/java/com/project/zcustom/controller/TestToolsController.java

@@ -14,7 +14,6 @@ import com.project.zcustom.service.plat.IPlatApiRecordService;
 import com.project.zcustom.service.post.IPlatPostStationService;
 import com.project.zcustom.service.property.IPlatPropertyService;
 import com.project.zcustom.service.smart.IPlatGreenSmartOtherService;
-import com.project.zcustom.tools.DataTools;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -33,10 +32,6 @@ import java.util.Objects;
 @RestController()
 public class TestToolsController {
 
-
-    @Resource
-    private DataTools dataTools;
-
     @Resource
     IPlatEmployeeTypeService platEmployeeTypeService;
     @Resource

project-zcustom/src/main/java/com/project/zcustom/controller/logistics/PlatAssetController.java

@@ -0,0 +1,112 @@
+package com.project.zcustom.controller.logistics;
+
+import com.project.common.core.domain.AjaxResult;
+import com.project.zcustom.service.logistics.ILargePlatAssetService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/large/asset")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatAssetController {
+
+    @Autowired
+    private ILargePlatAssetService largePlatAssetService;
+
+    /**
+     * 楼宇各类资产占比
+     */
+    @GetMapping("/building")
+    public AjaxResult getBuildingAssetRate(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatAssetService.getBuildingAssetRate(appOrg));
+    }
+
+    /**
+     * 服务各类资产占比
+     */
+    @GetMapping("/service")
+    public AjaxResult getServiceAssetRate(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatAssetService.getServiceAssetRate(appOrg));
+    }
+
+    /**
+     * 办公各类资产占比
+     */
+    @GetMapping("/office")
+    public AjaxResult getOfficeAssetRate(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatAssetService.getOfficeAssetRate(appOrg));
+    }
+
+    /**
+     * 资产存量
+     */
+    @GetMapping("/stock")
+    public AjaxResult getStockAssetNum(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatAssetService.getStockAssetNum(appOrg));
+    }
+
+    /**
+     * 2025年度资产新增数量
+     */
+    @GetMapping("/new")
+    public AjaxResult getNewAssetNum(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatAssetService.getNewAssetNum(appOrg));
+    }
+
+    /**
+     * 资产报废数量
+     */
+    @GetMapping("/scrap")
+    public AjaxResult getScrapAssetNum(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatAssetService.getScrapAssetNum(appOrg));
+    }
+
+    /**
+     * 赋码率 -贴签率
+     */
+    @GetMapping("/codedAndLabelRate")
+    public AjaxResult getCodedAndLabelRate(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatAssetService.getCodedAndLabelRate(appOrg));
+    }
+
+    /**
+     * 三大类资产占比
+     */
+    @GetMapping("/mainlyRate")
+    public AjaxResult getMainlyRate(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatAssetService.getMainlyRate(appOrg));
+    }
+
+    /**
+     * 典型场景应用率
+     */
+    @GetMapping("/sceneRate")
+    public AjaxResult getSceneRate(@RequestParam int flag) {
+        return AjaxResult.success("查询成功", largePlatAssetService.getSceneRate(flag));
+    }
+
+    /**
+     * 楼宇设备运行情况
+     */
+    @GetMapping("/operation")
+    public AjaxResult getOperation(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatAssetService.getOperation(appOrg));
+    }
+
+    /**
+     * 地市巡检执行数量
+     */
+    @GetMapping("/inspectionSchemeNumX")
+    public AjaxResult getInspectionSchemeNumX() {
+        return AjaxResult.success("查询成功", largePlatAssetService.getInspectionSchemeNumX());
+    }
+
+    /**
+     * 直属单位巡检执行数量
+     */
+    @GetMapping("/inspectionSchemeNumY")
+    public AjaxResult getInspectionSchemeNumY() {
+        return AjaxResult.success("查询成功", largePlatAssetService.getInspectionSchemeNumY());
+    }
+}

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

@@ -44,6 +44,12 @@ public class LargeLogistics extends CustomBaseEntity {
     private String orgId;
 
     /**
+     * 地区名称（后勤资产）
+     */
+    @ApiModelProperty("地区编码（后勤资产）")
+    private String appName;
+
+    /**
      * 父地区编码（后勤资产）
      */
     @Excel(name = "父地区编码")

project-zcustom/src/main/java/com/project/zcustom/mapper/logistics/PlatLogisticsMapper.java

@@ -5,6 +5,7 @@ import com.project.zcustom.domain.addional.LargeAssetDirs;
 import com.project.zcustom.domain.addional.LargeLogistics;
 
 import java.util.List;
+import java.util.Map;
 
 @InterceptorIgnore(blockAttack = "true")
 public interface PlatLogisticsMapper {
@@ -24,4 +25,44 @@ public interface PlatLogisticsMapper {
     public int insertBuildingAssetDirs(List<LargeAssetDirs> largeAssetDirsList);
 
     public int insertServiceAssetDirs(List<LargeAssetDirs> largeAssetDirsList);
+
+
+
+    public List<LargeAssetDirs> getBuildingAssetRate(String appOrg);
+
+    public Long getBuildingAssetNum(String appOrg);
+
+    public List<LargeAssetDirs> getServiceAssetRate(String appOrg);
+
+    public Long getServiceAssetNum(String appOrg);
+
+    public List<LargeAssetDirs> getOfficeAssetRate(String appOrg);
+
+    public Long getOfficeAssetNum(String appOrg);
+
+
+
+    public LargeLogistics getStockAssetNum(String appOrg);
+
+    public LargeLogistics getNewAssetNum(String appOrg);
+
+    public LargeLogistics getScrapAssetNum(String appOrg);
+
+
+
+    public Map<String, Object> getCodedAndLabelRate(String appOrg);
+
+    public LargeLogistics getMainlyRate(String appOrg);
+
+
+
+    public List<LargeLogistics> getSceneRateX();
+
+    public List<LargeLogistics> getSceneRateY();
+
+    public List<LargeLogistics> getOperation(String appOrg);
+
+    public List<LargeLogistics> getInspectionSchemeNumX();
+
+    public List<LargeLogistics> getInspectionSchemeNumY();
 }

project-zcustom/src/main/java/com/project/zcustom/service/logistics/ILargePlatAssetService.java

@@ -0,0 +1,32 @@
+package com.project.zcustom.service.logistics;
+
+import com.project.zcustom.domain.addional.LargeLogistics;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ILargePlatAssetService {
+    public LargeLogistics getBuildingAssetRate(String appOrg);
+
+    public LargeLogistics getServiceAssetRate(String appOrg);
+
+    public LargeLogistics getOfficeAssetRate(String appOrg);
+
+    public LargeLogistics getStockAssetNum(String appOrg);
+
+    public LargeLogistics getNewAssetNum(String appOrg);
+
+    public LargeLogistics getScrapAssetNum(String appOrg);
+
+    public Map<String, Object> getCodedAndLabelRate(String appOrg);
+
+    public LargeLogistics getMainlyRate(String appOrg);
+
+    public List<LargeLogistics> getSceneRate(int flag);
+
+    public List<LargeLogistics> getOperation(String appOrg);
+
+    public List<LargeLogistics> getInspectionSchemeNumX();
+
+    public List<LargeLogistics> getInspectionSchemeNumY();
+}

project-zcustom/src/main/java/com/project/zcustom/service/logistics/impl/LargePlatAssetServiceImpl.java

@@ -0,0 +1,78 @@
+package com.project.zcustom.service.logistics.impl;
+
+import com.project.zcustom.domain.addional.LargeLogistics;
+import com.project.zcustom.mapper.logistics.PlatLogisticsMapper;
+import com.project.zcustom.service.logistics.ILargePlatAssetService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
+
+    @Autowired
+    private PlatLogisticsMapper platLogisticsMapper;
+    public LargeLogistics getBuildingAssetRate(String appOrg){
+        LargeLogistics largeLogistics = new LargeLogistics();
+        largeLogistics.setBuildingAssetList(platLogisticsMapper.getBuildingAssetRate(appOrg));
+        largeLogistics.setBuildingAssetNum(platLogisticsMapper.getBuildingAssetNum(appOrg));
+        return largeLogistics;
+    }
+
+    public LargeLogistics getServiceAssetRate(String appOrg){
+        LargeLogistics largeLogistics = new LargeLogistics();
+        largeLogistics.setServiceAssetList(platLogisticsMapper.getServiceAssetRate(appOrg));
+        largeLogistics.setBuildingAssetNum(platLogisticsMapper.getServiceAssetNum(appOrg));
+        return largeLogistics;
+    }
+
+    public LargeLogistics getOfficeAssetRate(String appOrg){
+        LargeLogistics largeLogistics = new LargeLogistics();
+        largeLogistics.setServiceAssetList(platLogisticsMapper.getOfficeAssetRate(appOrg));
+        largeLogistics.setBuildingAssetNum(platLogisticsMapper.getOfficeAssetNum(appOrg));
+        return largeLogistics;
+    }
+
+    public LargeLogistics getStockAssetNum(String appOrg){
+        return platLogisticsMapper.getStockAssetNum(appOrg);
+    }
+
+    public LargeLogistics getNewAssetNum(String appOrg){
+        return platLogisticsMapper.getNewAssetNum(appOrg);
+    }
+
+    public LargeLogistics getScrapAssetNum(String appOrg){
+        return platLogisticsMapper.getScrapAssetNum(appOrg);
+    }
+
+    public Map<String, Object> getCodedAndLabelRate(String appOrg){
+        Map<String, Object> map = platLogisticsMapper.getCodedAndLabelRate(appOrg);
+        return map;
+    }
+
+    public LargeLogistics getMainlyRate(String appOrg){
+        return platLogisticsMapper.getMainlyRate(appOrg);
+    }
+
+    public List<LargeLogistics> getSceneRate(int flag){
+        if (flag == 0){
+            return platLogisticsMapper.getSceneRateX();
+        }
+        else return platLogisticsMapper.getSceneRateY();
+    }
+
+    public List<LargeLogistics> getOperation(String appOrg){
+        return platLogisticsMapper.getOperation(appOrg);
+    }
+
+    public List<LargeLogistics> getInspectionSchemeNumX(){
+        return platLogisticsMapper.getInspectionSchemeNumX();
+    }
+
+    public List<LargeLogistics> getInspectionSchemeNumY(){
+        return platLogisticsMapper.getInspectionSchemeNumY();
+    }
+}

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatBuildingServiceImpl.java

@@ -9,6 +9,7 @@ import com.project.zcustom.service.smart.IPlatGreenFoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -82,6 +83,11 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
             data.put("guideValue", guideValue);
             data.put("datumValue", datumValue);
             data.put("tieValue", tieValue);
+            BigDecimal bigDecimal1 = new BigDecimal(guideValue);
+            BigDecimal bigDecimal2 = new BigDecimal(datumValue);
+            BigDecimal bigDecimal3 = new BigDecimal(tieValue);
+            BigDecimal bigDecimal = bigDecimal1.add(bigDecimal2).add(bigDecimal3);
+            data.put("total", bigDecimal.toString());
             data.put("value", value);
             resultList.add(data);
         }

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

@@ -15,6 +15,15 @@ public class ApiUrlConfig {
         ApiUrlConfig.serviceUrl = serviceUrl;
     }
 
+    // 后勤运行监控中心接口地址
+    private static String logisticsUrl;
+    public static String getLogisticsUrl() {
+        return logisticsUrl;
+    }
+    public static void setLogisticsUrl(String logisticsUrl) {
+        ApiUrlConfig.logisticsUrl = logisticsUrl;
+    }
+
     // 楼宇运行监控 接口前缀
     private static String buildPrefix;
     public static String getBuildPrefix() {

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

@@ -6,6 +6,7 @@
     <resultMap type="com.project.zcustom.domain.addional.LargeLogistics" id="LargePlatLogisticsResult">
         <result property="id"    column="id"    />
         <result property="orgId"    column="app_code"    />
+        <result property="appName"    column="app_name"    />
         <result property="parentOrgId"    column="app_parent_code"    />
         <result property="codedNum"    column="coded_num"    />
         <result property="labelNum"    column="label_num"    />
@@ -143,4 +144,194 @@
     <delete id="deleteServiceAssetDirs">
         DELETE FROM `large_plat_logistics_service_asset`
     </delete>
+
+
+    <select id="getBuildingAssetRate" parameterType="String" resultMap="LargePlatAssetDirsResult">
+        SELECT
+            a.category_name,
+            a.asset_num
+        FROM
+            large_plat_logistics_building_asset a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getBuildingAssetNum" parameterType="String" resultType="Long">
+        SELECT
+            building_asset_num
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getServiceAssetRate" parameterType="String" resultMap="LargePlatAssetDirsResult">
+        SELECT
+            a.category_name,
+            a.asset_num
+        FROM
+            large_plat_logistics_service_asset a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getServiceAssetNum" parameterType="String" resultType="Long">
+        SELECT
+            service_asset_num
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getOfficeAssetRate" parameterType="String" resultMap="LargePlatAssetDirsResult">
+        SELECT
+            a.category_name,
+            a.asset_num
+        FROM
+            large_plat_logistics_office_asset a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getOfficeAssetNum" parameterType="String" resultType="Long">
+        SELECT
+            office_asset_num
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getStockAssetNum" parameterType="String" resultMap="LargePlatLogisticsResult">
+        SELECT
+            stock_building_asset_num,
+            stock_service_asset_num,
+            stock_office_asset_num
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getNewAssetNum" parameterType="String" resultMap="LargePlatLogisticsResult">
+        SELECT
+            new_building_asset_num,
+            new_service_asset_num,
+            new_office_asset_num
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getScrapAssetNum" parameterType="String" resultMap="LargePlatLogisticsResult">
+        SELECT
+            scrap_building_asset_num,
+            scrap_service_asset_num,
+            scrap_office_asset_num
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getCodedAndLabelRate" parameterType="String" resultType="Map">
+        SELECT
+                TRIM(
+                        TRAILING '.'
+                        FROM
+                        ROUND( a.coded_num / a.asset_num, 3 )) * 100 AS codedRate,
+                TRIM(
+                        TRAILING '.'
+                        FROM
+                        ROUND( a.label_num / a.asset_num, 3 )) * 100 AS labelRate
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getMainlyRate" parameterType="String" resultMap="LargePlatLogisticsResult">
+        SELECT
+            building_asset_num,
+            service_asset_num,
+            office_asset_num
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getSceneRateX" resultMap="LargePlatLogisticsResult">
+        SELECT
+            app_name,
+            scene_rate
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_parent_org = '10001'
+          AND b.app_org NOT LIKE '1A%'
+    </select>
+
+    <select id="getSceneRateY" resultMap="LargePlatLogisticsResult">
+        SELECT
+            app_name,
+            scene_rate
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_parent_org = '10001'
+          AND b.app_org LIKE '1A%'
+    </select>
+
+    <select id="getOperation" resultMap="LargePlatLogisticsResult">
+        SELECT
+            inspection_anomaly_record_num,
+            repair_record_num,
+            maintenance_record_num,
+            important_device_type_inspection_execute_rate
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_org = #{appOrg}
+    </select>
+
+    <select id="getInspectionSchemeNumX" resultMap="LargePlatLogisticsResult">
+        SELECT
+            app_name,
+            inspection_scheme_num
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_parent_org = '10001'
+          AND b.app_org NOT LIKE '1A%'
+    </select>
+
+    <select id="getInspectionSchemeNumY" resultMap="LargePlatLogisticsResult">
+        SELECT
+            app_name,
+            inspection_scheme_num
+        FROM
+            large_plat_logistics a
+                LEFT JOIN large_plat_app_org b ON a.app_code = b.app_code
+        WHERE
+            b.app_parent_org = '10001'
+          AND b.app_org LIKE '1A%'
+    </select>
 </mapper>