修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZAreaController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZAreaVo;
-import com.ruoyi.zdsz.domain.bo.ZAreaBo;
-import com.ruoyi.zdsz.service.IZAreaService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 小区管理
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/area")
-public class ZAreaController extends BaseController {
-
-    private final IZAreaService iZAreaService;
-
-    /**
-     * 查询小区管理列表
-     */
-    @SaCheckPermission("zdsz:area:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZAreaVo> list(ZAreaBo bo, PageQuery pageQuery) {
-        return iZAreaService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出小区管理列表
-     */
-    @SaCheckPermission("zdsz:area:export")
-    @Log(title = "小区管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZAreaBo bo, HttpServletResponse response) {
-        List<ZAreaVo> list = iZAreaService.queryList(bo);
-        ExcelUtil.exportExcel(list, "小区管理", ZAreaVo.class, response);
-    }
-
-    /**
-     * 获取小区管理详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:area:query")
-    @GetMapping("/{id}")
-    public R<ZAreaVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZAreaService.queryById(id));
-    }
-
-    /**
-     * 新增小区管理
-     */
-    @SaCheckPermission("zdsz:area:add")
-    @Log(title = "小区管理", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZAreaBo bo) {
-        return toAjax(iZAreaService.insertByBo(bo));
-    }
-
-    /**
-     * 修改小区管理
-     */
-    @SaCheckPermission("zdsz:area:edit")
-    @Log(title = "小区管理", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZAreaBo bo) {
-        return toAjax(iZAreaService.updateByBo(bo));
-    }
-
-    /**
-     * 删除小区管理
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:area:remove")
-    @Log(title = "小区管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZAreaService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZBuildingController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
-import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
-import com.ruoyi.zdsz.service.IZBuildingService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 楼宇管理
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/building")
-public class ZBuildingController extends BaseController {
-
-    private final IZBuildingService iZBuildingService;
-
-    /**
-     * 查询楼宇管理列表
-     */
-    @SaCheckPermission("zdsz:building:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZBuildingVo> list(ZBuildingBo bo, PageQuery pageQuery) {
-        return iZBuildingService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出楼宇管理列表
-     */
-    @SaCheckPermission("zdsz:building:export")
-    @Log(title = "楼宇管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZBuildingBo bo, HttpServletResponse response) {
-        List<ZBuildingVo> list = iZBuildingService.queryList(bo);
-        ExcelUtil.exportExcel(list, "楼宇管理", ZBuildingVo.class, response);
-    }
-
-    /**
-     * 获取楼宇管理详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:building:query")
-    @GetMapping("/{id}")
-    public R<ZBuildingVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZBuildingService.queryById(id));
-    }
-
-    /**
-     * 新增楼宇管理
-     */
-    @SaCheckPermission("zdsz:building:add")
-    @Log(title = "楼宇管理", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZBuildingBo bo) {
-        return toAjax(iZBuildingService.insertByBo(bo));
-    }
-
-    /**
-     * 修改楼宇管理
-     */
-    @SaCheckPermission("zdsz:building:edit")
-    @Log(title = "楼宇管理", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZBuildingBo bo) {
-        return toAjax(iZBuildingService.updateByBo(bo));
-    }
-
-    /**
-     * 删除楼宇管理
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:building:remove")
-    @Log(title = "楼宇管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZBuildingService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngiineeringPhotoController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
-import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 照片
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engiineeringPhoto")
-public class ZEngiineeringPhotoController extends BaseController {
-
-    private final IZEngiineeringPhotoService iZEngiineeringPhotoService;
-
-    /**
-     * 查询照片列表
-     */
-    @SaCheckPermission("zdsz:engiineeringPhoto:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngiineeringPhotoVo> list(ZEngiineeringPhotoBo bo, PageQuery pageQuery) {
-        return iZEngiineeringPhotoService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出照片列表
-     */
-    @SaCheckPermission("zdsz:engiineeringPhoto:export")
-    @Log(title = "照片", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngiineeringPhotoBo bo, HttpServletResponse response) {
-        List<ZEngiineeringPhotoVo> list = iZEngiineeringPhotoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "照片", ZEngiineeringPhotoVo.class, response);
-    }
-
-    /**
-     * 获取照片详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engiineeringPhoto:query")
-    @GetMapping("/{id}")
-    public R<ZEngiineeringPhotoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngiineeringPhotoService.queryById(id));
-    }
-
-    /**
-     * 新增照片
-     */
-    @SaCheckPermission("zdsz:engiineeringPhoto:add")
-    @Log(title = "照片", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngiineeringPhotoBo bo) {
-        return toAjax(iZEngiineeringPhotoService.insertByBo(bo));
-    }
-
-    /**
-     * 修改照片
-     */
-    @SaCheckPermission("zdsz:engiineeringPhoto:edit")
-    @Log(title = "照片", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngiineeringPhotoBo bo) {
-        return toAjax(iZEngiineeringPhotoService.updateByBo(bo));
-    }
-
-    /**
-     * 删除照片
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engiineeringPhoto:remove")
-    @Log(title = "照片", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngiineeringPhotoService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringCivilController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
-import com.ruoyi.zdsz.service.IZEngineeringCivilService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 民用工程
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringCivil")
-public class ZEngineeringCivilController extends BaseController {
-
-    private final IZEngineeringCivilService iZEngineeringCivilService;
-
-    /**
-     * 查询民用工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringCivil:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringCivilVo> list(ZEngineeringCivilBo bo, PageQuery pageQuery) {
-        return iZEngineeringCivilService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出民用工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringCivil:export")
-    @Log(title = "民用工程", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringCivilBo bo, HttpServletResponse response) {
-        List<ZEngineeringCivilVo> list = iZEngineeringCivilService.queryList(bo);
-        ExcelUtil.exportExcel(list, "民用工程", ZEngineeringCivilVo.class, response);
-    }
-
-    /**
-     * 获取民用工程详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringCivil:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringCivilVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngineeringCivilService.queryById(id));
-    }
-
-    /**
-     * 新增民用工程
-     */
-    @SaCheckPermission("zdsz:engineeringCivil:add")
-    @Log(title = "民用工程", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringCivilBo bo) {
-        return toAjax(iZEngineeringCivilService.insertByBo(bo));
-    }
-
-    /**
-     * 修改民用工程
-     */
-    @SaCheckPermission("zdsz:engineeringCivil:edit")
-    @Log(title = "民用工程", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringCivilBo bo) {
-        return toAjax(iZEngineeringCivilService.updateByBo(bo));
-    }
-
-    /**
-     * 删除民用工程
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringCivil:remove")
-    @Log(title = "民用工程", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngineeringCivilService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringDangerousController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringDangerousBo;
-import com.ruoyi.zdsz.service.IZEngineeringDangerousService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 危险工程
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringDangerous")
-public class ZEngineeringDangerousController extends BaseController {
-
-    private final IZEngineeringDangerousService iZEngineeringDangerousService;
-
-    /**
-     * 查询危险工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringDangerous:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringDangerousVo> list(ZEngineeringDangerousBo bo, PageQuery pageQuery) {
-        return iZEngineeringDangerousService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出危险工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringDangerous:export")
-    @Log(title = "危险工程", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringDangerousBo bo, HttpServletResponse response) {
-        List<ZEngineeringDangerousVo> list = iZEngineeringDangerousService.queryList(bo);
-        ExcelUtil.exportExcel(list, "危险工程", ZEngineeringDangerousVo.class, response);
-    }
-
-    /**
-     * 获取危险工程详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringDangerous:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringDangerousVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngineeringDangerousService.queryById(id));
-    }
-
-    /**
-     * 新增危险工程
-     */
-    @SaCheckPermission("zdsz:engineeringDangerous:add")
-    @Log(title = "危险工程", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringDangerousBo bo) {
-        return toAjax(iZEngineeringDangerousService.insertByBo(bo));
-    }
-
-    /**
-     * 修改危险工程
-     */
-    @SaCheckPermission("zdsz:engineeringDangerous:edit")
-    @Log(title = "危险工程", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringDangerousBo bo) {
-        return toAjax(iZEngineeringDangerousService.updateByBo(bo));
-    }
-
-    /**
-     * 删除危险工程
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringDangerous:remove")
-    @Log(title = "危险工程", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngineeringDangerousService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringIndustryController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
-import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 工业工程|市政工程
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringIndustry")
-public class ZEngineeringIndustryController extends BaseController {
-
-    private final IZEngineeringIndustryService iZEngineeringIndustryService;
-
-    /**
-     * 查询工业工程|市政工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringIndustry:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringIndustryVo> list(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
-        return iZEngineeringIndustryService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出工业工程|市政工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringIndustry:export")
-    @Log(title = "工业工程|市政工程", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringIndustryBo bo, HttpServletResponse response) {
-        List<ZEngineeringIndustryVo> list = iZEngineeringIndustryService.queryList(bo);
-        ExcelUtil.exportExcel(list, "工业工程|市政工程", ZEngineeringIndustryVo.class, response);
-    }
-
-    /**
-     * 获取工业工程|市政工程详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringIndustry:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringIndustryVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngineeringIndustryService.queryById(id));
-    }
-
-    /**
-     * 新增工业工程|市政工程
-     */
-    @SaCheckPermission("zdsz:engineeringIndustry:add")
-    @Log(title = "工业工程|市政工程", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringIndustryBo bo) {
-        return toAjax(iZEngineeringIndustryService.insertByBo(bo));
-    }
-
-    /**
-     * 修改工业工程|市政工程
-     */
-    @SaCheckPermission("zdsz:engineeringIndustry:edit")
-    @Log(title = "工业工程|市政工程", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringIndustryBo bo) {
-        return toAjax(iZEngineeringIndustryService.updateByBo(bo));
-    }
-
-    /**
-     * 删除工业工程|市政工程
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringIndustry:remove")
-    @Log(title = "工业工程|市政工程", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngineeringIndustryService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringInfoController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
-import com.ruoyi.zdsz.service.IZEngineeringInfoService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 工程详情
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringInfo")
-public class ZEngineeringInfoController extends BaseController {
-
-    private final IZEngineeringInfoService iZEngineeringInfoService;
-
-    /**
-     * 查询工程详情列表
-     */
-    @SaCheckPermission("zdsz:engineeringInfo:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringInfoVo> list(ZEngineeringInfoBo bo, PageQuery pageQuery) {
-        return iZEngineeringInfoService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出工程详情列表
-     */
-    @SaCheckPermission("zdsz:engineeringInfo:export")
-    @Log(title = "工程详情", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringInfoBo bo, HttpServletResponse response) {
-        List<ZEngineeringInfoVo> list = iZEngineeringInfoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "工程详情", ZEngineeringInfoVo.class, response);
-    }
-
-    /**
-     * 获取工程详情详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringInfo:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringInfoVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngineeringInfoService.queryById(id));
-    }
-
-    /**
-     * 新增工程详情
-     */
-    @SaCheckPermission("zdsz:engineeringInfo:add")
-    @Log(title = "工程详情", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringInfoBo bo) {
-        return toAjax(iZEngineeringInfoService.insertByBo(bo));
-    }
-
-    /**
-     * 修改工程详情
-     */
-    @SaCheckPermission("zdsz:engineeringInfo:edit")
-    @Log(title = "工程详情", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringInfoBo bo) {
-        return toAjax(iZEngineeringInfoService.updateByBo(bo));
-    }
-
-    /**
-     * 删除工程详情
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringInfo:remove")
-    @Log(title = "工程详情", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngineeringInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringInfrastructureController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
-import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 基建工程
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringInfrastructure")
-public class ZEngineeringInfrastructureController extends BaseController {
-
-    private final IZEngineeringInfrastructureService iZEngineeringInfrastructureService;
-
-    /**
-     * 查询基建工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringInfrastructureVo> list(ZEngineeringInfrastructureBo bo, PageQuery pageQuery) {
-        return iZEngineeringInfrastructureService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出基建工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:export")
-    @Log(title = "基建工程", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringInfrastructureBo bo, HttpServletResponse response) {
-        List<ZEngineeringInfrastructureVo> list = iZEngineeringInfrastructureService.queryList(bo);
-        ExcelUtil.exportExcel(list, "基建工程", ZEngineeringInfrastructureVo.class, response);
-    }
-
-    /**
-     * 获取基建工程详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringInfrastructureVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngineeringInfrastructureService.queryById(id));
-    }
-
-    /**
-     * 新增基建工程
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:add")
-    @Log(title = "基建工程", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringInfrastructureBo bo) {
-        return toAjax(iZEngineeringInfrastructureService.insertByBo(bo));
-    }
-
-    /**
-     * 修改基建工程
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:edit")
-    @Log(title = "基建工程", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringInfrastructureBo bo) {
-        return toAjax(iZEngineeringInfrastructureService.updateByBo(bo));
-    }
-
-    /**
-     * 删除基建工程
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:remove")
-    @Log(title = "基建工程", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngineeringInfrastructureService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringMaterialController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialBo;
-import com.ruoyi.zdsz.service.IZEngineeringMaterialService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 工程用料
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringMaterial")
-public class ZEngineeringMaterialController extends BaseController {
-
-    private final IZEngineeringMaterialService iZEngineeringMaterialService;
-
-    /**
-     * 查询工程用料列表
-     */
-    @SaCheckPermission("zdsz:engineeringMaterial:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringMaterialVo> list(ZEngineeringMaterialBo bo, PageQuery pageQuery) {
-        return iZEngineeringMaterialService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出工程用料列表
-     */
-    @SaCheckPermission("zdsz:engineeringMaterial:export")
-    @Log(title = "工程用料", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringMaterialBo bo, HttpServletResponse response) {
-        List<ZEngineeringMaterialVo> list = iZEngineeringMaterialService.queryList(bo);
-        ExcelUtil.exportExcel(list, "工程用料", ZEngineeringMaterialVo.class, response);
-    }
-
-    /**
-     * 获取工程用料详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringMaterial:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringMaterialVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngineeringMaterialService.queryById(id));
-    }
-
-    /**
-     * 新增工程用料
-     */
-    @SaCheckPermission("zdsz:engineeringMaterial:add")
-    @Log(title = "工程用料", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringMaterialBo bo) {
-        return toAjax(iZEngineeringMaterialService.insertByBo(bo));
-    }
-
-    /**
-     * 修改工程用料
-     */
-    @SaCheckPermission("zdsz:engineeringMaterial:edit")
-    @Log(title = "工程用料", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringMaterialBo bo) {
-        return toAjax(iZEngineeringMaterialService.updateByBo(bo));
-    }
-
-    /**
-     * 删除工程用料
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringMaterial:remove")
-    @Log(title = "工程用料", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngineeringMaterialService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringMaterialsResetsController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialsResetsVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialsResetsBo;
-import com.ruoyi.zdsz.service.IZEngineeringMaterialsResetsService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 工程用料预设
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringMaterialsResets")
-public class ZEngineeringMaterialsResetsController extends BaseController {
-
-    private final IZEngineeringMaterialsResetsService iZEngineeringMaterialsResetsService;
-
-    /**
-     * 查询工程用料预设列表
-     */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringMaterialsResetsVo> list(ZEngineeringMaterialsResetsBo bo, PageQuery pageQuery) {
-        return iZEngineeringMaterialsResetsService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出工程用料预设列表
-     */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:export")
-    @Log(title = "工程用料预设", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringMaterialsResetsBo bo, HttpServletResponse response) {
-        List<ZEngineeringMaterialsResetsVo> list = iZEngineeringMaterialsResetsService.queryList(bo);
-        ExcelUtil.exportExcel(list, "工程用料预设", ZEngineeringMaterialsResetsVo.class, response);
-    }
-
-    /**
-     * 获取工程用料预设详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringMaterialsResetsVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngineeringMaterialsResetsService.queryById(id));
-    }
-
-    /**
-     * 新增工程用料预设
-     */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:add")
-    @Log(title = "工程用料预设", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringMaterialsResetsBo bo) {
-        return toAjax(iZEngineeringMaterialsResetsService.insertByBo(bo));
-    }
-
-    /**
-     * 修改工程用料预设
-     */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:edit")
-    @Log(title = "工程用料预设", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringMaterialsResetsBo bo) {
-        return toAjax(iZEngineeringMaterialsResetsService.updateByBo(bo));
-    }
-
-    /**
-     * 删除工程用料预设
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:remove")
-    @Log(title = "工程用料预设", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngineeringMaterialsResetsService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringNodeController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.zdsz.service.IZEngineeringNodeService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 工程节点
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringNode")
-public class ZEngineeringNodeController extends BaseController {
-
-    private final IZEngineeringNodeService iZEngineeringNodeService;
-
-    /**
-     * 查询工程节点列表
-     */
-    @SaCheckPermission("zdsz:engineeringNode:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringNodeVo> list(ZEngineeringNodeBo bo, PageQuery pageQuery) {
-        return iZEngineeringNodeService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出工程节点列表
-     */
-    @SaCheckPermission("zdsz:engineeringNode:export")
-    @Log(title = "工程节点", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringNodeBo bo, HttpServletResponse response) {
-        List<ZEngineeringNodeVo> list = iZEngineeringNodeService.queryList(bo);
-        ExcelUtil.exportExcel(list, "工程节点", ZEngineeringNodeVo.class, response);
-    }
-
-    /**
-     * 获取工程节点详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringNode:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringNodeVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngineeringNodeService.queryById(id));
-    }
-
-    /**
-     * 新增工程节点
-     */
-    @SaCheckPermission("zdsz:engineeringNode:add")
-    @Log(title = "工程节点", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringNodeBo bo) {
-        return toAjax(iZEngineeringNodeService.insertByBo(bo));
-    }
-
-    /**
-     * 修改工程节点
-     */
-    @SaCheckPermission("zdsz:engineeringNode:edit")
-    @Log(title = "工程节点", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringNodeBo bo) {
-        return toAjax(iZEngineeringNodeService.updateByBo(bo));
-    }
-
-    /**
-     * 删除工程节点
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringNode:remove")
-    @Log(title = "工程节点", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngineeringNodeService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringPipeJackingController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingBo;
-import com.ruoyi.zdsz.service.IZEngineeringPipeJackingService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 顶管工程
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringPipeJacking")
-public class ZEngineeringPipeJackingController extends BaseController {
-
-    private final IZEngineeringPipeJackingService iZEngineeringPipeJackingService;
-
-    /**
-     * 查询顶管工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringPipeJackingVo> list(ZEngineeringPipeJackingBo bo, PageQuery pageQuery) {
-        return iZEngineeringPipeJackingService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出顶管工程列表
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:export")
-    @Log(title = "顶管工程", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringPipeJackingBo bo, HttpServletResponse response) {
-        List<ZEngineeringPipeJackingVo> list = iZEngineeringPipeJackingService.queryList(bo);
-        ExcelUtil.exportExcel(list, "顶管工程", ZEngineeringPipeJackingVo.class, response);
-    }
-
-    /**
-     * 获取顶管工程详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringPipeJackingVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngineeringPipeJackingService.queryById(id));
-    }
-
-    /**
-     * 新增顶管工程
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:add")
-    @Log(title = "顶管工程", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringPipeJackingBo bo) {
-        return toAjax(iZEngineeringPipeJackingService.insertByBo(bo));
-    }
-
-    /**
-     * 修改顶管工程
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:edit")
-    @Log(title = "顶管工程", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringPipeJackingBo bo) {
-        return toAjax(iZEngineeringPipeJackingService.updateByBo(bo));
-    }
-
-    /**
-     * 删除顶管工程
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:remove")
-    @Log(title = "顶管工程", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngineeringPipeJackingService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringReviewController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
-import com.ruoyi.zdsz.service.IZEngineeringReviewService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 工程审核
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/engineeringReview")
-public class ZEngineeringReviewController extends BaseController {
-
-    private final IZEngineeringReviewService iZEngineeringReviewService;
-
-    /**
-     * 查询工程审核列表
-     */
-    @SaCheckPermission("zdsz:engineeringReview:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZEngineeringReviewVo> list(ZEngineeringReviewBo bo, PageQuery pageQuery) {
-        return iZEngineeringReviewService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出工程审核列表
-     */
-    @SaCheckPermission("zdsz:engineeringReview:export")
-    @Log(title = "工程审核", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZEngineeringReviewBo bo, HttpServletResponse response) {
-        List<ZEngineeringReviewVo> list = iZEngineeringReviewService.queryList(bo);
-        ExcelUtil.exportExcel(list, "工程审核", ZEngineeringReviewVo.class, response);
-    }
-
-    /**
-     * 获取工程审核详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:engineeringReview:query")
-    @GetMapping("/{id}")
-    public R<ZEngineeringReviewVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZEngineeringReviewService.queryById(id));
-    }
-
-    /**
-     * 新增工程审核
-     */
-    @SaCheckPermission("zdsz:engineeringReview:add")
-    @Log(title = "工程审核", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringReviewBo bo) {
-        return toAjax(iZEngineeringReviewService.insertByBo(bo));
-    }
-
-    /**
-     * 修改工程审核
-     */
-    @SaCheckPermission("zdsz:engineeringReview:edit")
-    @Log(title = "工程审核", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringReviewBo bo) {
-        return toAjax(iZEngineeringReviewService.updateByBo(bo));
-    }
-
-    /**
-     * 删除工程审核
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:engineeringReview:remove")
-    @Log(title = "工程审核", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZEngineeringReviewService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZHouseController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZHouseVo;
-import com.ruoyi.zdsz.domain.bo.ZHouseBo;
-import com.ruoyi.zdsz.service.IZHouseService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 房屋管理
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/house")
-public class ZHouseController extends BaseController {
-
-    private final IZHouseService iZHouseService;
-
-    /**
-     * 查询房屋管理列表
-     */
-    @SaCheckPermission("zdsz:house:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZHouseVo> list(ZHouseBo bo, PageQuery pageQuery) {
-        return iZHouseService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出房屋管理列表
-     */
-    @SaCheckPermission("zdsz:house:export")
-    @Log(title = "房屋管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZHouseBo bo, HttpServletResponse response) {
-        List<ZHouseVo> list = iZHouseService.queryList(bo);
-        ExcelUtil.exportExcel(list, "房屋管理", ZHouseVo.class, response);
-    }
-
-    /**
-     * 获取房屋管理详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:house:query")
-    @GetMapping("/{id}")
-    public R<ZHouseVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZHouseService.queryById(id));
-    }
-
-    /**
-     * 新增房屋管理
-     */
-    @SaCheckPermission("zdsz:house:add")
-    @Log(title = "房屋管理", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZHouseBo bo) {
-        return toAjax(iZHouseService.insertByBo(bo));
-    }
-
-    /**
-     * 修改房屋管理
-     */
-    @SaCheckPermission("zdsz:house:edit")
-    @Log(title = "房屋管理", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZHouseBo bo) {
-        return toAjax(iZHouseService.updateByBo(bo));
-    }
-
-    /**
-     * 删除房屋管理
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:house:remove")
-    @Log(title = "房屋管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZHouseService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZUnitController.java

@@ -1,108 +0,0 @@
-package com.ruoyi.web.controller.zdsz;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zdsz.domain.vo.ZUnitVo;
-import com.ruoyi.zdsz.domain.bo.ZUnitBo;
-import com.ruoyi.zdsz.service.IZUnitService;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 单元管理
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/zdsz/unit")
-public class ZUnitController extends BaseController {
-
-    private final IZUnitService iZUnitService;
-
-    /**
-     * 查询单元管理列表
-     */
-    @SaCheckPermission("zdsz:unit:list")
-    @GetMapping("/list")
-    public TableDataInfo<ZUnitVo> list(ZUnitBo bo, PageQuery pageQuery) {
-        return iZUnitService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 导出单元管理列表
-     */
-    @SaCheckPermission("zdsz:unit:export")
-    @Log(title = "单元管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(ZUnitBo bo, HttpServletResponse response) {
-        List<ZUnitVo> list = iZUnitService.queryList(bo);
-        ExcelUtil.exportExcel(list, "单元管理", ZUnitVo.class, response);
-    }
-
-    /**
-     * 获取单元管理详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("zdsz:unit:query")
-    @GetMapping("/{id}")
-    public R<ZUnitVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(iZUnitService.queryById(id));
-    }
-
-    /**
-     * 新增单元管理
-     */
-    @SaCheckPermission("zdsz:unit:add")
-    @Log(title = "单元管理", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZUnitBo bo) {
-        return toAjax(iZUnitService.insertByBo(bo));
-    }
-
-    /**
-     * 修改单元管理
-     */
-    @SaCheckPermission("zdsz:unit:edit")
-    @Log(title = "单元管理", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZUnitBo bo) {
-        return toAjax(iZUnitService.updateByBo(bo));
-    }
-
-    /**
-     * 删除单元管理
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("zdsz:unit:remove")
-    @Log(title = "单元管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(iZUnitService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZArea.java

@@ -1,72 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 小区管理对象 z_area
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_area")
-public class ZArea extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 小区名
-     */
-    private String name;
-    /**
-     * 负责工长
-     */
-    private Long userId;
-    /**
-     * 删除标志
-     */
-    @TableLogic
-    private String delFlag;
-    /**
-     * 是否释放
-     */
-    private String releaseIs;
-    /**
-     * 释放人
-     */
-    private String releaseBy;
-    /**
-     * 行政区（字典district）
-     */
-    private String district;
-    /**
-     * 
-     */
-    private String calculateDistrictId;
-    /**
-     * 
-     */
-    private String calculateDistrictName;
-    /**
-     * 
-     */
-    private Long areaSize;
-    /**
-     * 
-     */
-    private String affiliatedPackage;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZBuilding.java

@@ -1,44 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 楼宇管理对象 z_building
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_building")
-public class ZBuilding extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 楼宇名
-     */
-    private String name;
-    /**
-     * 小区id
-     */
-    private Long areaId;
-    /**
-     * 删除标志
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngiineeringPhoto.java

@@ -1,44 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 照片对象 z_engiineering_photo
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engiineering_photo")
-public class ZEngiineeringPhoto extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 上级id
-     */
-    private Long parentId;
-    /**
-     * 图片地址
-     */
-    private String picUrl;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringCivil.java

@@ -1,73 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 民用工程对象 z_engineering_civil
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_civil")
-public class ZEngineeringCivil extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 小区id
-     */
-    private Long areaId;
-    /**
-     * 楼宇id
-     */
-    private Long buildingId;
-    /**
-     * 单元id
-     */
-    private Long unitId;
-    /**
-     * 房间id
-     */
-    private Long houseId;
-    /**
-     * 工程类型
-     */
-    private String engineeringType;
-    /**
-     * 负责人id
-     */
-    private String headName;
-    /**
-     * 负责人电话
-     */
-    private String headPhone;
-    /**
-     * 工程分类
-     */
-    private String engineeringClassification;
-    /**
-     * 
-     */
-    @Version
-    private String version;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringDangerous.java

@@ -1,175 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 危险工程对象 z_engineering_dangerous
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_dangerous")
-public class ZEngineeringDangerous extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 作业基本信息
-     */
-    private String basicInformation;
-    /**
-     * 工程名称
-     */
-    private String enginName;
-    /**
-     * 工程地点
-     */
-    private String enginAddre;
-    /**
-     * 工程时间
-     */
-    private Date enginTime;
-    /**
-     * 管径
-     */
-    private String pipeDiameter;
-    /**
-     * 管材
-     */
-    private String tubularProduct;
-    /**
-     * 是否存在套管
-     */
-    private String casingPresent;
-    /**
-     * 管道压力
-     */
-    private String pipePressure;
-    /**
-     * 气源方向
-     */
-    private String gasSourceDirection;
-    /**
-     * 作业位置
-     */
-    private String taskPosition;
-    /**
-     * 与作业相关阀门位置
-     */
-    private String valvePosition;
-    /**
-     * 压力报告
-     */
-    private String stressReport;
-    /**
-     * 监理旁站记录
-     */
-    private String supervisionRecord;
-    /**
-     * 工作联系单
-     */
-    private String workContactForm;
-    /**
-     * 巡线确认单
-     */
-    private String linePatrolConfirmationForm;
-    /**
-     * 危险作业坑大小(长)
-     */
-    private Long hazardousWorkPitsLong;
-    /**
-     * 危险作业坑大小(宽)
-     */
-    private Long hazardousWorkPitsWide;
-    /**
-     * 危险作业坑大小(深)
-     */
-    private Long hazardousWorkPitsDeep;
-    /**
-     * 是否需要支护
-     */
-    private String needSupport;
-    /**
-     * 作业坑内其他管道情况
-     */
-    private String otherPipelineConditionsWorkPit;
-    /**
-     * 现场负责人
-     */
-    private String siteHead;
-    /**
-     * 现场负责人电话
-     */
-    private String siteHeadPhone;
-    /**
-     * 作业人员信息
-     */
-    private String operatorInformation;
-    /**
-     * 检口
-     */
-    private String inspectionPort;
-    /**
-     * 管道刷油
-     */
-    private String pipelinePainting;
-    /**
-     * 管道支护
-     */
-    private String pipelineSupport;
-    /**
-     * 管道防腐
-     */
-    private String pipelineCorrosionProtection;
-    /**
-     * 砌筑阀门井
-     */
-    private String masonryValveWell;
-    /**
-     * 保护井
-     */
-    private String protectionWell;
-    /**
-     * 管件保护井砌筑
-     */
-    private String pipeProtectionWelMasonry;
-    /**
-     * 回填
-     */
-    private String backfill;
-    /**
-     * 夯实
-     */
-    private String tamp;
-    /**
-     * 平整场地
-     */
-    private String levelingTheSite;
-    /**
-     * 
-     */
-    @Version
-    private String version;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringIndustry.java

@@ -1,85 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工业工程|市政工程对象 z_engineering_industry
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_industry")
-public class ZEngineeringIndustry extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 工程类型
-     */
-    private String engineeringType;
-    /**
-     * 建筑单位
-     */
-    private String constructUnit;
-    /**
-     * 项目负责人
-     */
-    private String projectHead;
-    /**
-     * 现场负责人
-     */
-    private String sceneHead;
-    /**
-     * 设计单位
-     */
-    private String designUnit;
-    /**
-     * 设计负责人
-     */
-    private String designHead;
-    /**
-     * 设计联系电话
-     */
-    private String designPhone;
-    /**
-     * 监理单位
-     */
-    private String supervisionUnit;
-    /**
-     * 监理负责人
-     */
-    private String supervisionHead;
-    /**
-     * 监理联系电话
-     */
-    private String supervisionPhone;
-    /**
-     * 类型(工业工程|市政工程)
-     */
-    private String type;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-    /**
-     * 
-     */
-    @Version
-    private String version;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringInfo.java

@@ -1,75 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程详情对象 z_engineering_info
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_info")
-public class ZEngineeringInfo extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 民用工程id
-     */
-    private Long engInfoId;
-    /**
-     * 施工地址
-     */
-    private String constructAddre;
-    /**
-     * 是否按图纸施工
-     */
-    private String constructAccordingDrawings;
-    /**
-     * 分段打压是否合格
-     */
-    private String segmentedCompressionQualified;
-    /**
-     * 回填时间
-     */
-    private Date backfillTime;
-    /**
-     * 施工人电话
-     */
-    private String constructPhone;
-    /**
-     * 施工人
-     */
-    private String constructUser;
-    /**
-     * 施工时间
-     */
-    private Date constructTime;
-    /**
-     * 
-     */
-    @Version
-    private String version;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringInfrastructure.java

@@ -1,71 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 基建工程对象 z_engineering_infrastructure
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_infrastructure")
-public class ZEngineeringInfrastructure extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 工程名称
-     */
-    private String enginName;
-    /**
-     * 工程地址
-     */
-    private String enginAddre;
-    /**
-     * 建设单位
-     */
-    private String constructUnit;
-    /**
-     * 开工时间
-     */
-    private Date startTime;
-    /**
-     * 计划工期
-     */
-    private String plannedDuration;
-    /**
-     * 竣工时间
-     */
-    private Date completedTime;
-    /**
-     * 工程内容
-     */
-    private String enginContent;
-    /**
-     * 
-     */
-    @Version
-    private String version;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringMaterial.java

@@ -1,61 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程用料对象 z_engineering_material
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_material")
-public class ZEngineeringMaterial extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 详情id
-     */
-    private Long detailsId;
-    /**
-     * 材质
-     */
-    private String materialQuality;
-    /**
-     * 规格
-     */
-    private String specifications;
-    /**
-     * 尺寸
-     */
-    private Long size;
-    /**
-     * 数量
-     */
-    private Long number;
-    /**
-     * 
-     */
-    @Version
-    private String version;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringMaterialsResets.java

@@ -1,56 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程用料预设对象 z_engineering_materials_resets
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_materials_resets")
-public class ZEngineeringMaterialsResets extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 
-     */
-    private Long areaId;
-    /**
-     * 材质
-     */
-    private String materialQuality;
-    /**
-     * 规格
-     */
-    private String estimatedSpecifications;
-    /**
-     * 预估尺寸
-     */
-    private Long estimatedSize;
-    /**
-     * 预估金额
-     */
-    private String estimatedAmount;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringNode.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程节点对象 z_engineering_node
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_node")
-public class ZEngineeringNode extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 民用工程id
-     */
-    private Long civliId;
-    /**
-     * 节点类型
-     */
-    private String type;
-    /**
-     * 
-     */
-    @Version
-    private String version;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringPipeJacking.java

@@ -1,69 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 顶管工程对象 z_engineering_pipe_jacking
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_pipe_jacking")
-public class ZEngineeringPipeJacking extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 工程名称
-     */
-    private String enginName;
-    /**
-     * 工程地址
-     */
-    private String enginAddre;
-    /**
-     * 工程编码
-     */
-    private String enginCode;
-    /**
-     * 施工单位
-     */
-    private String constructUnit;
-    /**
-     * 工程规模
-     */
-    private String enginScale;
-    /**
-     * 施工质量
-     */
-    private String constructQuality;
-    /**
-     * 施工进度
-     */
-    private String constructSchedule;
-    /**
-     * 
-     */
-    @Version
-    private String version;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringReview.java

@@ -1,63 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程审核对象 z_engineering_review
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_engineering_review")
-public class ZEngineeringReview extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 审核时间
-     */
-    private Date reviewTime;
-    /**
-     * 审核人
-     */
-    private String reviewUser;
-    /**
-     * 审核状态
-     */
-    private String reviewStatus;
-    /**
-     * 审核内容
-     */
-    private String reviewContent;
-    /**
-     * 节点ID
-     */
-    private Long engInfoId;
-    /**
-     * 
-     */
-    @Version
-    private String version;
-    /**
-     * 删除标识
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZHouse.java

@@ -1,44 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 房屋管理对象 z_house
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_house")
-public class ZHouse extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 房屋名
-     */
-    private String name;
-    /**
-     * 单元id
-     */
-    private Long unitId;
-    /**
-     * 删除标志
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZUnit.java

@@ -1,44 +0,0 @@
-package com.ruoyi.zdsz.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 单元管理对象 z_unit
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("z_unit")
-public class ZUnit extends BaseEntity {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id")
-    private Long id;
-    /**
-     * 单元名
-     */
-    private String name;
-    /**
-     * 楼宇id
-     */
-    private Long buildingId;
-    /**
-     * 删除标志
-     */
-    @TableLogic
-    private String delFlag;
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZAreaBo.java

@@ -1,85 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 小区管理业务对象 z_area
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZAreaBo extends BaseEntity {
-
-    /**
-     * 主键id
-     */
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 小区名
-     */
-    @NotBlank(message = "小区名不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String name;
-
-    /**
-     * 负责工长
-     */
-    @NotNull(message = "负责工长不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long userId;
-
-    /**
-     * 是否释放
-     */
-    @NotBlank(message = "是否释放不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String releaseIs;
-
-    /**
-     * 释放人
-     */
-    @NotBlank(message = "释放人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String releaseBy;
-
-    /**
-     * 行政区（字典district）
-     */
-    @NotBlank(message = "行政区（字典district）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String district;
-
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String calculateDistrictId;
-
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String calculateDistrictName;
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long areaSize;
-
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String affiliatedPackage;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZBuildingBo.java

@@ -1,43 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 楼宇管理业务对象 z_building
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZBuildingBo extends BaseEntity {
-
-    /**
-     * 主键id
-     */
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 楼宇名
-     */
-    @NotBlank(message = "楼宇名不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String name;
-
-    /**
-     * 小区id
-     */
-    @NotNull(message = "小区id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long areaId;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngiineeringPhotoBo.java

@@ -1,43 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 照片业务对象 z_engiineering_photo
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngiineeringPhotoBo extends BaseEntity {
-
-    /**
-     * 主键
-     */
-    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 上级id
-     */
-    @NotNull(message = "上级id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long parentId;
-
-    /**
-     * 图片地址
-     */
-    @NotBlank(message = "图片地址不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String picUrl;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringCivilBo.java

@@ -1,79 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 民用工程业务对象 z_engineering_civil
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringCivilBo extends BaseEntity {
-
-    /**
-     * 主键
-     */
-    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 小区id
-     */
-    @NotNull(message = "小区id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long areaId;
-
-    /**
-     * 楼宇id
-     */
-    @NotNull(message = "楼宇id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long buildingId;
-
-    /**
-     * 单元id
-     */
-    @NotNull(message = "单元id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long unitId;
-
-    /**
-     * 房间id
-     */
-    @NotNull(message = "房间id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long houseId;
-
-    /**
-     * 工程类型
-     */
-    @NotBlank(message = "工程类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engineeringType;
-
-    /**
-     * 负责人id
-     */
-    @NotBlank(message = "负责人id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String headName;
-
-    /**
-     * 负责人电话
-     */
-    @NotBlank(message = "负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String headPhone;
-
-    /**
-     * 工程分类
-     */
-    @NotBlank(message = "工程分类不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engineeringClassification;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringDangerousBo.java

@@ -1,231 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 危险工程业务对象 z_engineering_dangerous
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringDangerousBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 作业基本信息
-     */
-    @NotBlank(message = "作业基本信息不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String basicInformation;
-
-    /**
-     * 工程名称
-     */
-    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String enginName;
-
-    /**
-     * 工程地点
-     */
-    @NotBlank(message = "工程地点不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String enginAddre;
-
-    /**
-     * 工程时间
-     */
-    @NotNull(message = "工程时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date enginTime;
-
-    /**
-     * 管径
-     */
-    @NotBlank(message = "管径不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipeDiameter;
-
-    /**
-     * 管材
-     */
-    @NotBlank(message = "管材不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String tubularProduct;
-
-    /**
-     * 是否存在套管
-     */
-    @NotBlank(message = "是否存在套管不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String casingPresent;
-
-    /**
-     * 管道压力
-     */
-    @NotBlank(message = "管道压力不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipePressure;
-
-    /**
-     * 气源方向
-     */
-    @NotBlank(message = "气源方向不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String gasSourceDirection;
-
-    /**
-     * 作业位置
-     */
-    @NotBlank(message = "作业位置不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String taskPosition;
-
-    /**
-     * 与作业相关阀门位置
-     */
-    @NotBlank(message = "与作业相关阀门位置不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String valvePosition;
-
-    /**
-     * 压力报告
-     */
-    @NotBlank(message = "压力报告不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String stressReport;
-
-    /**
-     * 监理旁站记录
-     */
-    @NotBlank(message = "监理旁站记录不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String supervisionRecord;
-
-    /**
-     * 工作联系单
-     */
-    @NotBlank(message = "工作联系单不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String workContactForm;
-
-    /**
-     * 巡线确认单
-     */
-    @NotBlank(message = "巡线确认单不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String linePatrolConfirmationForm;
-
-    /**
-     * 危险作业坑大小(长)
-     */
-    @NotNull(message = "危险作业坑大小(长)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long hazardousWorkPitsLong;
-
-    /**
-     * 危险作业坑大小(宽)
-     */
-    @NotNull(message = "危险作业坑大小(宽)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long hazardousWorkPitsWide;
-
-    /**
-     * 危险作业坑大小(深)
-     */
-    @NotNull(message = "危险作业坑大小(深)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long hazardousWorkPitsDeep;
-
-    /**
-     * 是否需要支护
-     */
-    @NotBlank(message = "是否需要支护不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String needSupport;
-
-    /**
-     * 作业坑内其他管道情况
-     */
-    @NotBlank(message = "作业坑内其他管道情况不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String otherPipelineConditionsWorkPit;
-
-    /**
-     * 现场负责人
-     */
-    @NotBlank(message = "现场负责人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String siteHead;
-
-    /**
-     * 现场负责人电话
-     */
-    @NotBlank(message = "现场负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String siteHeadPhone;
-
-    /**
-     * 作业人员信息
-     */
-    @NotBlank(message = "作业人员信息不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String operatorInformation;
-
-    /**
-     * 检口
-     */
-    @NotBlank(message = "检口不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String inspectionPort;
-
-    /**
-     * 管道刷油
-     */
-    @NotBlank(message = "管道刷油不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipelinePainting;
-
-    /**
-     * 管道支护
-     */
-    @NotBlank(message = "管道支护不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipelineSupport;
-
-    /**
-     * 管道防腐
-     */
-    @NotBlank(message = "管道防腐不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipelineCorrosionProtection;
-
-    /**
-     * 砌筑阀门井
-     */
-    @NotBlank(message = "砌筑阀门井不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String masonryValveWell;
-
-    /**
-     * 保护井
-     */
-    @NotBlank(message = "保护井不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String protectionWell;
-
-    /**
-     * 管件保护井砌筑
-     */
-    @NotBlank(message = "管件保护井砌筑不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String pipeProtectionWelMasonry;
-
-    /**
-     * 回填
-     */
-    @NotBlank(message = "回填不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String backfill;
-
-    /**
-     * 夯实
-     */
-    @NotBlank(message = "夯实不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String tamp;
-
-    /**
-     * 平整场地
-     */
-    @NotBlank(message = "平整场地不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String levelingTheSite;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringIndustryBo.java

@@ -1,97 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工业工程|市政工程业务对象 z_engineering_industry
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringIndustryBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 工程类型
-     */
-    @NotBlank(message = "工程类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String engineeringType;
-
-    /**
-     * 建筑单位
-     */
-    @NotBlank(message = "建筑单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructUnit;
-
-    /**
-     * 项目负责人
-     */
-    @NotBlank(message = "项目负责人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String projectHead;
-
-    /**
-     * 现场负责人
-     */
-    @NotBlank(message = "现场负责人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String sceneHead;
-
-    /**
-     * 设计单位
-     */
-    @NotBlank(message = "设计单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String designUnit;
-
-    /**
-     * 设计负责人
-     */
-    @NotBlank(message = "设计负责人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String designHead;
-
-    /**
-     * 设计联系电话
-     */
-    @NotBlank(message = "设计联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String designPhone;
-
-    /**
-     * 监理单位
-     */
-    @NotBlank(message = "监理单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String supervisionUnit;
-
-    /**
-     * 监理负责人
-     */
-    @NotBlank(message = "监理负责人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String supervisionHead;
-
-    /**
-     * 监理联系电话
-     */
-    @NotBlank(message = "监理联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String supervisionPhone;
-
-    /**
-     * 类型(工业工程|市政工程)
-     */
-    @NotBlank(message = "类型(工业工程|市政工程)不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String type;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringInfoBo.java

@@ -1,81 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程详情业务对象 z_engineering_info
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringInfoBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 民用工程id
-     */
-    @NotNull(message = "民用工程id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long engInfoId;
-
-    /**
-     * 施工地址
-     */
-    @NotBlank(message = "施工地址不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructAddre;
-
-    /**
-     * 是否按图纸施工
-     */
-    @NotBlank(message = "是否按图纸施工不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructAccordingDrawings;
-
-    /**
-     * 分段打压是否合格
-     */
-    @NotBlank(message = "分段打压是否合格不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String segmentedCompressionQualified;
-
-    /**
-     * 回填时间
-     */
-    @NotNull(message = "回填时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date backfillTime;
-
-    /**
-     * 施工人电话
-     */
-    @NotBlank(message = "施工人电话不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructPhone;
-
-    /**
-     * 施工人
-     */
-    @NotBlank(message = "施工人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructUser;
-
-    /**
-     * 施工时间
-     */
-    @NotNull(message = "施工时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date constructTime;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringInfrastructureBo.java

@@ -1,75 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 基建工程业务对象 z_engineering_infrastructure
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringInfrastructureBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 工程名称
-     */
-    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String enginName;
-
-    /**
-     * 工程地址
-     */
-    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String enginAddre;
-
-    /**
-     * 建设单位
-     */
-    @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructUnit;
-
-    /**
-     * 开工时间
-     */
-    @NotNull(message = "开工时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date startTime;
-
-    /**
-     * 计划工期
-     */
-    @NotBlank(message = "计划工期不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String plannedDuration;
-
-    /**
-     * 竣工时间
-     */
-    @NotNull(message = "竣工时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date completedTime;
-
-    /**
-     * 工程内容
-     */
-    @NotBlank(message = "工程内容不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String enginContent;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringMaterialBo.java

@@ -1,61 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程用料业务对象 z_engineering_material
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringMaterialBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 详情id
-     */
-    @NotNull(message = "详情id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long detailsId;
-
-    /**
-     * 材质
-     */
-    @NotBlank(message = "材质不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String materialQuality;
-
-    /**
-     * 规格
-     */
-    @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String specifications;
-
-    /**
-     * 尺寸
-     */
-    @NotNull(message = "尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long size;
-
-    /**
-     * 数量
-     */
-    @NotNull(message = "数量不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long number;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringMaterialsResetsBo.java

@@ -1,61 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程用料预设业务对象 z_engineering_materials_resets
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringMaterialsResetsBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long areaId;
-
-    /**
-     * 材质
-     */
-    @NotBlank(message = "材质不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String materialQuality;
-
-    /**
-     * 规格
-     */
-    @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String estimatedSpecifications;
-
-    /**
-     * 预估尺寸
-     */
-    @NotNull(message = "预估尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long estimatedSize;
-
-    /**
-     * 预估金额
-     */
-    @NotBlank(message = "预估金额不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String estimatedAmount;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringNodeBo.java

@@ -1,43 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程节点业务对象 z_engineering_node
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringNodeBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 民用工程id
-     */
-    @NotNull(message = "民用工程id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long civliId;
-
-    /**
-     * 节点类型
-     */
-    @NotBlank(message = "节点类型不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String type;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringPipeJackingBo.java

@@ -1,73 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 顶管工程业务对象 z_engineering_pipe_jacking
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringPipeJackingBo extends BaseEntity {
-
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 工程名称
-     */
-    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String enginName;
-
-    /**
-     * 工程地址
-     */
-    @NotBlank(message = "工程地址不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String enginAddre;
-
-    /**
-     * 工程编码
-     */
-    @NotBlank(message = "工程编码不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String enginCode;
-
-    /**
-     * 施工单位
-     */
-    @NotBlank(message = "施工单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructUnit;
-
-    /**
-     * 工程规模
-     */
-    @NotBlank(message = "工程规模不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String enginScale;
-
-    /**
-     * 施工质量
-     */
-    @NotBlank(message = "施工质量不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructQuality;
-
-    /**
-     * 施工进度
-     */
-    @NotBlank(message = "施工进度不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructSchedule;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringReviewBo.java

@@ -1,63 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工程审核业务对象 z_engineering_review
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZEngineeringReviewBo extends BaseEntity {
-
-    /**
-     * 主键
-     */
-    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 审核时间
-     */
-    @NotNull(message = "审核时间不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date reviewTime;
-
-    /**
-     * 审核人
-     */
-    @NotBlank(message = "审核人不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String reviewUser;
-
-    /**
-     * 审核状态
-     */
-    @NotBlank(message = "审核状态不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String reviewStatus;
-
-    /**
-     * 审核内容
-     */
-    @NotBlank(message = "审核内容不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String reviewContent;
-
-    /**
-     * 节点ID
-     */
-    @NotNull(message = "节点ID不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long engInfoId;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZHouseBo.java

@@ -1,43 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 房屋管理业务对象 z_house
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZHouseBo extends BaseEntity {
-
-    /**
-     * 主键id
-     */
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 房屋名
-     */
-    @NotBlank(message = "房屋名不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String name;
-
-    /**
-     * 单元id
-     */
-    @NotNull(message = "单元id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long unitId;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZUnitBo.java

@@ -1,43 +0,0 @@
-package com.ruoyi.zdsz.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 单元管理业务对象 z_unit
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ZUnitBo extends BaseEntity {
-
-    /**
-     * 主键id
-     */
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
-    private Long id;
-
-    /**
-     * 单元名
-     */
-    @NotBlank(message = "单元名不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String name;
-
-    /**
-     * 楼宇id
-     */
-    @NotNull(message = "楼宇id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long buildingId;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZAreaVo.java

@@ -1,86 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 小区管理视图对象 z_area
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZAreaVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @ExcelProperty(value = "主键id")
-    private Long id;
-
-    /**
-     * 小区名
-     */
-    @ExcelProperty(value = "小区名")
-    private String name;
-
-    /**
-     * 负责工长
-     */
-    @ExcelProperty(value = "负责工长")
-    private Long userId;
-
-    /**
-     * 是否释放
-     */
-    @ExcelProperty(value = "是否释放")
-    private String releaseIs;
-
-    /**
-     * 释放人
-     */
-    @ExcelProperty(value = "释放人")
-    private String releaseBy;
-
-    /**
-     * 行政区（字典district）
-     */
-    @ExcelProperty(value = "行政区", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "字=典district")
-    private String district;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private String calculateDistrictId;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private String calculateDistrictName;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long areaSize;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private String affiliatedPackage;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZBuildingVo.java

@@ -1,43 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 楼宇管理视图对象 z_building
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZBuildingVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @ExcelProperty(value = "主键id")
-    private Long id;
-
-    /**
-     * 楼宇名
-     */
-    @ExcelProperty(value = "楼宇名")
-    private String name;
-
-    /**
-     * 小区id
-     */
-    @ExcelProperty(value = "小区id")
-    private Long areaId;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngiineeringPhotoVo.java

@@ -1,43 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 照片视图对象 z_engiineering_photo
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngiineeringPhotoVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ExcelProperty(value = "主键")
-    private Long id;
-
-    /**
-     * 上级id
-     */
-    @ExcelProperty(value = "上级id")
-    private Long parentId;
-
-    /**
-     * 图片地址
-     */
-    @ExcelProperty(value = "图片地址")
-    private String picUrl;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringCivilVo.java

@@ -1,79 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 民用工程视图对象 z_engineering_civil
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringCivilVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ExcelProperty(value = "主键")
-    private Long id;
-
-    /**
-     * 小区id
-     */
-    @ExcelProperty(value = "小区id")
-    private Long areaId;
-
-    /**
-     * 楼宇id
-     */
-    @ExcelProperty(value = "楼宇id")
-    private Long buildingId;
-
-    /**
-     * 单元id
-     */
-    @ExcelProperty(value = "单元id")
-    private Long unitId;
-
-    /**
-     * 房间id
-     */
-    @ExcelProperty(value = "房间id")
-    private Long houseId;
-
-    /**
-     * 工程类型
-     */
-    @ExcelProperty(value = "工程类型")
-    private String engineeringType;
-
-    /**
-     * 负责人id
-     */
-    @ExcelProperty(value = "负责人id")
-    private String headName;
-
-    /**
-     * 负责人电话
-     */
-    @ExcelProperty(value = "负责人电话")
-    private String headPhone;
-
-    /**
-     * 工程分类
-     */
-    @ExcelProperty(value = "工程分类")
-    private String engineeringClassification;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringDangerousVo.java

@@ -1,231 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 危险工程视图对象 z_engineering_dangerous
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringDangerousVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long id;
-
-    /**
-     * 作业基本信息
-     */
-    @ExcelProperty(value = "作业基本信息")
-    private String basicInformation;
-
-    /**
-     * 工程名称
-     */
-    @ExcelProperty(value = "工程名称")
-    private String enginName;
-
-    /**
-     * 工程地点
-     */
-    @ExcelProperty(value = "工程地点")
-    private String enginAddre;
-
-    /**
-     * 工程时间
-     */
-    @ExcelProperty(value = "工程时间")
-    private Date enginTime;
-
-    /**
-     * 管径
-     */
-    @ExcelProperty(value = "管径")
-    private String pipeDiameter;
-
-    /**
-     * 管材
-     */
-    @ExcelProperty(value = "管材")
-    private String tubularProduct;
-
-    /**
-     * 是否存在套管
-     */
-    @ExcelProperty(value = "是否存在套管")
-    private String casingPresent;
-
-    /**
-     * 管道压力
-     */
-    @ExcelProperty(value = "管道压力")
-    private String pipePressure;
-
-    /**
-     * 气源方向
-     */
-    @ExcelProperty(value = "气源方向")
-    private String gasSourceDirection;
-
-    /**
-     * 作业位置
-     */
-    @ExcelProperty(value = "作业位置")
-    private String taskPosition;
-
-    /**
-     * 与作业相关阀门位置
-     */
-    @ExcelProperty(value = "与作业相关阀门位置")
-    private String valvePosition;
-
-    /**
-     * 压力报告
-     */
-    @ExcelProperty(value = "压力报告")
-    private String stressReport;
-
-    /**
-     * 监理旁站记录
-     */
-    @ExcelProperty(value = "监理旁站记录")
-    private String supervisionRecord;
-
-    /**
-     * 工作联系单
-     */
-    @ExcelProperty(value = "工作联系单")
-    private String workContactForm;
-
-    /**
-     * 巡线确认单
-     */
-    @ExcelProperty(value = "巡线确认单")
-    private String linePatrolConfirmationForm;
-
-    /**
-     * 危险作业坑大小(长)
-     */
-    @ExcelProperty(value = "危险作业坑大小(长)")
-    private Long hazardousWorkPitsLong;
-
-    /**
-     * 危险作业坑大小(宽)
-     */
-    @ExcelProperty(value = "危险作业坑大小(宽)")
-    private Long hazardousWorkPitsWide;
-
-    /**
-     * 危险作业坑大小(深)
-     */
-    @ExcelProperty(value = "危险作业坑大小(深)")
-    private Long hazardousWorkPitsDeep;
-
-    /**
-     * 是否需要支护
-     */
-    @ExcelProperty(value = "是否需要支护")
-    private String needSupport;
-
-    /**
-     * 作业坑内其他管道情况
-     */
-    @ExcelProperty(value = "作业坑内其他管道情况")
-    private String otherPipelineConditionsWorkPit;
-
-    /**
-     * 现场负责人
-     */
-    @ExcelProperty(value = "现场负责人")
-    private String siteHead;
-
-    /**
-     * 现场负责人电话
-     */
-    @ExcelProperty(value = "现场负责人电话")
-    private String siteHeadPhone;
-
-    /**
-     * 作业人员信息
-     */
-    @ExcelProperty(value = "作业人员信息")
-    private String operatorInformation;
-
-    /**
-     * 检口
-     */
-    @ExcelProperty(value = "检口")
-    private String inspectionPort;
-
-    /**
-     * 管道刷油
-     */
-    @ExcelProperty(value = "管道刷油")
-    private String pipelinePainting;
-
-    /**
-     * 管道支护
-     */
-    @ExcelProperty(value = "管道支护")
-    private String pipelineSupport;
-
-    /**
-     * 管道防腐
-     */
-    @ExcelProperty(value = "管道防腐")
-    private String pipelineCorrosionProtection;
-
-    /**
-     * 砌筑阀门井
-     */
-    @ExcelProperty(value = "砌筑阀门井")
-    private String masonryValveWell;
-
-    /**
-     * 保护井
-     */
-    @ExcelProperty(value = "保护井")
-    private String protectionWell;
-
-    /**
-     * 管件保护井砌筑
-     */
-    @ExcelProperty(value = "管件保护井砌筑")
-    private String pipeProtectionWelMasonry;
-
-    /**
-     * 回填
-     */
-    @ExcelProperty(value = "回填")
-    private String backfill;
-
-    /**
-     * 夯实
-     */
-    @ExcelProperty(value = "夯实")
-    private String tamp;
-
-    /**
-     * 平整场地
-     */
-    @ExcelProperty(value = "平整场地")
-    private String levelingTheSite;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringIndustryVo.java

@@ -1,97 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 工业工程|市政工程视图对象 z_engineering_industry
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringIndustryVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long id;
-
-    /**
-     * 工程类型
-     */
-    @ExcelProperty(value = "工程类型")
-    private String engineeringType;
-
-    /**
-     * 建筑单位
-     */
-    @ExcelProperty(value = "建筑单位")
-    private String constructUnit;
-
-    /**
-     * 项目负责人
-     */
-    @ExcelProperty(value = "项目负责人")
-    private String projectHead;
-
-    /**
-     * 现场负责人
-     */
-    @ExcelProperty(value = "现场负责人")
-    private String sceneHead;
-
-    /**
-     * 设计单位
-     */
-    @ExcelProperty(value = "设计单位")
-    private String designUnit;
-
-    /**
-     * 设计负责人
-     */
-    @ExcelProperty(value = "设计负责人")
-    private String designHead;
-
-    /**
-     * 设计联系电话
-     */
-    @ExcelProperty(value = "设计联系电话")
-    private String designPhone;
-
-    /**
-     * 监理单位
-     */
-    @ExcelProperty(value = "监理单位")
-    private String supervisionUnit;
-
-    /**
-     * 监理负责人
-     */
-    @ExcelProperty(value = "监理负责人")
-    private String supervisionHead;
-
-    /**
-     * 监理联系电话
-     */
-    @ExcelProperty(value = "监理联系电话")
-    private String supervisionPhone;
-
-    /**
-     * 类型(工业工程|市政工程)
-     */
-    @ExcelProperty(value = "类型(工业工程|市政工程)")
-    private String type;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringInfoVo.java

@@ -1,81 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 工程详情视图对象 z_engineering_info
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringInfoVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long id;
-
-    /**
-     * 民用工程id
-     */
-    @ExcelProperty(value = "民用工程id")
-    private Long engInfoId;
-
-    /**
-     * 施工地址
-     */
-    @ExcelProperty(value = "施工地址")
-    private String constructAddre;
-
-    /**
-     * 是否按图纸施工
-     */
-    @ExcelProperty(value = "是否按图纸施工")
-    private String constructAccordingDrawings;
-
-    /**
-     * 分段打压是否合格
-     */
-    @ExcelProperty(value = "分段打压是否合格")
-    private String segmentedCompressionQualified;
-
-    /**
-     * 回填时间
-     */
-    @ExcelProperty(value = "回填时间")
-    private Date backfillTime;
-
-    /**
-     * 施工人电话
-     */
-    @ExcelProperty(value = "施工人电话")
-    private String constructPhone;
-
-    /**
-     * 施工人
-     */
-    @ExcelProperty(value = "施工人")
-    private String constructUser;
-
-    /**
-     * 施工时间
-     */
-    @ExcelProperty(value = "施工时间")
-    private Date constructTime;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringInfrastructureVo.java

@@ -1,75 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 基建工程视图对象 z_engineering_infrastructure
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringInfrastructureVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long id;
-
-    /**
-     * 工程名称
-     */
-    @ExcelProperty(value = "工程名称")
-    private String enginName;
-
-    /**
-     * 工程地址
-     */
-    @ExcelProperty(value = "工程地址")
-    private String enginAddre;
-
-    /**
-     * 建设单位
-     */
-    @ExcelProperty(value = "建设单位")
-    private String constructUnit;
-
-    /**
-     * 开工时间
-     */
-    @ExcelProperty(value = "开工时间")
-    private Date startTime;
-
-    /**
-     * 计划工期
-     */
-    @ExcelProperty(value = "计划工期")
-    private String plannedDuration;
-
-    /**
-     * 竣工时间
-     */
-    @ExcelProperty(value = "竣工时间")
-    private Date completedTime;
-
-    /**
-     * 工程内容
-     */
-    @ExcelProperty(value = "工程内容")
-    private String enginContent;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringMaterialVo.java

@@ -1,61 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 工程用料视图对象 z_engineering_material
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringMaterialVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long id;
-
-    /**
-     * 详情id
-     */
-    @ExcelProperty(value = "详情id")
-    private Long detailsId;
-
-    /**
-     * 材质
-     */
-    @ExcelProperty(value = "材质")
-    private String materialQuality;
-
-    /**
-     * 规格
-     */
-    @ExcelProperty(value = "规格")
-    private String specifications;
-
-    /**
-     * 尺寸
-     */
-    @ExcelProperty(value = "尺寸")
-    private Long size;
-
-    /**
-     * 数量
-     */
-    @ExcelProperty(value = "数量")
-    private Long number;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringMaterialsResetsVo.java

@@ -1,61 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 工程用料预设视图对象 z_engineering_materials_resets
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringMaterialsResetsVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long id;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long areaId;
-
-    /**
-     * 材质
-     */
-    @ExcelProperty(value = "材质")
-    private String materialQuality;
-
-    /**
-     * 规格
-     */
-    @ExcelProperty(value = "规格")
-    private String estimatedSpecifications;
-
-    /**
-     * 预估尺寸
-     */
-    @ExcelProperty(value = "预估尺寸")
-    private Long estimatedSize;
-
-    /**
-     * 预估金额
-     */
-    @ExcelProperty(value = "预估金额")
-    private String estimatedAmount;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringNodeVo.java

@@ -1,43 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 工程节点视图对象 z_engineering_node
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringNodeVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long id;
-
-    /**
-     * 民用工程id
-     */
-    @ExcelProperty(value = "民用工程id")
-    private Long civliId;
-
-    /**
-     * 节点类型
-     */
-    @ExcelProperty(value = "节点类型")
-    private String type;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringPipeJackingVo.java

@@ -1,73 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 顶管工程视图对象 z_engineering_pipe_jacking
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringPipeJackingVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @ExcelProperty(value = "")
-    private Long id;
-
-    /**
-     * 工程名称
-     */
-    @ExcelProperty(value = "工程名称")
-    private String enginName;
-
-    /**
-     * 工程地址
-     */
-    @ExcelProperty(value = "工程地址")
-    private String enginAddre;
-
-    /**
-     * 工程编码
-     */
-    @ExcelProperty(value = "工程编码")
-    private String enginCode;
-
-    /**
-     * 施工单位
-     */
-    @ExcelProperty(value = "施工单位")
-    private String constructUnit;
-
-    /**
-     * 工程规模
-     */
-    @ExcelProperty(value = "工程规模")
-    private String enginScale;
-
-    /**
-     * 施工质量
-     */
-    @ExcelProperty(value = "施工质量")
-    private String constructQuality;
-
-    /**
-     * 施工进度
-     */
-    @ExcelProperty(value = "施工进度")
-    private String constructSchedule;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringReviewVo.java

@@ -1,63 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 工程审核视图对象 z_engineering_review
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZEngineeringReviewVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ExcelProperty(value = "主键")
-    private Long id;
-
-    /**
-     * 审核时间
-     */
-    @ExcelProperty(value = "审核时间")
-    private Date reviewTime;
-
-    /**
-     * 审核人
-     */
-    @ExcelProperty(value = "审核人")
-    private String reviewUser;
-
-    /**
-     * 审核状态
-     */
-    @ExcelProperty(value = "审核状态")
-    private String reviewStatus;
-
-    /**
-     * 审核内容
-     */
-    @ExcelProperty(value = "审核内容")
-    private String reviewContent;
-
-    /**
-     * 节点ID
-     */
-    @ExcelProperty(value = "节点ID")
-    private Long engInfoId;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZHouseVo.java

@@ -1,43 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 房屋管理视图对象 z_house
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZHouseVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @ExcelProperty(value = "主键id")
-    private Long id;
-
-    /**
-     * 房屋名
-     */
-    @ExcelProperty(value = "房屋名")
-    private String name;
-
-    /**
-     * 单元id
-     */
-    @ExcelProperty(value = "单元id")
-    private Long unitId;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZUnitVo.java

@@ -1,43 +0,0 @@
-package com.ruoyi.zdsz.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import lombok.Data;
-import java.util.Date;
-
-import java.io.Serializable;
-
-/**
- * 单元管理视图对象 z_unit
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@Data
-@ExcelIgnoreUnannotated
-public class ZUnitVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @ExcelProperty(value = "主键id")
-    private Long id;
-
-    /**
-     * 单元名
-     */
-    @ExcelProperty(value = "单元名")
-    private String name;
-
-    /**
-     * 楼宇id
-     */
-    @ExcelProperty(value = "楼宇id")
-    private Long buildingId;
-
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZAreaMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZArea;
-import com.ruoyi.zdsz.domain.vo.ZAreaVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 小区管理Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZAreaMapper extends BaseMapperPlus<ZAreaMapper, ZArea, ZAreaVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZBuildingMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZBuilding;
-import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 楼宇管理Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZBuildingMapper extends BaseMapperPlus<ZBuildingMapper, ZBuilding, ZBuildingVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngiineeringPhotoMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
-import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 照片Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngiineeringPhotoMapper extends BaseMapperPlus<ZEngiineeringPhotoMapper, ZEngiineeringPhoto, ZEngiineeringPhotoVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringCivilMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringCivil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 民用工程Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngineeringCivilMapper extends BaseMapperPlus<ZEngineeringCivilMapper, ZEngineeringCivil, ZEngineeringCivilVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringDangerousMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringDangerous;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 危险工程Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngineeringDangerousMapper extends BaseMapperPlus<ZEngineeringDangerousMapper, ZEngineeringDangerous, ZEngineeringDangerousVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringIndustryMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 工业工程|市政工程Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngineeringIndustryMapper extends BaseMapperPlus<ZEngineeringIndustryMapper, ZEngineeringIndustry, ZEngineeringIndustryVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringInfoMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 工程详情Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngineeringInfoMapper extends BaseMapperPlus<ZEngineeringInfoMapper, ZEngineeringInfo, ZEngineeringInfoVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringInfrastructureMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringInfrastructure;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 基建工程Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngineeringInfrastructureMapper extends BaseMapperPlus<ZEngineeringInfrastructureMapper, ZEngineeringInfrastructure, ZEngineeringInfrastructureVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringMaterialMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringMaterial;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 工程用料Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngineeringMaterialMapper extends BaseMapperPlus<ZEngineeringMaterialMapper, ZEngineeringMaterial, ZEngineeringMaterialVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringMaterialsResetsMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringMaterialsResets;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialsResetsVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 工程用料预设Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngineeringMaterialsResetsMapper extends BaseMapperPlus<ZEngineeringMaterialsResetsMapper, ZEngineeringMaterialsResets, ZEngineeringMaterialsResetsVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringNodeMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringNode;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 工程节点Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngineeringNodeMapper extends BaseMapperPlus<ZEngineeringNodeMapper, ZEngineeringNode, ZEngineeringNodeVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringPipeJackingMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringPipeJacking;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 顶管工程Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngineeringPipeJackingMapper extends BaseMapperPlus<ZEngineeringPipeJackingMapper, ZEngineeringPipeJacking, ZEngineeringPipeJackingVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringReviewMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZEngineeringReview;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 工程审核Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface ZEngineeringReviewMapper extends BaseMapperPlus<ZEngineeringReviewMapper, ZEngineeringReview, ZEngineeringReviewVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZHouseMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZHouse;
-import com.ruoyi.zdsz.domain.vo.ZHouseVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 房屋管理Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZHouseMapper extends BaseMapperPlus<ZHouseMapper, ZHouse, ZHouseVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZUnitMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zdsz.mapper;
-
-import com.ruoyi.zdsz.domain.ZUnit;
-import com.ruoyi.zdsz.domain.vo.ZUnitVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
-
-/**
- * 单元管理Mapper接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface ZUnitMapper extends BaseMapperPlus<ZUnitMapper, ZUnit, ZUnitVo> {
-
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZAreaService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZArea;
-import com.ruoyi.zdsz.domain.vo.ZAreaVo;
-import com.ruoyi.zdsz.domain.bo.ZAreaBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 小区管理Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZAreaService {
-
-    /**
-     * 查询小区管理
-     */
-    ZAreaVo queryById(Long id);
-
-    /**
-     * 查询小区管理列表
-     */
-    TableDataInfo<ZAreaVo> queryPageList(ZAreaBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询小区管理列表
-     */
-    List<ZAreaVo> queryList(ZAreaBo bo);
-
-    /**
-     * 新增小区管理
-     */
-    Boolean insertByBo(ZAreaBo bo);
-
-    /**
-     * 修改小区管理
-     */
-    Boolean updateByBo(ZAreaBo bo);
-
-    /**
-     * 校验并批量删除小区管理信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZBuildingService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZBuilding;
-import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
-import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 楼宇管理Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZBuildingService {
-
-    /**
-     * 查询楼宇管理
-     */
-    ZBuildingVo queryById(Long id);
-
-    /**
-     * 查询楼宇管理列表
-     */
-    TableDataInfo<ZBuildingVo> queryPageList(ZBuildingBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询楼宇管理列表
-     */
-    List<ZBuildingVo> queryList(ZBuildingBo bo);
-
-    /**
-     * 新增楼宇管理
-     */
-    Boolean insertByBo(ZBuildingBo bo);
-
-    /**
-     * 修改楼宇管理
-     */
-    Boolean updateByBo(ZBuildingBo bo);
-
-    /**
-     * 校验并批量删除楼宇管理信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngiineeringPhotoService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
-import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 照片Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngiineeringPhotoService {
-
-    /**
-     * 查询照片
-     */
-    ZEngiineeringPhotoVo queryById(Long id);
-
-    /**
-     * 查询照片列表
-     */
-    TableDataInfo<ZEngiineeringPhotoVo> queryPageList(ZEngiineeringPhotoBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询照片列表
-     */
-    List<ZEngiineeringPhotoVo> queryList(ZEngiineeringPhotoBo bo);
-
-    /**
-     * 新增照片
-     */
-    Boolean insertByBo(ZEngiineeringPhotoBo bo);
-
-    /**
-     * 修改照片
-     */
-    Boolean updateByBo(ZEngiineeringPhotoBo bo);
-
-    /**
-     * 校验并批量删除照片信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringCivilService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringCivil;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 民用工程Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngineeringCivilService {
-
-    /**
-     * 查询民用工程
-     */
-    ZEngineeringCivilVo queryById(Long id);
-
-    /**
-     * 查询民用工程列表
-     */
-    TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询民用工程列表
-     */
-    List<ZEngineeringCivilVo> queryList(ZEngineeringCivilBo bo);
-
-    /**
-     * 新增民用工程
-     */
-    Boolean insertByBo(ZEngineeringCivilBo bo);
-
-    /**
-     * 修改民用工程
-     */
-    Boolean updateByBo(ZEngineeringCivilBo bo);
-
-    /**
-     * 校验并批量删除民用工程信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringDangerousService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringDangerous;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringDangerousBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 危险工程Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngineeringDangerousService {
-
-    /**
-     * 查询危险工程
-     */
-    ZEngineeringDangerousVo queryById(Long id);
-
-    /**
-     * 查询危险工程列表
-     */
-    TableDataInfo<ZEngineeringDangerousVo> queryPageList(ZEngineeringDangerousBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询危险工程列表
-     */
-    List<ZEngineeringDangerousVo> queryList(ZEngineeringDangerousBo bo);
-
-    /**
-     * 新增危险工程
-     */
-    Boolean insertByBo(ZEngineeringDangerousBo bo);
-
-    /**
-     * 修改危险工程
-     */
-    Boolean updateByBo(ZEngineeringDangerousBo bo);
-
-    /**
-     * 校验并批量删除危险工程信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringIndustryService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 工业工程|市政工程Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngineeringIndustryService {
-
-    /**
-     * 查询工业工程|市政工程
-     */
-    ZEngineeringIndustryVo queryById(Long id);
-
-    /**
-     * 查询工业工程|市政工程列表
-     */
-    TableDataInfo<ZEngineeringIndustryVo> queryPageList(ZEngineeringIndustryBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询工业工程|市政工程列表
-     */
-    List<ZEngineeringIndustryVo> queryList(ZEngineeringIndustryBo bo);
-
-    /**
-     * 新增工业工程|市政工程
-     */
-    Boolean insertByBo(ZEngineeringIndustryBo bo);
-
-    /**
-     * 修改工业工程|市政工程
-     */
-    Boolean updateByBo(ZEngineeringIndustryBo bo);
-
-    /**
-     * 校验并批量删除工业工程|市政工程信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringInfoService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringInfo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 工程详情Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngineeringInfoService {
-
-    /**
-     * 查询工程详情
-     */
-    ZEngineeringInfoVo queryById(Long id);
-
-    /**
-     * 查询工程详情列表
-     */
-    TableDataInfo<ZEngineeringInfoVo> queryPageList(ZEngineeringInfoBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询工程详情列表
-     */
-    List<ZEngineeringInfoVo> queryList(ZEngineeringInfoBo bo);
-
-    /**
-     * 新增工程详情
-     */
-    Boolean insertByBo(ZEngineeringInfoBo bo);
-
-    /**
-     * 修改工程详情
-     */
-    Boolean updateByBo(ZEngineeringInfoBo bo);
-
-    /**
-     * 校验并批量删除工程详情信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringInfrastructureService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringInfrastructure;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 基建工程Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngineeringInfrastructureService {
-
-    /**
-     * 查询基建工程
-     */
-    ZEngineeringInfrastructureVo queryById(Long id);
-
-    /**
-     * 查询基建工程列表
-     */
-    TableDataInfo<ZEngineeringInfrastructureVo> queryPageList(ZEngineeringInfrastructureBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询基建工程列表
-     */
-    List<ZEngineeringInfrastructureVo> queryList(ZEngineeringInfrastructureBo bo);
-
-    /**
-     * 新增基建工程
-     */
-    Boolean insertByBo(ZEngineeringInfrastructureBo bo);
-
-    /**
-     * 修改基建工程
-     */
-    Boolean updateByBo(ZEngineeringInfrastructureBo bo);
-
-    /**
-     * 校验并批量删除基建工程信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringMaterialService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringMaterial;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 工程用料Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngineeringMaterialService {
-
-    /**
-     * 查询工程用料
-     */
-    ZEngineeringMaterialVo queryById(Long id);
-
-    /**
-     * 查询工程用料列表
-     */
-    TableDataInfo<ZEngineeringMaterialVo> queryPageList(ZEngineeringMaterialBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询工程用料列表
-     */
-    List<ZEngineeringMaterialVo> queryList(ZEngineeringMaterialBo bo);
-
-    /**
-     * 新增工程用料
-     */
-    Boolean insertByBo(ZEngineeringMaterialBo bo);
-
-    /**
-     * 修改工程用料
-     */
-    Boolean updateByBo(ZEngineeringMaterialBo bo);
-
-    /**
-     * 校验并批量删除工程用料信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringMaterialsResetsService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringMaterialsResets;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialsResetsVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialsResetsBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 工程用料预设Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngineeringMaterialsResetsService {
-
-    /**
-     * 查询工程用料预设
-     */
-    ZEngineeringMaterialsResetsVo queryById(Long id);
-
-    /**
-     * 查询工程用料预设列表
-     */
-    TableDataInfo<ZEngineeringMaterialsResetsVo> queryPageList(ZEngineeringMaterialsResetsBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询工程用料预设列表
-     */
-    List<ZEngineeringMaterialsResetsVo> queryList(ZEngineeringMaterialsResetsBo bo);
-
-    /**
-     * 新增工程用料预设
-     */
-    Boolean insertByBo(ZEngineeringMaterialsResetsBo bo);
-
-    /**
-     * 修改工程用料预设
-     */
-    Boolean updateByBo(ZEngineeringMaterialsResetsBo bo);
-
-    /**
-     * 校验并批量删除工程用料预设信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringNodeService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringNode;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringNodeVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 工程节点Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngineeringNodeService {
-
-    /**
-     * 查询工程节点
-     */
-    ZEngineeringNodeVo queryById(Long id);
-
-    /**
-     * 查询工程节点列表
-     */
-    TableDataInfo<ZEngineeringNodeVo> queryPageList(ZEngineeringNodeBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询工程节点列表
-     */
-    List<ZEngineeringNodeVo> queryList(ZEngineeringNodeBo bo);
-
-    /**
-     * 新增工程节点
-     */
-    Boolean insertByBo(ZEngineeringNodeBo bo);
-
-    /**
-     * 修改工程节点
-     */
-    Boolean updateByBo(ZEngineeringNodeBo bo);
-
-    /**
-     * 校验并批量删除工程节点信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringPipeJackingService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringPipeJacking;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringPipeJackingVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringPipeJackingBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 顶管工程Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngineeringPipeJackingService {
-
-    /**
-     * 查询顶管工程
-     */
-    ZEngineeringPipeJackingVo queryById(Long id);
-
-    /**
-     * 查询顶管工程列表
-     */
-    TableDataInfo<ZEngineeringPipeJackingVo> queryPageList(ZEngineeringPipeJackingBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询顶管工程列表
-     */
-    List<ZEngineeringPipeJackingVo> queryList(ZEngineeringPipeJackingBo bo);
-
-    /**
-     * 新增顶管工程
-     */
-    Boolean insertByBo(ZEngineeringPipeJackingBo bo);
-
-    /**
-     * 修改顶管工程
-     */
-    Boolean updateByBo(ZEngineeringPipeJackingBo bo);
-
-    /**
-     * 校验并批量删除顶管工程信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringReviewService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZEngineeringReview;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringReviewVo;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 工程审核Service接口
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-public interface IZEngineeringReviewService {
-
-    /**
-     * 查询工程审核
-     */
-    ZEngineeringReviewVo queryById(Long id);
-
-    /**
-     * 查询工程审核列表
-     */
-    TableDataInfo<ZEngineeringReviewVo> queryPageList(ZEngineeringReviewBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询工程审核列表
-     */
-    List<ZEngineeringReviewVo> queryList(ZEngineeringReviewBo bo);
-
-    /**
-     * 新增工程审核
-     */
-    Boolean insertByBo(ZEngineeringReviewBo bo);
-
-    /**
-     * 修改工程审核
-     */
-    Boolean updateByBo(ZEngineeringReviewBo bo);
-
-    /**
-     * 校验并批量删除工程审核信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZHouseService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZHouse;
-import com.ruoyi.zdsz.domain.vo.ZHouseVo;
-import com.ruoyi.zdsz.domain.bo.ZHouseBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 房屋管理Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZHouseService {
-
-    /**
-     * 查询房屋管理
-     */
-    ZHouseVo queryById(Long id);
-
-    /**
-     * 查询房屋管理列表
-     */
-    TableDataInfo<ZHouseVo> queryPageList(ZHouseBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询房屋管理列表
-     */
-    List<ZHouseVo> queryList(ZHouseBo bo);
-
-    /**
-     * 新增房屋管理
-     */
-    Boolean insertByBo(ZHouseBo bo);
-
-    /**
-     * 修改房屋管理
-     */
-    Boolean updateByBo(ZHouseBo bo);
-
-    /**
-     * 校验并批量删除房屋管理信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZUnitService.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zdsz.service;
-
-import com.ruoyi.zdsz.domain.ZUnit;
-import com.ruoyi.zdsz.domain.vo.ZUnitVo;
-import com.ruoyi.zdsz.domain.bo.ZUnitBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 单元管理Service接口
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-public interface IZUnitService {
-
-    /**
-     * 查询单元管理
-     */
-    ZUnitVo queryById(Long id);
-
-    /**
-     * 查询单元管理列表
-     */
-    TableDataInfo<ZUnitVo> queryPageList(ZUnitBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询单元管理列表
-     */
-    List<ZUnitVo> queryList(ZUnitBo bo);
-
-    /**
-     * 新增单元管理
-     */
-    Boolean insertByBo(ZUnitBo bo);
-
-    /**
-     * 修改单元管理
-     */
-    Boolean updateByBo(ZUnitBo bo);
-
-    /**
-     * 校验并批量删除单元管理信息
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZAreaServiceImpl.java

@@ -1,117 +0,0 @@
-package com.ruoyi.zdsz.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZAreaBo;
-import com.ruoyi.zdsz.domain.vo.ZAreaVo;
-import com.ruoyi.zdsz.domain.ZArea;
-import com.ruoyi.zdsz.mapper.ZAreaMapper;
-import com.ruoyi.zdsz.service.IZAreaService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 小区管理Service业务层处理
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@RequiredArgsConstructor
-@Service
-public class ZAreaServiceImpl implements IZAreaService {
-
-    private final ZAreaMapper baseMapper;
-
-    /**
-     * 查询小区管理
-     */
-    @Override
-    public ZAreaVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 查询小区管理列表
-     */
-    @Override
-    public TableDataInfo<ZAreaVo> queryPageList(ZAreaBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZArea> lqw = buildQueryWrapper(bo);
-        Page<ZAreaVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询小区管理列表
-     */
-    @Override
-    public List<ZAreaVo> queryList(ZAreaBo bo) {
-        LambdaQueryWrapper<ZArea> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<ZArea> buildQueryWrapper(ZAreaBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<ZArea> lqw = Wrappers.lambdaQuery();
-        lqw.like(StringUtils.isNotBlank(bo.getName()), ZArea::getName, bo.getName());
-        lqw.eq(bo.getUserId() != null, ZArea::getUserId, bo.getUserId());
-        lqw.eq(StringUtils.isNotBlank(bo.getReleaseIs()), ZArea::getReleaseIs, bo.getReleaseIs());
-        lqw.eq(StringUtils.isNotBlank(bo.getReleaseBy()), ZArea::getReleaseBy, bo.getReleaseBy());
-        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZArea::getDistrict, bo.getDistrict());
-        lqw.eq(StringUtils.isNotBlank(bo.getCalculateDistrictId()), ZArea::getCalculateDistrictId, bo.getCalculateDistrictId());
-        lqw.like(StringUtils.isNotBlank(bo.getCalculateDistrictName()), ZArea::getCalculateDistrictName, bo.getCalculateDistrictName());
-        lqw.eq(bo.getAreaSize() != null, ZArea::getAreaSize, bo.getAreaSize());
-        lqw.eq(StringUtils.isNotBlank(bo.getAffiliatedPackage()), ZArea::getAffiliatedPackage, bo.getAffiliatedPackage());
-        return lqw;
-    }
-
-    /**
-     * 新增小区管理
-     */
-    @Override
-    public Boolean insertByBo(ZAreaBo bo) {
-        ZArea add = BeanUtil.toBean(bo, ZArea.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改小区管理
-     */
-    @Override
-    public Boolean updateByBo(ZAreaBo bo) {
-        ZArea update = BeanUtil.toBean(bo, ZArea.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(ZArea entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除小区管理
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZBuildingServiceImpl.java

@@ -1,110 +0,0 @@
-package com.ruoyi.zdsz.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
-import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
-import com.ruoyi.zdsz.domain.ZBuilding;
-import com.ruoyi.zdsz.mapper.ZBuildingMapper;
-import com.ruoyi.zdsz.service.IZBuildingService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 楼宇管理Service业务层处理
- *
- * @author ruoyi
- * @date 2023-12-23
- */
-@RequiredArgsConstructor
-@Service
-public class ZBuildingServiceImpl implements IZBuildingService {
-
-    private final ZBuildingMapper baseMapper;
-
-    /**
-     * 查询楼宇管理
-     */
-    @Override
-    public ZBuildingVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 查询楼宇管理列表
-     */
-    @Override
-    public TableDataInfo<ZBuildingVo> queryPageList(ZBuildingBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZBuilding> lqw = buildQueryWrapper(bo);
-        Page<ZBuildingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询楼宇管理列表
-     */
-    @Override
-    public List<ZBuildingVo> queryList(ZBuildingBo bo) {
-        LambdaQueryWrapper<ZBuilding> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<ZBuilding> buildQueryWrapper(ZBuildingBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<ZBuilding> lqw = Wrappers.lambdaQuery();
-        lqw.like(StringUtils.isNotBlank(bo.getName()), ZBuilding::getName, bo.getName());
-        lqw.eq(bo.getAreaId() != null, ZBuilding::getAreaId, bo.getAreaId());
-        return lqw;
-    }
-
-    /**
-     * 新增楼宇管理
-     */
-    @Override
-    public Boolean insertByBo(ZBuildingBo bo) {
-        ZBuilding add = BeanUtil.toBean(bo, ZBuilding.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改楼宇管理
-     */
-    @Override
-    public Boolean updateByBo(ZBuildingBo bo) {
-        ZBuilding update = BeanUtil.toBean(bo, ZBuilding.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(ZBuilding entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除楼宇管理
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngiineeringPhotoServiceImpl.java

@@ -1,110 +0,0 @@
-package com.ruoyi.zdsz.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZEngiineeringPhotoBo;
-import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
-import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
-import com.ruoyi.zdsz.mapper.ZEngiineeringPhotoMapper;
-import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 照片Service业务层处理
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@RequiredArgsConstructor
-@Service
-public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService {
-
-    private final ZEngiineeringPhotoMapper baseMapper;
-
-    /**
-     * 查询照片
-     */
-    @Override
-    public ZEngiineeringPhotoVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 查询照片列表
-     */
-    @Override
-    public TableDataInfo<ZEngiineeringPhotoVo> queryPageList(ZEngiineeringPhotoBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZEngiineeringPhoto> lqw = buildQueryWrapper(bo);
-        Page<ZEngiineeringPhotoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询照片列表
-     */
-    @Override
-    public List<ZEngiineeringPhotoVo> queryList(ZEngiineeringPhotoBo bo) {
-        LambdaQueryWrapper<ZEngiineeringPhoto> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<ZEngiineeringPhoto> buildQueryWrapper(ZEngiineeringPhotoBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getParentId() != null, ZEngiineeringPhoto::getParentId, bo.getParentId());
-        lqw.eq(StringUtils.isNotBlank(bo.getPicUrl()), ZEngiineeringPhoto::getPicUrl, bo.getPicUrl());
-        return lqw;
-    }
-
-    /**
-     * 新增照片
-     */
-    @Override
-    public Boolean insertByBo(ZEngiineeringPhotoBo bo) {
-        ZEngiineeringPhoto add = BeanUtil.toBean(bo, ZEngiineeringPhoto.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改照片
-     */
-    @Override
-    public Boolean updateByBo(ZEngiineeringPhotoBo bo) {
-        ZEngiineeringPhoto update = BeanUtil.toBean(bo, ZEngiineeringPhoto.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(ZEngiineeringPhoto entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除照片
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

@@ -1,116 +0,0 @@
-package com.ruoyi.zdsz.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
-import com.ruoyi.zdsz.domain.ZEngineeringCivil;
-import com.ruoyi.zdsz.mapper.ZEngineeringCivilMapper;
-import com.ruoyi.zdsz.service.IZEngineeringCivilService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 民用工程Service业务层处理
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@RequiredArgsConstructor
-@Service
-public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
-
-    private final ZEngineeringCivilMapper baseMapper;
-
-    /**
-     * 查询民用工程
-     */
-    @Override
-    public ZEngineeringCivilVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 查询民用工程列表
-     */
-    @Override
-    public TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZEngineeringCivil> lqw = buildQueryWrapper(bo);
-        Page<ZEngineeringCivilVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询民用工程列表
-     */
-    @Override
-    public List<ZEngineeringCivilVo> queryList(ZEngineeringCivilBo bo) {
-        LambdaQueryWrapper<ZEngineeringCivil> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<ZEngineeringCivil> buildQueryWrapper(ZEngineeringCivilBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getAreaId() != null, ZEngineeringCivil::getAreaId, bo.getAreaId());
-        lqw.eq(bo.getBuildingId() != null, ZEngineeringCivil::getBuildingId, bo.getBuildingId());
-        lqw.eq(bo.getUnitId() != null, ZEngineeringCivil::getUnitId, bo.getUnitId());
-        lqw.eq(bo.getHouseId() != null, ZEngineeringCivil::getHouseId, bo.getHouseId());
-        lqw.eq(StringUtils.isNotBlank(bo.getEngineeringType()), ZEngineeringCivil::getEngineeringType, bo.getEngineeringType());
-        lqw.like(StringUtils.isNotBlank(bo.getHeadName()), ZEngineeringCivil::getHeadName, bo.getHeadName());
-        lqw.eq(StringUtils.isNotBlank(bo.getHeadPhone()), ZEngineeringCivil::getHeadPhone, bo.getHeadPhone());
-        lqw.eq(StringUtils.isNotBlank(bo.getEngineeringClassification()), ZEngineeringCivil::getEngineeringClassification, bo.getEngineeringClassification());
-        return lqw;
-    }
-
-    /**
-     * 新增民用工程
-     */
-    @Override
-    public Boolean insertByBo(ZEngineeringCivilBo bo) {
-        ZEngineeringCivil add = BeanUtil.toBean(bo, ZEngineeringCivil.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改民用工程
-     */
-    @Override
-    public Boolean updateByBo(ZEngineeringCivilBo bo) {
-        ZEngineeringCivil update = BeanUtil.toBean(bo, ZEngineeringCivil.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(ZEngineeringCivil entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除民用工程
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringDangerousServiceImpl.java

@@ -1,141 +0,0 @@
-package com.ruoyi.zdsz.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringDangerousBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
-import com.ruoyi.zdsz.domain.ZEngineeringDangerous;
-import com.ruoyi.zdsz.mapper.ZEngineeringDangerousMapper;
-import com.ruoyi.zdsz.service.IZEngineeringDangerousService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 危险工程Service业务层处理
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@RequiredArgsConstructor
-@Service
-public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousService {
-
-    private final ZEngineeringDangerousMapper baseMapper;
-
-    /**
-     * 查询危险工程
-     */
-    @Override
-    public ZEngineeringDangerousVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 查询危险工程列表
-     */
-    @Override
-    public TableDataInfo<ZEngineeringDangerousVo> queryPageList(ZEngineeringDangerousBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZEngineeringDangerous> lqw = buildQueryWrapper(bo);
-        Page<ZEngineeringDangerousVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询危险工程列表
-     */
-    @Override
-    public List<ZEngineeringDangerousVo> queryList(ZEngineeringDangerousBo bo) {
-        LambdaQueryWrapper<ZEngineeringDangerous> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<ZEngineeringDangerous> buildQueryWrapper(ZEngineeringDangerousBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<ZEngineeringDangerous> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getBasicInformation()), ZEngineeringDangerous::getBasicInformation, bo.getBasicInformation());
-        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringDangerous::getEnginName, bo.getEnginName());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringDangerous::getEnginAddre, bo.getEnginAddre());
-        lqw.eq(bo.getEnginTime() != null, ZEngineeringDangerous::getEnginTime, bo.getEnginTime());
-        lqw.eq(StringUtils.isNotBlank(bo.getPipeDiameter()), ZEngineeringDangerous::getPipeDiameter, bo.getPipeDiameter());
-        lqw.eq(StringUtils.isNotBlank(bo.getTubularProduct()), ZEngineeringDangerous::getTubularProduct, bo.getTubularProduct());
-        lqw.eq(StringUtils.isNotBlank(bo.getCasingPresent()), ZEngineeringDangerous::getCasingPresent, bo.getCasingPresent());
-        lqw.eq(StringUtils.isNotBlank(bo.getPipePressure()), ZEngineeringDangerous::getPipePressure, bo.getPipePressure());
-        lqw.eq(StringUtils.isNotBlank(bo.getGasSourceDirection()), ZEngineeringDangerous::getGasSourceDirection, bo.getGasSourceDirection());
-        lqw.eq(StringUtils.isNotBlank(bo.getTaskPosition()), ZEngineeringDangerous::getTaskPosition, bo.getTaskPosition());
-        lqw.eq(StringUtils.isNotBlank(bo.getValvePosition()), ZEngineeringDangerous::getValvePosition, bo.getValvePosition());
-        lqw.eq(StringUtils.isNotBlank(bo.getStressReport()), ZEngineeringDangerous::getStressReport, bo.getStressReport());
-        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionRecord()), ZEngineeringDangerous::getSupervisionRecord, bo.getSupervisionRecord());
-        lqw.eq(StringUtils.isNotBlank(bo.getWorkContactForm()), ZEngineeringDangerous::getWorkContactForm, bo.getWorkContactForm());
-        lqw.eq(StringUtils.isNotBlank(bo.getLinePatrolConfirmationForm()), ZEngineeringDangerous::getLinePatrolConfirmationForm, bo.getLinePatrolConfirmationForm());
-        lqw.eq(bo.getHazardousWorkPitsLong() != null, ZEngineeringDangerous::getHazardousWorkPitsLong, bo.getHazardousWorkPitsLong());
-        lqw.eq(bo.getHazardousWorkPitsWide() != null, ZEngineeringDangerous::getHazardousWorkPitsWide, bo.getHazardousWorkPitsWide());
-        lqw.eq(bo.getHazardousWorkPitsDeep() != null, ZEngineeringDangerous::getHazardousWorkPitsDeep, bo.getHazardousWorkPitsDeep());
-        lqw.eq(StringUtils.isNotBlank(bo.getNeedSupport()), ZEngineeringDangerous::getNeedSupport, bo.getNeedSupport());
-        lqw.eq(StringUtils.isNotBlank(bo.getOtherPipelineConditionsWorkPit()), ZEngineeringDangerous::getOtherPipelineConditionsWorkPit, bo.getOtherPipelineConditionsWorkPit());
-        lqw.eq(StringUtils.isNotBlank(bo.getSiteHead()), ZEngineeringDangerous::getSiteHead, bo.getSiteHead());
-        lqw.eq(StringUtils.isNotBlank(bo.getSiteHeadPhone()), ZEngineeringDangerous::getSiteHeadPhone, bo.getSiteHeadPhone());
-        lqw.eq(StringUtils.isNotBlank(bo.getOperatorInformation()), ZEngineeringDangerous::getOperatorInformation, bo.getOperatorInformation());
-        lqw.eq(StringUtils.isNotBlank(bo.getInspectionPort()), ZEngineeringDangerous::getInspectionPort, bo.getInspectionPort());
-        lqw.eq(StringUtils.isNotBlank(bo.getPipelinePainting()), ZEngineeringDangerous::getPipelinePainting, bo.getPipelinePainting());
-        lqw.eq(StringUtils.isNotBlank(bo.getPipelineSupport()), ZEngineeringDangerous::getPipelineSupport, bo.getPipelineSupport());
-        lqw.eq(StringUtils.isNotBlank(bo.getPipelineCorrosionProtection()), ZEngineeringDangerous::getPipelineCorrosionProtection, bo.getPipelineCorrosionProtection());
-        lqw.eq(StringUtils.isNotBlank(bo.getMasonryValveWell()), ZEngineeringDangerous::getMasonryValveWell, bo.getMasonryValveWell());
-        lqw.eq(StringUtils.isNotBlank(bo.getProtectionWell()), ZEngineeringDangerous::getProtectionWell, bo.getProtectionWell());
-        lqw.eq(StringUtils.isNotBlank(bo.getPipeProtectionWelMasonry()), ZEngineeringDangerous::getPipeProtectionWelMasonry, bo.getPipeProtectionWelMasonry());
-        lqw.eq(StringUtils.isNotBlank(bo.getBackfill()), ZEngineeringDangerous::getBackfill, bo.getBackfill());
-        lqw.eq(StringUtils.isNotBlank(bo.getTamp()), ZEngineeringDangerous::getTamp, bo.getTamp());
-        lqw.eq(StringUtils.isNotBlank(bo.getLevelingTheSite()), ZEngineeringDangerous::getLevelingTheSite, bo.getLevelingTheSite());
-        return lqw;
-    }
-
-    /**
-     * 新增危险工程
-     */
-    @Override
-    public Boolean insertByBo(ZEngineeringDangerousBo bo) {
-        ZEngineeringDangerous add = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改危险工程
-     */
-    @Override
-    public Boolean updateByBo(ZEngineeringDangerousBo bo) {
-        ZEngineeringDangerous update = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(ZEngineeringDangerous entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除危险工程
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -1,119 +0,0 @@
-package com.ruoyi.zdsz.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringIndustryBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
-import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
-import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
-import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 工业工程|市政工程Service业务层处理
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@RequiredArgsConstructor
-@Service
-public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustryService {
-
-    private final ZEngineeringIndustryMapper baseMapper;
-
-    /**
-     * 查询工业工程|市政工程
-     */
-    @Override
-    public ZEngineeringIndustryVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 查询工业工程|市政工程列表
-     */
-    @Override
-    public TableDataInfo<ZEngineeringIndustryVo> queryPageList(ZEngineeringIndustryBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZEngineeringIndustry> lqw = buildQueryWrapper(bo);
-        Page<ZEngineeringIndustryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询工业工程|市政工程列表
-     */
-    @Override
-    public List<ZEngineeringIndustryVo> queryList(ZEngineeringIndustryBo bo) {
-        LambdaQueryWrapper<ZEngineeringIndustry> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<ZEngineeringIndustry> buildQueryWrapper(ZEngineeringIndustryBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<ZEngineeringIndustry> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getEngineeringType()), ZEngineeringIndustry::getEngineeringType, bo.getEngineeringType());
-        lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
-        lqw.eq(StringUtils.isNotBlank(bo.getProjectHead()), ZEngineeringIndustry::getProjectHead, bo.getProjectHead());
-        lqw.eq(StringUtils.isNotBlank(bo.getSceneHead()), ZEngineeringIndustry::getSceneHead, bo.getSceneHead());
-        lqw.eq(StringUtils.isNotBlank(bo.getDesignUnit()), ZEngineeringIndustry::getDesignUnit, bo.getDesignUnit());
-        lqw.eq(StringUtils.isNotBlank(bo.getDesignHead()), ZEngineeringIndustry::getDesignHead, bo.getDesignHead());
-        lqw.eq(StringUtils.isNotBlank(bo.getDesignPhone()), ZEngineeringIndustry::getDesignPhone, bo.getDesignPhone());
-        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionUnit()), ZEngineeringIndustry::getSupervisionUnit, bo.getSupervisionUnit());
-        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionHead()), ZEngineeringIndustry::getSupervisionHead, bo.getSupervisionHead());
-        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionPhone()), ZEngineeringIndustry::getSupervisionPhone, bo.getSupervisionPhone());
-        lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringIndustry::getType, bo.getType());
-        return lqw;
-    }
-
-    /**
-     * 新增工业工程|市政工程
-     */
-    @Override
-    public Boolean insertByBo(ZEngineeringIndustryBo bo) {
-        ZEngineeringIndustry add = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改工业工程|市政工程
-     */
-    @Override
-    public Boolean updateByBo(ZEngineeringIndustryBo bo) {
-        ZEngineeringIndustry update = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(ZEngineeringIndustry entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除工业工程|市政工程
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringInfoServiceImpl.java

@@ -1,116 +0,0 @@
-package com.ruoyi.zdsz.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfoBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
-import com.ruoyi.zdsz.domain.ZEngineeringInfo;
-import com.ruoyi.zdsz.mapper.ZEngineeringInfoMapper;
-import com.ruoyi.zdsz.service.IZEngineeringInfoService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 工程详情Service业务层处理
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@RequiredArgsConstructor
-@Service
-public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
-
-    private final ZEngineeringInfoMapper baseMapper;
-
-    /**
-     * 查询工程详情
-     */
-    @Override
-    public ZEngineeringInfoVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 查询工程详情列表
-     */
-    @Override
-    public TableDataInfo<ZEngineeringInfoVo> queryPageList(ZEngineeringInfoBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZEngineeringInfo> lqw = buildQueryWrapper(bo);
-        Page<ZEngineeringInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询工程详情列表
-     */
-    @Override
-    public List<ZEngineeringInfoVo> queryList(ZEngineeringInfoBo bo) {
-        LambdaQueryWrapper<ZEngineeringInfo> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<ZEngineeringInfo> buildQueryWrapper(ZEngineeringInfoBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<ZEngineeringInfo> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getEngInfoId() != null, ZEngineeringInfo::getEngInfoId, bo.getEngInfoId());
-        lqw.eq(StringUtils.isNotBlank(bo.getConstructAddre()), ZEngineeringInfo::getConstructAddre, bo.getConstructAddre());
-        lqw.eq(StringUtils.isNotBlank(bo.getConstructAccordingDrawings()), ZEngineeringInfo::getConstructAccordingDrawings, bo.getConstructAccordingDrawings());
-        lqw.eq(StringUtils.isNotBlank(bo.getSegmentedCompressionQualified()), ZEngineeringInfo::getSegmentedCompressionQualified, bo.getSegmentedCompressionQualified());
-        lqw.eq(bo.getBackfillTime() != null, ZEngineeringInfo::getBackfillTime, bo.getBackfillTime());
-        lqw.eq(StringUtils.isNotBlank(bo.getConstructPhone()), ZEngineeringInfo::getConstructPhone, bo.getConstructPhone());
-        lqw.eq(StringUtils.isNotBlank(bo.getConstructUser()), ZEngineeringInfo::getConstructUser, bo.getConstructUser());
-        lqw.eq(bo.getConstructTime() != null, ZEngineeringInfo::getConstructTime, bo.getConstructTime());
-        return lqw;
-    }
-
-    /**
-     * 新增工程详情
-     */
-    @Override
-    public Boolean insertByBo(ZEngineeringInfoBo bo) {
-        ZEngineeringInfo add = BeanUtil.toBean(bo, ZEngineeringInfo.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改工程详情
-     */
-    @Override
-    public Boolean updateByBo(ZEngineeringInfoBo bo) {
-        ZEngineeringInfo update = BeanUtil.toBean(bo, ZEngineeringInfo.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(ZEngineeringInfo entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除工程详情
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringInfrastructureServiceImpl.java

@@ -1,115 +0,0 @@
-package com.ruoyi.zdsz.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringInfrastructureBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringInfrastructureVo;
-import com.ruoyi.zdsz.domain.ZEngineeringInfrastructure;
-import com.ruoyi.zdsz.mapper.ZEngineeringInfrastructureMapper;
-import com.ruoyi.zdsz.service.IZEngineeringInfrastructureService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 基建工程Service业务层处理
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@RequiredArgsConstructor
-@Service
-public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfrastructureService {
-
-    private final ZEngineeringInfrastructureMapper baseMapper;
-
-    /**
-     * 查询基建工程
-     */
-    @Override
-    public ZEngineeringInfrastructureVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 查询基建工程列表
-     */
-    @Override
-    public TableDataInfo<ZEngineeringInfrastructureVo> queryPageList(ZEngineeringInfrastructureBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = buildQueryWrapper(bo);
-        Page<ZEngineeringInfrastructureVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询基建工程列表
-     */
-    @Override
-    public List<ZEngineeringInfrastructureVo> queryList(ZEngineeringInfrastructureBo bo) {
-        LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<ZEngineeringInfrastructure> buildQueryWrapper(ZEngineeringInfrastructureBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = Wrappers.lambdaQuery();
-        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringInfrastructure::getEnginName, bo.getEnginName());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringInfrastructure::getEnginAddre, bo.getEnginAddre());
-        lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringInfrastructure::getConstructUnit, bo.getConstructUnit());
-        lqw.eq(bo.getStartTime() != null, ZEngineeringInfrastructure::getStartTime, bo.getStartTime());
-        lqw.eq(StringUtils.isNotBlank(bo.getPlannedDuration()), ZEngineeringInfrastructure::getPlannedDuration, bo.getPlannedDuration());
-        lqw.eq(bo.getCompletedTime() != null, ZEngineeringInfrastructure::getCompletedTime, bo.getCompletedTime());
-        lqw.eq(StringUtils.isNotBlank(bo.getEnginContent()), ZEngineeringInfrastructure::getEnginContent, bo.getEnginContent());
-        return lqw;
-    }
-
-    /**
-     * 新增基建工程
-     */
-    @Override
-    public Boolean insertByBo(ZEngineeringInfrastructureBo bo) {
-        ZEngineeringInfrastructure add = BeanUtil.toBean(bo, ZEngineeringInfrastructure.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改基建工程
-     */
-    @Override
-    public Boolean updateByBo(ZEngineeringInfrastructureBo bo) {
-        ZEngineeringInfrastructure update = BeanUtil.toBean(bo, ZEngineeringInfrastructure.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(ZEngineeringInfrastructure entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除基建工程
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringMaterialServiceImpl.java

@@ -1,113 +0,0 @@
-package com.ruoyi.zdsz.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import com.ruoyi.zdsz.domain.bo.ZEngineeringMaterialBo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringMaterialVo;
-import com.ruoyi.zdsz.domain.ZEngineeringMaterial;
-import com.ruoyi.zdsz.mapper.ZEngineeringMaterialMapper;
-import com.ruoyi.zdsz.service.IZEngineeringMaterialService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 工程用料Service业务层处理
- *
- * @author ruoyi
- * @date 2023-12-25
- */
-@RequiredArgsConstructor
-@Service
-public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialService {
-
-    private final ZEngineeringMaterialMapper baseMapper;
-
-    /**
-     * 查询工程用料
-     */
-    @Override
-    public ZEngineeringMaterialVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 查询工程用料列表
-     */
-    @Override
-    public TableDataInfo<ZEngineeringMaterialVo> queryPageList(ZEngineeringMaterialBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZEngineeringMaterial> lqw = buildQueryWrapper(bo);
-        Page<ZEngineeringMaterialVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询工程用料列表
-     */
-    @Override
-    public List<ZEngineeringMaterialVo> queryList(ZEngineeringMaterialBo bo) {
-        LambdaQueryWrapper<ZEngineeringMaterial> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<ZEngineeringMaterial> buildQueryWrapper(ZEngineeringMaterialBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getDetailsId() != null, ZEngineeringMaterial::getDetailsId, bo.getDetailsId());
-        lqw.eq(StringUtils.isNotBlank(bo.getMaterialQuality()), ZEngineeringMaterial::getMaterialQuality, bo.getMaterialQuality());
-        lqw.eq(StringUtils.isNotBlank(bo.getSpecifications()), ZEngineeringMaterial::getSpecifications, bo.getSpecifications());
-        lqw.eq(bo.getSize() != null, ZEngineeringMaterial::getSize, bo.getSize());
-        lqw.eq(bo.getNumber() != null, ZEngineeringMaterial::getNumber, bo.getNumber());
-        return lqw;
-    }
-
-    /**
-     * 新增工程用料
-     */
-    @Override
-    public Boolean insertByBo(ZEngineeringMaterialBo bo) {
-        ZEngineeringMaterial add = BeanUtil.toBean(bo, ZEngineeringMaterial.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改工程用料
-     */
-    @Override
-    public Boolean updateByBo(ZEngineeringMaterialBo bo) {
-        ZEngineeringMaterial update = BeanUtil.toBean(bo, ZEngineeringMaterial.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(ZEngineeringMaterial entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除工程用料
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}