公务用车 接口和类的修改

src/main/java/com/project/zcustom/controller/backManager/building/PlatBuildControlController.java

@@ -0,0 +1,80 @@
+package com.project.zcustom.controller.backManager.building;
+
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.service.service.smart.IPlatBuildingService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/large/third")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatBuildControlController {
+    @Autowired
+    private IPlatBuildingService platBuildingService;
+
+    @PostMapping("/updateAirNum")
+    public AjaxResult updateAirNum(@RequestBody Long num) {
+        return AjaxResult.success("查询成功", platBuildingService.updateAirNum(num));
+    }
+
+    @GetMapping("/getAirNum")
+    public AjaxResult getAirNum() {
+        return AjaxResult.success("查询成功", platBuildingService.getAirNum());
+    }
+
+    /*楼宇本周用电量*/
+    @GetMapping("/thisWeekElectricity")
+    public AjaxResult getThisWeekElectricity() {
+        return AjaxResult.success("查询成功", platBuildingService.getThisWeekElectricity());
+    }
+
+    /*专业所属电表明细*/
+    @GetMapping("/thisAmmeterDetail")
+    public AjaxResult getThisAmmeterDetail(@RequestParam String type) {
+        return AjaxResult.success("查询成功", platBuildingService.getThisAmmeterDetail(type));
+    }
+
+    /*楼宇今日总用电量*/
+    @GetMapping("/todayElectricity")
+    public AjaxResult getTodayElectricity() {
+        return AjaxResult.success("查询成功", platBuildingService.getTodayElectricity());
+    }
+
+    /*楼宇每月用电量*/
+    @GetMapping("/monthElectricity")
+    public AjaxResult getMonthElectricity() {
+        return AjaxResult.success("查询成功", platBuildingService.getMonthElectricity());
+    }
+
+    /*配电室重要回路负荷情况*/
+    @GetMapping("/roomLoad")
+    public AjaxResult getRoomLoad() {
+        return AjaxResult.success("查询成功", platBuildingService.getRoomLoad());
+    }
+
+    /*楼宇中当前告警的设备*/
+    @GetMapping("/warnDevice")
+    public AjaxResult getWarnDevice() {
+        return AjaxResult.success("查询成功", platBuildingService.getWarnDevice());
+    }
+
+    /*异常点位查看*/
+    @GetMapping("/abnormalPoint")
+    public AjaxResult getAbnormalPoint(@RequestParam String type) {
+        return AjaxResult.success("查询成功", platBuildingService.getAbnormalPoint(type));
+    }
+
+    /*告警事件的历史统计*/
+    @GetMapping("/warnEvent")
+    public AjaxResult getWarnEvent() {
+        return AjaxResult.success("查询成功", platBuildingService.getWarnEvent());
+    }
+
+    /*水箱的水位情况*/
+    @GetMapping("/waterState")
+    public AjaxResult getWarnState() {
+        return AjaxResult.success("查询成功", platBuildingService.getWarnState());
+    }
+}

src/main/java/com/project/zcustom/controller/backManager/building/PlatBuildOfficeController.java

@@ -0,0 +1,93 @@
+package com.project.zcustom.controller.backManager.building;
+
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.service.service.smart.IPlatBuildingService;
+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.RestController;
+
+@RestController
+@RequestMapping("/large/first")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatBuildOfficeController extends BaseController {
+
+    @Autowired
+    private IPlatBuildingService platBuildingService;
+
+    /**
+     * 近一月楼宇能耗信息
+     */
+    @GetMapping("/powerAndWaterMonth")
+    public AjaxResult getPowerAndWaterMonth() {
+        return AjaxResult.success("查询成功", platBuildingService.getPowerAndWaterMonth());
+    }
+
+    /**
+     * 空气概况
+     */
+    @GetMapping("/air")
+    public AjaxResult getAirCondition() {
+        return AjaxResult.success("查询成功", platBuildingService.getAirCondition());
+    }
+
+    /**
+     * 定额指标
+     */
+    @GetMapping("/getTarget")
+    public AjaxResult getTarget() {
+        return AjaxResult.success("查询成功", platBuildingService.getTarget());
+    }
+
+    /**
+     * 用电分项
+     */
+    @GetMapping("/useElectricity")
+    public AjaxResult useElectricity() {
+        return AjaxResult.success("查询成功", platBuildingService.useElectricity());
+    }
+
+    /**
+     * 绿电比例
+     */
+    @GetMapping("/greenElectricity")
+    public AjaxResult greenElectricity() {
+        return AjaxResult.success("查询成功", platBuildingService.greenElectricity());
+    }
+
+    /**
+     * 碳排放量月度变化趋势图
+     */
+    @GetMapping("/carbon")
+    public AjaxResult carbon() {
+        return AjaxResult.success("查询成功", platBuildingService.carbon());
+    }
+
+    /**
+     * 年度累计综合能粍
+     */
+    @GetMapping("/energyYear")
+    public AjaxResult energyYear() {
+        return AjaxResult.success("查询成功", platBuildingService.energyYear());
+    }
+
+    /**
+     * 年度累计综合电粍
+     */
+    @GetMapping("/powerYear")
+    public AjaxResult powerYear() {
+        return AjaxResult.success("查询成功", platBuildingService.powerYear());
+    }
+
+    /**
+     * 年度累计综合水粍
+     */
+    @GetMapping("/waterYear")
+    public AjaxResult waterYear() {
+        return AjaxResult.success("查询成功", platBuildingService.waterYear());
+    }
+
+}

src/main/java/com/project/zcustom/controller/backManager/building/PlatBuildProtectController.java

@@ -0,0 +1,44 @@
+package com.project.zcustom.controller.backManager.building;
+
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.service.service.smart.IPlatBuildingService;
+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.RestController;
+
+@RestController
+@RequestMapping("/large/second")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatBuildProtectController extends BaseController {
+
+    @Autowired
+    private IPlatBuildingService platBuildingService;
+
+    /**
+     * 巡更次数统计(近6月)
+     */
+    @GetMapping("/frequency")
+    public AjaxResult frequency() {
+        return AjaxResult.success("查询成功", platBuildingService.frequency());
+    }
+
+    /**
+     * 巡更及时率
+     */
+    @GetMapping("/patrol")
+    public AjaxResult patrol() {
+        return AjaxResult.success("查询成功", platBuildingService.patrol());
+    }
+
+    /**
+     * 巡更点统计
+     */
+    @GetMapping("/patrolPoint")
+    public AjaxResult patrolPoint() {
+        return AjaxResult.success("查询成功", platBuildingService.patrolPoint());
+    }
+}

src/main/java/com/project/zcustom/controller/officalCar/PlatCarController.java

@@ -29,8 +29,8 @@ public class PlatCarController {
      * 2025年度公务车车辆明细
      */
     @GetMapping("/carDetail")
-    public AjaxResult getCarDetail(@RequestParam String appOrg, @RequestParam Long flag) {
-        return AjaxResult.success("查询成功", largePlatCarService.getCarDetail(appOrg, flag));
+    public AjaxResult getCarDetail(@RequestParam String appOrg, @RequestParam Long flag, @RequestParam Long pageSize, @RequestParam Long page) {
+        return AjaxResult.success("查询成功", largePlatCarService.getCarDetail(appOrg, flag, pageSize, page));
     }
 
     /**
@@ -45,8 +45,8 @@ public class PlatCarController {
      * 公务车预警明细
      */
     @GetMapping("/warnDetail")
-    public AjaxResult getWarnDetail(@RequestParam String appOrg, @RequestParam String alertType) {
-        return AjaxResult.success("查询成功", largePlatCarService.getWarnDetail(appOrg, alertType));
+    public AjaxResult getWarnDetail(@RequestParam String appOrg, @RequestParam String alertType, @RequestParam Long pageSize, @RequestParam Long page) {
+        return AjaxResult.success("查询成功", largePlatCarService.getWarnDetail(appOrg, alertType, pageSize, page));
     }
 
     /**

src/main/java/com/project/zcustom/domain/addional/LargeCarDetail.java

@@ -54,7 +54,7 @@ public class LargeCarDetail extends CustomBaseEntity {
     /**
      * 配置日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
 
 
     private Date orgDate;
@@ -62,7 +62,7 @@ public class LargeCarDetail extends CustomBaseEntity {
     /**
      * 处置日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
 
 
     private Date handleDate;

src/main/java/com/project/zcustom/mapper/car/PlatCarMapper.java

@@ -12,11 +12,15 @@ public interface PlatCarMapper {
 
     LargeCar getResourceNumber(String appOrg);
 
-    List<LargeCarDetail> getCarDetail(String appOrg, Long flag);
+    List<LargeCarDetail> getCarDetail(String appOrg, Long flag, Long pageSize, Long page);
+
+    int getCarDetailNum(String appOrg, Long flag);
 
     LargeCar getMonitorNumber(String appOrg);
 
-    List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType);
+    List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType, Long pageSize, Long page);
+
+    int getWarnDetailNum(String appOrg, String alertType);
 
     LargeCar getOperationManageTopHalf(String appOrg);
 

src/main/java/com/project/zcustom/service/car/ILargePlatCarService.java

@@ -9,9 +9,9 @@ import java.util.Map;
 
 public interface ILargePlatCarService {
     LargeCar getResource(String appOrg);
-    List<LargeCarDetail> getCarDetail(String appOrg, Long flag);
+    Map<String, Object> getCarDetail(String appOrg, Long flag, Long pageSize, Long page);
     LargeCar getMonitor(String appOrg);
-    List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType);
+    Map<String, Object> getWarnDetail(String appOrg, String alertType, Long pageSize, Long page);
     LargeCar getOperationManageTopHalf(String appOrg);
     Map<String, Object> getOperationManageLastHalf();
     List<Long> getSelfCarNum();

src/main/java/com/project/zcustom/service/car/Impl/LargePlatCarServiceImpl.java

@@ -41,8 +41,11 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
         return largeCar;
     }
 
-    public List<LargeCarDetail> getCarDetail(String appOrg, Long flag){
-        return platCarMapper.getCarDetail(appOrg, flag);
+    public Map<String, Object> getCarDetail(String appOrg, Long flag, Long pageSize, Long page){
+        Map<String, Object> map = new HashMap<>();
+        map.put("list", platCarMapper.getCarDetail(appOrg, flag, pageSize, page * pageSize));
+        map.put("total", platCarMapper.getCarDetailNum(appOrg, flag));
+        return map;
     }
 
     public LargeCar getMonitor(String appOrg){
@@ -61,8 +64,11 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
         return largeCar;
     }
 
-    public List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType){
-        return platCarMapper.getWarnDetail(appOrg, alertType);
+    public Map<String, Object> getWarnDetail(String appOrg, String alertType, Long pageSize, Long page){
+        Map<String, Object> map = new HashMap<>();
+        map.put("list", platCarMapper.getWarnDetail(appOrg, alertType, pageSize, page * pageSize));
+        map.put("total", platCarMapper.getWarnDetailNum(appOrg, alertType));
+        return map;
     }
 
     public LargeCar getOperationManageTopHalf(String appOrg){

src/main/resources/mapper/zcustom/car/PlatCarMapper.xml

@@ -92,18 +92,31 @@
 
     <select id="getCarDetail" resultMap="LargePlatPublicCarChangeDetailResult">
         SELECT
-            app_name,
-            vehicle_num,
-            use_property,
-            assets_card,
-            org_date,
-            handle_date,
-            handle_reason
+        app_name,
+        vehicle_num,
+        use_property,
+        assets_card,
+        org_date,
+        handle_date,
+        handle_reason
         FROM
-            large_plat_public_car_change_detail a
-                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        large_plat_public_car_change_detail a
+        LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+        flag = #{flag}
+        <if test="appOrg != '10001'">AND b.app_org = #{appOrg}</if>
+        LIMIT #{pageSize} OFFSET #{page}
+    </select>
+
+    <select id="getCarDetailNum" resultType="int">
+        SELECT
+        count(1)
+        FROM
+        large_plat_public_car_change_detail a
+        LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
         WHERE
-            b.app_org = #{arg0} AND flag = #{arg1}
+        flag = #{flag}
+        <if test="appOrg != '10001'">AND b.app_org = #{appOrg}</if>
     </select>
 
     <select id="getMonitorNumber" parameterType="String" resultMap="LargePlatPublicCarResult">
@@ -126,16 +139,29 @@
 
     <select id="getWarnDetail" resultMap="LargePlatPublicCarWarnDetailResult">
         SELECT
-            app_name,
-            vehicle_num,
-            alert_type,
-            start_time,
-            end_time
+        app_name,
+        vehicle_num,
+        alert_type,
+        start_time,
+        end_time
         FROM
-            large_plat_public_car_warn_detail a
-                LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        large_plat_public_car_warn_detail a
+        LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        WHERE
+        alert_type = #{alertType}
+        <if test="appOrg != '10001'">AND b.app_org = #{appOrg}</if>
+        LIMIT #{pageSize} OFFSET #{page}
+    </select>
+
+    <select id="getWarnDetailNum" resultType="int">
+        SELECT
+        count(1)
+        FROM
+        large_plat_public_car_warn_detail a
+        LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
         WHERE
-            b.app_org = #{arg0} AND alert_type = #{arg1}
+        alert_type = #{alertType}
+        <if test="appOrg != '10001'">AND b.app_org = #{appOrg}</if>
     </select>
 
     <select id="getOperationManageTopHalf" parameterType="String" resultMap="LargePlatPublicCarResult">

src/main/resources/mapper/zcustom/unit/LargeIssueMapper.xml

@@ -166,10 +166,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND b.del_flag = 0
         AND c.del_flag = '0'
         AND (
-        DATE( a.create_time ) BETWEEN DATE( #{arg1} )
+        DATE( a.create_time ) BETWEEN DATE( #{date} )
         AND CURDATE()
         )
-        <if test="arg0 != '10001'">AND ( c.app_parent_org = #{arg0} OR c.app_org = #{arg0} )</if>
+        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
         order by a.create_time desc
     </select>
 </mapper>

src/main/resources/mapper/zcustom/unit/LargePlanMapper.xml

@@ -105,8 +105,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             large_plan
         WHERE
             type = 0
-          AND DATE( start_time ) >= #{arg0}
-          OR DATE( end_time ) <= #{arg1}
+          AND DATE( start_time ) >= #{startDate}
+          OR DATE( end_time ) <= #{endDate}
         GROUP BY
             `type`,
             project_id