暂时

src/main/java/com/project/zcustom/controller/backManager/engineering/LargeCameraController.java

@@ -0,0 +1,81 @@
+package com.project.zcustom.controller.backManager.engineering;
+
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.addional.LargeCamera;
+import com.project.zcustom.service.unit.ILargeCameraService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 摄像头Controller
+ *
+ * @author change
+ * @date 2024-12-30
+ */
+@RestController
+@RequestMapping("/zcustom/camera")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeCameraController extends BaseController {
+
+    @Autowired
+    private final ILargeCameraService largeCameraService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeCamera entity) {
+        return AjaxResult.success("查询成功", largeCameraService.pagingLargeCameraList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeCamera entity) {
+        return AjaxResult.success("查询成功", largeCameraService.selectLargeCameraList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeCameraService.getById(id));
+    }
+
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeCamera entity) {
+        return toAjax(largeCameraService.save(entity));
+    }
+
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeCamera entity) {
+        return toAjax(largeCameraService.updateById(entity));
+    }
+
+
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeCameraService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+
+    /**
+     * 某项目已接入摄像头
+     */
+    @GetMapping("/getConnectCameraNumByProject/{projectId}")
+    public AjaxResult getConnectCameraNumByProject(@PathVariable Long projectId){
+        return AjaxResult.success("查询成功", largeCameraService.getConnectCameraNumByProject(projectId));
+    }
+
+    /**
+     * 在线摄像头数量
+     */
+    @GetMapping("/getConnectOnlineCameraNum")
+    public AjaxResult getConnectOnlineCameraNum() {
+        return AjaxResult.success("查询成功", largeCameraService.getConnectOnlineCameraNum());
+    }
+}

src/main/java/com/project/zcustom/controller/backManager/engineering/LargeIssueController.java

@@ -0,0 +1,56 @@
+package com.project.zcustom.controller.backManager.engineering;
+
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.addional.LargeIssue;
+import com.project.zcustom.service.unit.ILargeIssueService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 上报问题Controller
+ *
+ * @author change
+ * @date 2024-12-30
+ */
+@RestController
+@RequestMapping("/zcustom/issue")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeIssueController extends BaseController {
+
+    private final ILargeIssueService largeIssueService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeIssue entity) {
+        return AjaxResult.success("查询成功", largeIssueService.selectList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeIssue entity) {
+        return AjaxResult.success("查询成功", largeIssueService.selectLargeIssueList(entity));
+    }
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeIssueService.selectLargeIssueById(id));
+    }
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeIssue entity) {
+        return toAjax(largeIssueService.save(entity));
+    }
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeIssue entity) {
+        return toAjax(largeIssueService.updateById(entity));
+    }
+
+}

src/main/java/com/project/zcustom/controller/backManager/engineering/LargePlanController.java

@@ -0,0 +1,70 @@
+package com.project.zcustom.controller.backManager.engineering;
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.addional.LargePlan;
+import com.project.zcustom.service.unit.ILargePlanService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工程计划Controller
+ *
+ * @author change
+ * @date 2024-12-30
+ */
+@RestController
+@RequestMapping("/zcustom/plan")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargePlanController extends BaseController {
+
+    private final ILargePlanService largePlanService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargePlan entity) {
+        return AjaxResult.success("查询成功", largePlanService.pagingLargePlanList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargePlan entity) {
+        return AjaxResult.success("查询成功", largePlanService.selectLargePlanList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largePlanService.getById(id));
+    }
+
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargePlan entity) {
+        return toAjax(largePlanService.save(entity));
+    }
+
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargePlan entity) {
+        return toAjax(largePlanService.updateById(entity));
+    }
+
+
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largePlanService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+    /**
+     * 本周检查项目数
+     */
+    @GetMapping(value = "/getCheckProjectNum")
+    public AjaxResult getCheckProjectNum(@RequestParam Date startDate, @RequestParam Date endDate){
+        return AjaxResult.success("查询成功", largePlanService.getCheckProjectNum(startDate, endDate));
+    }
+}

src/main/java/com/project/zcustom/controller/backManager/engineering/LargePlatAppOrgController.java

@@ -0,0 +1,90 @@
+package com.project.zcustom.controller.backManager.engineering;
+
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.basics.PlatAppOrg;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * 地区编码Controller
+ *
+ * @author change
+ * @date 2024-12-30
+ */
+@RestController
+@RequestMapping("/zcustom/platAppOrg")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargePlatAppOrgController extends BaseController {
+
+    private final IPlatAppOrgService largeUnitService;
+
+    @GetMapping("/list")
+    public AjaxResult list(PlatAppOrg entity) {
+        return AjaxResult.success("查询成功", largeUnitService.pagingPlatAppOrgList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(PlatAppOrg entity) {
+        return AjaxResult.success("查询成功", largeUnitService.selectPlatAppOrgList(entity));
+    }
+
+    @GetMapping("/listTree")
+    public AjaxResult listTree(PlatAppOrg entity) {
+        return AjaxResult.success("查询成功", largeUnitService.selectPlatAppOrgListTree(entity));
+    }
+
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeUnitService.getById(id));
+    }
+
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody PlatAppOrg entity) {
+        return toAjax(largeUnitService.save(entity));
+    }
+
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody PlatAppOrg entity) {
+        return toAjax(largeUnitService.updateById(entity));
+    }
+
+
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeUnitService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+    /**
+     * 接入单位数量
+     */
+    @GetMapping("/getConnectUnitNum")
+    public AjaxResult getConnectUnitNum() {
+        return AjaxResult.success("查询成功", largeUnitService.getConnectUnitNum());
+    }
+
+    /**
+     * 各单位已接入摄像头数量（在线和离线）
+     */
+    @GetMapping("/getAllCameraCondition")
+    public AjaxResult getAllCameraCondition(){
+        return AjaxResult.success("查询成功", largeUnitService.getAllCameraCondition());
+    }
+
+    /**
+     * 某单位已接入摄像头数量（在线和离线）
+     */
+    @GetMapping("/getCameraConditionByAppOrg/{appOrg}")
+    public AjaxResult getCameraConditionByAppOrg(@PathVariable String appOrg){
+        return AjaxResult.success("查询成功", largeUnitService.getCameraConditionByAppOrg(appOrg));
+    }
+}

src/main/java/com/project/zcustom/controller/backManager/engineering/LargeProjectController.java

@@ -0,0 +1,63 @@
+package com.project.zcustom.controller.backManager.engineering;
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.addional.LargeProject;
+import com.project.zcustom.service.unit.ILargeProjectService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 工程项目Controller
+ *
+ * @author change
+ * @date 2024-12-30
+ */
+@RestController
+@RequestMapping("/zcustom/project")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeProjectController extends BaseController {
+
+    private final ILargeProjectService largeProjectService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeProject entity) {
+        return AjaxResult.success("查询成功", largeProjectService.pagingLargeProjectList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeProject entity) {
+        return AjaxResult.success("查询成功", largeProjectService.selectLargeProjectList(entity));
+    }
+
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeProjectService.getById(id));
+    }
+
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeProject entity) {
+        return toAjax(largeProjectService.save(entity));
+    }
+
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeProject entity) {
+        return toAjax(largeProjectService.updateById(entity));
+    }
+
+
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeProjectService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeCarDetailController.java

@@ -0,0 +1,57 @@
+package com.project.zcustom.controller.backManager.officialCar;
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.addional.LargeCarDetail;
+import com.project.zcustom.service.unit.ILargeCarDetailService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+@RequestMapping("/zcustom/carDetail")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeCarDetailController extends BaseController {
+
+    private final ILargeCarDetailService largeCarDetailService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeCarDetail entity) {
+        return AjaxResult.success("查询成功", largeCarDetailService.pagingLargeCarDetailList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeCarDetail entity) {
+        return AjaxResult.success("查询成功", largeCarDetailService.selectLargeCarDetailList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeCarDetailService.getById(id));
+    }
+
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeCarDetail entity) {
+        return toAjax(largeCarDetailService.save(entity));
+    }
+
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeCarDetail entity) {
+        return toAjax(largeCarDetailService.updateById(entity));
+    }
+
+
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeCarDetailService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}
+

src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeCarRankController.java

@@ -0,0 +1,56 @@
+package com.project.zcustom.controller.backManager.officialCar;
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.addional.LargeCarRank;
+import com.project.zcustom.service.unit.ILargeCarRankService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+@RequestMapping("/zcustom/carRank")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeCarRankController extends BaseController {
+
+    private final ILargeCarRankService largeCarRankService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeCarRank entity) {
+        return AjaxResult.success("查询成功", largeCarRankService.pagingLargeCarRankList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeCarRank entity) {
+        return AjaxResult.success("查询成功", largeCarRankService.selectLargeCarRankList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeCarRankService.getById(id));
+    }
+
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeCarRank entity) {
+        return toAjax(largeCarRankService.save(entity));
+    }
+
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeCarRank entity) {
+        return toAjax(largeCarRankService.updateById(entity));
+    }
+
+
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeCarRankService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

src/main/java/com/project/zcustom/controller/backManager/officialCar/LargePublicCarController.java

@@ -0,0 +1,61 @@
+package com.project.zcustom.controller.backManager.officialCar;
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.service.unit.ILargePublicCarService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/zcustom/public")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargePublicCarController extends BaseController {
+
+    private final ILargePublicCarService largePlatPublicCarService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeCar entity) {
+        return AjaxResult.success("查询成功", largePlatPublicCarService.pagingLargeCarList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeCar entity) {
+        return AjaxResult.success("查询成功", largePlatPublicCarService.selectLargeCarList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largePlatPublicCarService.getById(id));
+    }
+
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeCar entity) {
+        return toAjax(largePlatPublicCarService.save(entity));
+    }
+
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeCar entity) {
+        return toAjax(largePlatPublicCarService.updateById(entity));
+    }
+
+
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largePlatPublicCarService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+    @PostMapping("/upload")
+    public AjaxResult upload(@RequestParam("type") String type, @RequestBody Map<String, Object> obj) {
+        return toAjax(largePlatPublicCarService.upload(type, obj));
+    }
+}

src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeUnitRankController.java

@@ -0,0 +1,61 @@
+package com.project.zcustom.controller.backManager.officialCar;
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.addional.LargeUnitRank;
+import com.project.zcustom.service.unit.ILargeUnitRankService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+@RequestMapping("/zcustom/unitRank")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeUnitRankController extends BaseController {
+
+    private final ILargeUnitRankService largeUnitRankService;
+
+    @GetMapping("/getList")
+    public AjaxResult getList() {
+        return AjaxResult.success("查询成功", largeUnitRankService.getList());
+    }
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeUnitRank entity) {
+        return AjaxResult.success("查询成功", largeUnitRankService.pagingLargeUnitRankList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeUnitRank entity) {
+        return AjaxResult.success("查询成功", largeUnitRankService.selectLargeUnitRankList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeUnitRankService.getById(id));
+    }
+
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeUnitRank entity) {
+        return toAjax(largeUnitRankService.save(entity));
+    }
+
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeUnitRank entity) {
+        return toAjax(largeUnitRankService.updateById(entity));
+    }
+
+
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeUnitRankService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

src/main/java/com/project/zcustom/controller/backManager/officialCar/LargeWarnDetailController.java

@@ -0,0 +1,56 @@
+package com.project.zcustom.controller.backManager.officialCar;
+
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.addional.LargeWarnDetail;
+import com.project.zcustom.service.unit.ILargeWarnDetailService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+@RequestMapping("/zcustom/warnDetail")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeWarnDetailController extends BaseController {
+
+    private final ILargeWarnDetailService largeWarnDetailService;
+
+    @GetMapping("/list")
+    public AjaxResult list(LargeWarnDetail entity) {
+        return AjaxResult.success("查询成功", largeWarnDetailService.pagingLargeWarnDetailList(entity));
+    }
+
+    @GetMapping("/listAll")
+    public AjaxResult listAll(LargeWarnDetail entity) {
+        return AjaxResult.success("查询成功", largeWarnDetailService.selectLargeWarnDetailList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeWarnDetailService.getById(id));
+    }
+
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeWarnDetail entity) {
+        return toAjax(largeWarnDetailService.save(entity));
+    }
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeWarnDetail entity) {
+        return toAjax(largeWarnDetailService.updateById(entity));
+    }
+
+
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeWarnDetailService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

src/main/java/com/project/zcustom/controller/build/PlatBuildOfficeController.java

@@ -1,92 +0,0 @@
-package com.project.zcustom.controller.build;
-
-import com.project.zcustom.controller.core.AjaxResult;
-import com.project.zcustom.controller.core.BaseController;
-import com.project.zcustom.service.unit.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/build/PlatBuildProtectController.java

@@ -1,43 +0,0 @@
-package com.project.zcustom.controller.build;
-
-import com.project.zcustom.controller.core.AjaxResult;
-import com.project.zcustom.controller.core.BaseController;
-import com.project.zcustom.service.unit.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/core/StringUtils.java

@@ -1,7 +1,8 @@
 package com.project.zcustom.controller.core;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.TypeReference;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.util.AntPathMatcher;
 
 import java.math.BigDecimal;
@@ -583,6 +584,17 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     }
 
     /**
+     * 获取组装图表数据
+     */
+    public static void createdTableData(List<String> xList,Object yList,List<String>  cList,Map<String, Object> mapInfo) {
+        mapInfo.put("xList",xList);
+        Map<String, Object> temp = new HashMap<>();
+        temp.put("cList",cList);
+        temp.put("yList", yList);
+        mapInfo.put("yData",temp);
+    }
+
+    /**
      * 生成默认list<long>数组
      */
     public static List<Long> getDefaultListLong(int size) {
@@ -698,7 +710,41 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
      * 将形如[{"elOne":"30","elSix":"10","elTwo":"30","elFive":"10","elFour":"29","elThree":"29"}]数据处理为  List<Map<String, Object>>
      */
     public static List<Map<String, Object>> getListMap(String jsonStr) {
-        return JSON.parseObject(jsonStr, new TypeReference<List<Map<String, String>>>() {});
+        // 将JSON字符串转换为JSONArray
+        JSONArray jsonArray = JSON.parseArray(jsonStr);
+
+        // 将JSONArray转换为List<Map<String, Object>>
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject jsonObject = jsonArray.getJSONObject(i);
+            Map<String, Object> map = jsonObject.toJavaObject(Map.class);
+            list.add(map);
+        }
+
+        // 打印List<Map<String, Object>>的内容
+        for (Map<String, Object> map : list) {
+            map.forEach((key, value) -> {
+                System.out.println(key + ": " + value);
+            });
+        }
+        return list;
+    }
+
+
+    public static Map<String, Object> getListToMap(String jsonStr) {
+        // 将JSON字符串转换为JSONArray
+        Map<String, Object> jsonMap = JSON.parseObject(jsonStr, Map.class);
+
+        // 将JSONArray转换为List<Map<String, Object>>
+       /* List<Map<String, Object>> list = new ArrayList<>();
+
+        for (String key : jsonMap.keySet()) {
+            Map<String, Object> map = Maps.newHashMap();
+            map.put(key, jsonMap.get(key));
+            list.add(map);
+        }*/
+
+        return jsonMap;
     }
 
     /**

src/main/java/com/project/zcustom/controller/engineering/PlatProjectCheckController.java

@@ -1,16 +1,28 @@
 package com.project.zcustom.controller.engineering;
 
+
 import com.project.zcustom.controller.core.AjaxResult;
 import com.project.zcustom.controller.core.BaseController;
 import com.project.zcustom.domain.addional.LargeIssue;
 import com.project.zcustom.service.unit.ILargeIssueService;
+import com.project.zcustom.service.unit.ILargePlanService;
 import com.project.zcustom.service.unit.ILargeProjectService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.ws.mime.MimeMessage;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Date;
 
 @RestController
-@RequestMapping("/large/three")
+@RequestMapping("/large/check")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class PlatProjectCheckController extends BaseController {
 
@@ -18,36 +30,39 @@ public class PlatProjectCheckController extends BaseController {
 
     private final ILargeIssueService largeIssueService;
 
+    private final ILargePlanService largePlanService;
+
+
     /**
      * 问题数量
      */
-    @GetMapping("/getIssueNum")
-    public AjaxResult getIssueNum() {
-        return AjaxResult.success("查询成功", largeIssueService.getIssueNum());
+    @GetMapping("/getIssueNum/{appOrg}")
+    public AjaxResult getIssueNum(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeIssueService.getIssueNum(appOrg));
     }
 
     /**
      * 已整改问题数量
      */
-    @GetMapping("/getOverIssueNum")
-    public AjaxResult getOverIssueNum() {
-        return AjaxResult.success("查询成功", largeIssueService.getOverIssueNum());
+    @GetMapping("/getOverIssueNum/{appOrg}")
+    public AjaxResult getOverIssueNum(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeIssueService.getOverIssueNum(appOrg));
     }
 
     /**
      * 本周检查项目数量
      */
-    @GetMapping("/getProjectNumThisWeek")
-    public AjaxResult getProjectNumThisWeek() {
-        return AjaxResult.success("查询成功", largeProjectService.getProjectNumThisWeek());
+    @GetMapping("/getProjectNumThisWeek/{appOrg}")
+    public AjaxResult getProjectNumThisWeek(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumThisWeek(appOrg));
     }
 
     /**
      * 近一周问题列表
      */
-    @GetMapping("/getIssueListLastWeek")
-    public AjaxResult getIssueListLastWeek() {
-        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek());
+    @GetMapping("/getIssueListLastWeek/{appOrg}")
+    public AjaxResult getIssueListLastWeek(@PathVariable String appOrg, @RequestParam(required = false, name = "day") Date day) {
+        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek(appOrg, day));
     }
 
     /**
@@ -65,4 +80,21 @@ public class PlatProjectCheckController extends BaseController {
     public AjaxResult changeIssueStatus(@RequestBody LargeIssue entity) {
         return toAjax(largeIssueService.updateById(entity));
     }
+
+
+    /**
+     * 本周检查计划
+     * */
+    @GetMapping("/planCheckList")
+    public AjaxResult planCheckList() {
+        return AjaxResult.success("查询成功", largePlanService.planCheckList());
+    }
+
+    /**
+     * 本周施工计划
+     * */
+    @GetMapping("/planDoneList")
+    public AjaxResult planDoneList() {
+        return AjaxResult.success("查询成功", largePlanService.planDoneList());
+    }
 }

src/main/java/com/project/zcustom/controller/engineering/PlatProjectMonitorController.java

@@ -1,10 +1,11 @@
 package com.project.zcustom.controller.engineering;
 
+
 import com.project.zcustom.controller.core.AjaxResult;
 import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
 import com.project.zcustom.service.unit.ILargeCameraService;
 import com.project.zcustom.service.unit.ILargeProjectService;
-import com.project.zcustom.service.unit.ILargeUnitService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,11 +14,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/large/two")
+@RequestMapping("/large/monitor")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class PlatProjectMonitorController extends BaseController {
 
-    private final ILargeUnitService largeUnitService;
+    private final IPlatAppOrgService platAppOrgService;
 
     private final ILargeProjectService largeProjectService;
 
@@ -26,17 +27,17 @@ public class PlatProjectMonitorController extends BaseController {
     /**
      * 各单位已接入项目数量和已接入摄像头数量
      */
-    @GetMapping("/getProjectCameraNumList")
-    public AjaxResult getProjectCameraNumList() {
-        return AjaxResult.success("查询成功", largeUnitService.getProjectCameraNumList());
+    @GetMapping("/getProjectCameraNumList/{appOrg}")
+    public AjaxResult getProjectCameraNumList(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", platAppOrgService.getProjectCameraNumList(appOrg));
     }
 
     /**
      * 各项目已接入摄像头数量
      */
-    @GetMapping("/getCameraNumList/{unitCode}")
-    public AjaxResult getCameraNumList(@PathVariable String unitCode) {
-        return AjaxResult.success("查询成功", largeProjectService.getCameraNumList(unitCode));
+    @GetMapping("/getCameraNumList/{appOrg}")
+    public AjaxResult getCameraNumList(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeProjectService.getCameraNumList(appOrg));
     }
 
     /**

src/main/java/com/project/zcustom/controller/engineering/PlatProjectProductionController.java

@@ -1,5 +1,6 @@
 package com.project.zcustom.controller.engineering;
 
+
 import com.project.zcustom.controller.core.AjaxResult;
 import com.project.zcustom.controller.core.BaseController;
 import com.project.zcustom.service.unit.ILargeProjectService;
@@ -11,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/large/one")
+@RequestMapping("/large/production")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class PlatProjectProductionController extends BaseController {
 
@@ -20,16 +21,40 @@ public class PlatProjectProductionController extends BaseController {
     /**
      * 已接入项目数量(在建)
      */
-    @GetMapping("/getProjectNumX/{subdivision}")
-    public AjaxResult getProjectNumX(@PathVariable String subdivision) {
-        return AjaxResult.success("查询成功", largeProjectService.getProjectNumX(subdivision));
+    @GetMapping("/getProjectNum/{appOrg}")
+    public AjaxResult getProjectNum(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNum(appOrg));
+    }
+
+    /**
+     * 已接入项目数量(审批)
+     */
+    @GetMapping("/getProjectNumX/{appOrg}")
+    public AjaxResult getProjectNumX(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumX(appOrg));
     }
 
     /**
      * 已接入项目数量(施工)
      */
-    @GetMapping("/getProjectNumY/{subdivision}")
-    public AjaxResult getProjectNumY(@PathVariable String subdivision) {
-        return AjaxResult.success("查询成功", largeProjectService.getProjectNumY(subdivision));
+    @GetMapping("/getProjectNumY/{appOrg}")
+    public AjaxResult getProjectNumY(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumY(appOrg));
+    }
+
+    /**
+     * 查询对应市的项目信息
+     */
+    @GetMapping("/getProjectByAppOrg/{appOrg}")
+    public AjaxResult getProjectByAppOrg(@PathVariable String appOrg) {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectByAppOrg(appOrg));
+    }
+
+    /**
+     * 获取各个市的在建和施工项目数量
+     */
+    @GetMapping("/getProjectNumZ")
+    public AjaxResult getProjectNumZ() {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumZ());
     }
 }

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

@@ -0,0 +1,75 @@
+package com.project.zcustom.controller.officalCar;
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.service.car.ILargePlatCarService;
+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/car")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatCarController {
+
+    @Autowired
+    private ILargePlatCarService largePlatCarService;
+
+    /**
+     * 资源台账
+     */
+    @GetMapping("/resource")
+    public AjaxResult getResource(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatCarService.getResource(appOrg));
+    }
+
+    /**
+     * 2025年度公务车车辆明细
+     */
+    @GetMapping("/carDetail")
+    public AjaxResult getCarDetail(@RequestParam String appOrg, @RequestParam Long flag) {
+        return AjaxResult.success("查询成功", largePlatCarService.getCarDetail(appOrg, flag));
+    }
+
+    /**
+     * 监控管理
+     */
+    @GetMapping("/monitor")
+    public AjaxResult getMonitor(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatCarService.getMonitor(appOrg));
+    }
+
+    /**
+     * 公务车预警明细
+     */
+    @GetMapping("/warnDetail")
+    public AjaxResult getWarnDetail(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatCarService.getWarnDetail(appOrg));
+    }
+
+    /**
+     * 运行管理 上
+     */
+    @GetMapping("/operationManageTopHalf")
+    public AjaxResult getOperationManageTopHalf(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", largePlatCarService.getOperationManageTopHalf(appOrg));
+    }
+
+    /**
+     * 运行管理 下
+     */
+    @GetMapping("/operationManageLastHalf")
+    public AjaxResult getOperationManageLastHalf() {
+        return AjaxResult.success("查询成功", largePlatCarService.getOperationManageLastHalf());
+    }
+
+    /**
+     * 所有地市各自的公务车总数
+     */
+    @GetMapping("/selfCarNum")
+    public AjaxResult getSelfCarNum() {
+        return AjaxResult.success("查询成功", largePlatCarService.getSelfCarNum());
+    }
+}

src/main/java/com/project/zcustom/controller/service/PlatBasicsController.java

@@ -2,16 +2,11 @@ package com.project.zcustom.controller.service;
 
 import com.project.zcustom.controller.core.AjaxResult;
 import com.project.zcustom.controller.core.BaseController;
-import com.project.zcustom.domain.basics.PlatBasics;
-import com.project.zcustom.domain.video.ZhhqLargeScreenUnit;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
-import com.project.zcustom.service.basics.IPlatBasicsCompanyService;
-import com.project.zcustom.service.basics.IPlatBasicsServerService;
-import com.project.zcustom.service.basics.IPlatBasicsService;
-import com.project.zcustom.service.video.IZhhqLargeScreenUnitService;
+import com.project.zcustom.service.service.basics.IPlatBasicsCompanyService;
+import com.project.zcustom.service.service.basics.IPlatBasicsServerService;
+import com.project.zcustom.service.service.basics.IPlatBasicsService;
 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;
@@ -22,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author change
  * @date 2024-10-21
  */
+
 @RestController
 @RequestMapping("/large/basics")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -30,8 +26,7 @@ public class PlatBasicsController extends BaseController {
     private final IPlatBasicsService platBasicsService;
     private final IPlatBasicsCompanyService platBasicsCompanyService;
     private final IPlatBasicsServerService platBasicsServerService;
-    private final IPlatAppOrgService iPlatAppOrgService;
-    private final IZhhqLargeScreenUnitService iZhhqLargeScreenUnitService;
+
 
 
     @RequestMapping("/getOverviewData")
@@ -39,42 +34,17 @@ public class PlatBasicsController extends BaseController {
         return AjaxResult.success("查询成功", platBasicsService.getOverviewData(appOrg));
     }
 
+
     @RequestMapping("/getTopTenCompany")
     public AjaxResult getTopTenCompany(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platBasicsCompanyService.getTopTenCompany(appOrg));
     }
 
-//    @ApiOperation("系统运行报警信息")
-//    @RequestMapping("/getSystemRunErrData/{appOrg}")
-//    public AjaxResult getSystemRunErrData(@PathVariable String appOrg) {
-//        return AjaxResult.success("查询成功", platBasicsService.getSystemRunErrData(appOrg));
-//    }
-//
-//    @ApiOperation("系统运行峰值情况分析")
-//    @RequestMapping("/getSystemRunData/{appOrg}")
-//    public AjaxResult getSystemRunData(@PathVariable String appOrg) {
-//        return AjaxResult.success("查询成功", platBasicsSystemService.getSystemRunData(appOrg));
-//    }
+
 
     @RequestMapping("/getServerListData")
     public AjaxResult getServerListData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platBasicsServerService.selectServerListByAppOrg(appOrg));
     }
 
-
-    @GetMapping("/testAdd")
-    public AjaxResult testAdd() {
-        PlatBasics platBasics = new PlatBasics();
-        platBasics.setAppOrg("11111");
-        return AjaxResult.success("新增成功", platBasicsService.save(platBasics));
-    }
-
-    @GetMapping("/testUnit")
-    public AjaxResult testUnit() {
-        ZhhqLargeScreenUnit znhqLargeScreenUnit = new ZhhqLargeScreenUnit();
-        znhqLargeScreenUnit.setAppOrg("11111");
-        znhqLargeScreenUnit.setName("测试");
-        return AjaxResult.success("新增成功", iZhhqLargeScreenUnitService.save(znhqLargeScreenUnit));
-    }
-
 }

src/main/java/com/project/zcustom/controller/service/PlatBuildController.java

@@ -1,120 +0,0 @@
-package com.project.zcustom.controller.service;
-
-import com.project.zcustom.controller.core.AjaxResult;
-import com.project.zcustom.controller.core.BaseController;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
-import com.project.zcustom.service.build.IPlatBuildParamsService;
-import com.project.zcustom.service.build.IPlatBuildYearTrendService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 楼宇接口Controller
- *
- * @author change
- * @date 2024-10-21
- */
-@RestController
-@RequestMapping("/build")
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-public class PlatBuildController extends BaseController {
-
-    private final IPlatBuildYearTrendService iPlatBuildYearTrendService;
-    private final IPlatBuildParamsService iPlatBuildParamsService;
-    private final IPlatAppOrgService iPlatAppOrgService;
-
-
-
-    @RequestMapping("/carbonEmissionStatistics")
-    public AjaxResult carbonEmissionStatistics() {
-        return AjaxResult.success("查询成功", iPlatBuildYearTrendService.getLineStatisticsYearTrendData(0));
-    }
-
-    @RequestMapping("/powerForMonth")
-    public AjaxResult powerForMonth() {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.powerForMonth());
-    }
-
-    @RequestMapping("/energyForYear")
-    public AjaxResult energyForYear() {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.energyForYear());
-    }
-
-    @RequestMapping("/energyStatistics")
-    public AjaxResult energyStatistics() {
-        return AjaxResult.success("查询成功", iPlatBuildYearTrendService.getLineStatisticsYearTrendData(1));
-    }
-
-    @RequestMapping("/useHeatGas")
-    public AjaxResult useHeatGas(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.useHeatGas(appOrg));
-    }
-
-    @RequestMapping("/dataCenterRoom")
-    public AjaxResult dataCenterRoom(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.dataCenterRoom(appOrg));
-    }
-
-    @RequestMapping("/powerForYear")
-    public AjaxResult powerForYear() {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.powerForYear());
-    }
-
-    @RequestMapping("/electricityStatistics")
-    public AjaxResult electricityStatistics() {
-        return AjaxResult.success("查询成功", iPlatBuildYearTrendService.getLineStatisticsYearTrendData(2));
-    }
-
-    @RequestMapping("/heatingEnergy")
-    public AjaxResult heatingEnergy(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.heatingEnergy(appOrg));
-    }
-
-    @RequestMapping("/gasInfo")
-    public AjaxResult gasInfo(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.gasInfo(appOrg));
-    }
-
-    @RequestMapping("/resourceInfo")
-    public AjaxResult resourceInfo(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.resourceInfo(appOrg));
-    }
-
-    @RequestMapping("/greenPowerInfo")
-    public AjaxResult greenPowerInfo(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.greenPowerInfo(appOrg));
-    }
-
-    @RequestMapping("/waterForYear")
-    public AjaxResult waterForYear() {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.waterForYear());
-    }
-
-    @RequestMapping("/waterStatistics")
-    public AjaxResult waterStatistics() {
-        return AjaxResult.success("查询成功", iPlatBuildYearTrendService.getLineStatisticsYearTrendData(3));
-    }
-
-    @RequestMapping("/officeCarbonForYear")
-    public AjaxResult officeCarbonForYear() {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.officeCarbonForYear());
-    }
-
-    @RequestMapping("/nonHeatingEnergyForYear")
-    public AjaxResult nonHeatingEnergyForYear() {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.nonHeatingEnergyForYear());
-    }
-
-    @RequestMapping("/usePowerStatistics")
-    public AjaxResult usePowerStatistics() {
-        return AjaxResult.success("查询成功", iPlatBuildYearTrendService.getLineStatisticsYearTrendData(4));
-    }
-
-    @RequestMapping("/officeCarbonForFloor")
-    public AjaxResult officeCarbonForFloor() {
-        return AjaxResult.success("查询成功", iPlatBuildParamsService.selectPlatBuildParamsListByField("type","12"));
-    }
-}

src/main/java/com/project/zcustom/controller/service/PlatEmployeeController.java

@@ -1,13 +1,15 @@
 package com.project.zcustom.controller.service;
 
+
 import com.project.zcustom.controller.core.AjaxResult;
 import com.project.zcustom.controller.core.BaseController;
 import com.project.zcustom.service.access.IPlatAccessService;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthIllnessService;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeTypeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 员工概况Controller
@@ -15,39 +17,52 @@ import org.springframework.web.bind.annotation.*;
  * @author change
  * @date 2024-10-21
  */
+
 @RestController
 @RequestMapping("/large/employee")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class PlatEmployeeController extends BaseController {
 
+    @Autowired
     private final IPlatEmployeeTypeService platEmployeeTypeService;
+    @Autowired
     private final IPlatAccessService iPlatAccessService;
 
+    /**
+     * 员工类型 饼图
+     * @param appOrg
+     * @return
+     */
     @RequestMapping("/getEmployeePieData")
     public AjaxResult getEmployeePieData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getEmployeePieData(appOrg));
     }
 
+
     @RequestMapping("/getEnterBuildData")
     public AjaxResult getEnterBuildData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getEnterBuildData(appOrg));
     }
 
-    @RequestMapping("/getPastWeekFlowData")
+
+    @RequestMapping("/getPastWeekFlowData" )
     public AjaxResult getPastWeekFlowData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getChartsFlowData(appOrg));
     }
 
-    @RequestMapping("/getAgePieData")
-    public AjaxResult getAgePieData(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", platEmployeeTypeService.getAgePieData(appOrg));
-    }
+//
+//    @RequestMapping("/getAgePieData")
+//    public AjaxResult getAgePieData(@RequestParam String appOrg) {
+//        return AjaxResult.success("查询成功", platEmployeeTypeService.getAgePieData(appOrg));
+//    }
+
 
     @RequestMapping("/getSexChartData")
     public AjaxResult getSexChartData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getSexChartData(appOrg));
     }
 
+
     @RequestMapping("/getOtherData")
     public AjaxResult getOtherData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatAccessService.getOtherData(appOrg));

src/main/java/com/project/zcustom/controller/service/PlatEmployeeHealthController.java

@@ -1,11 +1,15 @@
 package com.project.zcustom.controller.service;
 
+
 import com.project.zcustom.controller.core.AjaxResult;
 import com.project.zcustom.controller.core.BaseController;
-import com.project.zcustom.service.employee.*;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthIllnessService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 员工概况Controller
@@ -13,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
  * @author change
  * @date 2024-10-21
  */
+
 @RestController
 @RequestMapping("/large/health")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -21,31 +26,17 @@ public class PlatEmployeeHealthController extends BaseController {
     private final IPlatEmployeeHealthService platEmployeeHealthService;
     private final IPlatEmployeeHealthIllnessService platEmployeeHealthIllnessService;
 
+
     @RequestMapping("/getHealthData")
     public AjaxResult getHealthData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeHealthService.getHealthData(appOrg));
     }
 
+
     @RequestMapping("/getIllnessChartData")
     public AjaxResult getIllnessChartData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeHealthIllnessService.getIllnessChartData(appOrg));
     }
 
 
-
-
-
-//    @ApiOperation("员工健康分布 去除")
-//    @RequestMapping("/getHealthPieData/{appOrg}")
-//    public AjaxResult getHealthPieData(@PathVariable String appOrg) {
-//        return AjaxResult.success("查询成功", platEmployeeHealthService.getHealthPieData(appOrg));
-//    }
-
-//    @ApiOperation("近12月大病发现数量")
-//    @RequestMapping("/getHealthIllnessBrokenData/{appOrg}")
-//    public AjaxResult getHealthIllnessBrokenData(@PathVariable String appOrg) {
-//        return AjaxResult.success("查询成功", platEmployeeHealthChartService.getHealthBrokenData(appOrg,1));
-//    }
-
-
 }

src/main/java/com/project/zcustom/controller/service/PlatGreenSmartController.java

@@ -1,20 +1,17 @@
 package com.project.zcustom.controller.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import com.project.zcustom.controller.core.AjaxResult;
 import com.project.zcustom.controller.core.BaseController;
-import com.project.zcustom.controller.core.StringUtils;
 import com.project.zcustom.domain.smart.PlatGreenSmart;
-import com.project.zcustom.service.smart.*;
+import com.project.zcustom.service.service.smart.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 绿智食堂Controller
@@ -29,107 +26,153 @@ public class PlatGreenSmartController extends BaseController {
 
     private final IPlatGreenSmartService platGreenSmartService;
     private final IPlatGreenSmartOtherService iPlatGreenSmartOtherService;
-    private final IPlatGreenSmartEnergyService iPlatGreenSmartEnergyService;
     private final IPlatGreenSmartRankService iPlatGreenSmartRankService;
     private final IPlatGreenSmartSafetyService iPlatGreenSmartSafetyService;
     private final IPlatGreenFoodsService iPlatGreenFoodsService;
 
+
+    /**
+     *  食堂概览
+     * @param appOrg
+     * @return
+     */
     @RequestMapping("/getCanteenData")
     public AjaxResult getCanteenData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platGreenSmartService.getCanteenData(appOrg));
     }
 
+
+    /**
+     * 食堂安全管理
+     * @param appOrg
+     * @return
+     */
     @RequestMapping("/getSafetyData")
     public AjaxResult getSafetyData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartSafetyService.getSafetyData(appOrg));
     }
 
+
+    /**
+     *  下拉 公司食堂名称
+     * @param appOrg
+     * @return
+     */
     @RequestMapping("/getCanteenNameList")
     public AjaxResult getCanteenNameList(@RequestParam String appOrg) {
-        QueryWrapper<PlatGreenSmart> queryWrapper = new QueryWrapper<>();
-        List<PlatGreenSmart> smartList = new ArrayList<>();
-        if(Objects.equals(appOrg,"0000")){
-            queryWrapper.select("canteen_num").ne("app_org","10001").groupBy("canteen_num").last("limit 3");
-            smartList = platGreenSmartService.list(queryWrapper);
-            PlatGreenSmart smartInfo = platGreenSmartService.getOne((new QueryWrapper<PlatGreenSmart>()).eq("app_org","10001").select("canteen_num").last("limit 1"));
-            if(StringUtils.isNotNull(smartInfo)){
-                smartList.add(0,smartInfo);
-            }
-        }else{
-            queryWrapper.select("canteen_num").eq("app_org", appOrg).groupBy("canteen_num").last("limit 4");
-            smartList = platGreenSmartService.list(queryWrapper);
-        }
+        List<PlatGreenSmart> smartList = platGreenSmartService.getgreenSmartName(appOrg);
         return AjaxResult.success("查询成功", smartList);
     }
 
+
     @RequestMapping("/getCanteenScoreData")
-    public AjaxResult getCanteenScoreData(@RequestParam String appOrg,@RequestParam String canteenName) {
-        return AjaxResult.success("查询成功", platGreenSmartService.getCanteenScoreData(appOrg, canteenName));
+    public AjaxResult getCanteenScoreData(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", platGreenSmartService.getCanteenScoreData(appOrg));
     }
 
-    @RequestMapping("/getPowerData")
-    public AjaxResult getPowerData(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", iPlatGreenSmartEnergyService.getPowerData(appOrg));
-    }
 
+    /**
+     * 热销菜品排行
+     * @param appOrg
+     * @return
+     */
     @RequestMapping("/getFoodRankData")
     public AjaxResult getFoodRankData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartRankService.getRankData(appOrg));
     }
 
+    /**
+     * 食堂服务人员情况接口
+     * @param appOrg
+     * @return
+     */
+    @RequestMapping("/getCanteenStaff")
+    public AjaxResult getCanteenStaff(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", platGreenSmartService.getCanteenStaff(appOrg));
+    }
+
     @RequestMapping("/getCanteenDegreeData")
     public AjaxResult getCanteenDegreeData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platGreenSmartService.getCanteenDegreeData(appOrg));
     }
 
-    @RequestMapping("/getCanteenTotalRank")
-    public AjaxResult getCanteenTotalRank(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", platGreenSmartService.getCanteenTotalRank(appOrg));
-    }
+
 
     @RequestMapping("/geParticipateData")
     public AjaxResult geParticipateData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.geParticipateData(appOrg));
     }
 
+
     @RequestMapping("/getDiningPieData")
     public AjaxResult getDiningPieData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getDiningPieData(appOrg));
     }
 
+
+    /**
+     *  食堂健康许可证数量
+     * @param appOrg
+     * @param canteenName
+     * @return
+     */
     @RequestMapping("/getQualificationData")
     public AjaxResult getLicenceData(@RequestParam String appOrg,@RequestParam String canteenName) {
         return AjaxResult.success("查询成功", platGreenSmartService.getQualificationData(appOrg, canteenName));
     }
 
+
     @RequestMapping("/getSmartCanteenPieData")
     public AjaxResult getSmartCanteenPieData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getSmartCanteenPieData(appOrg));
     }
 
+
     @RequestMapping("/getEmployeePieData")
     public AjaxResult getEmployeePieData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getEmployeePieData(appOrg));
     }
 
+
     @RequestMapping("/getFoodData")
     public AjaxResult getFoodData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getFoodData(appOrg));
     }
 
+    /**
+     * 获取其他数据信息
+     * @param appOrg
+     * @return
+     */
     @RequestMapping("/getOtherData")
     public AjaxResult getOtherData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getOtherData(appOrg));
     }
 
+    /**
+     * 电子餐券
+     * @param appOrg
+     * @return
+     */
     @RequestMapping("/getElectronicVouchersData")
     public AjaxResult getElectronicVouchersData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenSmartOtherService.getElectronicVouchersData(appOrg));
     }
 
+
     @RequestMapping("/getFoodsList")
     public AjaxResult getFoodsList(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatGreenFoodsService.getPlatGreenFoodsByField("app_org",appOrg));
     }
 
+
+    /**
+     * 单位菜品种类数量
+     * @param appOrg
+     */
+    @RequestMapping("/getFoodsTypeNum")
+    public AjaxResult getFoodsTypeNum(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", iPlatGreenFoodsService.getFoodsTypeNum(appOrg));
+    }
+
 }

src/main/java/com/project/zcustom/controller/service/PlatPostStationController.java

@@ -2,16 +2,14 @@ package com.project.zcustom.controller.service;
 
 import com.project.zcustom.controller.core.AjaxResult;
 import com.project.zcustom.controller.core.BaseController;
-import com.project.zcustom.domain.post.PlatPostStation;
 import com.project.zcustom.service.access.IPlatAccessService;
-import com.project.zcustom.service.post.IPlatPostStationChartService;
-import com.project.zcustom.service.post.IPlatPostStationService;
+import com.project.zcustom.service.service.post.IPlatPostStationChartService;
+import com.project.zcustom.service.service.post.IPlatPostStationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 物业服务Controller
@@ -19,6 +17,7 @@ import java.util.List;
  * @author change
  * @date 2024-10-21
  */
+
 @RestController
 @RequestMapping("/large/post")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -28,21 +27,25 @@ public class PlatPostStationController extends BaseController {
     private final IPlatPostStationChartService iPlatPostStationChartService;
     private final IPlatAccessService iPlatAccessService;
 
+
     @RequestMapping("/getOverviewData")
     public AjaxResult getOverviewData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPostStationService.getOverviewData(appOrg));
     }
 
+
     @RequestMapping("/getPastMonthPieData")
     public AjaxResult getPastMonthPieData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPostStationService.getPastMonthPieData(appOrg));
     }
 
+
     @RequestMapping("/getPastSixMonthChartsData")
     public AjaxResult getPastSixMonthChartsData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatPostStationChartService.getPastSixMonthChartsData(appOrg));
     }
 
+
     @RequestMapping("/getCarFlowData")
     public AjaxResult getCarFlowData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", iPlatAccessService.getCarFlowData(appOrg));

src/main/java/com/project/zcustom/controller/service/PlatPropertyController.java

@@ -1,10 +1,11 @@
 package com.project.zcustom.controller.service;
 
+
 import com.project.zcustom.controller.core.AjaxResult;
 import com.project.zcustom.controller.core.BaseController;
-import com.project.zcustom.service.property.IPlatPropertyListService;
-import com.project.zcustom.service.property.IPlatPropertyService;
-import com.project.zcustom.service.property.IPlatPropertyToolsService;
+import com.project.zcustom.service.service.property.IPlatPropertyListService;
+import com.project.zcustom.service.service.property.IPlatPropertyService;
+import com.project.zcustom.service.service.property.IPlatPropertyToolsService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author change
  * @date 2024-10-21
  */
+
 @RestController
 @RequestMapping("/large/property")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -26,18 +28,21 @@ public class PlatPropertyController extends BaseController {
     private final IPlatPropertyListService platPropertyListService;
     private final IPlatPropertyToolsService platPropertyToolsService;
 
+
     @RequestMapping("/getOverviewData")
     public AjaxResult getOverviewData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPropertyService.getOverviewData(appOrg));
     }
 
+
     @RequestMapping("/getPropertyList")
     public AjaxResult getPropertyList(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPropertyListService.selectServerListByAppOrg(appOrg));
     }
 
-    @RequestMapping("/getToolsChartsList")
-    public AjaxResult getToolsChartsList(@RequestParam String appOrg) {
+
+    @RequestMapping("/getSelfTestAndConsultation")
+    public AjaxResult getSelfTestAndConsultation(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPropertyToolsService.getToolsChartsList(appOrg));
     }
 }

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

@@ -0,0 +1,43 @@
+package com.project.zcustom.domain.addional;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.zcustom.controller.core.CustomBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeAssetDirs extends CustomBaseEntity {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+
+    private Long id;
+
+    /**
+     * 地区编码（后勤资产）
+     */
+
+    private String appCode;
+
+    /**
+     * 小类名称
+     */
+
+    private String categoryName;
+
+    /**
+     * 小类资产数量
+     */
+
+    private Long assetNum;
+
+}

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

@@ -3,7 +3,6 @@ package com.project.zcustom.domain.addional;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
-
 import com.project.zcustom.controller.core.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,13 +13,15 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-@TableName("large_building")
+@TableName("large_plat_building")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeBuilding extends CustomBaseEntity {
     /**
      * 楼宇数据id
      */
     @TableId(value = "楼宇数据id")
+
     private Long id;
 
     private String jsonFrequency;

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

@@ -0,0 +1,163 @@
+package com.project.zcustom.domain.addional;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("large_plat_building_control")
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeBuildingControl {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+
+    private Long id;
+
+    /**
+     * 分类用电初始化数据json（楼宇本周用电量）
+     */
+
+    private String weekElectricity;
+
+    /**
+     * 机房总用电量二级分类json（楼宇本周用电量）
+     */
+
+    private String roomElectricity;
+
+    /**
+     * 楼宇今日用电量json
+     */
+
+    private String todayElectricity;
+
+    /**
+     * 楼宇每月用电量json (配电室1)
+     */
+
+    private String monthElectricityOne;
+
+    /**
+     * 楼宇每月用电量json (配电室2)
+     */
+
+    private String monthElectricityTwo;
+
+    /**
+     * 楼宇每月用电量json (配电室3)
+     */
+
+    private String monthElectricityThree;
+
+    /**
+     * 配电室重要回路负荷情况json (配电室1)
+     */
+
+    private String roomLoadOne;
+
+    /**
+     * 配电室重要回路负荷情况json (配电室2)
+     */
+
+    private String roomLoadTwo;
+
+    /**
+     * 配电室重要回路负荷情况json (配电室3)
+     */
+
+    private String roomLoadThree;
+
+    /**
+     * 楼宇中当前告警的设备json
+     */
+
+    private String warnDevice;
+
+    /**
+     * 空调水浸总数
+     */
+
+    private Long waterDeviceAirNum;
+
+    /**
+     * 中控水浸正常数
+     */
+
+    private Long waterControlNormalNum;
+
+    /**
+     * 中控水浸异常数
+     */
+
+    private Long waterControlAbnormalNum;
+
+    /**
+     * 告警事件的历史统计json
+     */
+
+    private String warnEventStatistics;
+
+    /**
+     * 水箱水位情况json（23层）
+     */
+
+    private String waterStateOne;
+
+    /**
+     * 水箱水位情况json（-2层）
+     */
+
+    private String waterStateTwo;
+
+    /**
+     * 异常点位查看  电表
+     */
+    private String abnormalPointOne;
+
+    /**
+     * 异常点位查看  水浸
+     */
+    private String abnormalPointTwo;
+
+    /**
+     * 异常点位查看  烟雾
+     */
+    private String abnormalPointThree;
+
+    /**
+     * 异常点位查看  液位
+     */
+    private String abnormalPointFour;
+
+
+    public LargeBuildingControl() {
+    }
+
+    public LargeBuildingControl(String weekElectricity, String roomElectricity, String todayElectricity, String monthElectricityOne, String monthElectricityTwo, String monthElectricityThree, String roomLoadOne, String roomLoadTwo, String roomLoadThree, String warnDevice, Long waterControlNormalNum, Long waterControlAbnormalNum, String warnEventStatistics, String waterStateOne, String waterStateTwo) {
+        this.weekElectricity = weekElectricity;
+        this.roomElectricity = roomElectricity;
+        this.todayElectricity = todayElectricity;
+        this.monthElectricityOne = monthElectricityOne;
+        this.monthElectricityTwo = monthElectricityTwo;
+        this.monthElectricityThree = monthElectricityThree;
+        this.roomLoadOne = roomLoadOne;
+        this.roomLoadTwo = roomLoadTwo;
+        this.roomLoadThree = roomLoadThree;
+        this.warnDevice = warnDevice;
+        this.waterControlNormalNum = waterControlNormalNum;
+        this.waterControlAbnormalNum = waterControlAbnormalNum;
+        this.warnEventStatistics = warnEventStatistics;
+        this.waterStateOne = waterStateOne;
+        this.waterStateTwo = waterStateTwo;
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.project.zcustom.domain.addional;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("large_plat_building_ammeter_detail")
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeBuildingControlAmmeterDetail {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 专业所属电表明细json
+     */
+
+    private String ammeterDetail;
+
+    /**
+     * 类型
+     */
+    private String type;
+}

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

@@ -3,6 +3,7 @@ package com.project.zcustom.domain.addional;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import com.project.zcustom.controller.core.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,7 +11,7 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 
 /**
- * 摄像头对象 large_camera
+ * 摄像头对象 large_plat_camera
  *
  * @author change
  * @date 2024-12-30
@@ -19,7 +20,8 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-@TableName("large_camera")
+@TableName("large_plat_camera")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeCamera extends CustomBaseEntity {
 
@@ -27,36 +29,56 @@ public class LargeCamera extends CustomBaseEntity {
      * 摄像头id
      */
     @TableId(value = "id")
+
     private Long id;
 
     /**
      * 摄像头名称
      */
+
+
     private String cameraName;
 
     /**
+     * 摄像头编码
+     */
+
+
+    private String cameraCode;
+
+    /**
      * 所属项目id
      */
+
+
     private Long projectId;
 
     /**
      * 摄像头类型（0代表''，1代表''， 2代表''）
      */
+
+
     private String type;
 
     /**
      * 摄像头状态（0代表启用  2代表禁用）
      */
+
+
     private String status;
 
     /**
      * 在线标志（0代表在线 2代表不在线）
      */
+
+
     private String onlineFlag;
 
     /**
      * 接入标志（0代表接入 2代表未接入）
      */
+
+
     private String connectFlag;
 
 }

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

@@ -0,0 +1,193 @@
+package com.project.zcustom.domain.addional;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.zcustom.controller.core.CustomBaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("large_plat_public_car")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeCar extends CustomBaseEntity {
+    @JSONField(name = "ID")
+    private Long id;
+
+    /**
+     * 所属单位
+     */
+
+    @JSONField(name = "orgCode")
+    private String appEncode;
+
+    private String orgName;
+
+    /**
+     * 公务车实有总数
+     */
+
+    @JSONField(name = "gwcNum")
+    private Long totalCarNum;
+
+    /**
+     * 商务车数量
+     */
+
+    @JSONField(name = "swc")
+    private Long carNumOne;
+
+    /**
+     * 越野车数量
+     */
+
+    @JSONField(name = "yyc")
+    private Long carNumTwo;
+
+    /**
+     * 小轿车数量
+     */
+
+    @JSONField(name = "xjc")
+    private Long carNumThree;
+
+    /**
+     * 小型客车数量
+     */
+
+    @JSONField(name = "xxkc")
+    private Long carNumFour;
+
+    /**
+     * 大型客车数量
+     */
+
+    @JSONField(name = "dxkc")
+    private Long carNumFive;
+
+    /**
+     * 企业用车数量
+     */
+
+    @JSONField(name = "qyyc")
+    private Long enterpriseCarNum;
+
+    /**
+     * 企业负责人用车数量
+     */
+
+    @JSONField(name = "qyfzr")
+    private Long headCarNum;
+
+    /**
+     * 燃油车数量
+     */
+
+    @JSONField(name = "ryc")
+    private Long oilCarNum;
+
+    /**
+     * 新能源车数量
+     */
+
+    @JSONField(name = "xnyc")
+    private Long newPowerCarNum;
+
+
+
+    /**
+     * 公务车编制数
+     */
+
+    @JSONField(name = "gwcBZS")
+    private Long establishmentsCarNum;
+
+    /**
+     * 公务车年度增加数
+     */
+
+    @JSONField(name = "gwcZJS")
+    private Long yearAddNum;
+
+    /**
+     * 公务车年度减少数
+     */
+
+    @JSONField(name = "gwcJSS")
+    private Long yearReduceNum;
+
+    /**
+     * 公务车终端数
+     */
+    @JSONField(name = "terminalTotal")
+    private Long terminalTotal;
+
+    /**
+     * 公务车终端安装数
+     */
+    @JSONField(name = "terminalInstall")
+    private Long terminalInstall;
+
+    /**
+     * 公务车终端在线数
+     */
+    @JSONField(name = "online")
+    private Long terminalOnline;
+
+    /**
+     * 处置未归档数量
+     */
+
+    @JSONField(name = "CZWGD")
+    private Long notArchivedNum;
+
+    /**
+     * 未带工单数
+     */
+
+    @JSONField(name = "noPid")
+    private Long noPidNum;
+
+    /**
+     * 超速预警数
+     */
+
+    @JSONField(name = "overSpeed")
+    private Long overSpeedNum;
+
+    /**
+     * 节假日预警数
+     */
+
+    @JSONField(name = "Holiday")
+    private Long holidayNum;
+
+    /**
+     * 派车单总数
+     */
+
+    @JSONField(name = "pcdNum")
+    private Long pcdNum;
+
+    /**
+     * 均车派车单数
+     */
+
+    @JSONField(name = "gwcTotal")
+    private Long avgPcdNum;
+
+    /**
+     * 公务车行驶总里程
+     */
+
+    @JSONField(name = "mileCount")
+    private BigDecimal mileCount;
+
+    /**
+     * 均车里程
+     */
+
+    @JSONField(name = "avgMile")
+    private BigDecimal avgMile;
+}

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

@@ -0,0 +1,83 @@
+package com.project.zcustom.domain.addional;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.zcustom.controller.core.CustomBaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("large_plat_public_car_change_detail")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeCarDetail extends CustomBaseEntity {
+    @JSONField(name = "ID")
+    private Long id;
+
+    /**
+     * 单位名称
+     */
+    @TableField(exist = false)
+    private String appName;
+
+    /**
+     * 所属单位编码
+     */
+
+    @JSONField(name = "orgCode")
+    private String appEncode;
+
+    /**
+     * 车牌号
+     */
+
+    @JSONField(name = "vehicleNumber")
+    private String vehicleNum;
+
+    /**
+     * 车辆用途
+     */
+
+
+    private String useProperty;
+
+    /**
+     * 资产卡号
+     */
+
+
+    private String assetsCard;
+
+    /**
+     * 配置日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+
+    private Date orgDate;
+
+    /**
+     * 处置日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+
+    private Date handleDate;
+
+    /**
+     * 处置原因
+     */
+
+
+    private String handleReason;
+
+    /**
+     * 类别（0:增加; 1:减少）
+     */
+
+
+    private Integer flag;
+}

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

@@ -0,0 +1,38 @@
+package com.project.zcustom.domain.addional;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.zcustom.controller.core.CustomBaseEntity;
+import lombok.Data;
+
+@Data
+@TableName("large_plat_public_car_rank_person")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeCarRank extends CustomBaseEntity {
+    private Long id;
+
+    /**
+     * 单位名称
+     */
+    @JSONField(name = "orgName")
+    private String orgName;
+
+    /**
+     * 派车单总数
+     */
+    private Long pcdCount;
+
+    /**
+     * 车牌号
+     */
+    @JSONField(name = "vehicleNumber")
+    private String vechileNum;
+
+    /**
+     * 单位编码
+     */
+    @JSONField(name = "orgCode")
+    private String appEncode;
+
+}

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

@@ -0,0 +1,81 @@
+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.zcustom.controller.core.CustomBaseEntity;
+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_plat_housing_land")
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeHousingLand extends CustomBaseEntity {
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+
+    private Long id;
+
+    /**
+     * 房产名称
+     */
+
+
+    private String housing;
+
+    /**
+     * 房产面积
+     */
+
+
+    private BigDecimal acreage;
+
+    /**
+     * 房产类型
+     */
+
+
+    private Long type;
+
+    @TableField(exist = false)
+    private String typeName;
+
+    /**
+     * 施工时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+
+    private Date constructionTime;
+
+    /**
+     * 是否拥有所有权（0否；1是）
+     */
+
+
+    private Integer ownershipFlag;
+
+    /**
+     * 是否为投资计划（0否；1是）
+     */
+
+
+    private Integer investmentPlanFlag;
+
+    @TableField(exist = false)
+    private Long num;
+}

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

@@ -1,7 +1,9 @@
 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.zcustom.controller.core.CustomBaseEntity;
 import lombok.Data;
@@ -9,8 +11,10 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
- * 上报问题对象 large_issue
+ * 上报问题对象 large_plat_issue
  *
  * @author change
  * @date 2024-12-30
@@ -19,7 +23,8 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-@TableName("large_issue")
+@TableName("large_plat_issue")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeIssue extends CustomBaseEntity {
 
@@ -27,23 +32,57 @@ public class LargeIssue extends CustomBaseEntity {
      * 问题id
      */
     @TableId(value = "id")
+
     private Long id;
 
     /**
+     * 问题标题
+     */
+
+    private String title;
+
+    /**
+     * 附件地址
+     */
+
+    private String imagePath;
+
+    /**
      * 问题描述
      */
+
+
     private String description;
 
     /**
+     * 要求
+     */
+
+    private String need;
+
+    /**
+     * 发起人
+     */
+
+    private String person;
+
+    /**
      * 所属项目id
      */
+
     private Integer projectId;
 
+
+    @TableField(exist = false)
     private String projectName;
 
     /**
-     * 问题状态（0代表已解决  2代表待解决）
+     * 问题状态（0代表未解决  1代表已解决）
      */
+
     private String status;
 
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createDate;
 }

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

@@ -0,0 +1,217 @@
+package com.project.zcustom.domain.addional;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.zcustom.controller.core.CustomBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 后勤运行监控中心对象 large_plat_logistics
+ *
+ * @author change
+ * @date 2025-02-10
+ */
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("large_plat_logistics")
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeLogistics extends CustomBaseEntity {
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+
+    private Long id;
+
+    /**
+     * 地区编码（后勤资产）
+     */
+
+    private String orgId;
+
+    /**
+     * 地区名称（后勤资产）
+     */
+
+    private String appName;
+
+    /**
+     * 父地区编码（后勤资产）
+     */
+
+
+    private String parentOrgId;
+
+    /**
+     * 已赋码台账数
+     */
+
+
+    private Long codedNum;
+
+    /**
+     * 已贴签台账数
+     */
+
+
+    private Long labelNum;
+
+    /**
+     * 台账总数
+     */
+
+
+    private Long assetNum;
+
+    /**
+     * 办公资产数
+     */
+
+
+    private Long officeAssetNum;
+
+    /**
+     * 存量办公资产数
+     */
+
+
+    private Long stockOfficeAssetNum;
+
+    /**
+     * 新增办公资产数
+     */
+
+
+    private Long newOfficeAssetNum;
+
+    /**
+     * 报废办公资产数
+     */
+
+
+    private Long scrapOfficeAssetNum;
+
+    /**
+     * 楼宇设备数
+     */
+
+
+    private Long buildingAssetNum;
+
+    /**
+     * 存量楼宇设备数
+     */
+
+
+    private Long stockBuildingAssetNum;
+
+    /**
+     * 新增楼宇设备数
+     */
+
+
+    private Long newBuildingAssetNum;
+
+    /**
+     * 报废楼宇设备数
+     */
+
+
+    private Long scrapBuildingAssetNum;
+
+    /**
+     * 服务设备数
+     */
+
+
+    private Long serviceAssetNum;
+
+    /**
+     * 存量服务设备数
+     */
+
+
+    private Long stockServiceAssetNum;
+
+    /**
+     * 新增服务设备数
+     */
+
+
+    private Long newServiceAssetNum;
+
+    /**
+     * 报废服务设备数
+     */
+
+
+    private Long scrapServiceAssetNum;
+
+    /**
+     * 典型应用场景覆盖率
+     */
+
+    private BigDecimal sceneRate;
+
+    /**
+     * 楼宇资产巡检执行数
+     */
+
+    private Long inspectionSchemeNum;
+
+    /**
+     * 重点楼宇设备巡检执行数
+     */
+
+    private BigDecimal importantDeviceTypeInspectionExecuteRate;
+
+    /**
+     * 楼宇资产巡检异常数
+     */
+
+    private Long inspectionAnomalyRecordNum;
+
+
+    /**
+     * 检修记录数
+     */
+
+
+    private Long repairRecordNum;
+
+    /**
+     * 维保记录数
+     */
+
+
+    private Long maintenanceRecordNum;
+
+    /**
+     * 办公资产分布列表
+     */
+
+    private List<LargeAssetDirs> officeAssetList;
+
+    /**
+     * 楼宇设备分布列表
+     */
+
+    private List<LargeAssetDirs> buildingAssetList;
+
+    /**
+     * 服务设备分布列表
+     */
+
+    private List<LargeAssetDirs> serviceAssetList;
+}

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

@@ -1,9 +1,11 @@
 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.zcustom.controller.core.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +15,7 @@ import lombok.experimental.Accessors;
 import java.util.Date;
 
 /**
- * 工程计划对象 large_plan
+ * 工程计划对象 large_plat_plan
  *
  * @author change
  * @date 2024-12-30
@@ -22,7 +24,8 @@ import java.util.Date;
 @Accessors(chain = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-@TableName("large_plan")
+@TableName("large_plat_plan")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargePlan extends CustomBaseEntity {
 
@@ -30,38 +33,54 @@ public class LargePlan extends CustomBaseEntity {
      * 计划id
      */
     @TableId(value = "id")
+
     private Long id;
 
     /**
      * 所属项目id
      */
+
+
     private Long projectId;
 
     /**
      * 计划类型（0 检查   1施工）
      */
+
+
     private String type;
 
     /**
      * 负责人
      */
+
+
     private String head;
 
     /**
      * 具体内容
      */
+
+
     private String content;
 
     /**
      * 开始日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+
     private Date startTime;
 
     /**
      * 结束日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+
     private Date endTime;
 
+    @TableField(exist = false)
+    private String projectName;
+
 }

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

@@ -10,8 +10,10 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 /**
- * 工程项目对象 large_project
+ * 工程项目对象 large_plat_project
  *
  * @author change
  * @date 2024-12-30
@@ -20,7 +22,8 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-@TableName("large_project")
+@TableName("large_plat_project")
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeProject extends CustomBaseEntity {
 
@@ -28,29 +31,65 @@ public class LargeProject extends CustomBaseEntity {
      * 项目id
      */
     @TableId(value = "id")
+
     private Long id;
 
     /**
      * 项目名称
      */
+
+
     private String projectName;
 
+    private String constructionUnit;
+
+    private String supervisionUnit;
+
+    /**
+     * 横坐标
+     */
+
+    private BigDecimal abscissa;
+
+    /**
+     * 纵坐标
+     */
+
+    private BigDecimal ordinate;
+
     /**
-     * 所属单位id
+     * 所属单位编码
      */
-    private String unitCode;
+
+
+    private String appOrg;
+
+    /**
+     * 所属单位的父单位编码
+     */
+    @TableField(exist = false)
+    private String appParentOrg;
 
     /**
      * 项目类型
      */
+
+
     private String type;
 
     /**
      * 接入标志（0代表接入 2代表未接入）
      */
+
+
     private String connectFlag;
 
     @TableField(exist = false)
     private Long cameraNum;
 
+    private Long subdivision;
+
+    @TableField(exist = false)
+    private Long num;
+
 }

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

@@ -1,57 +0,0 @@
-package com.project.zcustom.domain.addional;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.project.zcustom.controller.core.CustomBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-/**
- * 地区编码对象 large_plat_app_org
- *
- * @author change
- * @date 2024-12-30
- */
-@Data
-@Accessors(chain = true)
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = false)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class LargeUnit extends CustomBaseEntity {
-
-    /**
-     * $column.columnComment
-     */
-    @TableId(value = "id")
-    private Long id;
-
-    /**
-     * 地区编码
-     */
-    private String unitCode;
-
-    private String parentUnitCode;
-
-    /**
-     * 地区名称
-     */
-    private String unitName;
-
-    /**
-     * 接入标志
-     */
-    private String connectFlag;
-
-    @TableField(exist = false)
-    private Long projectNum;
-
-    @TableField(exist = false)
-    private Long cameraNum;
-
-    @TableField(exist = false)
-    private Long onlineCameraNum;
-
-}

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

@@ -0,0 +1,45 @@
+package com.project.zcustom.domain.addional;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.zcustom.controller.core.CustomBaseEntity;
+import lombok.Data;
+
+@Data
+@TableName("large_plat_public_car")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeUnitRank extends CustomBaseEntity {
+    private Long id;
+
+    /**
+     * 单位名称
+     */
+    @TableField(exist = false)
+    @JSONField(name = "orgName")
+    private String appName;
+
+
+    /**
+     * 单位编码
+     */
+
+
+    private String appEncode;
+
+
+    /**
+     * 公务车总数
+     */
+
+
+    private Long totalCarNum;
+
+    /**
+     * 公务车派车次数
+     */
+
+
+    private Long pcdNum;
+}

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

@@ -0,0 +1,60 @@
+package com.project.zcustom.domain.addional;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.project.zcustom.controller.core.CustomBaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("large_plat_public_car_warn_detail")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeWarnDetail extends CustomBaseEntity {
+    @JSONField(name = "ID")
+    private Long id;
+
+    /**
+     * 单位名称
+     */
+    @TableField(exist = false)
+    private String appName;
+
+    /**
+     * 所属单位编码
+     */
+
+    @JSONField(name = "orgCode")
+    private String appEncode;
+
+    /**
+     * 车牌号
+     */
+
+    @JSONField(name = "vehicleNumber")
+    private String vehicleNum;
+
+    /**
+     * 预警类型
+     */
+
+    private String alertType;
+
+    /**
+     * 预警开始时间
+     */
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    /**
+     * 预警结束时间
+     */
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+}

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

@@ -0,0 +1,25 @@
+package com.project.zcustom.domain.addional;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ManagerEmail implements Serializable {
+    /**
+     * 邮件接收方
+     */
+    private String receiver;
+    /**
+     * 邮件主题
+     */
+    private String subject;
+    /**
+     * 邮件内容
+     */
+    private String content;
+}

src/main/java/com/project/zcustom/domain/basics/PlatAppOrg.java

@@ -1,5 +1,6 @@
 package com.project.zcustom.domain.basics;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.project.zcustom.controller.core.CustomBaseEntity;
@@ -8,6 +9,8 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 地区编码对象 plat_app_org
  *
@@ -25,16 +28,53 @@ public class PlatAppOrg extends CustomBaseEntity {
      * 主键id
      */
     @TableId(value = "id")
+
     private Long id;
 
     /**
      * 地区编码
      */
+
     private String appOrg;
 
     /**
+     * 地区编码（后勤资产）
+     */
+    private String appCode;
+
+    /**
+     * 地区编码（公务用车）
+     */
+    private String appEncode;
+
+    /**
+     * 父地区编码
+     */
+
+    private String appParentOrg;
+
+    /**
      * 地区名称
      */
+
     private String appName;
 
+    /**
+     * 接入标志
+     */
+
+    private String connectFlag;
+
+    @TableField(exist = false)
+    private Long projectNum;
+
+    @TableField(exist = false)
+    private Long cameraNum;
+
+    @TableField(exist = false)
+    private Long onlineCameraNum;
+
+    @TableField(exist = false)
+    private List<PlatAppOrg> children;
+
 }

src/main/java/com/project/zcustom/domain/post/PlatPostStation.java

@@ -2,6 +2,7 @@ package com.project.zcustom.domain.post;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import com.project.zcustom.controller.core.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -19,92 +20,126 @@ import lombok.experimental.Accessors;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_post_station")
+
 public class PlatPostStation extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
+
     private Long id;
 
     /**
      * 地区编码
      */
+
+
     private String appOrg;
 
     /**
      * 物业服务--故障保修订单数
      */
+
+
     private Long faultWarrantyNum;
 
     /**
      * 物业服务--派单数量
      */
+
+
     private Long dispatchedNum;
 
     /**
      * 物业服务--建议订单数量
      */
+
+
     private Long suggestedNum;
 
     /**
      * 物业服务--维修订单数量
      */
+
+
     private Long repairOrdersNum;
 
     /**
      * 物业服务--调查问卷数量
      */
+
+
     private Long questionnairesNum;
 
     /**
-     * 近一个月报修分类占比--消防
+     * 近一个月报修分类占比--办公家具报修
      */
-    private Long fireControlNum;
+
+
+    private Long furniture;
 
     /**
-     * 近一个月报修分类占比--电梯
+     * 近一个月报修分类占比--冷热水故障
      */
-    private Long elevatorNum;
+
+
+    private Long hotColdWater;
 
     /**
-     * 近一个月报修分类占比--照明灯具
+     * 近一个月报修分类占比--门禁故障
      */
-    private Long lampNum;
+
+
+    private Long accessControl;
 
     /**
-     * 近一个月报修分类占比--安防
+     * 近一个月报修分类占比--其他报修故障
      */
-    private Long securityNum;
+
+
+    private Long other;
 
     /**
-     * 近一个月报修分类占比--卫生间
+     * 近一个月报修分类占比--墙类/地类报修
      */
-    private Long toiletNum;
+
+
+    private Long wall;
 
     /**
-     * 近一个月报修分类占比--公区
+     * 近一个月报修分类占比--电气故障报修
      */
-    private Long areaNum;
+
+
+    private Long electrical;
 
     /**
-     * 近一个月报修分类占比--空调
+     * 近一个月报修分类占比--电梯故障
      */
-    private Long conditionerNum;
+
+
+    private Long elevator;
 
     /**
-     * 近一个月报修分类占比--其它维修
+     * 近一个月报修分类占比--消防设施设备故障
      */
-    private Long repairsNum;
+
+
+    private Long fireControl;
 
     /**
-     * 近一个月报修分类占比--会议保障
+     * 近一个月报修分类占比--保洁服务
      */
-    private Long meetingNum;
+
+
+    private Long cleaning;
 
     /**
-     * 近一个月报修分类占比--办公室
+     * 近一个月报修分类占比--空调故障
      */
-    private Long officeNum;
+
+
+    private Long airConditioning;
 
 }

src/main/java/com/project/zcustom/domain/property/PlatPropertyTools.java

@@ -2,6 +2,7 @@ package com.project.zcustom.domain.property;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import com.project.zcustom.controller.core.CustomBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -19,57 +20,35 @@ import lombok.experimental.Accessors;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_property_tools")
+
 public class PlatPropertyTools extends CustomBaseEntity {
 
     /**
      * 主键id
      */
     @TableId(value = "id")
+
     private Long id;
 
     /**
      * 地区编码
      */
-    private String appOrg;
 
-    /**
-     * 工具名称
-     */
-    private String toolsNameFirst;
 
-    /**
-     * 工具数量
-     */
-    private Long toolsNumFirst;
+    private String appOrg;
 
     /**
-     * 工具名称
+     * 健康自测
      */
-    private String toolsNameTwo;
 
-    /**
-     * 工具数量
-     */
-    private Long toolsNumTwo;
 
-    /**
-     * 工具名称
-     */
-    private String toolsNameThird;
+    private Long selfTest;
 
     /**
-     * 工具数量
+     * 远程问诊
      */
-    private Long toolsNumThird;
 
-    /**
-     * 工具名称
-     */
-    private String toolsNameFour;
 
-    /**
-     * 工具数量
-     */
-    private Long toolsNumFour;
+    private Long consultation;
 
 }

src/main/java/com/project/zcustom/logistics/LargeHousingLandController.java

@@ -0,0 +1,52 @@
+package com.project.zcustom.logistics;
+
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+import com.project.zcustom.domain.addional.LargeHousingLand;
+import com.project.zcustom.service.logistics.ILargeHousingLandService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+@RestController
+@RequestMapping("/zcustom/housing")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class LargeHousingLandController extends BaseController {
+
+    @Autowired
+    private ILargeHousingLandService largeHousingLandService;
+    @GetMapping("/list")
+    public AjaxResult list(LargeHousingLand entity) {
+        return AjaxResult.success("查询成功", largeHousingLandService.pagingLargePlatHousingLandList(entity));
+    }
+
+
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success("查询成功", largeHousingLandService.getById(id));
+    }
+
+
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeHousingLand entity) {
+        return toAjax(largeHousingLandService.save(entity));
+    }
+
+
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody LargeHousingLand entity) {
+        return toAjax(largeHousingLandService.updateById(entity));
+    }
+
+
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(largeHousingLandService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+
+}

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

@@ -0,0 +1,116 @@
+package com.project.zcustom.logistics;
+
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.service.logistics.ILargePlatAssetService;
+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/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());
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.project.zcustom.logistics;
+
+
+import com.project.zcustom.controller.core.AjaxResult;
+import com.project.zcustom.controller.core.BaseController;
+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.RestController;
+
+@RestController
+@RequestMapping("/large/housing")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class PlatHousingLandController extends BaseController {
+
+    @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());
+    }
+
+}

src/main/java/com/project/zcustom/mapper/basics/PlatAppOrgMapper.java

@@ -3,6 +3,8 @@ package com.project.zcustom.mapper.basics;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 
+import java.util.List;
+
 /**
  * 地区编码Mapper接口
  *
@@ -11,5 +13,11 @@ import com.project.zcustom.domain.basics.PlatAppOrg;
  */
 public interface PlatAppOrgMapper extends BaseMapper<PlatAppOrg> {
 
+    public List<PlatAppOrg> getProjectCameraNumList(String appOrg);
+
+    public int getConnectUnitNum();
+
+    public List<PlatAppOrg> getAllCameraCondition();
 
+    public PlatAppOrg getCameraConditionByAppOrg(String appOrg);
 }

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

@@ -0,0 +1,28 @@
+package com.project.zcustom.mapper.car;
+
+import com.project.zcustom.domain.addional.*;
+
+import java.util.List;
+
+public interface PlatCarMapper {
+
+    List<LargeUnitRank> getUnitRankList();
+
+    LargeCar getResourceNumber(String appOrg);
+
+    List<LargeCarDetail> getCarDetail(String appOrg, Long flag);
+
+    LargeCar getMonitorNumber(String appOrg);
+
+    List<LargeWarnDetail> getWarnDetail(String appOrg);
+
+    LargeCar getOperationManageTopHalf(String appOrg);
+
+    List<LargeUnitRank> getUnitRankTop();
+
+    List<LargeUnitRank> getUnitRankLast();
+
+    List<LargeCarRank> getCarRank();
+
+    List<LargeCar> getSelfCarNum(List<String> appOrg);
+}

src/main/java/com/project/zcustom/mapper/employee/PlatEmployeeHealthIllnessMapper.java

@@ -1,71 +1,22 @@
 package com.project.zcustom.mapper.employee;
 
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.project.zcustom.domain.employee.PlatEmployeeHealthIllness;
 import org.apache.ibatis.annotations.Param;
 
-
 /**
  * 多发疾病排行Mapper接口
- * 
+ *
  * @author change
- * @date 2024-11-12
+ * @date 2024-10-21
  */
-public interface PlatEmployeeHealthIllnessMapper extends BaseMapper<PlatEmployeeHealthIllness>
-{
-    /**
-     * 查询多发疾病排行
-     * 
-     * @param id 多发疾病排行主键
-     * @return 多发疾病排行
-     */
-    public PlatEmployeeHealthIllness selectPlatEmployeeHealthIllnessById(Long id);
-
-    /**
-     * 查询多发疾病排行列表
-     * 
-     * @param largePlatEmployeeHealthIllness 多发疾病排行
-     * @return 多发疾病排行集合
-     */
-    public List<PlatEmployeeHealthIllness> selectPlatEmployeeHealthIllnessList(PlatEmployeeHealthIllness largePlatEmployeeHealthIllness);
-
-    /**
-     * 新增多发疾病排行
-     * 
-     * @param largePlatEmployeeHealthIllness 多发疾病排行
-     * @return 结果
-     */
-    public int insertPlatEmployeeHealthIllness(PlatEmployeeHealthIllness largePlatEmployeeHealthIllness);
+public interface PlatEmployeeHealthIllnessMapper extends BaseMapper<PlatEmployeeHealthIllness> {
 
-    /**
-     * 修改多发疾病排行
-     * 
-     * @param largePlatEmployeeHealthIllness 多发疾病排行
-     * @return 结果
-     */
-    public int updatePlatEmployeeHealthIllness(PlatEmployeeHealthIllness largePlatEmployeeHealthIllness);
 
     /**
-     * 删除多发疾病排行
-     * 
-     * @param id 多发疾病排行主键
-     * @return 结果
+     * 真删接口
      */
-    public int deletePlatEmployeeHealthIllnessById(Long id);
-
-    /**
-     * 批量删除多发疾病排行
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deletePlatEmployeeHealthIllnessByIds(Long[] ids);
-
-    /**
-    * 真删接口
-    */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<PlatEmployeeHealthIllness> deleteWrapper);
 }

src/main/java/com/project/zcustom/mapper/employee/PlatEmployeeTypeMapper.java

@@ -1,6 +1,8 @@
 package com.project.zcustom.mapper.employee;
 
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -10,62 +12,11 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * 员工概况Mapper接口
- * 
+ *
  * @author change
  * @date 2024-11-12
  */
 public interface PlatEmployeeTypeMapper extends BaseMapper<PlatEmployeeType>
 {
-    /**
-     * 查询员工概况
-     * 
-     * @param id 员工概况主键
-     * @return 员工概况
-     */
-    public PlatEmployeeType selectPlatEmployeeTypeById(Long id);
-
-    /**
-     * 查询员工概况列表
-     * 
-     * @param largePlatEmployeeType 员工概况
-     * @return 员工概况集合
-     */
-    public List<PlatEmployeeType> selectPlatEmployeeTypeList(PlatEmployeeType largePlatEmployeeType);
-
-    /**
-     * 新增员工概况
-     * 
-     * @param largePlatEmployeeType 员工概况
-     * @return 结果
-     */
-    public int insertPlatEmployeeType(PlatEmployeeType largePlatEmployeeType);
-
-    /**
-     * 修改员工概况
-     * 
-     * @param largePlatEmployeeType 员工概况
-     * @return 结果
-     */
-    public int updatePlatEmployeeType(PlatEmployeeType largePlatEmployeeType);
-
-    /**
-     * 删除员工概况
-     * 
-     * @param id 员工概况主键
-     * @return 结果
-     */
-    public int deletePlatEmployeeTypeById(Long id);
-
-    /**
-     * 批量删除员工概况
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deletePlatEmployeeTypeByIds(Long[] ids);
-
-    /**
-    * 真删接口
-    */
-    Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<PlatEmployeeType> deleteWrapper);
+    public PlatEmployeeType getEmployeePieData(String appOrg);
 }

src/main/java/com/project/zcustom/mapper/logistics/PlatAssetMapper.java

@@ -0,0 +1,68 @@
+package com.project.zcustom.mapper.logistics;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+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 PlatAssetMapper {
+
+    public int deleteLogistics();
+
+    public int deleteOfficeAssetDirs();
+
+    public int deleteBuildingAssetDirs();
+
+    public int deleteServiceAssetDirs();
+
+    public int insertLargePlatLogistics(List<LargeLogistics> largeLogisticsList);
+
+    public int insertOfficeAssetDirs(List<LargeAssetDirs> largeAssetDirsList);
+
+    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 LargeLogistics getOperation(String appOrg);
+
+    public List<LargeLogistics> getInspectionSchemeNumX();
+
+    public List<LargeLogistics> getInspectionSchemeNumY();
+}

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

@@ -0,0 +1,17 @@
+package com.project.zcustom.mapper.logistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.zcustom.domain.addional.LargeHousingLand;
+
+import java.util.List;
+import java.util.Map;
+
+public interface PlatHousingLandMapper extends BaseMapper<LargeHousingLand> {
+    List<LargeHousingLand> getStockOfEstateResources();
+
+    Map<String, Object> getStockOfLandResources();
+
+    Map<String, Object> getInvestFinishState();
+
+    int upload(List<LargeHousingLand> data);
+}

src/main/java/com/project/zcustom/mapper/smart/PlatGreenFoodsMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * 菜谱数据Mapper接口
- * 
+ *
  * @author change
  * @date 2024-11-12
  */
@@ -18,7 +18,7 @@ public interface PlatGreenFoodsMapper extends BaseMapper<PlatGreenFoods>
 {
     /**
      * 查询菜谱数据
-     * 
+     *
      * @param id 菜谱数据主键
      * @return 菜谱数据
      */
@@ -26,7 +26,7 @@ public interface PlatGreenFoodsMapper extends BaseMapper<PlatGreenFoods>
 
     /**
      * 查询菜谱数据列表
-     * 
+     *
      * @param largePlatGreenFoods 菜谱数据
      * @return 菜谱数据集合
      */
@@ -34,7 +34,7 @@ public interface PlatGreenFoodsMapper extends BaseMapper<PlatGreenFoods>
 
     /**
      * 新增菜谱数据
-     * 
+     *
      * @param largePlatGreenFoods 菜谱数据
      * @return 结果
      */
@@ -42,7 +42,7 @@ public interface PlatGreenFoodsMapper extends BaseMapper<PlatGreenFoods>
 
     /**
      * 修改菜谱数据
-     * 
+     *
      * @param largePlatGreenFoods 菜谱数据
      * @return 结果
      */
@@ -50,7 +50,7 @@ public interface PlatGreenFoodsMapper extends BaseMapper<PlatGreenFoods>
 
     /**
      * 删除菜谱数据
-     * 
+     *
      * @param id 菜谱数据主键
      * @return 结果
      */
@@ -58,7 +58,7 @@ public interface PlatGreenFoodsMapper extends BaseMapper<PlatGreenFoods>
 
     /**
      * 批量删除菜谱数据
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
@@ -68,4 +68,6 @@ public interface PlatGreenFoodsMapper extends BaseMapper<PlatGreenFoods>
     * 真删接口
     */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<PlatGreenFoods> deleteWrapper);
+
+    public String getFoodsTypeNum(String appOrg);
 }

src/main/java/com/project/zcustom/mapper/unit/LargeCarDetailMapper.java

@@ -0,0 +1,7 @@
+package com.project.zcustom.mapper.unit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.zcustom.domain.addional.LargeCarDetail;
+
+public interface LargeCarDetailMapper extends BaseMapper<LargeCarDetail> {
+}

src/main/java/com/project/zcustom/mapper/unit/LargeCarRankMapper.java

@@ -0,0 +1,8 @@
+package com.project.zcustom.mapper.unit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.zcustom.domain.addional.LargeCarRank;
+
+public interface LargeCarRankMapper extends BaseMapper<LargeCarRank>{
+
+}

src/main/java/com/project/zcustom/mapper/unit/LargeIssueMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.project.zcustom.domain.addional.LargeIssue;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -70,9 +71,11 @@ public interface LargeIssueMapper extends BaseMapper<LargeIssue>
     */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargeIssue> deleteWrapper);
 
-    public int getIssueNum();
+    public int getIssueNum(String appOrg);
 
-    public int getOverIssueNum();
+    public int getOverIssueNum(String appOrg);
 
-    public List<LargeIssue> getIssueListLastWeek();
+    public List<LargeIssue> getIssueListLastWeek(String appOrg);
+
+    public List<LargeIssue> getIssueList(String appOrg, Date date);
 }

src/main/java/com/project/zcustom/mapper/unit/LargePlanMapper.java

@@ -72,4 +72,8 @@ public interface LargePlanMapper extends BaseMapper<LargePlan>
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargePlan> deleteWrapper);
 
     public int getCheckProjectNum(Date startDate, Date endDate);
+
+    public List<LargePlan> planCheckList();
+
+    public List<LargePlan> planDoneList();
 }

src/main/java/com/project/zcustom/mapper/unit/LargeProjectMapper.java

@@ -63,11 +63,17 @@ public interface LargeProjectMapper extends BaseMapper<LargeProject>
     */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargeProject> deleteWrapper);
 
-    public int getProjectNumX(String subdivision);
+    public Long getProjectNum(String appOrg);
 
-    public int getProjectNumY(String subdivision);
+    public List<LargeProject> getProjectNumX(String appOrg);
 
-    public List<LargeProject> getCameraNumList(String unitCode);
+    public List<LargeProject> getProjectNumY(String appOrg);
 
-    public int getProjectNumThisWeek();
+    public List<LargeProject> getProjectByAppOrg(String appOrg);
+
+    public List<LargeProject> getCameraNumList(String appOrg);
+
+    public int getProjectNumThisWeek(String appOrg);
+
+    public List<LargeProject> getProjectNumZ(List<String> appOrg);
 }

src/main/java/com/project/zcustom/mapper/unit/LargePublicCarMapper.java

@@ -0,0 +1,9 @@
+package com.project.zcustom.mapper.unit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.zcustom.domain.addional.LargeCar;
+
+public interface LargePublicCarMapper extends BaseMapper<LargeCar>
+{
+
+}

src/main/java/com/project/zcustom/mapper/unit/LargeUnitMapper.java

@@ -1,80 +0,0 @@
-package com.project.zcustom.mapper.unit;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.project.zcustom.domain.addional.LargeUnit;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-
-/**
- * 地区编码Mapper接口
- *
- * @author change
- * @date 2024-12-30
- */
-public interface LargeUnitMapper extends BaseMapper<LargeUnit>
-{
-    /**
-     * 查询地区编码
-     *
-     * @param id 地区编码主键
-     * @return 地区编码
-     */
-    public LargeUnit selectLargeUnitById(Long id);
-
-    /**
-     * 查询地区编码列表
-     *
-     * @param largeUnit 地区编码
-     * @return 地区编码集合
-     */
-    public List<LargeUnit> selectLargeUnitList(LargeUnit largeUnit);
-
-    /**
-     * 新增地区编码
-     *
-     * @param largeUnit 地区编码
-     * @return 结果
-     */
-    public int insertLargeUnit(LargeUnit largeUnit);
-
-    /**
-     * 修改地区编码
-     *
-     * @param largeUnit 地区编码
-     * @return 结果
-     */
-    public int updateLargeUnit(LargeUnit largeUnit);
-
-    /**
-     * 删除地区编码
-     *
-     * @param id 地区编码主键
-     * @return 结果
-     */
-    public int deleteLargeUnitById(Long id);
-
-    /**
-     * 批量删除地区编码
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteLargeUnitByIds(Long[] ids);
-
-    /**
-    * 真删接口
-    */
-    Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<LargeUnit> deleteWrapper);
-
-    public List<LargeUnit> getProjectCameraNumList();
-
-    public int getConnectUnitNum();
-
-    public List<LargeUnit> getAllCameraCondition();
-
-    public LargeUnit getCameraConditionByAppOrg(String unitCode);
-}

src/main/java/com/project/zcustom/mapper/unit/LargeUnitRankMapper.java

@@ -0,0 +1,9 @@
+package com.project.zcustom.mapper.unit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.zcustom.domain.addional.LargeUnitRank;
+
+public interface LargeUnitRankMapper extends BaseMapper<LargeUnitRank>
+{
+
+}

src/main/java/com/project/zcustom/mapper/unit/LargeWarnDetailMapper.java

@@ -0,0 +1,7 @@
+package com.project.zcustom.mapper.unit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.project.zcustom.domain.addional.LargeWarnDetail;
+
+public interface LargeWarnDetailMapper extends BaseMapper<LargeWarnDetail> {
+}

src/main/java/com/project/zcustom/mapper/unit/PlatBuildingMapper.java

@@ -1,7 +1,13 @@
 package com.project.zcustom.mapper.unit;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.project.zcustom.domain.addional.LargeBuilding;
+import com.project.zcustom.domain.addional.LargeBuildingControl;
+import com.project.zcustom.domain.addional.LargeBuildingControlAmmeterDetail;
 
+import java.util.List;
+
+@InterceptorIgnore(blockAttack = "true")
 public interface PlatBuildingMapper {
     public int getCount();
 
@@ -31,6 +37,21 @@ public interface PlatBuildingMapper {
 
 
 
+
+    LargeBuildingControl getThisWeekElectricity();
+    String getThisAmmeterDetail(String type);
+    String getTodayElectricity();
+    LargeBuildingControl getMonthElectricity();
+    LargeBuildingControl getRoomLoad();
+    LargeBuildingControl getWarnDevice();
+
+    LargeBuildingControl getAbnormalPoint();
+    String getWarnEvent();
+    LargeBuildingControl getWarnState();
+
+
+
+
     public int updatePowerAndWaterMonth(String res);
 
     public int updateAirCondition(String res);
@@ -57,4 +78,13 @@ public interface PlatBuildingMapper {
 
     public int updateBuilding(LargeBuilding largeBuilding);
     public int insertBuilding(LargeBuilding largeBuilding);
+
+    public int getExist();
+    public int updateAirNum(Long num);
+    public Long getAirNum();
+    public int addBuildingControl(LargeBuildingControl largeBuildingControl);
+
+    public void deleteAmmeterDetails();
+    public int addAmmeterDetails(List<LargeBuildingControlAmmeterDetail> list);
+    public int updateBuildingControl(LargeBuildingControl largeBuildingControl);
 }

src/main/java/com/project/zcustom/service/access/IPlatAccessService.java

@@ -18,92 +18,6 @@ import java.util.Map;
 public interface IPlatAccessService extends IService<PlatAccess> {
 
     /**
-     * 分页查询便捷出入列表
-     *
-     * @param platAccess 便捷出入
-     * @return 便捷出入集合
-     */
-    public IPage<PlatAccess> pagingPlatAccessList(PlatAccess platAccess);
-
-    /**
-     * 分页查询便捷出入列表
-     *
-     * @param lqw
-     * @return 便捷出入集合
-     */
-    public IPage<PlatAccess> pagingPlatAccessList(PageParamVo pageParamVo, LambdaQueryWrapper<PlatAccess> lqw);
-
-    /**
-     * 查询便捷出入列表
-     *
-     * @param platAccess 便捷出入
-     * @return 便捷出入集合
-     */
-    public List<PlatAccess> selectPlatAccessList(PlatAccess platAccess);
-
-    /**
-     * 查询便捷出入列表
-     *
-     * @param platAccess 便捷出入
-     * @return 便捷出入集合
-     */
-    public List<PlatAccess> selectPlatAccessList(PlatAccess platAccess,Long limitNum);
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 便捷出入
-     */
-    public PlatAccess getPlatAccessByField(String field, String filedValue);
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 便捷出入
-     */
-    public PlatAccess getPlatAccessByField(String field, String filedValue,String fieldString);
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 便捷出入
-     */
-    public List<PlatAccess> selectPlatAccessListByField(String field, String filedValue);
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 便捷出入
-     */
-    public List<PlatAccess> selectPlatAccessListByField(String field, String filedValue,Long limitNum);
-
-    /**
-     *判断指定字段值是否存在
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     */
-    public void checkFieldExist(String field, String filedValue,String tips,Long id);
-
-    /**
-     *  真删接口
-     */
-    public void reallyDeletePlatAccess(LambdaQueryWrapper<PlatAccess> lqw);
-
-    /**
-     *  添加便捷出入数据
-     */
-    public void addPlatAccess(String appOrg, Map<String, Object> mapField);
-
-    /**
      * 其他数据信息
      */
     public Map<String, Object> getOtherData(String appOrg);

src/main/java/com/project/zcustom/service/access/impl/PlatAccessServiceImpl.java

@@ -27,217 +27,14 @@ import java.util.*;
 @Service
 public class PlatAccessServiceImpl extends ServiceImpl<PlatAccessMapper, PlatAccess> implements IPlatAccessService {
 
-    /**
-     * 组装查询条件
-     */
-    private LambdaQueryWrapper<PlatAccess> getLambdaQueryWrapper(PlatAccess platAccess) {
-        LambdaQueryWrapper<PlatAccess> lqw = new LambdaQueryWrapper<PlatAccess>();
-        if (StringUtils.isNotBlank(platAccess.getAppOrg())) {
-            lqw.eq(PlatAccess::getAppOrg, platAccess.getAppOrg());
-        }
-        return lqw;
-    }
-
-    /**
-     * 分页查询便捷出入列表
-     *
-     * @param platAccess 便捷出入
-     * @return 便捷出入集合
-     */
-    @Override
-    public IPage<PlatAccess> pagingPlatAccessList(PlatAccess platAccess) {
-        IPage<PlatAccess> page = new Page<>(platAccess.getPageNum(), platAccess.getPageSize());
-        LambdaQueryWrapper<PlatAccess> lqw = getLambdaQueryWrapper(platAccess);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatAccess::getCreateTime);
-        return baseMapper.selectPage(page, lqw);
-    }
 
-    /**
-     * 分页查询便捷出入列表
-     *
-     * @param lqw
-     * @return 便捷出入集合
-     */
-    @Override
-    public IPage<PlatAccess> pagingPlatAccessList(PageParamVo pageParamVo, LambdaQueryWrapper<PlatAccess> lqw) {
-        IPage<PlatAccess> page = new Page<>(pageParamVo.getPageNum(), pageParamVo.getPageSize());
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatAccess::getCreateTime);
-        return baseMapper.selectPage(page, lqw);
-    }
-
-    /**
-     * 查询便捷出入列表
-     *
-     * @param platAccess 便捷出入
-     * @return 便捷出入
-     */
-    @Override
-    public List<PlatAccess> selectPlatAccessList(PlatAccess platAccess) {
-        LambdaQueryWrapper<PlatAccess> lqw = getLambdaQueryWrapper(platAccess);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatAccess::getCreateTime);
-        return baseMapper.selectList(lqw);
-    }
-
-    /**
-     * 查询便捷出入列表
-     *
-     * @param platAccess 便捷出入
-     * @return 便捷出入
-     */
-    @Override
-    public List<PlatAccess> selectPlatAccessList(PlatAccess platAccess, Long limitNum) {
-        LambdaQueryWrapper<PlatAccess> lqw = getLambdaQueryWrapper(platAccess);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatAccess::getCreateTime);
-        lqw.last("limit " + limitNum);
-        return baseMapper.selectList(lqw);
-    }
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 便捷出入
-     */
-    @Override
-    public PlatAccess getPlatAccessByField(String field, String filedValue) {
-        QueryWrapper<PlatAccess> lqw = new QueryWrapper<PlatAccess>();
-        lqw.eq(field, filedValue);
-        lqw.last("limit 1");
-        return this.getOne(lqw, false);
-    }
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 便捷出入
-     */
-    @Override
-    public PlatAccess getPlatAccessByField(String field, String filedValue,String fieldString) {
-        QueryWrapper<PlatAccess> lqw = new QueryWrapper<PlatAccess>();
-        if(!(Objects.equals(field,"app_org") && Objects.equals(filedValue,"0000"))){
-            lqw.eq(field, filedValue);
-        }
-        lqw.select(fieldString);
-        lqw.last("limit 1");
-        return this.getOne(lqw, false);
-    }
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 便捷出入
-     */
-    @Override
-    public List<PlatAccess> selectPlatAccessListByField(String field, String filedValue, Long limitNum) {
-        QueryWrapper<PlatAccess> lqw = new QueryWrapper<PlatAccess>();
-        lqw.eq(field, filedValue);
-        lqw.last("limit " + limitNum);
-        return this.list(lqw);
-    }
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 便捷出入
-     */
-    @Override
-    public List<PlatAccess> selectPlatAccessListByField(String field, String filedValue) {
-        QueryWrapper<PlatAccess> lqw = new QueryWrapper<PlatAccess>();
-        lqw.eq(field, filedValue);
-        return this.list(lqw);
-    }
-
-    /**
-     * 判断指定字段值是否存在
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     */
-    @Override
-    public void checkFieldExist(String field, String filedValue, String tips, Long id) {
-        QueryWrapper<PlatAccess> lqw = new QueryWrapper<PlatAccess>();
-        lqw.eq(field, filedValue);
-        lqw.ne("id", id);
-        if (this.getOne(lqw, false) != null) {
-            throw new RuntimeException(tips + "已存在");
-        }
-    }
-
-    /**
-     * 真删接口
-     */
-    @Override
-    public void reallyDeletePlatAccess(LambdaQueryWrapper<PlatAccess> lqw) {
-        baseMapper.reallyDeleteByWrapper(lqw);
-    }
-
-    /**
-     *  添加便捷出入数据
-     */
-    @Override
-    public void addPlatAccess(String appOrg, Map<String, Object> mapField){
-        PlatAccess accessInfo = this.getPlatAccessByField("app_org", appOrg);
-        try {
-            if (StringUtils.isNotNull(accessInfo)) {
-                this.setPlatAccess(mapField, accessInfo);
-                baseMapper.updatePlatAccess(accessInfo);
-            } else {
-                accessInfo = new PlatAccess();
-                this.setPlatAccess(mapField, accessInfo);
-                accessInfo.setAppOrg(appOrg);
-                baseMapper.insertPlatAccess(accessInfo);
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e.getMessage());
-        }
-    }
-
-    private void setPlatAccess(Map<String, Object> mapField, PlatAccess accessInfo) {
-        List<String> keyList = Arrays.asList("carlicense","guardCard","blackLists","beforeCar","twoDaysCar","threeDayCar","fourDayCar","fiveDayCar","sixDayCar","sevenDayCar");
-        StringUtils.setFieldValue(accessInfo,mapField,keyList,0, PlatAccess::setCarLicenseNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,mapField,keyList,1, PlatAccess::setGuardCardNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,mapField,keyList,2, PlatAccess::setBlackListsNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,mapField,keyList,3, PlatAccess::setBeforeCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,mapField,keyList,4, PlatAccess::setTwoDaysCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,mapField,keyList,5, PlatAccess::setThreeDaysCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,mapField,keyList,6, PlatAccess::setFourDaysCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,mapField,keyList,7, PlatAccess::setFiveDaysCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,mapField,keyList,8, PlatAccess::setSixDaysCarNum,Long.class);
-        StringUtils.setFieldValue(accessInfo,mapField,keyList,9, PlatAccess::setSevenDaysCarNum,Long.class);
-    }
 
 
     /**
      * 其他数据信息
      */
     public Map<String, Object> getOtherData(String appOrg){
-        String fieldString = "car_license_num,guard_card_num,black_lists_num";
-        if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(car_license_num) as car_license_num,sum(guard_card_num) as guard_card_num,sum(black_lists_num) as black_lists_num";
-        }
-        PlatAccess platAccess = this.getPlatAccessByField("app_org", appOrg,fieldString);
-        Map<String, Object> tempMap = new HashMap<>();
-        if (StringUtils.isNull(platAccess)) {
-            StringUtils.getMapData("车证数量", "carlicense", 0, tempMap);
-            StringUtils.getMapData("门禁卡数量", "guardCard", 0, tempMap);
-            StringUtils.getMapData("黑名单数量", "blackLists", 0, tempMap);
-        } else {
-            StringUtils.getMapData("车证数量", "carlicense", platAccess.getCarLicenseNum(), tempMap);
-            StringUtils.getMapData("门禁卡数量", "guardCard", platAccess.getGuardCardNum(), tempMap);
-            StringUtils.getMapData("黑名单数量", "blackLists", platAccess.getBlackListsNum(), tempMap);
-        }
-        return tempMap;
+
     }
 
 
@@ -246,28 +43,7 @@ public class PlatAccessServiceImpl extends ServiceImpl<PlatAccessMapper, PlatAcc
      */
     @Override
     public Map<String, Object> getCarFlowData(String appOrg){
-        // 获取7天前的日期
-        List<String> dateList = DateUtils.generateDateList(7);
-        String fieldString = "before_car_num,two_days_car_num,three_days_car_num,four_days_car_num,five_days_car_num,six_days_car_num,seven_days_car_num";
-        if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(before_car_num) as before_car_num," +
-                    "sum(two_days_car_num) as two_days_car_num," +
-                    "sum(three_days_car_num) as three_days_car_num," +
-                    "sum(four_days_car_num) as four_days_car_num," +
-                    "sum(five_days_car_num) as five_days_car_num," +
-                    "sum(six_days_car_num) as six_days_car_num," +
-                    "sum(seven_days_car_num) as seven_days_car_num";
-        }
-        PlatAccess platAccess = this.getPlatAccessByField("app_org", appOrg,fieldString);
-        List<Long> valueList = StringUtils.getDefaultListLong(7);
-        if(StringUtils.isNotNull(platAccess)){
-            valueList = Arrays.asList(platAccess.getBeforeCarNum(), platAccess.getTwoDaysCarNum(), platAccess.getThreeDaysCarNum(), platAccess.getFourDaysCarNum(), platAccess.getFiveDaysCarNum(), platAccess.getSixDaysCarNum(), platAccess.getSevenDaysCarNum());
-            // 倒序
-            Collections.reverse(valueList);
-        }
-        Map<String, Object> tempMap = new HashMap<>();
-        StringUtils.createdTableData(dateList,valueList,"#ffd296",tempMap);
-        return tempMap;
+
     }
 
 

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

@@ -0,0 +1,18 @@
+package com.project.zcustom.service.car;
+
+import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.domain.addional.LargeCarDetail;
+import com.project.zcustom.domain.addional.LargeWarnDetail;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ILargePlatCarService {
+    LargeCar getResource(String appOrg);
+    List<LargeCarDetail> getCarDetail(String appOrg, Long flag);
+    LargeCar getMonitor(String appOrg);
+    List<LargeWarnDetail> getWarnDetail(String appOrg);
+    LargeCar getOperationManageTopHalf(String appOrg);
+    Map<String, Object> getOperationManageLastHalf();
+    List<Long> getSelfCarNum();
+}

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

@@ -0,0 +1,107 @@
+package com.project.zcustom.service.car.Impl;
+
+import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.domain.addional.LargeCarDetail;
+import com.project.zcustom.domain.addional.LargeUnitRank;
+import com.project.zcustom.domain.addional.LargeWarnDetail;
+import com.project.zcustom.mapper.car.PlatCarMapper;
+import com.project.zcustom.service.car.ILargePlatCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class LargePlatCarServiceImpl implements ILargePlatCarService {
+
+    @Autowired
+    private PlatCarMapper platCarMapper;
+
+    public LargeCar getResource(String appOrg){
+        LargeCar largeCar = platCarMapper.getResourceNumber(appOrg);
+        if (largeCar == null){
+            LargeCar car = new LargeCar();
+            car.setTotalCarNum(0L);
+            car.setCarNumOne(0L);
+            car.setCarNumTwo(0L);
+            car.setCarNumThree(0L);
+            car.setCarNumFour(0L);
+            car.setCarNumFive(0L);
+            car.setEnterpriseCarNum(0L);
+            car.setHeadCarNum(0L);
+            car.setNewPowerCarNum(0L);
+            car.setOilCarNum(0L);
+            car.setEstablishmentsCarNum(0L);
+            car.setYearAddNum(0L);
+            car.setYearReduceNum(0L);
+            return car;
+        }
+        return largeCar;
+    }
+
+    public List<LargeCarDetail> getCarDetail(String appOrg, Long flag){
+        return platCarMapper.getCarDetail(appOrg, flag);
+    }
+
+    public LargeCar getMonitor(String appOrg){
+        LargeCar largeCar = platCarMapper.getMonitorNumber(appOrg);
+        if (largeCar == null){
+            LargeCar car = new LargeCar();
+            car.setTerminalInstall(0L);
+            car.setTerminalTotal(0L);
+            car.setTerminalOnline(0L);
+            car.setNoPidNum(0L);
+            car.setNotArchivedNum(0L);
+            car.setOverSpeedNum(0L);
+            car.setHolidayNum(0L);
+            return car;
+        }
+        return largeCar;
+    }
+
+    public List<LargeWarnDetail> getWarnDetail(String appOrg){
+        return platCarMapper.getWarnDetail(appOrg);
+    }
+
+    public LargeCar getOperationManageTopHalf(String appOrg){
+        LargeCar largeCar = platCarMapper.getOperationManageTopHalf(appOrg);
+        if (largeCar == null){
+            LargeCar car = new LargeCar();
+            car.setPcdNum(0L);
+            car.setAvgPcdNum(0L);
+            car.setAvgMile(BigDecimal.valueOf(0));
+            car.setMileCount(BigDecimal.valueOf(0));
+            return car;
+        }
+        return largeCar;
+    }
+
+    public Map<String, Object> getOperationManageLastHalf(){
+        Map<String, Object> map = new HashMap<>();
+        List<LargeUnitRank> list1 = platCarMapper.getUnitRankTop();
+        map.put("x1", list1.stream().map(LargeUnitRank::getTotalCarNum).collect(Collectors.toList()));
+        map.put("y1", list1.stream().map(LargeUnitRank::getPcdNum).collect(Collectors.toList()));
+        map.put("z1", list1.stream().map(LargeUnitRank::getAppName).collect(Collectors.toList()));
+        List<LargeUnitRank> list2 = platCarMapper.getUnitRankLast();
+        map.put("x2", list2.stream().map(LargeUnitRank::getTotalCarNum).collect(Collectors.toList()));
+        map.put("y2", list2.stream().map(LargeUnitRank::getPcdNum).collect(Collectors.toList()));
+        map.put("z2", list2.stream().map(LargeUnitRank::getAppName).collect(Collectors.toList()));
+        map.put("list", platCarMapper.getCarRank());
+        return map;
+    }
+
+    public List<Long> getSelfCarNum(){
+        List<String> appOrg = new ArrayList<>(Arrays.asList("1A003", "1B001", "1C001", "1D001", "1E001", "1F001", "1K001", "1L001", "1H001", "1M001", "1J001"));
+        List<LargeCar> carList = platCarMapper.getSelfCarNum(appOrg);
+        List<Long> list = new ArrayList<>();
+        for (LargeCar car : carList){
+            if (car.getTotalCarNum() == null){
+                car.setTotalCarNum(0L);
+            }
+            list.add(car.getTotalCarNum());
+        }
+        return list;
+    }
+}

src/main/java/com/project/zcustom/service/employee/IPlatEmployeeHealthIllnessService.java

@@ -1,103 +0,0 @@
-package com.project.zcustom.service.employee;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.employee.PlatEmployeeHealthIllness;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.project.zcustom.controller.core.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 多发疾病排行Service接口
- *
- * @author change
- * @date 2024-10-21
- */
-public interface IPlatEmployeeHealthIllnessService extends IService<PlatEmployeeHealthIllness> {
-
-    /**
-     * 分页查询多发疾病排行列表
-     *
-     * @param platEmployeeHealthIllness 多发疾病排行
-     * @return 多发疾病排行集合
-     */
-    public IPage<PlatEmployeeHealthIllness> pagingPlatEmployeeTypeIllnessList(PlatEmployeeHealthIllness platEmployeeHealthIllness);
-
-    /**
-     * 分页查询多发疾病排行列表
-     *
-     * @param lqw
-     * @return 多发疾病排行集合
-     */
-    public IPage<PlatEmployeeHealthIllness> pagingPlatEmployeeTypeIllnessList(PageParamVo pageParamVo, LambdaQueryWrapper<PlatEmployeeHealthIllness> lqw);
-
-    /**
-     * 查询多发疾病排行列表
-     *
-     * @param platEmployeeHealthIllness 多发疾病排行
-     * @return 多发疾病排行集合
-     */
-    public List<PlatEmployeeHealthIllness> selectPlatEmployeeTypeIllnessList(PlatEmployeeHealthIllness platEmployeeHealthIllness);
-
-    /**
-     * 查询多发疾病排行列表
-     *
-     * @param platEmployeeHealthIllness 多发疾病排行
-     * @return 多发疾病排行集合
-     */
-    public List<PlatEmployeeHealthIllness> selectPlatEmployeeTypeIllnessList(PlatEmployeeHealthIllness platEmployeeHealthIllness, Long limitNum);
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 多发疾病排行
-     */
-    public PlatEmployeeHealthIllness getPlatEmployeeTypeIllnessByField(String field, String filedValue);
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 多发疾病排行
-     */
-    public List<PlatEmployeeHealthIllness> selectPlatEmployeeTypeIllnessListByField(String field, String filedValue);
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 多发疾病排行
-     */
-    public List<PlatEmployeeHealthIllness> selectPlatEmployeeTypeIllnessListByField(String field, String filedValue, Long limitNum);
-
-    /**
-     *判断指定字段值是否存在
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     */
-    public void checkFieldExist(String field, String filedValue,String tips,Long id);
-
-    /**
-     *  真删接口
-     */
-    public void reallyDeletePlatEmployeeHealthIllness(LambdaQueryWrapper<PlatEmployeeHealthIllness> lqw);
-
-    /**
-     * 添加数据
-     *
-     * @param appOrg
-     * @param mapField
-     */
-    public void addEmployeeHealthIllness(String appOrg, Map<String, Object> mapField);
-
-    /**
-     * 多发疾病排行
-     */
-    public Map<String, Object> getIllnessChartData(String appOrg);
-}

src/main/java/com/project/zcustom/service/employee/IPlatEmployeeHealthService.java

@@ -1,121 +0,0 @@
-package com.project.zcustom.service.employee;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.employee.PlatEmployeeHealth;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.project.zcustom.controller.core.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 员工健康Service接口
- *
- * @author change
- * @date 2024-10-21
- */
-public interface IPlatEmployeeHealthService extends IService<PlatEmployeeHealth> {
-
-    /**
-     * 分页查询员工健康列表
-     *
-     * @param platEmployeeHealth 员工健康
-     * @return 员工健康集合
-     */
-    public IPage<PlatEmployeeHealth> pagingPlatEmployeeHealthList(PlatEmployeeHealth platEmployeeHealth);
-
-    /**
-     * 分页查询员工健康列表
-     *
-     * @param lqw
-     * @return 员工健康集合
-     */
-    public IPage<PlatEmployeeHealth> pagingPlatEmployeeHealthList(PageParamVo pageParamVo, LambdaQueryWrapper<PlatEmployeeHealth> lqw);
-
-    /**
-     * 查询员工健康列表
-     *
-     * @param platEmployeeHealth 员工健康
-     * @return 员工健康集合
-     */
-    public List<PlatEmployeeHealth> selectPlatEmployeeHealthList(PlatEmployeeHealth platEmployeeHealth);
-
-    /**
-     * 查询员工健康列表
-     *
-     * @param platEmployeeHealth 员工健康
-     * @return 员工健康集合
-     */
-    public List<PlatEmployeeHealth> selectPlatEmployeeHealthList(PlatEmployeeHealth platEmployeeHealth,Long limitNum);
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 员工健康
-     */
-    public PlatEmployeeHealth getPlatEmployeeHealthByField(String field, String filedValue);
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 员工健康
-     */
-    public PlatEmployeeHealth getPlatEmployeeHealthByField(String field, String filedValue,String fieldString);
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 员工健康
-     */
-    public List<PlatEmployeeHealth> selectPlatEmployeeHealthListByField(String field, String filedValue);
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 员工健康
-     */
-    public List<PlatEmployeeHealth> selectPlatEmployeeHealthListByField(String field, String filedValue,Long limitNum);
-
-    /**
-     * 添加员工健康信息
-     */
-    public void addPlatEmployeeHealth(String appOrg,Map<String, Object> mapField);
-
-    /**
-     *判断指定字段值是否存在
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     */
-    public void checkFieldExist(String field, String filedValue,String tips,Long id);
-
-    /**
-     * 健康服务
-     */
-    public Map<String, Object> getHealthData(String appOrg);
-
-
-    /**
-     * 体检情况 柱形图
-     */
-    public Map<String, Object> getPhysicalChartData(String appOrg);
-
-    /**
-     * 体检情况 扇形图
-     */
-    public List<Map<String, Object>> getPhysicalPieData(String appOrg);
-
-    /**
-     * 员工健康分布
-     */
-    @Deprecated
-    public List<Map<String, Object>> getHealthPieData(String appOrg);
-}

src/main/java/com/project/zcustom/service/employee/IPlatEmployeeTypeService.java

@@ -1,126 +0,0 @@
-package com.project.zcustom.service.employee;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.employee.PlatEmployeeType;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.project.zcustom.controller.core.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 员工概况Service接口
- *
- * @author change
- * @date 2024-10-21
- */
-public interface IPlatEmployeeTypeService extends IService<PlatEmployeeType> {
-
-    /**
-     * 分页查询员工概况列表
-     *
-     * @param platEmployeeType 员工概况
-     * @return 员工概况集合
-     */
-    public IPage<PlatEmployeeType> pagingPlatEmployeeTypeList(PlatEmployeeType platEmployeeType);
-
-    /**
-     * 分页查询员工概况列表
-     *
-     * @param lqw
-     * @return 员工概况集合
-     */
-    public IPage<PlatEmployeeType> pagingPlatEmployeeTypeList(PageParamVo pageParamVo, LambdaQueryWrapper<PlatEmployeeType> lqw);
-
-    /**
-     * 查询员工概况列表
-     *
-     * @param platEmployeeType 员工概况
-     * @return 员工概况集合
-     */
-    public List<PlatEmployeeType> selectPlatEmployeeTypeList(PlatEmployeeType platEmployeeType);
-
-    /**
-     * 查询员工概况列表
-     *
-     * @param platEmployeeType 员工概况
-     * @return 员工概况集合
-     */
-    public List<PlatEmployeeType> selectPlatEmployeeTypeList(PlatEmployeeType platEmployeeType,Long limitNum);
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 员工概况
-     */
-    public PlatEmployeeType getPlatEmployeeTypeByField(String field, String filedValue,String fieldString);
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 员工概况
-     */
-    public PlatEmployeeType getPlatEmployeeTypeByField(String field, String filedValue);
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 员工概况
-     */
-    public List<PlatEmployeeType> selectPlatEmployeeTypeListByField(String field, String filedValue);
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 员工概况
-     */
-    public List<PlatEmployeeType> selectPlatEmployeeTypeListByField(String field, String filedValue,Long limitNum);
-
-    /**
-     *判断指定字段值是否存在
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     */
-    public void checkFieldExist(String field, String filedValue,String tips,Long id);
-
-    /**
-     * 添加数据
-     */
-    public void addPlatEmployeeType(String appOrg,Map<String, Object> mapField);
-
-    /**
-     * 员工类型
-     */
-    public List<Map<String, Object>> getEmployeePieData(String appOrg);
-
-    /**
-     * 入楼情况
-     */
-    public Map<String, Object> getEnterBuildData(String appOrg);
-
-    /**
-     * 员工年龄分布情况
-     */
-    public List<Map<String, Object>> getAgePieData(String appOrg);
-
-    /**
-     * 近一周人流量统计
-     */
-    public Map<String, Object> getChartsFlowData(String appOrg);
-
-    /**
-     * 员工性别情况
-     */
-    public Map<String, Object> getSexChartData(String appOrg);
-
-
-}

src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeHealthIllnessServiceImpl.java

@@ -1,226 +0,0 @@
-package com.project.zcustom.service.employee.impl;
-
-import com.project.zcustom.domain.employee.PlatEmployeeHealthIllness;
-import com.project.zcustom.mapper.employee.PlatEmployeeHealthIllnessMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthIllnessService;
-import com.project.zcustom.controller.core.PageParamVo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.project.zcustom.controller.core.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 多发疾病排行Service业务层处理
- *
- * @author change
- * @date 2024-10-21
- */
-@Service
-public class PlatEmployeeHealthIllnessServiceImpl extends ServiceImpl<PlatEmployeeHealthIllnessMapper, PlatEmployeeHealthIllness> implements IPlatEmployeeHealthIllnessService {
-
-    /**
-     * 组装查询条件
-     */
-    private LambdaQueryWrapper<PlatEmployeeHealthIllness> getLambdaQueryWrapper(PlatEmployeeHealthIllness platEmployeeHealthIllness) {
-        LambdaQueryWrapper<PlatEmployeeHealthIllness> lqw = new LambdaQueryWrapper<PlatEmployeeHealthIllness>();
-        if (StringUtils.isNotBlank(platEmployeeHealthIllness.getAppOrg())) {
-            lqw.eq(PlatEmployeeHealthIllness::getAppOrg, platEmployeeHealthIllness.getAppOrg());
-        }
-        if (StringUtils.isNotBlank(platEmployeeHealthIllness.getParamsName())) {
-            lqw.like(PlatEmployeeHealthIllness::getParamsName, platEmployeeHealthIllness.getParamsName());
-        }
-        if (StringUtils.isNotNull(platEmployeeHealthIllness.getParamsValue())) {
-            lqw.eq(PlatEmployeeHealthIllness::getParamsValue, platEmployeeHealthIllness.getParamsValue());
-        }
-        return lqw;
-    }
-
-    /**
-     * 分页查询多发疾病排行列表
-     *
-     * @param platEmployeeHealthIllness 多发疾病排行
-     * @return 多发疾病排行集合
-     */
-    @Override
-    public IPage<PlatEmployeeHealthIllness> pagingPlatEmployeeTypeIllnessList(PlatEmployeeHealthIllness platEmployeeHealthIllness) {
-        IPage<PlatEmployeeHealthIllness> page = new Page<>(platEmployeeHealthIllness.getPageNum(), platEmployeeHealthIllness.getPageSize());
-        LambdaQueryWrapper<PlatEmployeeHealthIllness> lqw = getLambdaQueryWrapper(platEmployeeHealthIllness);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeHealthIllness::getCreateTime);
-        return baseMapper.selectPage(page, lqw);
-    }
-
-    /**
-     * 分页查询多发疾病排行列表
-     *
-     * @param lqw
-     * @return 多发疾病排行集合
-     */
-    @Override
-    public IPage<PlatEmployeeHealthIllness> pagingPlatEmployeeTypeIllnessList(PageParamVo pageParamVo, LambdaQueryWrapper<PlatEmployeeHealthIllness> lqw) {
-        IPage<PlatEmployeeHealthIllness> page = new Page<>(pageParamVo.getPageNum(), pageParamVo.getPageSize());
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeHealthIllness::getCreateTime);
-        return baseMapper.selectPage(page, lqw);
-    }
-
-    /**
-     * 查询多发疾病排行列表
-     *
-     * @param platEmployeeHealthIllness 多发疾病排行
-     * @return 多发疾病排行
-     */
-    @Override
-    public List<PlatEmployeeHealthIllness> selectPlatEmployeeTypeIllnessList(PlatEmployeeHealthIllness platEmployeeHealthIllness) {
-        LambdaQueryWrapper<PlatEmployeeHealthIllness> lqw = getLambdaQueryWrapper(platEmployeeHealthIllness);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeHealthIllness::getCreateTime);
-        return baseMapper.selectList(lqw);
-    }
-
-    /**
-     * 查询多发疾病排行列表
-     *
-     * @param platEmployeeHealthIllness 多发疾病排行
-     * @return 多发疾病排行
-     */
-    @Override
-    public List<PlatEmployeeHealthIllness> selectPlatEmployeeTypeIllnessList(PlatEmployeeHealthIllness platEmployeeHealthIllness, Long limitNum) {
-        LambdaQueryWrapper<PlatEmployeeHealthIllness> lqw = getLambdaQueryWrapper(platEmployeeHealthIllness);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeHealthIllness::getCreateTime);
-        lqw.last("limit " + limitNum);
-        return baseMapper.selectList(lqw);
-    }
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 多发疾病排行
-     */
-    @Override
-    public PlatEmployeeHealthIllness getPlatEmployeeTypeIllnessByField(String field, String filedValue) {
-        QueryWrapper<PlatEmployeeHealthIllness> lqw = new QueryWrapper<PlatEmployeeHealthIllness>();
-        lqw.eq(field, filedValue);
-        lqw.last("limit 1");
-        return this.getOne(lqw, false);
-    }
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 多发疾病排行
-     */
-    @Override
-    public List<PlatEmployeeHealthIllness> selectPlatEmployeeTypeIllnessListByField(String field, String filedValue, Long limitNum) {
-        QueryWrapper<PlatEmployeeHealthIllness> lqw = new QueryWrapper<PlatEmployeeHealthIllness>();
-        lqw.eq(field, filedValue);
-        lqw.last("limit " + limitNum);
-        return this.list(lqw);
-    }
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 多发疾病排行
-     */
-    @Override
-    public List<PlatEmployeeHealthIllness> selectPlatEmployeeTypeIllnessListByField(String field, String filedValue) {
-        QueryWrapper<PlatEmployeeHealthIllness> lqw = new QueryWrapper<PlatEmployeeHealthIllness>();
-        lqw.eq(field, filedValue);
-        lqw.orderByDesc("params_value");
-        return this.list(lqw);
-    }
-
-    /**
-     * 判断指定字段值是否存在
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     */
-    @Override
-    public void checkFieldExist(String field, String filedValue, String tips, Long id) {
-        QueryWrapper<PlatEmployeeHealthIllness> lqw = new QueryWrapper<PlatEmployeeHealthIllness>();
-        lqw.eq(field, filedValue);
-        lqw.ne("id", id);
-        if (this.getOne(lqw, false) != null) {
-            throw new RuntimeException(tips + "已存在");
-        }
-    }
-    /**
-     *  真删接口
-     */
-    @Override
-    public void reallyDeletePlatEmployeeHealthIllness(LambdaQueryWrapper<PlatEmployeeHealthIllness> lqw){
-        baseMapper.reallyDeleteByWrapper(lqw);
-    }
-
-    /**
-     * 添加数据
-     *
-     * @param appOrg
-     * @param mapField
-     */
-    @Override
-    @Transactional
-    public void addEmployeeHealthIllness(String appOrg, Map<String, Object> mapField) {
-        // 先删除数据
-        System.out.printf("==========================:%s",mapField);
-        this.reallyDeletePlatEmployeeHealthIllness(new LambdaQueryWrapper<PlatEmployeeHealthIllness>().eq(PlatEmployeeHealthIllness::getAppOrg, appOrg));
-        List<String> keyList = Arrays.asList("hyperlipidemia", "hypertension", "hyperglycemia");
-        List<String> nameList = Arrays.asList("高血脂", "高血压", "高血糖");
-        List<PlatEmployeeHealthIllness> addList = new ArrayList<>();
-        for (int i = 0; i < keyList.size(); i++) {
-            PlatEmployeeHealthIllness platEmployeeHealthIllness = new PlatEmployeeHealthIllness();
-            platEmployeeHealthIllness.setAppOrg(appOrg);
-            platEmployeeHealthIllness.setParamsName(nameList.get(i));
-            StringUtils.setFieldValue(platEmployeeHealthIllness, mapField, keyList, i, PlatEmployeeHealthIllness::setParamsValue, Long.class);
-//            addList.add(platEmployeeHealthIllness);
-            baseMapper.insertPlatEmployeeHealthIllness(platEmployeeHealthIllness);
-        }
-//        this.saveBatch(addList);
-    }
-
-
-    /**
-     * 多发疾病排行
-     */
-    @Override
-    public Map<String, Object> getIllnessChartData(String appOrg){
-        QueryWrapper<PlatEmployeeHealthIllness> lqw = new QueryWrapper<PlatEmployeeHealthIllness>();
-        if(!Objects.equals(appOrg,"0000")){
-            lqw.eq("app_org", appOrg);
-            lqw.select("params_name,params_value");
-        }else{
-            lqw.groupBy("params_name");
-            lqw.select("params_name,sum(params_value) as params_value");
-        }
-        lqw.orderByDesc("params_value");
-        List<PlatEmployeeHealthIllness> list = this.list(lqw);
-        Map<String, Object> tempMap = new HashMap<>();
-        List<String> nameList;
-        List<Long> valueList;
-        if (list.isEmpty()){
-            nameList = Arrays.asList("高血压","高血脂","高血糖");
-            valueList = StringUtils.getDefaultListLong(3);
-        }else{
-            nameList = list.stream().map(PlatEmployeeHealthIllness::getParamsName).collect(Collectors.toList());
-            valueList = list.stream().map(PlatEmployeeHealthIllness::getParamsValue).collect(Collectors.toList());
-        }
-        StringUtils.createdTableData(nameList,valueList,"#eaa654",tempMap);
-        return tempMap;
-    }
-}

src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeTypeFlowServiceImpl.java

@@ -1,196 +0,0 @@
-package com.project.zcustom.service.employee.impl;
-
-import com.project.zcustom.domain.employee.PlatEmployeeTypeFlow;
-import com.project.zcustom.mapper.employee.PlatEmployeeTypeFlowMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeFlowService;
-import com.project.zcustom.controller.core.PageParamVo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.project.zcustom.controller.core.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 近一周人流量统计Service业务层处理
- *
- * @author change
- * @date 2024-10-21
- */
-@Service
-public class PlatEmployeeTypeFlowServiceImpl extends ServiceImpl<PlatEmployeeTypeFlowMapper, PlatEmployeeTypeFlow> implements IPlatEmployeeTypeFlowService {
-
-    /**
-     * 组装查询条件
-     */
-    private LambdaQueryWrapper<PlatEmployeeTypeFlow> getLambdaQueryWrapper(PlatEmployeeTypeFlow platEmployeeTypeFlow) {
-        LambdaQueryWrapper<PlatEmployeeTypeFlow> lqw = new LambdaQueryWrapper<PlatEmployeeTypeFlow>();
-        if (StringUtils.isNotBlank(platEmployeeTypeFlow.getAppOrg())) {
-            lqw.eq(PlatEmployeeTypeFlow::getAppOrg, platEmployeeTypeFlow.getAppOrg());
-        }
-        return lqw;
-    }
-
-    /**
-     * 分页查询近一周人流量统计列表
-     *
-     * @param platEmployeeTypeFlow 近一周人流量统计
-     * @return 近一周人流量统计集合
-     */
-    @Override
-    public IPage<PlatEmployeeTypeFlow> pagingPlatEmployeeTypeFlowList(PlatEmployeeTypeFlow platEmployeeTypeFlow) {
-        IPage<PlatEmployeeTypeFlow> page = new Page<>(platEmployeeTypeFlow.getPageNum(), platEmployeeTypeFlow.getPageSize());
-        LambdaQueryWrapper<PlatEmployeeTypeFlow> lqw = getLambdaQueryWrapper(platEmployeeTypeFlow);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeTypeFlow::getCreateTime);
-        return baseMapper.selectPage(page, lqw);
-    }
-
-    /**
-     * 分页查询近一周人流量统计列表
-     *
-     * @param lqw
-     * @return 近一周人流量统计集合
-     */
-    @Override
-    public IPage<PlatEmployeeTypeFlow> pagingPlatEmployeeTypeFlowList(PageParamVo pageParamVo, LambdaQueryWrapper<PlatEmployeeTypeFlow> lqw) {
-        IPage<PlatEmployeeTypeFlow> page = new Page<>(pageParamVo.getPageNum(), pageParamVo.getPageSize());
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeTypeFlow::getCreateTime);
-        return baseMapper.selectPage(page, lqw);
-    }
-
-    /**
-     * 查询近一周人流量统计列表
-     *
-     * @param platEmployeeTypeFlow 近一周人流量统计
-     * @return 近一周人流量统计
-     */
-    @Override
-    public List<PlatEmployeeTypeFlow> selectPlatEmployeeTypeFlowList(PlatEmployeeTypeFlow platEmployeeTypeFlow) {
-        LambdaQueryWrapper<PlatEmployeeTypeFlow> lqw = getLambdaQueryWrapper(platEmployeeTypeFlow);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeTypeFlow::getCreateTime);
-        return baseMapper.selectList(lqw);
-    }
-
-    /**
-     * 查询近一周人流量统计列表
-     *
-     * @param platEmployeeTypeFlow 近一周人流量统计
-     * @return 近一周人流量统计
-     */
-    @Override
-    public List<PlatEmployeeTypeFlow> selectPlatEmployeeTypeFlowList(PlatEmployeeTypeFlow platEmployeeTypeFlow, Long limitNum) {
-        LambdaQueryWrapper<PlatEmployeeTypeFlow> lqw = getLambdaQueryWrapper(platEmployeeTypeFlow);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeTypeFlow::getCreateTime);
-        lqw.last("limit " + limitNum);
-        return baseMapper.selectList(lqw);
-    }
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 近一周人流量统计
-     */
-    @Override
-    public PlatEmployeeTypeFlow getPlatEmployeeTypeFlowByField(String field, String filedValue) {
-        QueryWrapper<PlatEmployeeTypeFlow> lqw = new QueryWrapper<PlatEmployeeTypeFlow>();
-        lqw.eq(field, filedValue);
-        lqw.last("limit 1");
-        return this.getOne(lqw, false);
-    }
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 近一周人流量统计
-     */
-    @Override
-    public List<PlatEmployeeTypeFlow> selectPlatEmployeeTypeFlowListByField(String field, String filedValue, Long limitNum) {
-        QueryWrapper<PlatEmployeeTypeFlow> lqw = new QueryWrapper<PlatEmployeeTypeFlow>();
-        lqw.eq(field, filedValue);
-        lqw.last("limit " + limitNum);
-        lqw.orderByDesc("time_sign");
-        return this.list(lqw);
-    }
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 近一周人流量统计
-     */
-    @Override
-    public List<PlatEmployeeTypeFlow> selectPlatEmployeeTypeFlowListByField(String field, String filedValue) {
-        QueryWrapper<PlatEmployeeTypeFlow> lqw = new QueryWrapper<PlatEmployeeTypeFlow>();
-        lqw.eq(field, filedValue);
-        return this.list(lqw);
-    }
-
-    /**
-     * 判断指定字段值是否存在
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     */
-    @Override
-    public void checkFieldExist(String field, String filedValue, String tips, Long id) {
-        QueryWrapper<PlatEmployeeTypeFlow> lqw = new QueryWrapper<PlatEmployeeTypeFlow>();
-        lqw.eq(field, filedValue);
-        lqw.ne("id", id);
-        if (this.getOne(lqw, false) != null) {
-            throw new RuntimeException(tips + "已存在");
-        }
-    }
-
-    /**
-     * 处理人流量数据
-     * @param appOrg
-     * @param mapField
-     */
-    @Override
-    @Transactional
-    public void handleEmployeeFlow(String appOrg,Map<String, Object> mapField){
-        // 先删除 employeeTypeFlow 数据
-        LambdaQueryWrapper<PlatEmployeeTypeFlow> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PlatEmployeeTypeFlow::getAppOrg, appOrg);
-        baseMapper.reallyDeleteByWrapper(queryWrapper);
-        List<String> firstList = Arrays.asList("dayBeforeIns", "dayBeforeLoan", "dayBeforeAsso", "dayBeforePro","dayBeforeVis");// 前一天的数据
-        List<String> secondList = Arrays.asList("twoDaysIns", "twoDaysLoan", "twoDaysAsso", "twoDaysPro","twoDaysVis"); // 前两天的数据
-        List<String> thirdList = Arrays.asList("firstThreeDaysIns", "firstThreeDaysLoan", "firstThreeDaysAsso", "firstThreeDaysPro","firstThreeDaysVis");// 前三天的数据
-        List<String> fourList = Arrays.asList("firstFourDaysIns", "firstFourDaysLoan", "firstFourDaysAsso", "firstFourDaysPro","firstFourDaysVis");// 前四天的数据
-        List<String> fiveList = Arrays.asList("firstFiveDaysIns", "firstFiveDaysLoan", "firstFiveDaysAsso", "firstFiveDaysPro","firstFiveDaysVis");// 前五天的数据
-        List<String> sixList = Arrays.asList("firstSixDaysIns", "firstSixDaysLoan", "firstSixDaysAsso", "firstSixDaysPro","firstSixDaysVis");// 前六天的数据
-        List<String> sevenList = Arrays.asList("firstSevenDaysIns", "firstSevenDaysLoan", "firstSevenDaysAsso", "firstSevenDaysPro","firstSevenDaysVis");// 前七天的数据
-        List<List<String>> weekList = Arrays.asList(firstList, secondList, thirdList, fourList, fiveList, sixList, sevenList);
-        List<PlatEmployeeTypeFlow> addList = new ArrayList<>();
-        for (int i = 0; i < weekList.size(); i++){
-            List<String> list = weekList.get(i);
-            PlatEmployeeTypeFlow platEmployeeTypeFlow = new PlatEmployeeTypeFlow();
-            platEmployeeTypeFlow.setAppOrg(appOrg);
-            platEmployeeTypeFlow.setTimeSign(i+1);
-            StringUtils.setFieldValue(platEmployeeTypeFlow, mapField, list, 0, PlatEmployeeTypeFlow::setInsideNum, Long.class);
-            StringUtils.setFieldValue(platEmployeeTypeFlow, mapField, list, 1, PlatEmployeeTypeFlow::setLoanNum, Long.class);
-            StringUtils.setFieldValue(platEmployeeTypeFlow, mapField, list, 2, PlatEmployeeTypeFlow::setAssociationNum, Long.class);
-            StringUtils.setFieldValue(platEmployeeTypeFlow, mapField, list, 3, PlatEmployeeTypeFlow::setPropertyNum, Long.class);
-            StringUtils.setFieldValue(platEmployeeTypeFlow, mapField, list, 4, PlatEmployeeTypeFlow::setVisitNum, Long.class);
-//            addList.add(platEmployeeTypeFlow);
-            baseMapper.insertPlatEmployeeTypeFlow(platEmployeeTypeFlow);
-        }
-    }
-
-}

src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeTypeServiceImpl.java

@@ -1,374 +0,0 @@
-package com.project.zcustom.service.employee.impl;
-
-import com.project.zcustom.controller.core.DateUtils;
-import com.project.zcustom.domain.employee.PlatEmployeeType;
-import com.project.zcustom.domain.employee.PlatEmployeeTypeFlow;
-import com.project.zcustom.mapper.employee.PlatEmployeeTypeMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeFlowService;
-import com.project.zcustom.service.employee.IPlatEmployeeTypeService;
-import com.project.zcustom.controller.core.PageParamVo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.project.zcustom.controller.core.StringUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-/**
- * 员工概况Service业务层处理
- *
- * @author change
- * @date 2024-10-21
- */
-@Service
-public class PlatEmployeeTypeServiceImpl extends ServiceImpl<PlatEmployeeTypeMapper, PlatEmployeeType> implements IPlatEmployeeTypeService {
-
-    @Resource
-    private IPlatEmployeeTypeFlowService iPlatEmployeeTypeFlowService;
-
-    /**
-     * 组装查询条件
-     */
-    private LambdaQueryWrapper<PlatEmployeeType> getLambdaQueryWrapper(PlatEmployeeType platEmployeeType) {
-        LambdaQueryWrapper<PlatEmployeeType> lqw = new LambdaQueryWrapper<PlatEmployeeType>();
-        if (StringUtils.isNotBlank(platEmployeeType.getAppOrg())) {
-            lqw.eq(PlatEmployeeType::getAppOrg, platEmployeeType.getAppOrg());
-        }
-        return lqw;
-    }
-
-    /**
-     * 分页查询员工概况列表
-     *
-     * @param platEmployeeType 员工概况
-     * @return 员工概况集合
-     */
-    @Override
-    public IPage<PlatEmployeeType> pagingPlatEmployeeTypeList(PlatEmployeeType platEmployeeType) {
-        IPage<PlatEmployeeType> page = new Page<>(platEmployeeType.getPageNum(), platEmployeeType.getPageSize());
-        LambdaQueryWrapper<PlatEmployeeType> lqw = getLambdaQueryWrapper(platEmployeeType);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeType::getCreateTime);
-        return baseMapper.selectPage(page, lqw);
-    }
-
-    /**
-     * 分页查询员工概况列表
-     *
-     * @param lqw
-     * @return 员工概况集合
-     */
-    @Override
-    public IPage<PlatEmployeeType> pagingPlatEmployeeTypeList(PageParamVo pageParamVo, LambdaQueryWrapper<PlatEmployeeType> lqw) {
-        IPage<PlatEmployeeType> page = new Page<>(pageParamVo.getPageNum(), pageParamVo.getPageSize());
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeType::getCreateTime);
-        return baseMapper.selectPage(page, lqw);
-    }
-
-    /**
-     * 查询员工概况列表
-     *
-     * @param platEmployeeType 员工概况
-     * @return 员工概况
-     */
-    @Override
-    public List<PlatEmployeeType> selectPlatEmployeeTypeList(PlatEmployeeType platEmployeeType) {
-        LambdaQueryWrapper<PlatEmployeeType> lqw = getLambdaQueryWrapper(platEmployeeType);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeType::getCreateTime);
-        return baseMapper.selectList(lqw);
-    }
-
-    /**
-     * 查询员工概况列表
-     *
-     * @param platEmployeeType 员工概况
-     * @return 员工概况
-     */
-    @Override
-    public List<PlatEmployeeType> selectPlatEmployeeTypeList(PlatEmployeeType platEmployeeType, Long limitNum) {
-        LambdaQueryWrapper<PlatEmployeeType> lqw = getLambdaQueryWrapper(platEmployeeType);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(PlatEmployeeType::getCreateTime);
-        lqw.last("limit " + limitNum);
-        return baseMapper.selectList(lqw);
-    }
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 员工概况
-     */
-    @Override
-    public PlatEmployeeType getPlatEmployeeTypeByField(String field, String filedValue) {
-        QueryWrapper<PlatEmployeeType> lqw = new QueryWrapper<PlatEmployeeType>();
-        lqw.eq(field, filedValue);
-        lqw.last("limit 1");
-        return this.getOne(lqw, false);
-    }
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 员工概况
-     */
-    @Override
-    public PlatEmployeeType getPlatEmployeeTypeByField(String field, String filedValue,String fieldString) {
-        QueryWrapper<PlatEmployeeType> lqw = new QueryWrapper<PlatEmployeeType>();
-        if(!(Objects.equals(field,"app_org") && Objects.equals(filedValue,"0000"))){
-            lqw.eq(field, filedValue);
-        }
-        lqw.select(fieldString);
-        lqw.last("limit 1");
-        return this.getOne(lqw, false);
-    }
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 员工概况
-     */
-    @Override
-    public List<PlatEmployeeType> selectPlatEmployeeTypeListByField(String field, String filedValue, Long limitNum) {
-        QueryWrapper<PlatEmployeeType> lqw = new QueryWrapper<PlatEmployeeType>();
-        lqw.eq(field, filedValue);
-        lqw.last("limit " + limitNum);
-        return this.list(lqw);
-    }
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     * @return 员工概况
-     */
-    @Override
-    public List<PlatEmployeeType> selectPlatEmployeeTypeListByField(String field, String filedValue) {
-        QueryWrapper<PlatEmployeeType> lqw = new QueryWrapper<PlatEmployeeType>();
-        lqw.eq(field, filedValue);
-        return this.list(lqw);
-    }
-
-    /**
-     * 判断指定字段值是否存在
-     *
-     * @param field      字段名称
-     * @param filedValue 字段值
-     */
-    @Override
-    public void checkFieldExist(String field, String filedValue, String tips, Long id) {
-        QueryWrapper<PlatEmployeeType> lqw = new QueryWrapper<PlatEmployeeType>();
-        lqw.eq(field, filedValue);
-        lqw.ne("id", id);
-        if (this.getOne(lqw, false) != null) {
-            throw new RuntimeException(tips + "已存在");
-        }
-    }
-
-    /**
-     * 添加数据
-     *
-     * @param appOrg
-     * @param mapField
-     */
-    @Override
-    public void addPlatEmployeeType(String appOrg, Map<String, Object> mapField) {
-        PlatEmployeeType platEmployeeType = this.getPlatEmployeeTypeByField("app_org", appOrg);
-        try {
-            if (StringUtils.isNotNull(platEmployeeType)) {
-                this.setPlatEmployeeType(mapField, platEmployeeType);
-                baseMapper.updatePlatEmployeeType(platEmployeeType);
-            } else {
-                platEmployeeType = new PlatEmployeeType();
-                this.setPlatEmployeeType(mapField, platEmployeeType);
-                platEmployeeType.setAppOrg(appOrg);
-                baseMapper.insertPlatEmployeeType(platEmployeeType);
-            }
-            iPlatEmployeeTypeFlowService.handleEmployeeFlow(appOrg, mapField);
-        } catch (Exception e) {
-            throw new RuntimeException(e.getMessage());
-        }
-    }
-
-    /**
-     * 设置数据
-     */
-    private void setPlatEmployeeType(Map<String, Object> mapField, PlatEmployeeType platEmployeeType) {
-        List<String> fieldList = Arrays.asList("inside", "loan", "association", "property", "entryInternal", "entryToLoan", "entryAssist", "entryProperty", "visitor", "gross", "Between2030", "Between3040","Between4050","exceed50","man","women");
-
-        // 员工类型
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 0, PlatEmployeeType::setInsideNum, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 1, PlatEmployeeType::setLoanNum, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 2, PlatEmployeeType::setAssociationNum, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 3, PlatEmployeeType::setPropertyNum, Long.class);
-
-        // 入楼情况
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 4, PlatEmployeeType::setEntryInternalNum, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 5, PlatEmployeeType::setEntryToLoanNum, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 6, PlatEmployeeType::setEntryAssistNum, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 7, PlatEmployeeType::setEntryPropertyNum, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 8, PlatEmployeeType::setVisitorNum, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 9, PlatEmployeeType::setGrossNum, Long.class);
-
-        // 员工年龄分布情况
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 10, PlatEmployeeType::setBetween2030Num, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 11, PlatEmployeeType::setBetween3040Num, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 12, PlatEmployeeType::setBetween4050Num, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 13, PlatEmployeeType::setExceed50Num, Long.class);
-
-        // 员工性别情况
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 14, PlatEmployeeType::setManNum, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 15, PlatEmployeeType::setWomenNum, Long.class);
-
-    }
-
-
-    /**
-     * 员工类型
-     */
-    @Override
-    public List<Map<String, Object>> getEmployeePieData(String appOrg) {
-        String fieldString = "inside_num,loan_num,association_num,property_num";
-        if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(inside_num) as inside_num,sum(loan_num) as loan_num,sum(association_num) as association_num,sum(property_num) as property_num";
-        }
-        PlatEmployeeType employeeType = this.getPlatEmployeeTypeByField("app_org", appOrg,fieldString);
-        List<Long> valueList = StringUtils.getDefaultListLong(4);
-        if (StringUtils.isNotNull(employeeType)) {
-            valueList = Arrays.asList(employeeType.getInsideNum(), employeeType.getLoanNum(), employeeType.getAssociationNum(), employeeType.getPropertyNum());
-        }
-        List<String> xList = Arrays.asList("内部员工", "借调人员", "外协人员", "物业人员");
-        List<String> colorList = Arrays.asList("#fec72f", "#2f82fe", "#7565ef", "#00ffff");
-        List<Map<String, Object>> tempList = new ArrayList<>();
-        StringUtils.createdPieData(xList, colorList, valueList, tempList);
-        return tempList;
-    }
-
-    /**
-     * 获取入楼情况
-     */
-    @Override
-    public Map<String, Object> getEnterBuildData(String appOrg) {
-        String fieldString = "entry_internal_num,entry_to_loan_num,entry_assist_num,entry_property_num,visitor_num,gross_num";
-        if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(entry_internal_num) as entry_internal_num,sum(entry_to_loan_num) as entry_to_loan_num,sum(entry_assist_num) as entry_assist_num,sum(entry_property_num) as entry_property_num,sum(visitor_num) as visitor_num,sum(gross_num) as gross_num";
-        }
-        PlatEmployeeType employeeType = this.getPlatEmployeeTypeByField("app_org", appOrg,fieldString);
-        Map<String, Object> tempMap = new HashMap<>();
-        if (StringUtils.isNull(employeeType)) {
-            StringUtils.getMapData("内部员工", "entryInternalNum", 0, tempMap);
-            StringUtils.getMapData("借调人员", "entryToLoanNum", 0, tempMap);
-            StringUtils.getMapData("外协人员", "entryAssistNum", 0, tempMap);
-            StringUtils.getMapData("物业人员", "entryPropertyNum", 0, tempMap);
-            StringUtils.getMapData("访客", "visitorNum", 0, tempMap);
-            StringUtils.getMapData("共计人员", "grossNum", 0, tempMap);
-        } else {
-            StringUtils.getMapData("内部员工", "entryInternalNum", employeeType.getEntryInternalNum(), tempMap);
-            StringUtils.getMapData("借调人员", "entryToLoanNum", employeeType.getEntryToLoanNum(), tempMap);
-            StringUtils.getMapData("外协人员", "entryAssistNum", employeeType.getEntryAssistNum(), tempMap);
-            StringUtils.getMapData("物业人员", "entryPropertyNum", employeeType.getEntryPropertyNum(), tempMap);
-            StringUtils.getMapData("访客", "visitorNum", employeeType.getVisitorNum(), tempMap);
-            StringUtils.getMapData("共计人员", "grossNum", employeeType.getGrossNum(), tempMap);
-        }
-        return tempMap;
-    }
-
-
-    /**
-     * 近一周人流量统计
-     */
-    @Override
-    public Map<String, Object> getChartsFlowData(String appOrg) {
-        List<String> nameList = Arrays.asList("内部人员", "借调人员", "外协", "物业","访客");
-        // 获取7天前的日期
-        List<String> dateList = DateUtils.generateDateList(7);
-        List<String> colorList = Arrays.asList("#0084ff", "#ffd296", "#7565ef", "#00ffff","#ffcd3e");
-        List<String> keyList = Arrays.asList("inside", "loan", "association", "property","visitor");
-        QueryWrapper<PlatEmployeeTypeFlow> flowQueryWrapper = new QueryWrapper<>();
-        if(!Objects.equals(appOrg,"0000")){
-            flowQueryWrapper.eq("app_org", appOrg);
-            flowQueryWrapper.select("time_sign,inside_num,loan_num,association_num,property_num,visit_num");
-        }else{
-            flowQueryWrapper.groupBy("time_sign");
-            flowQueryWrapper.select("time_sign,sum(inside_num) as inside_num,sum(loan_num) as loan_num,sum(association_num) as association_num,sum(property_num) as property_num,sum(visit_num) as visit_num");
-        }
-        flowQueryWrapper.orderByAsc("time_sign");
-        flowQueryWrapper.last("limit 7");
-        List<PlatEmployeeTypeFlow> flowList = iPlatEmployeeTypeFlowService.list(flowQueryWrapper);
-        List<List<Long>> valueList = Arrays.asList(StringUtils.getDefaultListLong(7), StringUtils.getDefaultListLong(7), StringUtils.getDefaultListLong(7), StringUtils.getDefaultListLong(7), StringUtils.getDefaultListLong(7));
-        if (!flowList.isEmpty()) {
-            for (int i = 0;i < flowList.size();i++){
-                valueList.get(0).set(i,flowList.get(i).getInsideNum());
-                valueList.get(1).set(i,flowList.get(i).getLoanNum());
-                valueList.get(2).set(i,flowList.get(i).getAssociationNum());
-                valueList.get(3).set(i,flowList.get(i).getPropertyNum());
-                valueList.get(4).set(i,flowList.get(i).getVisitNum());
-            }
-        }
-        Map<String,Object> yMap = new HashMap<>();
-        for (int i = 0; i < nameList.size(); i++){
-            Map<String,Object> tempMap = new HashMap<>();
-            tempMap.put("name",nameList.get(i));
-            tempMap.put("color",colorList.get(i));
-            tempMap.put("dataList",valueList.get(i));
-            yMap.put(keyList.get(i),tempMap);
-        }
-        yMap.put("xList",dateList);
-        return yMap;
-
-    }
-
-    /**
-     * 员工年龄分布情况
-     */
-    @Override
-    public List<Map<String, Object>> getAgePieData(String appOrg) {
-        String fieldString = "between2030_num,between3040_num,between4050_num,exceed50_num";
-        if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(between2030_num) as between2030_num,sum(between3040_num) as between3040_num,sum(between4050_num) as between4050_num,sum(exceed50_num) as exceed50_num";
-        }
-        PlatEmployeeType employeeType = this.getPlatEmployeeTypeByField("app_org", appOrg,fieldString);
-        List<Long> valueList = StringUtils.getDefaultListLong(4);
-        if (StringUtils.isNotNull(employeeType)) {
-            valueList = Arrays.asList(employeeType.getBetween2030Num(), employeeType.getBetween3040Num(), employeeType.getBetween4050Num(), employeeType.getExceed50Num());
-        }
-        List<String> xList = Arrays.asList("20-30岁", "31-40岁", "41-50岁", "51岁以上");
-        List<String> colorList = Arrays.asList("#FFB948", "#2F82FE", "#7565EF", "#00F6EC");
-        List<Map<String, Object>> tempList = new ArrayList<>();
-        StringUtils.createdPieData(xList, colorList, valueList, tempList);
-        return tempList;
-    }
-
-    /**
-     * 员工性别情况
-     */
-    @Override
-    public Map<String, Object> getSexChartData(String appOrg) {
-        String fieldString = "man_num,women_num";
-        if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(man_num) as man_num,sum(women_num) as women_num";
-        }
-        PlatEmployeeType employeeType = this.getPlatEmployeeTypeByField("app_org", appOrg,fieldString);
-        Map<String, Object> tempMap = new HashMap<>();
-        if (StringUtils.isNull(employeeType)) {
-            StringUtils.createdTableData(Arrays.asList("男", "女"), Arrays.asList(0L,0L), "#d67c15", tempMap);
-        } else {
-            StringUtils.createdTableData(Arrays.asList("男", "女"), Arrays.asList(employeeType.getManNum(), employeeType.getWomenNum()), "#d67c15", tempMap);
-        }
-        return tempMap;
-    }
-
-
-}

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

@@ -0,0 +1,25 @@
+package com.project.zcustom.service.logistics;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.project.zcustom.domain.addional.LargeHousingLand;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+public interface ILargeHousingLandService extends IService<LargeHousingLand> {
+    Map<String, Object> getStockOfEstateResources();
+
+    Map<String, Object> getStockOfLandResources();
+
+    Map<String, Object> getInvestFinishState();
+
+    /**
+     * 分页查询房产土地列表
+     *
+     * @param largeHousingLand 房产土地
+     * @return 房产土地集合
+     */
+    public IPage<LargeHousingLand> pagingLargePlatHousingLandList(LargeHousingLand largeHousingLand);
+
+}

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

@@ -0,0 +1,31 @@
+package com.project.zcustom.service.logistics;
+
+import com.project.zcustom.domain.addional.LargeLogistics;
+
+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 Map<String, Object> getSceneRate(int flag);
+
+    public LargeLogistics getOperation(String appOrg);
+
+    public Map<String, Object> getInspectionSchemeNumX();
+
+    public Map<String, Object> getInspectionSchemeNumY();
+}

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

@@ -0,0 +1,104 @@
+package com.project.zcustom.service.logistics.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.zcustom.controller.core.StringUtils;
+import com.project.zcustom.domain.addional.LargeHousingLand;
+import com.project.zcustom.mapper.logistics.PlatHousingLandMapper;
+import com.project.zcustom.service.logistics.ILargeHousingLandService;
+import com.sun.rowset.internal.Row;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.*;
+
+@Service
+public class LargeHousingLandServiceImpl extends ServiceImpl<PlatHousingLandMapper, LargeHousingLand> implements ILargeHousingLandService {
+
+    @Autowired
+    private PlatHousingLandMapper platHousingLandMapper;
+
+
+    public Map<String, Object> getStockOfEstateResources(){
+        String[] strArr = {"办公用房", "周转用房", "生产管理", "教育培训用房", "交流干部住房", "单身公寓/单身宿舍"};
+        List<LargeHousingLand> arr = new ArrayList<>();
+        for (int i = 0; i < 6; i++){
+            LargeHousingLand land = new LargeHousingLand();
+            land.setNum(0L);
+            land.setAcreage(BigDecimal.valueOf(0));
+            land.setType((long) i);
+            land.setTypeName(strArr[i]);
+            arr.add(land);
+        }
+        List<LargeHousingLand> list = platHousingLandMapper.getStockOfEstateResources();
+        Map<String, Object> map = new HashMap<>();
+        BigDecimal housingAcreage = new BigDecimal(0);
+        Long housingNum = 0L;
+        for (LargeHousingLand it : list){
+            housingAcreage = housingAcreage.add(it.getAcreage());
+            housingNum += it.getNum();
+            arr.get(it.getType().intValue()).setAcreage(it.getAcreage());
+            arr.get(it.getType().intValue()).setNum(it.getNum());
+        }
+        map.put("pieChart", arr);
+        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();
+    }
+
+    /**
+     * 分页查询房产土地列表
+     *
+     * @param largePlatHousingLand 房产土地
+     * @return 房产土地集合
+     */
+    @Override
+    public IPage<LargeHousingLand> pagingLargePlatHousingLandList(LargeHousingLand largePlatHousingLand) {
+        IPage<LargeHousingLand> page = new Page<>(largePlatHousingLand.getPageNum(), largePlatHousingLand.getPageSize());
+        LambdaQueryWrapper<LargeHousingLand> lqw = getLambdaQueryWrapper(largePlatHousingLand);
+        // 排序 默认时间倒序
+        lqw.orderByDesc(LargeHousingLand::getCreateTime);
+        return baseMapper.selectPage(page, lqw);
+    }
+
+
+    /**
+     * 组装查询条件
+     */
+    private LambdaQueryWrapper<LargeHousingLand> getLambdaQueryWrapper(LargeHousingLand largePlatHousingLand) {
+        LambdaQueryWrapper<LargeHousingLand> lqw = new LambdaQueryWrapper<LargeHousingLand>();
+        if (StringUtils.isNotBlank(largePlatHousingLand.getHousing())){
+            lqw.eq(LargeHousingLand::getHousing ,largePlatHousingLand.getHousing());
+        }
+        if (StringUtils.isNotNull(largePlatHousingLand.getAcreage())){
+            lqw.eq(LargeHousingLand::getAcreage ,largePlatHousingLand.getAcreage());
+        }
+        if (StringUtils.isNotNull(largePlatHousingLand.getType())){
+            lqw.eq(LargeHousingLand::getType ,largePlatHousingLand.getType());
+        }
+        if (StringUtils.isNotNull(largePlatHousingLand.getConstructionTime())){
+            lqw.eq(LargeHousingLand::getConstructionTime ,largePlatHousingLand.getConstructionTime());
+        }
+        if (StringUtils.isNotNull(largePlatHousingLand.getOwnershipFlag())){
+            lqw.eq(LargeHousingLand::getOwnershipFlag ,largePlatHousingLand.getOwnershipFlag());
+        }
+        if (StringUtils.isNotNull(largePlatHousingLand.getInvestmentPlanFlag())){
+            lqw.eq(LargeHousingLand::getInvestmentPlanFlag ,largePlatHousingLand.getInvestmentPlanFlag());
+        }
+        return lqw;
+    }
+}

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

@@ -0,0 +1,232 @@
+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.PlatAssetMapper;
+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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
+
+    @Autowired
+    private PlatAssetMapper platAssetMapper;
+
+    public LargeLogistics getBuildingAssetRate(String appOrg){
+        LargeLogistics largeLogistics = new LargeLogistics();
+        List<LargeAssetDirs> list1 = platAssetMapper.getBuildingAssetRate(appOrg);
+        if (list1.size() > 0){
+            largeLogistics.setBuildingAssetList(list1);
+            largeLogistics.setBuildingAssetNum(platAssetMapper.getBuildingAssetNum(appOrg));
+        }
+        else {
+            largeLogistics.setBuildingAssetNum(0L);
+            List<LargeAssetDirs> list2 = new ArrayList<>();
+            LargeAssetDirs largeAssetDirs1 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs2 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs3 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs4 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs5 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs6 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs7 = new LargeAssetDirs();
+            largeAssetDirs1.setAssetNum(0L);
+            largeAssetDirs2.setAssetNum(0L);
+            largeAssetDirs3.setAssetNum(0L);
+            largeAssetDirs4.setAssetNum(0L);
+            largeAssetDirs5.setAssetNum(0L);
+            largeAssetDirs6.setAssetNum(0L);
+            largeAssetDirs7.setAssetNum(0L);
+            largeAssetDirs1.setCategoryName("电梯");
+            largeAssetDirs2.setCategoryName("电气");
+            largeAssetDirs3.setCategoryName("空调通风");
+            largeAssetDirs4.setCategoryName("供热采暖");
+            largeAssetDirs5.setCategoryName("消防");
+            largeAssetDirs6.setCategoryName("给排水");
+            largeAssetDirs7.setCategoryName("楼宇智能化");
+            list2.add(largeAssetDirs1);
+            list2.add(largeAssetDirs2);
+            list2.add(largeAssetDirs3);
+            list2.add(largeAssetDirs4);
+            list2.add(largeAssetDirs5);
+            list2.add(largeAssetDirs6);
+            list2.add(largeAssetDirs7);
+            largeLogistics.setBuildingAssetList(list2);
+        }
+        return largeLogistics;
+    }
+
+    public LargeLogistics getServiceAssetRate(String appOrg){
+        LargeLogistics largeLogistics = new LargeLogistics();
+        List<LargeAssetDirs> list1 = platAssetMapper.getServiceAssetRate(appOrg);
+        if (list1.size() > 0){
+            largeLogistics.setServiceAssetList(list1);
+            largeLogistics.setServiceAssetNum(platAssetMapper.getServiceAssetNum(appOrg));
+        }
+        else {
+            largeLogistics.setServiceAssetNum(0L);
+            List<LargeAssetDirs> list2 = new ArrayList<>();
+            LargeAssetDirs largeAssetDirs1 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs2 = new LargeAssetDirs();
+            largeAssetDirs1.setAssetNum(0L);
+            largeAssetDirs2.setAssetNum(0L);
+            largeAssetDirs1.setCategoryName("物业设备");
+            largeAssetDirs2.setCategoryName("食堂设备");
+            list2.add(largeAssetDirs1);
+            list2.add(largeAssetDirs2);
+            largeLogistics.setServiceAssetList(list2);
+        }
+
+        return largeLogistics;
+    }
+
+    public LargeLogistics getOfficeAssetRate(String appOrg){
+        LargeLogistics largeLogistics = new LargeLogistics();
+        List<LargeAssetDirs> list1 = platAssetMapper.getOfficeAssetRate(appOrg);
+        if (list1.size() > 0){
+            largeLogistics.setOfficeAssetList(list1);
+            largeLogistics.setOfficeAssetNum(platAssetMapper.getOfficeAssetNum(appOrg));
+        }
+        else {
+            largeLogistics.setOfficeAssetNum(0L);
+            List<LargeAssetDirs> list2 = new ArrayList<>();
+            LargeAssetDirs largeAssetDirs1 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs2 = new LargeAssetDirs();
+            LargeAssetDirs largeAssetDirs3 = new LargeAssetDirs();
+            largeAssetDirs1.setAssetNum(0L);
+            largeAssetDirs2.setAssetNum(0L);
+            largeAssetDirs3.setAssetNum(0L);
+            largeAssetDirs1.setCategoryName("普通低值易耗品");
+            largeAssetDirs2.setCategoryName("重点低值易耗品");
+            largeAssetDirs3.setCategoryName("办公固定资产");
+            list2.add(largeAssetDirs1);
+            list2.add(largeAssetDirs2);
+            list2.add(largeAssetDirs3);
+            largeLogistics.setOfficeAssetList(list2);
+        }
+        return largeLogistics;
+    }
+
+    public LargeLogistics getStockAssetNum(String appOrg){
+        LargeLogistics largeLogistics = platAssetMapper.getStockAssetNum(appOrg);
+        if (largeLogistics == null){
+            largeLogistics = new LargeLogistics();
+            largeLogistics.setStockBuildingAssetNum(0L);
+            largeLogistics.setStockServiceAssetNum(0L);
+            largeLogistics.setStockOfficeAssetNum(0L);
+        }
+        return largeLogistics;
+    }
+
+    public LargeLogistics getNewAssetNum(String appOrg){
+        LargeLogistics largeLogistics = platAssetMapper.getNewAssetNum(appOrg);
+        if (largeLogistics == null){
+            largeLogistics = new LargeLogistics();
+            largeLogistics.setNewBuildingAssetNum(0L);
+            largeLogistics.setNewServiceAssetNum(0L);
+            largeLogistics.setNewOfficeAssetNum(0L);
+        }
+        return largeLogistics;
+    }
+
+    public LargeLogistics getScrapAssetNum(String appOrg){
+        LargeLogistics largeLogistics = platAssetMapper.getScrapAssetNum(appOrg);
+        if (largeLogistics == null){
+            largeLogistics = new LargeLogistics();
+            largeLogistics.setScrapBuildingAssetNum(0L);
+            largeLogistics.setScrapServiceAssetNum(0L);
+            largeLogistics.setScrapOfficeAssetNum(0L);
+        }
+        return largeLogistics;
+    }
+
+    public Map<String, Object> getCodedAndLabelRate(String appOrg){
+        Map<String, Object> map = platAssetMapper.getCodedAndLabelRate(appOrg);
+        if (map == null) {
+            map = new HashMap<>();
+            map.put("labelRate", 0);
+            map.put("codedRate", 0);
+        }
+        return map;
+    }
+
+    public LargeLogistics getMainlyRate(String appOrg){
+        LargeLogistics largeLogistics =  platAssetMapper.getMainlyRate(appOrg);
+        if (largeLogistics == null) {
+            largeLogistics = new LargeLogistics();
+            largeLogistics.setBuildingAssetNum(0L);
+            largeLogistics.setServiceAssetNum(0L);
+            largeLogistics.setOfficeAssetNum(0L);
+        }
+        return largeLogistics;
+    }
+
+    public Map<String, Object> getSceneRate(int flag){
+        List<LargeLogistics> list;
+        List<String> list1 = new ArrayList<>();
+        List<BigDecimal> list2 = new ArrayList<>();
+        if (flag == 0){
+            list = platAssetMapper.getSceneRateX();
+            for (LargeLogistics it : list){
+                it.setAppName(it.getAppName().substring(2, 4));
+            }
+        }
+        else {
+            list = platAssetMapper.getSceneRateY();
+        }
+        for (LargeLogistics it : list){
+            list1.add(it.getAppName());
+            list2.add(it.getSceneRate());
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("xList", list1);
+        map.put("yList", list2);
+        return map;
+    }
+
+    public LargeLogistics getOperation(String appOrg){
+        LargeLogistics largeLogistics =  platAssetMapper.getOperation(appOrg);
+        if (largeLogistics == null){
+            largeLogistics = new LargeLogistics();
+            largeLogistics.setImportantDeviceTypeInspectionExecuteRate(new BigDecimal(0));
+            largeLogistics.setInspectionAnomalyRecordNum(0L);
+            largeLogistics.setRepairRecordNum(0L);
+            largeLogistics.setMaintenanceRecordNum(0L);
+        }
+        return largeLogistics;
+    }
+
+    public Map<String, Object> getInspectionSchemeNumX(){
+        List<LargeLogistics> list = platAssetMapper.getInspectionSchemeNumX();
+        List<String> list1 = new ArrayList<>();
+        List<Long> list2 = new ArrayList<>();
+        for (LargeLogistics it : list){
+            list1.add(it.getAppName().substring(2, 4));
+            list2.add(it.getInspectionSchemeNum());
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("xList", list1);
+        map.put("yList", list2);
+        return map;
+    }
+
+    public Map<String, Object> getInspectionSchemeNumY(){
+        List<LargeLogistics> list = platAssetMapper.getInspectionSchemeNumY();
+        List<String> list1 = new ArrayList<>();
+        List<Long> list2 = new ArrayList<>();
+        for (LargeLogistics it : list){
+            list1.add(it.getAppName());
+            list2.add(it.getInspectionSchemeNum());
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("xList", list1);
+        map.put("yList", list2);
+        return map;
+    }
+}

src/main/java/com/project/zcustom/service/basics/IPlatAppOrgService.java → src/main/java/com/project/zcustom/service/service/basics/IPlatAppOrgService.java

@@ -1,9 +1,9 @@
-package com.project.zcustom.service.basics;
+package com.project.zcustom.service.service.basics;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.controller.core.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 
 import java.util.List;
@@ -46,6 +46,14 @@ public interface IPlatAppOrgService extends IService<PlatAppOrg> {
      * @param platAppOrg 地区编码
      * @return 地区编码集合
      */
+    public PlatAppOrg selectPlatAppOrgListTree(PlatAppOrg platAppOrg);
+
+    /**
+     * 查询地区编码列表
+     *
+     * @param platAppOrg 地区编码
+     * @return 地区编码集合
+     */
     public List<PlatAppOrg> selectPlatAppOrgList(PlatAppOrg platAppOrg,Long limitNum);
 
     /**
@@ -82,4 +90,18 @@ public interface IPlatAppOrgService extends IService<PlatAppOrg> {
      * @param filedValue 字段值
      */
     public void checkFieldExist(String field, String filedValue,String tips,Long id);
+
+    public List<PlatAppOrg> getProjectCameraNumList(String appOrg);
+
+    public int getConnectUnitNum();
+
+    public List<PlatAppOrg> getAllCameraCondition();
+
+    public PlatAppOrg getCameraConditionByAppOrg(String appOrg);
+
+    /**
+     * 查询后勤资产 部门编码
+     * @return
+     */
+    List<PlatAppOrg> selectAppCodeList();
 }

src/main/java/com/project/zcustom/service/basics/IPlatBasicsCompanyService.java → src/main/java/com/project/zcustom/service/service/basics/IPlatBasicsCompanyService.java

@@ -1,10 +1,11 @@
-package com.project.zcustom.service.basics;
+package com.project.zcustom.service.service.basics;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.basics.PlatBasicsCompany;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.controller.core.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.project.zcustom.domain.basics.PlatBasicsCompany;
+
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/project/zcustom/service/basics/IPlatBasicsServerService.java → src/main/java/com/project/zcustom/service/service/basics/IPlatBasicsServerService.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.service.basics;
+package com.project.zcustom.service.service.basics;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

src/main/java/com/project/zcustom/service/basics/IPlatBasicsService.java → src/main/java/com/project/zcustom/service/service/basics/IPlatBasicsService.java

@@ -1,11 +1,11 @@
-package com.project.zcustom.service.basics;
+package com.project.zcustom.service.service.basics;
 
-import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.controller.core.PageParamVo;
 import com.project.zcustom.domain.basics.PlatBasics;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/project/zcustom/service/basics/IPlatBasicsSystemService.java → src/main/java/com/project/zcustom/service/service/basics/IPlatBasicsSystemService.java

@@ -1,10 +1,11 @@
-package com.project.zcustom.service.basics;
+package com.project.zcustom.service.service.basics;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.basics.PlatBasicsSystem;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.project.zcustom.controller.core.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.project.zcustom.domain.basics.PlatBasicsSystem;
+
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/project/zcustom/service/basics/impl/PlatAppOrgServiceImpl.java → src/main/java/com/project/zcustom/service/service/basics/impl/PlatAppOrgServiceImpl.java

@@ -1,17 +1,19 @@
-package com.project.zcustom.service.basics.impl;
+package com.project.zcustom.service.service.basics.impl;
 
-import com.project.zcustom.controller.core.PageParamVo;
-import com.project.zcustom.domain.basics.PlatAppOrg;
-import com.project.zcustom.mapper.basics.PlatAppOrgMapper;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.zcustom.controller.core.PageParamVo;
 import com.project.zcustom.controller.core.StringUtils;
+import com.project.zcustom.domain.basics.PlatAppOrg;
+import com.project.zcustom.mapper.basics.PlatAppOrgMapper;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -22,15 +24,28 @@ import java.util.List;
  */
 @Service
 public class PlatAppOrgServiceImpl extends ServiceImpl<PlatAppOrgMapper, PlatAppOrg> implements IPlatAppOrgService {
+    @Autowired
+    private PlatAppOrgMapper platAppOrgMapper;
 
     /**
      * 组装查询条件
      */
     private LambdaQueryWrapper<PlatAppOrg> getLambdaQueryWrapper(PlatAppOrg platAppOrg) {
         LambdaQueryWrapper<PlatAppOrg> lqw = new LambdaQueryWrapper<PlatAppOrg>();
+        lqw.select(
+                PlatAppOrg::getId,
+                PlatAppOrg::getAppOrg,
+                PlatAppOrg::getAppParentOrg,
+                PlatAppOrg::getAppEncode,
+                PlatAppOrg::getAppName,
+                PlatAppOrg::getConnectFlag
+        );
         if (StringUtils.isNotBlank(platAppOrg.getAppOrg())) {
             lqw.eq(PlatAppOrg::getAppOrg, platAppOrg.getAppOrg());
         }
+        if (StringUtils.isNotBlank(platAppOrg.getConnectFlag())) {
+            lqw.eq(PlatAppOrg::getConnectFlag, platAppOrg.getConnectFlag());
+        }
         if (StringUtils.isNotBlank(platAppOrg.getAppName())) {
             lqw.like(PlatAppOrg::getAppName, platAppOrg.getAppName());
         }
@@ -74,6 +89,7 @@ public class PlatAppOrgServiceImpl extends ServiceImpl<PlatAppOrgMapper, PlatApp
      */
     @Override
     public List<PlatAppOrg> selectPlatAppOrgList(PlatAppOrg platAppOrg) {
+        platAppOrg.setConnectFlag("1");
         LambdaQueryWrapper<PlatAppOrg> lqw = getLambdaQueryWrapper(platAppOrg);
         // 排序 默认时间倒序
         lqw.orderByAsc(PlatAppOrg::getId);
@@ -154,4 +170,73 @@ public class PlatAppOrgServiceImpl extends ServiceImpl<PlatAppOrgMapper, PlatApp
             throw new RuntimeException(tips + "已存在");
         }
     }
+
+    @Override
+    public PlatAppOrg selectPlatAppOrgListTree(PlatAppOrg platAppOrg) {
+        LambdaQueryWrapper<PlatAppOrg> lqw = getLambdaQueryWrapper(platAppOrg);
+        // 排序 默认时间倒序
+        lqw.orderByAsc(PlatAppOrg::getId);
+        List<PlatAppOrg> list = baseMapper.selectList(lqw);
+        PlatAppOrg platAppOrgEx = new PlatAppOrg();
+
+        int i = 0;
+        for (PlatAppOrg appOrg : list){
+            if (appOrg.getAppOrg().equals("10001")){
+                platAppOrgEx = appOrg;
+                break;
+            }
+            i++;
+        }
+        list.remove(i);
+
+        digui(platAppOrgEx, list);
+
+
+        return platAppOrgEx;
+    }
+
+    private void digui(PlatAppOrg platAppOrg, List<PlatAppOrg> list){
+        List<PlatAppOrg> listEx = new ArrayList<>();
+        for (PlatAppOrg appOrg : list){
+            if (appOrg.getAppParentOrg().equals(platAppOrg.getAppOrg())){
+                listEx.add(appOrg);
+            }
+        }
+
+        if (listEx.size() > 0){
+            platAppOrg.setChildren(listEx);
+            for (int i = 0;i < listEx.size(); i++){
+                digui(platAppOrg.getChildren().get(i), list);
+            }
+        }
+
+    }
+
+    public List<PlatAppOrg> getProjectCameraNumList(String appOrg){
+        return platAppOrgMapper.getProjectCameraNumList(appOrg);
+    }
+
+    public int getConnectUnitNum(){
+        return platAppOrgMapper.getConnectUnitNum();
+    }
+
+    public List<PlatAppOrg> getAllCameraCondition(){
+        return platAppOrgMapper.getAllCameraCondition();
+    }
+
+    public PlatAppOrg getCameraConditionByAppOrg(String appOrg){
+        return platAppOrgMapper.getCameraConditionByAppOrg(appOrg);
+    }
+
+    @Override
+    public List<PlatAppOrg> selectAppCodeList() {
+        LambdaQueryWrapper<PlatAppOrg> lqw = new LambdaQueryWrapper<PlatAppOrg>();
+        lqw.select(
+                PlatAppOrg::getId,
+                PlatAppOrg::getAppCode,
+                PlatAppOrg::getAppName
+        );
+        lqw.isNotNull(PlatAppOrg::getAppCode);
+        return this.list(lqw);
+    }
 }

src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsCompanyServiceImpl.java → src/main/java/com/project/zcustom/service/service/basics/impl/PlatBasicsCompanyServiceImpl.java

@@ -1,20 +1,21 @@
-package com.project.zcustom.service.basics.impl;
+package com.project.zcustom.service.service.basics.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.zcustom.controller.core.PageParamVo;
+import com.project.zcustom.controller.core.StringUtils;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.domain.basics.PlatBasics;
 import com.project.zcustom.domain.basics.PlatBasicsCompany;
 import com.project.zcustom.mapper.basics.PlatBasicsCompanyMapper;
-import com.project.zcustom.service.basics.IPlatAppOrgService;
-import com.project.zcustom.service.basics.IPlatBasicsCompanyService;
-import com.project.zcustom.controller.core.PageParamVo;
-import com.project.zcustom.service.basics.IPlatBasicsService;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
+import com.project.zcustom.service.service.basics.IPlatBasicsCompanyService;
+import com.project.zcustom.service.service.basics.IPlatBasicsService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.project.zcustom.controller.core.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -197,7 +198,7 @@ public class PlatBasicsCompanyServiceImpl extends ServiceImpl<PlatBasicsCompanyM
             QueryWrapper<PlatAppOrg> orgQueryWrapper = new QueryWrapper<>();
             orgQueryWrapper.eq("CHAR_LENGTH(app_org)",5);
             orgQueryWrapper.last("limit 10");
-            orgQueryWrapper.orderByAsc("id");
+            orgQueryWrapper.orderByAsc("app_org");
             List<PlatAppOrg> appOrgList = iPlatAppOrgService.list(orgQueryWrapper);
             companyNameList = appOrgList.stream().map(PlatAppOrg::getAppName).collect(Collectors.toList());
             activeUserNumList = Collections.nCopies(10,BigDecimal.ZERO);

src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsServerServiceImpl.java → src/main/java/com/project/zcustom/service/service/basics/impl/PlatBasicsServerServiceImpl.java

@@ -1,16 +1,16 @@
-package com.project.zcustom.service.basics.impl;
+package com.project.zcustom.service.service.basics.impl;
 
-import com.project.zcustom.domain.basics.PlatBasicsServer;
-import com.project.zcustom.mapper.basics.PlatBasicsServerMapper;
-import com.project.zcustom.service.basics.IPlatBasicsServerService;
-import com.project.zcustom.controller.core.PageParamVo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.zcustom.controller.core.PageParamVo;
 import com.project.zcustom.controller.core.StringUtils;
+import com.project.zcustom.domain.basics.PlatBasicsServer;
+import com.project.zcustom.mapper.basics.PlatBasicsServerMapper;
+import com.project.zcustom.service.service.basics.IPlatBasicsServerService;
+import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;

src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsServiceImpl.java → src/main/java/com/project/zcustom/service/service/basics/impl/PlatBasicsServiceImpl.java

@@ -1,32 +1,28 @@
-package com.project.zcustom.service.basics.impl;
+package com.project.zcustom.service.service.basics.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.zcustom.controller.core.PageParamVo;
+import com.project.zcustom.controller.core.StringUtils;
 import com.project.zcustom.domain.basics.PlatBasics;
 import com.project.zcustom.domain.basics.PlatBasicsCompany;
 import com.project.zcustom.domain.basics.PlatBasicsServer;
 import com.project.zcustom.domain.basics.PlatBasicsSystem;
-import com.project.zcustom.domain.employee.PlatEmployeeHealth;
-import com.project.zcustom.domain.employee.PlatEmployeeType;
-import com.project.zcustom.mapper.basics.PlatBasicsCompanyMapper;
 import com.project.zcustom.mapper.basics.PlatBasicsMapper;
-import com.project.zcustom.mapper.basics.PlatBasicsServerMapper;
-import com.project.zcustom.mapper.basics.PlatBasicsSystemMapper;
-import com.project.zcustom.service.basics.IPlatBasicsCompanyService;
-import com.project.zcustom.service.basics.IPlatBasicsServerService;
-import com.project.zcustom.service.basics.IPlatBasicsService;
-import com.project.zcustom.controller.core.PageParamVo;
-import com.project.zcustom.service.basics.IPlatBasicsSystemService;
+import com.project.zcustom.service.service.basics.IPlatBasicsCompanyService;
+import com.project.zcustom.service.service.basics.IPlatBasicsServerService;
+import com.project.zcustom.service.service.basics.IPlatBasicsService;
+import com.project.zcustom.service.service.basics.IPlatBasicsSystemService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.project.zcustom.controller.core.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 /**
@@ -40,15 +36,9 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
     @Resource
     IPlatBasicsCompanyService platBasicsCompanyService;
     @Resource
-    PlatBasicsCompanyMapper platBasicsCompanyMapper;
-    @Resource
     IPlatBasicsServerService platBasicsServerService;
     @Resource
-    PlatBasicsServerMapper platBasicsServerMapper;
-    @Resource
     IPlatBasicsSystemService platBasicsSystemService;
-    @Resource
-    PlatBasicsSystemMapper platBasicsSystemMapper;
 
 
     /**
@@ -208,12 +198,12 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
         try {
             if(StringUtils.isNotNull(platBasics)){
                 this.setPlatBasics(mapField,platBasics);
-                baseMapper.updatePlatBasics(platBasics);
+                this.updateById(platBasics);
             }else{
                 platBasics = new PlatBasics();
                 this.setPlatBasics(mapField,platBasics);
                 platBasics.setAppOrg(appOrg);
-                baseMapper.insertPlatBasics(platBasics);
+                this.save(platBasics);
             }
             this.operatorServer(appOrg,mapField);
             this.operatorCompany(appOrg,appName,mapField);
@@ -226,11 +216,9 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
      * 设置数据
      */
     private void setPlatBasics(Map<String, Object> mapField, PlatBasics platBasics){
-        List<String> keyList = Arrays.asList("register","onLine","activeUsers","rate");
+        List<String> keyList = Arrays.asList("register","activeUsers");
         StringUtils.setFieldValue(platBasics,mapField,keyList,0, PlatBasics::setRegisterNum,Long.class);
-        StringUtils.setFieldValue(platBasics,mapField,keyList,1, PlatBasics::setOnlineNum,Long.class);
-        StringUtils.setFieldValue(platBasics,mapField,keyList,2, PlatBasics::setOrderNum,Long.class);
-        StringUtils.setFieldValue(platBasics,mapField,keyList,3, PlatBasics::setOnlineRate,BigDecimal.class);
+        StringUtils.setFieldValue(platBasics,mapField,keyList,1, PlatBasics::setOrderNum,Long.class);
 //
 //
 //        platBasics.setRegisterNum((Long) mapField.get("register"));
@@ -251,13 +239,13 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
         PlatBasicsCompany platBasicsCompany = platBasicsCompanyService.getPlatBasicsCompanyByField("app_org", appOrg);
         if(StringUtils.isNotNull(platBasicsCompany)){
             StringUtils.setFieldValue(platBasicsCompany, mapField, Collections.singletonList("activeUsers"), 0,PlatBasicsCompany::setActiveUserNum, Long.class);
-            platBasicsCompanyMapper.updatePlatBasicsCompany(platBasicsCompany);
+            platBasicsCompanyService.updateById(platBasicsCompany);
         }else{
             platBasicsCompany = new PlatBasicsCompany();
             platBasicsCompany.setCompanyName(appName);
             platBasicsCompany.setAppOrg(appOrg);
             StringUtils.setFieldValue(platBasicsCompany, mapField, Collections.singletonList("activeUsers"), 0,PlatBasicsCompany::setActiveUserNum, Long.class);
-            platBasicsCompanyMapper.insertPlatBasicsCompany(platBasicsCompany);
+            platBasicsCompanyService.save(platBasicsCompany);
         }
 
     }
@@ -281,11 +269,9 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
                     platBasicsServer.setAppOrg(appOrg);
                     platBasicsServer.setServerName(temp.get("name").toString());
                     platBasicsServer.setServerNum((Long) temp.get("number"));
-//                    addList.add(platBasicsServer);
-                    platBasicsServerMapper.insertPlatBasicsServer(platBasicsServer);
+                    addList.add(platBasicsServer);
                 }
-
-//                platBasicsServerService.saveBatch(addList);
+                platBasicsServerService.saveBatch(addList);
             }
 
 //            // cpu
@@ -322,7 +308,7 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
                 platBasicsSystem.setBetween12Num((Long) mapField.get(keyList.get(1)));
                 platBasicsSystem.setBetween18Num((Long) mapField.get(keyList.get(2)));
                 platBasicsSystem.setBetween24Num((Long) mapField.get(keyList.get(3)));
-                platBasicsSystemMapper.updatePlatBasicsSystem(platBasicsSystem);
+                platBasicsSystemService.updateById(platBasicsSystem);
             }else{
                 platBasicsSystem = new PlatBasicsSystem();
                 platBasicsSystem.setBetween6Num((Long) mapField.get(keyList.get(0)));
@@ -331,7 +317,6 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
                 platBasicsSystem.setBetween24Num((Long) mapField.get(keyList.get(3)));
                 platBasicsSystem.setAppOrg(appOrg);
                 platBasicsSystem.setSysType(type);
-                platBasicsSystemMapper.insertPlatBasicsSystem(platBasicsSystem);
             }
 
         }catch (Exception e){
@@ -345,22 +330,24 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
      */
     @Override
     public Map<String, Object> getOverviewData(String appOrg){
-        String fieldString = "register_num,online_num,order_num";
+        String fieldString = "register_num,order_num";
         if(Objects.equals(appOrg,"0000")){
-            fieldString = "sum(register_num) as register_num,sum(online_num) as online_num,sum(order_num) as order_num";
+            fieldString = "sum(register_num) as register_num,sum(order_num) as order_num";
         }
         PlatBasics platBasics = this.getPlatBasicsByField("app_org", appOrg,fieldString);
         Map<String, Object> tempMap = new HashMap<>();
         if (StringUtils.isNull(platBasics)) {
             StringUtils.getMapData("注册用户数", "registerNum", 0, tempMap);
-            StringUtils.getMapData("在线用户数", "onlineNum", 0, tempMap);
-            StringUtils.getMapData("日活跃人数", "orderNum", 0, tempMap);
-            StringUtils.getMapData("在线率", "onlineRate", 0, tempMap);
+            StringUtils.getMapData("活跃人数", "orderNum", 0, tempMap);
+            tempMap.put("onlineRate", "0");
         }else{
             StringUtils.getMapData("注册用户数", "registerNum", platBasics.getRegisterNum(), tempMap);
-            StringUtils.getMapData("在线用户数", "onlineNum", platBasics.getOnlineNum(), tempMap);
-            StringUtils.getMapData("日活跃人数", "orderNum", platBasics.getOrderNum(), tempMap);
-            StringUtils.getMapData("在线率", "onlineRate", StringUtils.sumPercentage(platBasics.getOnlineNum(), platBasics.getRegisterNum()), tempMap);
+            StringUtils.getMapData("活跃人数", "orderNum", platBasics.getOrderNum(), tempMap);
+            BigDecimal a = new BigDecimal(platBasics.getOrderNum());
+            BigDecimal b = new BigDecimal(platBasics.getRegisterNum());
+            BigDecimal result = a.divide(b, 4, RoundingMode.HALF_UP);
+            BigDecimal percentage = result.multiply(new BigDecimal("100")).stripTrailingZeros();
+            tempMap.put("onlineRate", percentage.toPlainString());
         }
         return tempMap;
     }

src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsSystemServiceImpl.java → src/main/java/com/project/zcustom/service/service/basics/impl/PlatBasicsSystemServiceImpl.java

@@ -1,16 +1,16 @@
-package com.project.zcustom.service.basics.impl;
+package com.project.zcustom.service.service.basics.impl;
 
-import com.project.zcustom.domain.basics.PlatBasicsSystem;
-import com.project.zcustom.mapper.basics.PlatBasicsSystemMapper;
-import com.project.zcustom.service.basics.IPlatBasicsSystemService;
-import com.project.zcustom.controller.core.PageParamVo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.zcustom.controller.core.PageParamVo;
 import com.project.zcustom.controller.core.StringUtils;
+import com.project.zcustom.domain.basics.PlatBasicsSystem;
+import com.project.zcustom.mapper.basics.PlatBasicsSystemMapper;
+import com.project.zcustom.service.service.basics.IPlatBasicsSystemService;
+import org.springframework.stereotype.Service;
 
 import java.util.*;
 

src/main/java/com/project/zcustom/service/employee/IPlatEmployeeHealthChartService.java → src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeHealthChartService.java

@@ -1,10 +1,12 @@
-package com.project.zcustom.service.employee;
+package com.project.zcustom.service.service.employee;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.employee.PlatEmployeeHealthChart;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
 import com.project.zcustom.controller.core.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.project.zcustom.domain.employee.PlatEmployeeHealthChart;
+
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeHealthIllnessService.java

@@ -0,0 +1,25 @@
+package com.project.zcustom.service.service.employee;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import com.project.zcustom.controller.core.PageParamVo;
+import com.project.zcustom.domain.employee.PlatEmployeeHealthIllness;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 多发疾病排行Service接口
+ *
+ * @author change
+ * @date 2024-10-21
+ */
+public interface IPlatEmployeeHealthIllnessService extends IService<PlatEmployeeHealthIllness> {
+
+    /**
+     * 多发疾病排行
+     */
+    public Map<String, Object> getIllnessChartData(String appOrg);
+}

src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeHealthService.java

@@ -0,0 +1,32 @@
+package com.project.zcustom.service.service.employee;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import com.project.zcustom.controller.core.PageParamVo;
+import com.project.zcustom.domain.employee.PlatEmployeeHealth;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 员工健康Service接口
+ *
+ * @author change
+ * @date 2024-10-21
+ */
+public interface IPlatEmployeeHealthService extends IService<PlatEmployeeHealth> {
+
+    /**
+     * 健康服务
+     */
+    public Map<String, Object> getHealthData(String appOrg);
+
+
+    /**
+     * 员工健康分布
+     */
+    @Deprecated
+    public List<Map<String, Object>> getHealthPieData(String appOrg);
+}

src/main/java/com/project/zcustom/service/employee/IPlatEmployeeTypeFlowService.java → src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeTypeFlowService.java

@@ -1,10 +1,12 @@
-package com.project.zcustom.service.employee;
+package com.project.zcustom.service.service.employee;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.employee.PlatEmployeeTypeFlow;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
 import com.project.zcustom.controller.core.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.project.zcustom.domain.employee.PlatEmployeeTypeFlow;
+
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/project/zcustom/service/service/employee/IPlatEmployeeTypeService.java

@@ -0,0 +1,46 @@
+package com.project.zcustom.service.service.employee;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.project.zcustom.controller.core.PageParamVo;
+import com.project.zcustom.domain.employee.PlatEmployeeType;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 员工概况Service接口
+ *
+ * @author change
+ * @date 2024-10-21
+ */
+public interface IPlatEmployeeTypeService extends IService<PlatEmployeeType> { ;
+
+    /**
+     * 员工类型
+     */
+    public List<Map<String, Object>> getEmployeePieData(String appOrg);
+
+    /**
+     * 入楼情况
+     */
+    public Map<String, Object> getEnterBuildData(String appOrg);
+
+    /**
+     * 员工年龄分布情况
+     */
+    public List<Map<String, Object>> getAgePieData(String appOrg);
+
+    /**
+     * 近一周人流量统计
+     */
+    public Map<String, Object> getChartsFlowData(String appOrg);
+
+    /**
+     * 员工性别情况
+     */
+    public Map<String, Object> getSexChartData(String appOrg);
+
+
+}

src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeHealthChartServiceImpl.java → src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeHealthChartServiceImpl.java

@@ -1,16 +1,16 @@
-package com.project.zcustom.service.employee.impl;
+package com.project.zcustom.service.service.employee.impl;
 
-import com.project.zcustom.domain.employee.PlatEmployeeHealthChart;
-import com.project.zcustom.mapper.employee.PlatEmployeeHealthChartMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthChartService;
-import com.project.zcustom.controller.core.PageParamVo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.zcustom.controller.core.PageParamVo;
 import com.project.zcustom.controller.core.StringUtils;
+import com.project.zcustom.domain.employee.PlatEmployeeHealthChart;
+import com.project.zcustom.mapper.employee.PlatEmployeeHealthChartMapper;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthChartService;
+import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
 import java.util.HashMap;

src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeHealthIllnessServiceImpl.java

@@ -0,0 +1,37 @@
+package com.project.zcustom.service.service.employee.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.project.zcustom.controller.core.PageParamVo;
+import com.project.zcustom.controller.core.StringUtils;
+import com.project.zcustom.domain.employee.PlatEmployeeHealthIllness;
+import com.project.zcustom.mapper.employee.PlatEmployeeHealthIllnessMapper;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthIllnessService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 多发疾病排行Service业务层处理
+ *
+ * @author change
+ * @date 2024-10-21
+ */
+@Service
+public class PlatEmployeeHealthIllnessServiceImpl extends ServiceImpl<PlatEmployeeHealthIllnessMapper, PlatEmployeeHealthIllness> implements IPlatEmployeeHealthIllnessService {
+
+
+    /**
+     * 多发疾病排行
+     */
+    @Override
+    public Map<String, Object> getIllnessChartData(String appOrg){
+
+    }
+}

src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeHealthServiceImpl.java → src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeHealthServiceImpl.java

@@ -1,25 +1,22 @@
-package com.project.zcustom.service.employee.impl;
+package com.project.zcustom.service.service.employee.impl;
 
-import com.project.zcustom.domain.employee.PlatEmployeeHealth;
-import com.project.zcustom.domain.employee.PlatEmployeeHealthChart;
-import com.project.zcustom.domain.employee.PlatEmployeeType;
-import com.project.zcustom.mapper.employee.PlatEmployeeHealthChartMapper;
-import com.project.zcustom.mapper.employee.PlatEmployeeHealthMapper;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthChartService;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthIllnessService;
-import com.project.zcustom.service.employee.IPlatEmployeeHealthService;
-import com.project.zcustom.controller.core.PageParamVo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.zcustom.controller.core.PageParamVo;
 import com.project.zcustom.controller.core.StringUtils;
+import com.project.zcustom.domain.employee.PlatEmployeeHealth;
+import com.project.zcustom.domain.employee.PlatEmployeeHealthChart;
+import com.project.zcustom.mapper.employee.PlatEmployeeHealthMapper;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthChartService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthIllnessService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeHealthService;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 
 /**
@@ -33,8 +30,6 @@ public class PlatEmployeeHealthServiceImpl extends ServiceImpl<PlatEmployeeHealt
     @Resource
     private IPlatEmployeeHealthChartService platEmployeeHealthChartService;
     @Resource
-    private PlatEmployeeHealthChartMapper platEmployeeHealthChartMapper;
-    @Resource
     private IPlatEmployeeHealthIllnessService iPlatEmployeeHealthIllnessService;
 
     /**
@@ -177,12 +172,12 @@ public class PlatEmployeeHealthServiceImpl extends ServiceImpl<PlatEmployeeHealt
         try {
             if(StringUtils.isNotNull(platEmployeeHealth)){
                 this.setPlatEmployeeHealth(mapField,platEmployeeHealth);
-                baseMapper.updatePlatEmployeeHealth(platEmployeeHealth);
+                this.updateById(platEmployeeHealth);
             }else{
                 platEmployeeHealth = new PlatEmployeeHealth();
                 this.setPlatEmployeeHealth(mapField,platEmployeeHealth);
                 platEmployeeHealth.setAppOrg(appOrg);
-                baseMapper.insertPlatEmployeeHealth(platEmployeeHealth);
+                this.save(platEmployeeHealth);
             }
             iPlatEmployeeHealthIllnessService.addEmployeeHealthIllness(appOrg,mapField);
 //            this.handleHealthChartData(appOrg,mapField);
@@ -225,7 +220,7 @@ public class PlatEmployeeHealthServiceImpl extends ServiceImpl<PlatEmployeeHealt
             healthChart0.setOctoberNum((Long) mapField.get("tenIllness"));
             healthChart0.setNovemberNum((Long) mapField.get("elevenllness"));
             healthChart0.setDecemberNum((Long) mapField.get("twelvellness"));
-            platEmployeeHealthChartMapper.updatePlatEmployeeHealthChart(healthChart0);
+            platEmployeeHealthChartService.updateById(healthChart0);
         }else{
             healthChart0.setJanuaryNum((Long) mapField.get("oneIllness"));
             healthChart0.setFebruaryNum((Long) mapField.get("twoIllness"));
@@ -241,7 +236,7 @@ public class PlatEmployeeHealthServiceImpl extends ServiceImpl<PlatEmployeeHealt
             healthChart0.setDecemberNum((Long) mapField.get("twelvellness"));
             healthChart0.setAppOrg(appOrg);
             healthChart0.setType(0);
-            platEmployeeHealthChartMapper.insertPlatEmployeeHealthChart(healthChart0);
+            platEmployeeHealthChartService.save(healthChart0);
         }
     }
 

src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeTypeServiceImpl.java

@@ -0,0 +1,89 @@
+package com.project.zcustom.service.service.employee.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.project.zcustom.controller.core.DateUtils;
+import com.project.zcustom.controller.core.PageParamVo;
+import com.project.zcustom.controller.core.StringUtils;
+import com.project.zcustom.domain.employee.PlatEmployeeType;
+import com.project.zcustom.domain.employee.PlatEmployeeTypeFlow;
+import com.project.zcustom.mapper.employee.PlatEmployeeTypeMapper;
+import com.project.zcustom.service.service.employee.IPlatEmployeeTypeFlowService;
+import com.project.zcustom.service.service.employee.IPlatEmployeeTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 员工概况Service业务层处理
+ *
+ * @author change
+ * @date 2024-10-21
+ */
+@Service
+public class PlatEmployeeTypeServiceImpl extends ServiceImpl<PlatEmployeeTypeMapper, PlatEmployeeType> implements IPlatEmployeeTypeService {
+
+    @Autowired
+    private PlatEmployeeTypeMapper platEmployeeTypeMapper;
+
+    @Resource
+    private IPlatEmployeeTypeFlowService iPlatEmployeeTypeFlowService;
+
+    /**
+     * 员工类型
+     */
+    @Override
+    public List<Map<String, Object>> getEmployeePieData(String appOrg) {
+        PlatEmployeeType employeeType = platEmployeeTypeMapper.getEmployeePieData(appOrg);
+        List<Long> valueList = StringUtils.getDefaultListLong(4);
+        if (StringUtils.isNotNull(employeeType)) {
+            valueList = Arrays.asList(employeeType.getInsideNum(), employeeType.getLoanNum(), employeeType.getAssociationNum(), employeeType.getPropertyNum());
+        }
+        List<String> xList = Arrays.asList("内部员工", "借调人员", "外协人员", "物业人员");
+        List<String> colorList = Arrays.asList("#fec72f", "#2f82fe", "#7565ef", "#00ffff");
+        List<Map<String, Object>> tempList = new ArrayList<>();
+        StringUtils.createdPieData(xList, colorList, valueList, tempList);
+        return tempList;
+    }
+
+    /**
+     * 获取入楼情况
+     */
+    @Override
+    public Map<String, Object> getEnterBuildData(String appOrg) {
+        platEmployeeTypeMapper.getEnterBuildData(appOrg);
+    }
+
+
+    /**
+     * 近一周人流量统计
+     */
+    @Override
+    public Map<String, Object> getChartsFlowData(String appOrg) {
+
+    }
+
+    /**
+     * 员工年龄分布情况
+     */
+    @Override
+    public List<Map<String, Object>> getAgePieData(String appOrg) {
+
+    }
+
+    /**
+     * 员工性别情况
+     */
+    @Override
+    public Map<String, Object> getSexChartData(String appOrg) {
+
+    }
+
+
+}

src/main/java/com/project/zcustom/service/post/IPlatPostStationChartService.java → src/main/java/com/project/zcustom/service/service/post/IPlatPostStationChartService.java

@@ -1,10 +1,12 @@
-package com.project.zcustom.service.post;
+package com.project.zcustom.service.service.post;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.post.PlatPostStationChart;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
 import com.project.zcustom.controller.core.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.project.zcustom.domain.post.PlatPostStationChart;
+
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/project/zcustom/service/post/IPlatPostStationService.java → src/main/java/com/project/zcustom/service/service/post/IPlatPostStationService.java

@@ -1,10 +1,12 @@
-package com.project.zcustom.service.post;
+package com.project.zcustom.service.service.post;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.post.PlatPostStation;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
 import com.project.zcustom.controller.core.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.project.zcustom.domain.post.PlatPostStation;
+
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/project/zcustom/service/post/impl/PlatPostStationChartServiceImpl.java → src/main/java/com/project/zcustom/service/service/post/impl/PlatPostStationChartServiceImpl.java

@@ -1,20 +1,21 @@
-package com.project.zcustom.service.post.impl;
+package com.project.zcustom.service.service.post.impl;
 
-import com.project.zcustom.controller.core.DateUtils;
-import com.project.zcustom.domain.post.PlatPostStationChart;
-import com.project.zcustom.mapper.post.PlatPostStationChartMapper;
-import com.project.zcustom.service.post.IPlatPostStationChartService;
-import com.project.zcustom.controller.core.PageParamVo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.zcustom.controller.core.DateUtils;
+import com.project.zcustom.controller.core.PageParamVo;
 import com.project.zcustom.controller.core.StringUtils;
+import com.project.zcustom.domain.post.PlatPostStationChart;
+
+import com.project.zcustom.mapper.post.PlatPostStationChartMapper;
+import com.project.zcustom.service.service.post.IPlatPostStationChartService;
+import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -191,9 +192,9 @@ public class PlatPostStationChartServiceImpl extends ServiceImpl<PlatPostStation
             // 去month后两位 并转为数字
             return Integer.parseInt(month.substring(5)) + "月";
         }).collect(Collectors.toList());
-        List<String> nameList = Arrays.asList("消防", "电梯", "照明灯具", "安防", "卫生间", "公区", "空调", "其它维修", "会议保障", "办公室");
+        List<String> nameList = Arrays.asList("办公家具报修", "冷热水故障", "门禁故障", "其他报修故障", "墙类/地类报修", "电气故障报修", "电梯故障", "消防设施设备故障", "保洁服务", "空调故障");
         List<String> keyList = Arrays.asList("colNum", "elevatorNum", "laNum", "seNum", "toNum", "arNum", "diNum", "otNum", "meNum", "ofNum");
-        List<String> colorList = Arrays.asList("#464a99","#1a9dc1","#12db62","#cbd5ff","#6567ef","#079966","#00ffff","#00aeff","#00f6ff","#008cff");
+        List<String> colorList = Arrays.asList("#ff9d00", "#2f82fe", "#12db62", "#7565ef", "#079966", "#4e2ffe", "#00f6ec", "#ff7300", "#002aff", "#FF99C3");
         List<Long> defaultList = StringUtils.getDefaultListLong(6);
         List<List<Long>> yList = Arrays.asList(defaultList,defaultList,defaultList,defaultList,defaultList,defaultList,defaultList,defaultList,defaultList,defaultList);
         Map<String,Object> yMap = new HashMap<>();