接口调整

project-zcustom/src/main/java/com/project/zcustom/controller/build/PlatBuildControlController.java

@@ -26,7 +26,7 @@ public class PlatBuildControlController {
 
     /*专业所属电表明细*/
     @GetMapping("/thisAmmeterDetail")
-    public AjaxResult getThisAmmeterDetail() {
+    public AjaxResult getThisAmmeterDetail(@RequestParam String type) {
         return AjaxResult.success("查询成功", platBuildingService.getThisAmmeterDetail());
     }
 
@@ -56,7 +56,7 @@ public class PlatBuildControlController {
 
     /*异常点位查看*/
     @GetMapping("/abnormalPoint")
-    public AjaxResult getAbnormalPoint() {
+    public AjaxResult getAbnormalPoint(@RequestParam String type) {
         return AjaxResult.success("查询成功", platBuildingService.getAbnormalPoint());
     }
 

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

@@ -0,0 +1,43 @@
+package com.project.zcustom.controller.logistics;
+
+import com.project.common.core.domain.AjaxResult;
+import com.project.zcustom.service.logistics.ILargeHousingLandService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/large/housing")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatHousingLandController {
+
+    @Autowired
+    private ILargeHousingLandService largeHousingLandService;
+
+    /**
+     * 房产资源存量
+     */
+    @GetMapping("/stockOfEstateResources")
+    public AjaxResult getStockOfEstateResources() {
+        return AjaxResult.success("查询成功", largeHousingLandService.getStockOfEstateResources());
+    }
+
+    /**
+     * 土地资源存量
+     */
+    @GetMapping("/stockOfLandResources")
+    public AjaxResult getStockOfLandResources() {
+        return AjaxResult.success("查询成功", largeHousingLandService.getStockOfLandResources());
+    }
+
+    /**
+     * 2025年度投资房产完成情况
+     */
+    @GetMapping("/investFinishState")
+    public AjaxResult getInvestFinishState() {
+        return AjaxResult.success("查询成功", largeHousingLandService.getInvestFinishState());
+    }
+}

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

@@ -0,0 +1,80 @@
+package com.project.zcustom.domain.addional;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("Large_housing_land")
+@ApiModel(value = "Large_housing_land实体类")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeHousingLand {
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    @ApiModelProperty("id")
+    private Long id;
+
+    /**
+     * 房产名称
+     */
+
+    @ApiModelProperty("房产名称")
+    private String housing;
+
+    /**
+     * 房产面积
+     */
+
+    @ApiModelProperty("房产面积")
+    private BigDecimal acreage;
+
+    /**
+     * 房产名称
+     */
+
+    @ApiModelProperty("房产名称")
+    private String type;
+
+    /**
+     * 施工时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+    @ApiModelProperty("施工时间")
+    private Date constructionTime;
+
+    /**
+     * 是否拥有所有权（0否；1是）
+     */
+
+    @ApiModelProperty("是否拥有所有权（0否；1是）")
+    private Integer ownershipFlag;
+
+    /**
+     * 是否为投资计划（0否；1是）
+     */
+
+    @ApiModelProperty("是否为投资计划（0否；1是）")
+    private Integer investmentPlanFlag;
+
+    @TableField(exist = false)
+    private Long num;
+}

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

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 @InterceptorIgnore(blockAttack = "true")
-public interface PlatLogisticsMapper {
+public interface PlatAssetMapper {
 
     public int deleteLogistics();
 

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

@@ -0,0 +1,14 @@
+package com.project.zcustom.mapper.logistics;
+
+import com.project.zcustom.domain.addional.LargeHousingLand;
+
+import java.util.List;
+import java.util.Map;
+
+public interface PlatHousingLandMapper {
+    List<LargeHousingLand> getStockOfEstateResources();
+
+    Map<String, Object> getStockOfLandResources();
+
+    Map<String, Object> getInvestFinishState();
+}

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

@@ -0,0 +1,11 @@
+package com.project.zcustom.service.logistics;
+
+import java.util.Map;
+
+public interface ILargeHousingLandService {
+    Map<String, Object> getStockOfEstateResources();
+
+    Map<String, Object> getStockOfLandResources();
+
+    Map<String, Object> getInvestFinishState();
+}

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

@@ -0,0 +1,43 @@
+package com.project.zcustom.service.logistics.impl;
+
+import com.project.zcustom.domain.addional.LargeHousingLand;
+import com.project.zcustom.mapper.logistics.PlatHousingLandMapper;
+import com.project.zcustom.service.logistics.ILargeHousingLandService;
+import com.project.zcustom.service.logistics.ILargePlatAssetService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+@Service
+public class LargeHousingLandServiceImpl implements ILargeHousingLandService {
+
+    @Autowired
+    private PlatHousingLandMapper platHousingLandMapper;
+
+
+    public Map<String, Object> getStockOfEstateResources(){
+        List<LargeHousingLand> list = platHousingLandMapper.getStockOfEstateResources();
+        Map<String, Object> map = new HashMap<>();
+        map.put("pieChart", list);
+        BigDecimal housingAcreage = new BigDecimal(0);
+        Long housingNum = 0L;
+        for (LargeHousingLand it : list){
+            housingAcreage = housingAcreage.add(it.getAcreage());
+            housingNum += it.getNum();
+        }
+        map.put("housingNum", housingNum);
+        map.put("housingAcreage", housingAcreage);
+        return map;
+    }
+
+    public Map<String, Object> getStockOfLandResources(){
+        return platHousingLandMapper.getStockOfLandResources();
+    }
+
+    public Map<String, Object> getInvestFinishState(){
+        return platHousingLandMapper.getInvestFinishState();
+    }
+}

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

@@ -2,7 +2,7 @@ package com.project.zcustom.service.logistics.impl;
 
 import com.project.zcustom.domain.addional.LargeAssetDirs;
 import com.project.zcustom.domain.addional.LargeLogistics;
-import com.project.zcustom.mapper.logistics.PlatLogisticsMapper;
+import com.project.zcustom.mapper.logistics.PlatAssetMapper;
 import com.project.zcustom.service.logistics.ILargePlatAssetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,13 +17,14 @@ import java.util.Map;
 public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
 
     @Autowired
-    private PlatLogisticsMapper platLogisticsMapper;
+    private PlatAssetMapper platAssetMapper;
+
     public LargeLogistics getBuildingAssetRate(String appOrg){
         LargeLogistics largeLogistics = new LargeLogistics();
-        List<LargeAssetDirs> list1 = platLogisticsMapper.getBuildingAssetRate(appOrg);
+        List<LargeAssetDirs> list1 = platAssetMapper.getBuildingAssetRate(appOrg);
         if (list1.size() > 0){
             largeLogistics.setBuildingAssetList(list1);
-            largeLogistics.setBuildingAssetNum(platLogisticsMapper.getBuildingAssetNum(appOrg));
+            largeLogistics.setBuildingAssetNum(platAssetMapper.getBuildingAssetNum(appOrg));
         }
         else {
             largeLogistics.setBuildingAssetNum(0L);
@@ -63,10 +64,10 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
 
     public LargeLogistics getServiceAssetRate(String appOrg){
         LargeLogistics largeLogistics = new LargeLogistics();
-        List<LargeAssetDirs> list1 = platLogisticsMapper.getServiceAssetRate(appOrg);
+        List<LargeAssetDirs> list1 = platAssetMapper.getServiceAssetRate(appOrg);
         if (list1.size() > 0){
             largeLogistics.setServiceAssetList(list1);
-            largeLogistics.setServiceAssetNum(platLogisticsMapper.getServiceAssetNum(appOrg));
+            largeLogistics.setServiceAssetNum(platAssetMapper.getServiceAssetNum(appOrg));
         }
         else {
             largeLogistics.setServiceAssetNum(0L);
@@ -87,10 +88,10 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
 
     public LargeLogistics getOfficeAssetRate(String appOrg){
         LargeLogistics largeLogistics = new LargeLogistics();
-        List<LargeAssetDirs> list1 = platLogisticsMapper.getOfficeAssetRate(appOrg);
+        List<LargeAssetDirs> list1 = platAssetMapper.getOfficeAssetRate(appOrg);
         if (list1.size() > 0){
             largeLogistics.setOfficeAssetList(list1);
-            largeLogistics.setOfficeAssetNum(platLogisticsMapper.getOfficeAssetNum(appOrg));
+            largeLogistics.setOfficeAssetNum(platAssetMapper.getOfficeAssetNum(appOrg));
         }
         else {
             largeLogistics.setOfficeAssetNum(0L);
@@ -113,7 +114,7 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     }
 
     public LargeLogistics getStockAssetNum(String appOrg){
-        LargeLogistics largeLogistics = platLogisticsMapper.getStockAssetNum(appOrg);
+        LargeLogistics largeLogistics = platAssetMapper.getStockAssetNum(appOrg);
         if (largeLogistics == null){
             largeLogistics = new LargeLogistics();
             largeLogistics.setStockBuildingAssetNum(0L);
@@ -124,7 +125,7 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     }
 
     public LargeLogistics getNewAssetNum(String appOrg){
-        LargeLogistics largeLogistics = platLogisticsMapper.getNewAssetNum(appOrg);
+        LargeLogistics largeLogistics = platAssetMapper.getNewAssetNum(appOrg);
         if (largeLogistics == null){
             largeLogistics = new LargeLogistics();
             largeLogistics.setNewBuildingAssetNum(0L);
@@ -135,7 +136,7 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     }
 
     public LargeLogistics getScrapAssetNum(String appOrg){
-        LargeLogistics largeLogistics = platLogisticsMapper.getScrapAssetNum(appOrg);
+        LargeLogistics largeLogistics = platAssetMapper.getScrapAssetNum(appOrg);
         if (largeLogistics == null){
             largeLogistics = new LargeLogistics();
             largeLogistics.setScrapBuildingAssetNum(0L);
@@ -146,7 +147,7 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     }
 
     public Map<String, Object> getCodedAndLabelRate(String appOrg){
-        Map<String, Object> map = platLogisticsMapper.getCodedAndLabelRate(appOrg);
+        Map<String, Object> map = platAssetMapper.getCodedAndLabelRate(appOrg);
         if (map == null) {
             map = new HashMap<>();
             map.put("labelRate", 0);
@@ -156,7 +157,7 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     }
 
     public LargeLogistics getMainlyRate(String appOrg){
-        LargeLogistics largeLogistics =  platLogisticsMapper.getMainlyRate(appOrg);
+        LargeLogistics largeLogistics =  platAssetMapper.getMainlyRate(appOrg);
         if (largeLogistics == null) {
             largeLogistics = new LargeLogistics();
             largeLogistics.setBuildingAssetNum(0L);
@@ -171,13 +172,13 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
         List<String> list1 = new ArrayList<>();
         List<BigDecimal> list2 = new ArrayList<>();
         if (flag == 0){
-            list = platLogisticsMapper.getSceneRateX();
+            list = platAssetMapper.getSceneRateX();
             for (LargeLogistics it : list){
                 it.setAppName(it.getAppName().substring(2, 4));
             }
         }
         else {
-            list = platLogisticsMapper.getSceneRateY();
+            list = platAssetMapper.getSceneRateY();
         }
         for (LargeLogistics it : list){
             list1.add(it.getAppName());
@@ -190,7 +191,7 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     }
 
     public LargeLogistics getOperation(String appOrg){
-        LargeLogistics largeLogistics =  platLogisticsMapper.getOperation(appOrg);
+        LargeLogistics largeLogistics =  platAssetMapper.getOperation(appOrg);
         if (largeLogistics == null){
             largeLogistics = new LargeLogistics();
             largeLogistics.setImportantDeviceTypeInspectionExecuteRate(new BigDecimal(0));
@@ -202,7 +203,7 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     }
 
     public Map<String, Object> getInspectionSchemeNumX(){
-        List<LargeLogistics> list = platLogisticsMapper.getInspectionSchemeNumX();
+        List<LargeLogistics> list = platAssetMapper.getInspectionSchemeNumX();
         List<String> list1 = new ArrayList<>();
         List<Long> list2 = new ArrayList<>();
         for (LargeLogistics it : list){
@@ -216,7 +217,7 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
     }
 
     public Map<String, Object> getInspectionSchemeNumY(){
-        List<LargeLogistics> list = platLogisticsMapper.getInspectionSchemeNumY();
+        List<LargeLogistics> list = platAssetMapper.getInspectionSchemeNumY();
         List<String> list1 = new ArrayList<>();
         List<Long> list2 = new ArrayList<>();
         for (LargeLogistics it : list){

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

@@ -435,8 +435,8 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
     public Map<String, Object> getWarnState(){
         LargeBuildingControl largeBuildingControl = platBuildingMapper.getWarnState();
         Map<String, Object> map = new HashMap<>();
-        map.put("23F", JSONObject.parseObject(largeBuildingControl.getWaterStateOne()));
-        map.put("-2F", JSONObject.parseObject(largeBuildingControl.getWaterStateTwo()));
+        map.put("twentyThree", JSONObject.parseObject(largeBuildingControl.getWaterStateOne()));
+        map.put("minusTwo", JSONObject.parseObject(largeBuildingControl.getWaterStateTwo()));
         return map;
     }
 

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

@@ -9,7 +9,7 @@ import com.project.zcustom.domain.addional.LargeAssetDirs;
 import com.project.zcustom.domain.addional.LargeLogistics;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.domain.plat.PlatApiRecord;
-import com.project.zcustom.mapper.logistics.PlatLogisticsMapper;
+import com.project.zcustom.mapper.logistics.PlatAssetMapper;
 import com.project.zcustom.service.basics.IPlatAppOrgService;
 import com.project.zcustom.service.plat.IPlatApiRecordService;
 import org.apache.commons.compress.utils.Lists;
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
 public class LogisticsService {
 
     @Autowired
-    private PlatLogisticsMapper platLogisticsMapper;
+    private PlatAssetMapper platAssetMapper;
     @Autowired
     private IPlatAppOrgService platAppOrgService;
     @Resource
@@ -92,14 +92,14 @@ public class LogisticsService {
 
             list.add(largeLogistics);
         }
-        platLogisticsMapper.deleteLogistics();
-        platLogisticsMapper.insertLargePlatLogistics(list);
-        platLogisticsMapper.deleteOfficeAssetDirs();
-        platLogisticsMapper.insertOfficeAssetDirs(officeAssetList);
-        platLogisticsMapper.deleteBuildingAssetDirs();
-        platLogisticsMapper.insertBuildingAssetDirs(buildingAssetList);
-        platLogisticsMapper.deleteServiceAssetDirs();
-        platLogisticsMapper.insertServiceAssetDirs(serviceAssetList);
+        platAssetMapper.deleteLogistics();
+        platAssetMapper.insertLargePlatLogistics(list);
+        platAssetMapper.deleteOfficeAssetDirs();
+        platAssetMapper.insertOfficeAssetDirs(officeAssetList);
+        platAssetMapper.deleteBuildingAssetDirs();
+        platAssetMapper.insertBuildingAssetDirs(buildingAssetList);
+        platAssetMapper.deleteServiceAssetDirs();
+        platAssetMapper.insertServiceAssetDirs(serviceAssetList);
     }
 
     /**

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.logistics.PlatLogisticsMapper">
+<mapper namespace="com.project.zcustom.mapper.logistics.PlatAssetMapper">
     <resultMap type="com.project.zcustom.domain.addional.LargeLogistics" id="LargePlatLogisticsResult">
         <result property="id"    column="id"    />
         <result property="orgId"    column="app_code"    />

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.project.zcustom.mapper.logistics.PlatHousingLandMapper">
+    <resultMap type="com.project.zcustom.domain.addional.LargeHousingLand" id="LargeHousingLandResult">
+        <result property="id"    column="id"    />
+        <result property="housing"    column="housing"    />
+        <result property="investmentPlanFlag"    column="investment_plan_flag"    />
+        <result property="ownershipFlag"    column="ownership_flag"    />
+        <result property="constructionTime"    column="construction_time"    />
+    </resultMap>
+
+    <select id="getStockOfEstateResources" resultMap="LargeHousingLandResult">
+        SELECT
+            count( 1 ) AS num,
+            sum( acreage ) AS acreage
+        FROM
+            large_plat_housing_land
+        GROUP BY
+            type
+    </select>
+
+    <select id="getStockOfLandResources" resultType="map">
+        SELECT
+            count( 1 ) AS num,
+            COUNT( CASE WHEN YEAR ( construction_time ) >= YEAR ( CURDATE()) THEN 1 END ) AS new,
+            COUNT( CASE WHEN ownership_flag = 1 THEN 1 END ) AS own
+        FROM
+            large_plat_housing_land
+    </select>
+
+    <select id="getInvestFinishState" resultType="map">
+        SELECT
+            COUNT( CASE WHEN YEAR ( construction_time ) >= YEAR ( CURDATE()) THEN 1 END ) AS new,
+            COUNT( CASE WHEN ( investment_plan_flag = 1 AND YEAR ( construction_time ) >= YEAR ( CURDATE())) THEN 1 END ) AS invest
+        FROM
+            large_plat_housing_land
+    </select>
+</mapper>