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

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

@@ -2,9 +2,9 @@ package com.project.zcustom.controller.engineering;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;
+import com.project.zcustom.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;
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class PlatProjectMonitorController extends BaseController {
 
-    private final ILargeUnitService largeUnitService;
+    private final IPlatAppOrgService platAppOrgService;
 
     private final ILargeProjectService largeProjectService;
 
@@ -28,15 +28,15 @@ public class PlatProjectMonitorController extends BaseController {
      */
     @GetMapping("/getProjectCameraNumList")
     public AjaxResult getProjectCameraNumList() {
-        return AjaxResult.success("查询成功", largeUnitService.getProjectCameraNumList());
+        return AjaxResult.success("查询成功", platAppOrgService.getProjectCameraNumList());
     }
 
     /**
      * 各项目已接入摄像头数量
      */
-    @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));
     }
 
     /**

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

@@ -20,6 +20,14 @@ public class PlatProjectProductionController extends BaseController {
     /**
      * 已接入项目数量(在建)
      */
+    @GetMapping("/getProjectNum")
+    public AjaxResult getProjectNum() {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNum());
+    }
+
+    /**
+     * 已接入项目数量(审批)
+     */
     @GetMapping("/getProjectNumX")
     public AjaxResult getProjectNumX() {
         return AjaxResult.success("查询成功", largeProjectService.getProjectNumX());

project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeUnitController.java

@@ -6,7 +6,8 @@ import com.project.common.core.domain.AjaxResult;
 import com.project.common.enums.BusinessType;
 import com.project.common.utils.poi.ExcelUtil;
 import com.project.zcustom.domain.addional.LargeUnit;
-import com.project.zcustom.service.unit.ILargeUnitService;
+import com.project.zcustom.domain.basics.PlatAppOrg;
+import com.project.zcustom.service.basics.IPlatAppOrgService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,23 +27,28 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class LargeUnitController extends BaseController {
 
-    private final ILargeUnitService largeUnitService;
+    private final IPlatAppOrgService largeUnitService;
 
     @GetMapping("/list")
-    public AjaxResult list(LargeUnit entity) {
-        return AjaxResult.success("查询成功", largeUnitService.pagingLargeUnitList(entity));
+    public AjaxResult list(PlatAppOrg entity) {
+        return AjaxResult.success("查询成功", largeUnitService.pagingPlatAppOrgList(entity));
     }
 
     @GetMapping("/listAll")
-    public AjaxResult listAll(LargeUnit entity) {
-        return AjaxResult.success("查询成功", largeUnitService.selectLargeUnitList(entity));
+    public AjaxResult listAll(PlatAppOrg entity) {
+        return AjaxResult.success("查询成功", largeUnitService.selectPlatAppOrgList(entity));
+    }
+
+    @GetMapping("/listTree")
+    public AjaxResult listTree(PlatAppOrg entity) {
+        return AjaxResult.success("查询成功", largeUnitService.selectPlatAppOrgListTree(entity));
     }
 
     @Log(title = "地区编码", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LargeUnit entity) {
-        List<LargeUnit> list = largeUnitService.selectLargeUnitList(entity);
-        ExcelUtil<LargeUnit> util = new ExcelUtil<>(LargeUnit.class);
+    public void export(HttpServletResponse response, PlatAppOrg entity) {
+        List<PlatAppOrg> list = largeUnitService.selectPlatAppOrgList(entity);
+        ExcelUtil<PlatAppOrg> util = new ExcelUtil<>(PlatAppOrg.class);
         util.exportExcel(response, list, "地区编码数据");
     }
 
@@ -54,14 +60,14 @@ public class LargeUnitController extends BaseController {
     @PreAuthorize("@ss.hasPermi('zcustom:platAppOrg:add')")
     @Log(title = "地区编码", businessType = BusinessType.INSERT)
     @PostMapping("add")
-    public AjaxResult add(@RequestBody LargeUnit entity) {
+    public AjaxResult add(@RequestBody PlatAppOrg entity) {
         return toAjax(largeUnitService.save(entity));
     }
 
     @PreAuthorize("@ss.hasPermi('zcustom:platAppOrg:edit')")
     @Log(title = "地区编码", businessType = BusinessType.UPDATE)
     @PostMapping("edit")
-    public AjaxResult edit(@RequestBody LargeUnit entity) {
+    public AjaxResult edit(@RequestBody PlatAppOrg entity) {
         return toAjax(largeUnitService.updateById(entity));
     }
 

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

@@ -47,7 +47,7 @@ public class LargeProject extends CustomBaseEntity {
      */
     @Excel(name = "所属单位编码")
     @ApiModelProperty("所属单位编码")
-    private String unitCode;
+    private String appOrg;
 
     /**
      * 项目类型

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

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

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

@@ -1,5 +1,7 @@
 package com.project.zcustom.domain.basics;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -11,6 +13,8 @@ import lombok.experimental.Accessors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.List;
+
 /**
  * 地区编码对象 plat_app_org
  *
@@ -23,6 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
 @EqualsAndHashCode(callSuper = false)
 @TableName("large_plat_app_org")
 @ApiModel(value = "large_plat_app_org实体类")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class PlatAppOrg extends CustomBaseEntity {
 
     /**
@@ -40,10 +45,36 @@ public class PlatAppOrg extends CustomBaseEntity {
     private String appOrg;
 
     /**
+     * 父地区编码
+     */
+    @Excel(name = "父地区编码")
+    @ApiModelProperty("父地区编码")
+    private String appParentOrg;
+
+    /**
      * 地区名称
      */
     @Excel(name = "地区名称")
     @ApiModelProperty("地区名称")
     private String appName;
 
+    /**
+     * 接入标志
+     */
+    @Excel(name = "接入标志")
+    @ApiModelProperty("接入标志")
+    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;
+
 }

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

@@ -1,15 +1,24 @@
 package com.project.zcustom.mapper.basics;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 
+import java.util.List;
+
 /**
  * 地区编码Mapper接口
  *
  * @author change
  * @date 2024-10-23
  */
-public interface PlatAppOrgMapper extends MPJBaseMapper<PlatAppOrg> {
+public interface PlatAppOrgMapper extends BaseMapper<PlatAppOrg> {
+
+    public List<PlatAppOrg> getProjectCameraNumList();
+
+    public int getConnectUnitNum();
 
+    public List<PlatAppOrg> getAllCameraCondition();
 
+    public PlatAppOrg getCameraConditionByAppOrg(String appOrg);
 }

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

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

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

@@ -1,79 +0,0 @@
-package com.project.zcustom.mapper.unit;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.project.zcustom.domain.addional.LargeUnit;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Param;
-
-
-/**
- * 地区编码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);
-}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.project.common.core.domain.search.PageParamVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.project.zcustom.domain.addional.LargeUnit;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 
 import java.util.List;
@@ -46,6 +47,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 +91,12 @@ public interface IPlatAppOrgService extends IService<PlatAppOrg> {
      * @param filedValue 字段值
      */
     public void checkFieldExist(String field, String filedValue,String tips,Long id);
+
+    public List<PlatAppOrg> getProjectCameraNumList();
+
+    public int getConnectUnitNum();
+
+    public List<PlatAppOrg> getAllCameraCondition();
+
+    public PlatAppOrg getCameraConditionByAppOrg(String appOrg);
 }

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

@@ -1,9 +1,11 @@
 package com.project.zcustom.service.basics.impl;
 
 import com.project.common.core.domain.search.PageParamVo;
+import com.project.zcustom.domain.addional.LargeUnit;
 import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.mapper.basics.PlatAppOrgMapper;
 import com.project.zcustom.service.basics.IPlatAppOrgService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.project.common.utils.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -22,12 +25,20 @@ 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::getAppName
+        );
         if (StringUtils.isNotBlank(platAppOrg.getAppOrg())) {
             lqw.eq(PlatAppOrg::getAppOrg, platAppOrg.getAppOrg());
         }
@@ -154,4 +165,61 @@ 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(){
+        return platAppOrgMapper.getProjectCameraNumList();
+    }
+
+    public int getConnectUnitNum(){
+        return platAppOrgMapper.getConnectUnitNum();
+    }
+
+    public List<PlatAppOrg> getAllCameraCondition(){
+        return platAppOrgMapper.getAllCameraCondition();
+    }
+
+    public PlatAppOrg getCameraConditionByAppOrg(String appOrg){
+        return platAppOrgMapper.getCameraConditionByAppOrg(appOrg);
+    }
 }

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

@@ -119,8 +119,8 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         String publicEnergy = jsonObject.getString("publicEnergy");
         String grennEnergy = jsonObject.getString("grennEnergy");
         Map<String, Object> data = new HashMap<>();
-        data.put("普通", publicEnergy);
-        data.put("绿电", grennEnergy);
+        data.put("publicEnergy", "30");
+        data.put("grennEnergy", grennEnergy);
         return data;
     }
 

project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeProjectService.java

@@ -87,11 +87,13 @@ public interface ILargeProjectService extends IService<LargeProject> {
      */
     public void reallyDeleteLargeProject(LambdaQueryWrapper<LargeProject> lqw);
 
+    public Long getProjectNum();
+
     public List<LargeProject> getProjectNumX();
 
     public List<LargeProject> getProjectNumY();
 
-    public List<LargeProject> getCameraNumList(String unitCode);
+    public List<LargeProject> getCameraNumList(String appOrg);
 
     public int getProjectNumThisWeek();
 }

project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeUnitService.java

@@ -1,97 +0,0 @@
-package com.project.zcustom.service.unit;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.zcustom.domain.addional.LargeUnit;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.project.common.core.domain.search.PageParamVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import java.util.List;
-
-/**
- * 地区编码Service接口
- *
- * @author change
- * @date 2024-12-30
- */
-public interface ILargeUnitService extends IService<LargeUnit> {
-
-    /**
-     * 分页查询地区编码列表
-     *
-     * @param largeUnit 地区编码
-     * @return 地区编码集合
-     */
-    public IPage<LargeUnit> pagingLargeUnitList(LargeUnit largeUnit);
-
-    /**
-     * 分页查询地区编码列表
-     *
-     * @param lqw
-     * @return 地区编码集合
-     */
-    public IPage<LargeUnit> pagingLargeUnitList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeUnit> lqw);
-
-    /**
-     * 查询地区编码列表
-     *
-     * @param largeUnit 地区编码
-     * @return 地区编码集合
-     */
-    public List<LargeUnit> selectLargeUnitList(LargeUnit largeUnit);
-
-    /**
-     * 查询地区编码列表
-     *
-     * @param largeUnit 地区编码
-     * @return 地区编码集合
-     */
-    public List<LargeUnit> selectLargeUnitList(LargeUnit largeUnit,Long limitNum);
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 地区编码
-     */
-    public LargeUnit getLargeUnitByField(String field, String filedValue);
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 地区编码
-     */
-    public List<LargeUnit> selectLargeUnitListByField(String field, String filedValue);
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 地区编码
-     */
-    public List<LargeUnit> selectLargeUnitListByField(String field, String filedValue,Long limitNum);
-
-    /**
-     *判断指定字段值是否存在
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     */
-    public void checkFieldExist(String field, String filedValue,String tips,Long id);
-
-    /**
-     *  真删接口
-     */
-    public void reallyDeleteLargeUnit(LambdaQueryWrapper<LargeUnit> lqw);
-
-    public List<LargeUnit> getProjectCameraNumList();
-
-    public int getConnectUnitNum();
-
-    public List<LargeUnit> getAllCameraCondition();
-
-    public LargeUnit getCameraConditionByAppOrg(String appOrg);
-}

project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeProjectServiceImpl.java

@@ -35,8 +35,8 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
                         if (StringUtils.isNotBlank(largeProject.getProjectName())){
                         lqw.like(LargeProject::getProjectName ,largeProject.getProjectName());
                     }
-                        if (StringUtils.isNotNull(largeProject.getUnitCode())){
-                        lqw.eq(LargeProject::getUnitCode ,largeProject.getUnitCode());
+                        if (StringUtils.isNotNull(largeProject.getAppOrg())){
+                        lqw.eq(LargeProject::getAppOrg ,largeProject.getAppOrg());
                     }
                         if (StringUtils.isNotBlank(largeProject.getConnectFlag())){
                         lqw.eq(LargeProject::getConnectFlag ,largeProject.getConnectFlag());
@@ -169,6 +169,10 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
         baseMapper.reallyDeleteByWrapper(lqw);
     }
 
+    public Long getProjectNum(){
+        return largeProjectMapper.getProjectNum();
+    }
+
     public List<LargeProject> getProjectNumX() {
         return largeProjectMapper.getProjectNumX();
     }
@@ -176,8 +180,8 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
         return largeProjectMapper.getProjectNumY();
     }
 
-    public List<LargeProject> getCameraNumList(String unitCode){
-        return largeProjectMapper.getCameraNumList(unitCode);
+    public List<LargeProject> getCameraNumList(String appOrg){
+        return largeProjectMapper.getCameraNumList(appOrg);
     }
 
     public int getProjectNumThisWeek(){

project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeUnitServiceImpl.java

@@ -1,184 +0,0 @@
-package com.project.zcustom.service.unit.impl;
-
-import com.project.zcustom.domain.addional.LargeUnit;
-import com.project.zcustom.mapper.unit.LargeUnitMapper;
-import com.project.zcustom.service.unit.ILargeUnitService;
-import com.project.common.core.domain.search.PageParamVo;
-import org.springframework.beans.factory.annotation.Autowired;
-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.common.utils.StringUtils;
-
-import java.util.List;
-
-/**
- * 地区编码Service业务层处理
- *
- * @author change
- * @date 2024-12-30
- */
-@Service
-public class LargeUnitServiceImpl extends ServiceImpl<LargeUnitMapper, LargeUnit> implements ILargeUnitService {
-
-    @Autowired
-    private LargeUnitMapper largeUnitMapper;
-
-    /**
-     * 组装查询条件
-     */
-    private LambdaQueryWrapper<LargeUnit> getLambdaQueryWrapper(LargeUnit largeUnit) {
-        LambdaQueryWrapper<LargeUnit> lqw = new LambdaQueryWrapper<LargeUnit>();
-                        if (StringUtils.isNotBlank(largeUnit.getUnitCode())){
-                        lqw.eq(LargeUnit::getUnitCode ,largeUnit.getUnitCode());
-                    }
-                        if (StringUtils.isNotBlank(largeUnit.getUnitName())){
-                        lqw.like(LargeUnit::getUnitName ,largeUnit.getUnitName());
-                    }
-        return lqw;
-    }
-
-    /**
-     * 分页查询地区编码列表
-     *
-     * @param largeUnit 地区编码
-     * @return 地区编码集合
-     */
-    @Override
-    public IPage<LargeUnit> pagingLargeUnitList(LargeUnit largeUnit) {
-        IPage<LargeUnit> page = new Page<>(largeUnit.getPageNum(), largeUnit.getPageSize());
-        LambdaQueryWrapper<LargeUnit> lqw = getLambdaQueryWrapper(largeUnit);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(LargeUnit::getCreateTime);
-        return baseMapper.selectPage(page, lqw);
-    }
-
-    /**
-     * 分页查询地区编码列表
-     *
-     * @param lqw
-     * @return 地区编码集合
-     */
-    @Override
-    public IPage<LargeUnit> pagingLargeUnitList(PageParamVo pageParamVo, LambdaQueryWrapper<LargeUnit> lqw) {
-        IPage<LargeUnit> page = new Page<>(pageParamVo.getPageNum(), pageParamVo.getPageSize());
-        // 排序 默认时间倒序
-        lqw.orderByDesc(LargeUnit::getCreateTime);
-        return baseMapper.selectPage(page, lqw);
-    }
-
-    /**
-     * 查询地区编码列表
-     *
-     * @param largeUnit 地区编码
-     * @return 地区编码
-     */
-    @Override
-    public List<LargeUnit> selectLargeUnitList(LargeUnit largeUnit) {
-        LambdaQueryWrapper<LargeUnit> lqw = getLambdaQueryWrapper(largeUnit);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(LargeUnit::getCreateTime);
-        return baseMapper.selectList(lqw);
-    }
-
-    /**
-     * 查询地区编码列表
-     *
-     * @param largeUnit 地区编码
-     * @return 地区编码
-     */
-    @Override
-    public List<LargeUnit> selectLargeUnitList(LargeUnit largeUnit,Long limitNum) {
-        LambdaQueryWrapper<LargeUnit> lqw = getLambdaQueryWrapper(largeUnit);
-        // 排序 默认时间倒序
-        lqw.orderByDesc(LargeUnit::getCreateTime);
-        lqw.last("limit "+limitNum);
-        return baseMapper.selectList(lqw);
-    }
-
-    /**
-     * 根据指定字段查询信息
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 地区编码
-     */
-    @Override
-    public LargeUnit getLargeUnitByField(String field, String filedValue) {
-        QueryWrapper<LargeUnit> lqw = new QueryWrapper<LargeUnit>();
-        lqw.eq(field, filedValue);
-        lqw.last("limit 1");
-        return this.getOne(lqw, false);
-    }
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 地区编码
-     */
-    @Override
-    public List<LargeUnit> selectLargeUnitListByField(String field, String filedValue,Long limitNum) {
-        QueryWrapper<LargeUnit> lqw = new QueryWrapper<LargeUnit>();
-        lqw.eq(field, filedValue);
-        lqw.last("limit "+limitNum);
-        return this.list(lqw);
-    }
-
-    /**
-     * 根据指定字段查询信息列表
-     *
-     * @param field 字段名称
-     * @param filedValue 字段值
-     * @return 地区编码
-     */
-    @Override
-    public List<LargeUnit> selectLargeUnitListByField(String field, String filedValue) {
-        QueryWrapper<LargeUnit> lqw = new QueryWrapper<LargeUnit>();
-        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<LargeUnit> lqw = new QueryWrapper<LargeUnit>();
-        lqw.eq(field, filedValue);
-        lqw.ne("id", id);
-        if(this.getOne(lqw,false) != null){
-            throw new RuntimeException(tips + "已存在");
-        }
-    }
-    /**
-     *  真删接口
-     */
-    @Override
-    public void reallyDeleteLargeUnit(LambdaQueryWrapper<LargeUnit> lqw){
-        baseMapper.reallyDeleteByWrapper(lqw);
-    }
-
-    public List<LargeUnit> getProjectCameraNumList(){
-        return largeUnitMapper.getProjectCameraNumList();
-    }
-
-    public int getConnectUnitNum(){
-        return largeUnitMapper.getConnectUnitNum();
-    }
-
-    public List<LargeUnit> getAllCameraCondition(){
-        return largeUnitMapper.getAllCameraCondition();
-    }
-
-    public LargeUnit getCameraConditionByAppOrg(String appOrg){
-        return largeUnitMapper.getCameraConditionByAppOrg(appOrg);
-    }
-}

project-zcustom/src/main/resources/mapper/zcustom/basics/PlatAppOrgMapper.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.project.zcustom.mapper.basics.PlatAppOrgMapper">
+
+    <resultMap type="com.project.zcustom.domain.basics.PlatAppOrg" id="LargeUnitResult">
+        <result property="id"    column="id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="connectFlag"    column="connect_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="appOrg"    column="app_code"    />
+        <result property="appName"    column="app_name"    />
+        <result property="appParentOrg"    column="app_parent_org"    />
+    </resultMap>
+
+    <select id="getProjectCameraNumList" resultMap="LargeUnitResult">
+        SELECT
+            c.app_name,
+            COUNT(*) AS projectNum,
+            SUM(t.cameraNum) AS cameraNum
+        FROM
+            (
+                SELECT
+                    a.unit_code,
+                    COUNT(
+                            IF
+                                ( a.del_flag = 0 AND b.del_flag = 0, 1, NULL )) AS cameraNum
+                FROM
+                    large_plat_project a
+                        LEFT JOIN large_plat_camera b ON a.id = b.project_id
+                WHERE a.del_flag = 0
+                GROUP BY a.id
+            ) t
+                LEFT JOIN large_plat_app_org c ON t.unit_code = c.app_org
+        WHERE c.del_flag = 0
+        GROUP BY
+            c.id
+    </select>
+
+    <select id="getConnectUnitNum" resultType="int">
+        select count(*) from large_plat_app_org
+        where connect_flag = '0' and del_flag = '0'
+    </select>
+
+    <select id="getAllCameraCondition" resultMap="LargeUnitResult">
+        SELECT
+            c.app_org,
+            c.app_name,
+            COUNT(
+                    IF
+                        ( a.del_flag = 0 AND a.connect_flag = 0, 1, NULL )) AS cameraNum,
+            COUNT(
+                    IF
+                        ( a.del_flag = 0 AND a.connect_flag = 0 AND a.online_flag = 0, 1, NULL )) AS onlineCameraNum
+        FROM
+            `large_plat_camera` a
+                LEFT JOIN large_plat_project b ON a.project_id = b.id
+                LEFT JOIN large_plat_app_org c ON b.unit_code = c.app_org
+        GROUP BY
+            c.unit_code
+    </select>
+
+    <select id="getCameraConditionByAppOrg" parameterType="String" resultMap="LargeUnitResult">
+        SELECT
+            c.app_org,
+            c.app_name,
+            COUNT(
+                    IF
+                        ( a.del_flag = 0 AND a.connect_flag = 0, 1, NULL )) AS cameraNum,
+            COUNT(
+                    IF
+                        ( a.del_flag = 0 AND a.connect_flag = 0 AND a.online_flag = 0, 1, NULL )) AS onlineCameraNum
+        FROM
+            `large_plat_camera` a
+                LEFT JOIN large_plat_project b ON a.project_id = b.id
+                LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
+        WHERE
+            c.app_org = #{appOrg}
+    </select>
+</mapper>

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeProjectMapper.xml

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.project.zcustom.domain.addional.LargeProject" id="LargeProjectResult">
         <result property="id"    column="id"    />
         <result property="projectName"    column="project_name"    />
-        <result property="unitCode"    column="unit_code"    />
+        <result property="appOrg"    column="app_org"    />
         <result property="connectFlag"    column="connect_flag"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="subdivision"    column="subdivision"    />
@@ -18,14 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLargeProjectVo">
-        select id, project_name, unit_code, connect_flag, del_flag, create_by, create_time, update_by, update_time from large_plat_project
+        select id, project_name, app_org, connect_flag, del_flag, create_by, create_time, update_by, update_time from large_plat_project
     </sql>
 
     <select id="selectLargeProjectList" parameterType="LargeProject" resultMap="LargeProjectResult">
         <include refid="selectLargeProjectVo"/>
         <where>
             <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
-            <if test="unitCode != null "> and unit_code = #{unitCode}</if>
+            <if test="appOrg != null "> and app_org = #{appOrg}</if>
             <if test="connectFlag != null  and connectFlag != ''"> and connect_flag = #{connectFlag}</if>
         </where>
     </select>
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into large_plat_project
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectName != null">project_name,</if>
-            <if test="unitCode != null">unit_code,</if>
+            <if test="appOrg != null">app_org,</if>
             <if test="connectFlag != null">connect_flag,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectName != null">#{projectName},</if>
-            <if test="unitCode != null">#{unitCode},</if>
+            <if test="appOrg != null">#{appOrg},</if>
             <if test="connectFlag != null">#{connectFlag},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update large_plat_project
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectName != null">project_name = #{projectName},</if>
-            <if test="unitCode != null">unit_code = #{unitCode},</if>
+            <if test="appOrg != null">app_org = #{appOrg},</if>
             <if test="connectFlag != null">connect_flag = #{connectFlag},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -83,6 +83,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DELETE FROM large_plat_project ${ew.customSqlSegment}
     </delete>
 
+    <select id="getProjectNum" resultType="Long">
+        select count(*) as num from large_plat_project
+        where del_flag = '0'
+    </select>
+
     <select id="getProjectNumX" parameterType="String" resultMap="LargeProjectResult">
         select count(*) as num, subdivision from large_plat_project
         where del_flag = '0' and subdivision &lt;= 10
@@ -104,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             large_plat_project a
                 LEFT JOIN large_plat_camera b ON a.id = b.project_id
-        WHERE a.del_flag = 0 AND a.unit_code = #{unitCode}
+        WHERE a.del_flag = 0 AND a.app_org = #{appOrg}
         GROUP BY a.id
     </select>
 

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeUnitMapper.xml

@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.project.zcustom.mapper.unit.LargeUnitMapper">
-
-    <resultMap type="com.project.zcustom.domain.addional.LargeUnit" id="LargeUnitResult">
-        <result property="id"    column="id"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="connectFlag"    column="connect_flag"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="unitCode"    column="unit_code"    />
-        <result property="unitName"    column="unit_name"    />
-        <result property="parentUnitCode"    column="parent_unit_code"    />
-    </resultMap>
-
-    <sql id="selectLargeUnitVo">
-        select id, del_flag, connect_flag, create_by, create_time, update_by, update_time, unit_name, unit_code, parent_unit_code from large_plat_unit
-    </sql>
-
-    <select id="selectLargeUnitList" parameterType="LargeUnit" resultMap="LargeUnitResult">
-        <include refid="selectLargeUnitVo"/>
-        <where>
-            <if test="unitCode != null  and unitCode != ''"> and unit_code = #{unitCode}</if>
-            <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
-        </where>
-    </select>
-
-    <select id="selectLargeUnitById" parameterType="Long" resultMap="LargeUnitResult">
-        <include refid="selectLargeUnitVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertLargeUnit" parameterType="LargeUnit" useGeneratedKeys="true" keyProperty="id">
-        insert into large_plat_unit
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="appOrg != null">app_org,</if>
-            <if test="appName != null">app_name,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="appOrg != null">#{appOrg},</if>
-            <if test="appName != null">#{appName},</if>
-         </trim>
-    </insert>
-
-    <update id="updateLargeUnit" parameterType="LargeUnit">
-        update large_plat_unit
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="appOrg != null">app_org = #{appOrg},</if>
-            <if test="appName != null">app_name = #{appName},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteLargeUnitById" parameterType="Long">
-        delete from large_plat_unit where id = #{id}
-    </delete>
-
-    <delete id="deleteLargeUnitByIds" parameterType="String">
-        delete from large_plat_unit where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-    <delete id="reallyDeleteByWrapper">
-        DELETE FROM large_plat_unit ${ew.customSqlSegment}
-    </delete>
-
-    <select id="getProjectCameraNumList" resultMap="LargeUnitResult">
-        SELECT
-            c.unit_name,
-            COUNT(*) AS projectNum,
-            SUM(t.cameraNum) AS cameraNum
-        FROM
-            (
-                SELECT
-                    a.unit_code,
-                    COUNT(
-                            IF
-                                ( a.del_flag = 0 AND b.del_flag = 0, 1, NULL )) AS cameraNum
-                FROM
-                    large_plat_project a
-                        LEFT JOIN large_plat_camera b ON a.id = b.project_id
-                WHERE a.del_flag = 0
-                GROUP BY a.id
-            ) t
-                LEFT JOIN large_plat_unit c ON t.unit_code = c.unit_code
-        WHERE c.del_flag = 0
-        GROUP BY
-            c.id
-    </select>
-
-
-    <select id="getConnectUnitNum" resultType="int">
-        select count(*) from large_plat_unit
-        where connect_flag = '0' and del_flag = '0'
-    </select>
-
-    <select id="getAllCameraCondition" resultMap="LargeUnitResult">
-        SELECT
-            c.unit_code,
-            c.unit_name,
-            COUNT(
-                    IF
-                        ( a.del_flag = 0 AND a.connect_flag = 0, 1, NULL )) AS cameraNum,
-            COUNT(
-                    IF
-                        ( a.del_flag = 0 AND a.connect_flag = 0 AND a.online_flag = 0, 1, NULL )) AS onlineCameraNum
-        FROM
-            `large_plat_camera` a
-                LEFT JOIN large_plat_project b ON a.project_id = b.id
-                LEFT JOIN large_plat_unit c ON b.unit_code = c.unit_code
-        GROUP BY
-            c.unit_code
-    </select>
-
-    <select id="getCameraConditionByAppOrg" parameterType="String" resultMap="LargeUnitResult">
-        SELECT
-            c.unit_code,
-            c.unit_name,
-            COUNT(
-                    IF
-                        ( a.del_flag = 0 AND a.connect_flag = 0, 1, NULL )) AS cameraNum,
-            COUNT(
-                    IF
-                        ( a.del_flag = 0 AND a.connect_flag = 0 AND a.online_flag = 0, 1, NULL )) AS onlineCameraNum
-        FROM
-            `large_plat_camera` a
-                LEFT JOIN large_plat_project b ON a.project_id = b.id
-                LEFT JOIN large_plat_unit c ON b.unit_code = c.unit_code
-        WHERE
-            c.unit_code = #{unitCode}
-    </select>
-</mapper>